Merge branch 'master' into leonard

client_Wu Xijin

2018-10-26 82931aabaaa3e479bc04e11630a77cd9c9dd5fe3

 System/KnapSack/Logic/ItemTipsModel.cs

@@ -33,7 +33,7 @@
        public Dictionary<int, HorseConfig> unlockMountDict { get; private set; }

        private Dictionary<int, Dictionary<int, int>> petSkillDict = new Dictionary<int, Dictionary<int, int>>(); // 编号 解锁阶级 技能

        private Dictionary<int, Dictionary<int, List<int>>> mountSkillDict = new Dictionary<int, Dictionary<int, List<int>>>(); // 编号 解锁阶级 技能 



        public Dictionary<int, string> petAndMountQualityDict = new Dictionary<int, string>();

        public string expValueFormula = "";



        public int[] guardAutoDrops;

@@ -415,6 +415,19 @@


            FuncConfigConfig randomRuneConfig = Config.Instance.Get<FuncConfigConfig>("RandomRuneIDList");

            randomRuneIds = ConfigParse.GetMultipleStr<int>(randomRuneConfig.Numerical1);



            FuncConfigConfig petQuality = Config.Instance.Get<FuncConfigConfig>("PetQuality");

            int[] qualitys = ConfigParse.GetMultipleStr<int>(petQuality.Numerical1);

            string[] qualityNames = ConfigParse.GetMultipleStr(petQuality.Numerical2);

            if (qualitys != null && qualityNames != null

                && qualitys.Length == qualityNames.Length)

            {

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

                {

                    petAndMountQualityDict.Add(qualitys[i],qualityNames[i]);

                }

            }

        
        }



        public void OnBeforePlayerDataInitialize()

@@ -780,7 +793,7 @@
                {

                    if(isOverdue)

                    {

                        attrData.SetTipsFuncBtn(ItemWinBtnType.renewal, (ItemWinBtnType, ItemAttrData) => { PackSendQuestMgr.Instance.SendRenewalQuest(ItemWinBtnType.renewal, attrData.index); });

                        attrData.SetTipsFuncBtn(ItemWinBtnType.renewal, (ItemWinBtnType, ItemAttrData) => { PackSendQuestMgr.Instance.SendRenewalQuest(ItemWinBtnType.renewal, attrData.guid); });

                    }

                }

            }

@@ -1780,6 +1793,13 @@
            return null;

        }



        public string GetQualityName(int quality)

        {

            string nameStr = string.Empty;

            petAndMountQualityDict.TryGetValue(quality,out nameStr);

            return nameStr;

        }



        public Dictionary<int,List<int>> GetMountSkillDict(int unlockId)

        {

            if(unlockMountDict.ContainsKey(unlockId))