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

client_linchunjie

2019-01-31 741d568d506830ee50132b13675b9845af1965b1

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

 System/JadeDynastyKnapSack/JadeDynastyStoneSuitAttrBeh.cs

@@ -138,7 +138,15 @@
                            equipsName = StringUtility.Contact(equipsName, " ", equipName);

                        }

                    }

                    string activeGemNum = StringUtility.Contact(UIHelper.AppendStringColor(TextColType.Green, activeStoneNum.ToString()),"/",equipModel.gemResonanceNum);

                    string activeGemNum = string.Empty;

                    if(activeStoneNum > 0)

                    {

                        activeGemNum = StringUtility.Contact(UIHelper.AppendStringColor(TextColType.Green, activeStoneNum.ToString()), "/", equipModel.gemResonanceNum);

                    }

                    else

                    {

                        activeGemNum = StringUtility.Contact(activeStoneNum, "/", equipModel.gemResonanceNum);

                    }

                    string conditionSB = Language.Get("JadeDynastyEquip7", equipsName,equipModel.gemResonanceNum,suitAttrData.suitLv,activeGemNum);

                    activeText.text = conditionSB;

                }


 System/Role/MagicianModel.cs

@@ -80,6 +80,7 @@


        private Dictionary<int, int[]> godWeaponLevelUpCost = new Dictionary<int, int[]>();

        public List<int> godWeaponTypes { get; private set; }

        public Dictionary<int, int> godWeaponBoxDict { get; private set; } //key 神兵石礼包 value 神兵类型

        public List<int> godWeaponEffectTypes { get; private set; }

        public Dictionary<int, string> godWeaponIcons { get; private set; }

        public Dictionary<int, Dictionary<int, int>> godWeaponSkillDict = new Dictionary<int, Dictionary<int, int>>();

@@ -125,6 +126,9 @@
        public int audioLength { get; private set; }

        void ParseConfig()

        {

            var godWeaponBox = Config.Instance.Get<FuncConfigConfig>("GodWeaponBox");

            godWeaponBoxDict = ConfigParse.GetDic<int, int>(godWeaponBox.Numerical1);



            godWeaponTypes = GodWeaponConfig.GetGodWeaponType();

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

            {

@@ -330,6 +334,12 @@
                    return true;

                }

            }



            if(godWeaponBoxDict.ContainsKey(itemId))

            {

                type = godWeaponBoxDict[itemId];

                return true;

            }

            return false;

        }