Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_linchunjie

2018-11-23 3a2a8b36470ee811cec2357ea071167f88ba2138

Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

 System/PlayerDead/ReliveWin.cs

@@ -52,6 +52,7 @@
                var skillConfigs = SkillConfig.GetSkillActConfigs(0,0,DeadModel.deadBuffId);

                string skillName = string.Empty;

                int buffLv = 0;

                bool isMaxBuff = false;

                if(buffIds.Count > 0)

                {

                    for(int i = 0; i < buffIds.Count; i++)

@@ -61,29 +62,19 @@
                        if(skillConfig.SkillTypeID == DeadModel.deadBuffId)

                        {

                            buffLv = skillConfig.SkillLV + 1;

                            buffLv = buffLv > DeadModel.maxDeadBuffLV ? DeadModel.maxDeadBuffLV : buffLv;

                            for (int j = 0; j < skillConfigs.Count; j++)

                            {

                                var config = skillConfigs[j];

                                if(config.SkillLV == buffLv)

                                {

                                    skillName = config.SkillName;

                                    break;

                                }

                            }

                            isMaxBuff = buffLv > DeadModel.maxDeadBuffLV ? true : false;

                            break;

                        }

                    }

                }

    

                if(skillConfigs != null && skillConfigs.Count > 0 && buffLv == 0)

                if(skillConfigs != null && skillConfigs.Count > 0)

                {

                    SkillConfig skillConfig = skillConfigs[0];

                    skillName = skillConfig.SkillName;

                    buffLv = 1;

                }



                buffText.text = Language.Get("AncientBattlefield_Text_2",buffLv,skillName);

                buffText.text = Language.Get("AncientBattlefield_Text_2",skillName);

                buffText.gameObject.SetActive(!isMaxBuff);

            }

            for (int i = 0; i < DeadModel.dungeonKillArray.Length; i++)

            {


 System/Strengthening/WashTips.cs

@@ -36,6 +36,7 @@
    [SerializeField] Text contain_Cost_Money;

    [SerializeField] GameObject contain_Default;



    [SerializeField]

    List<Text> specAttrNameText = new List<Text>();

    [SerializeField]

    List<Text> specAttrValueText = new List<Text>();