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

client_Wu Xijin

2018-10-25 ceb3cf7149190967dc3181f018b5910a19449fc7

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

 System/KnapSack/Logic/ItemTipsModel.cs

@@ -32,7 +32,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;

@@ -414,6 +414,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()

@@ -1779,6 +1792,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))


 System/Store/PetAndMountPushWin.cs

@@ -12,6 +12,8 @@
        [SerializeField] Button closeBtn;

        [SerializeField] RichText m_Goto;

        [SerializeField] Text fightPower;

        [SerializeField] Text qualityText;

        [SerializeField] Image desImg;



        StoreModel storeModel { get { return ModelCenter.Instance.GetModel<StoreModel>(); } }

        ItemTipsModel tipsModel { get { return ModelCenter.Instance.GetModel<ItemTipsModel>(); } }

@@ -60,19 +62,25 @@
                rawImag.gameObject.SetActive(true);

                if(itemConfig != null)

                {

                    titleText.text = itemConfig.ItemName;

                    titleText.color = UIHelper.GetUIColor(itemConfig.ItemColor,true);

                    switch (itemConfig.Type)

                    {

                        case 26:

                            titleText.text = Language.Get("StorePetPush");

                            PetInfoConfig petInfo = tipsModel.unlockPetDict[storeConfig.ItemID];

                            var config = Config.Instance.Get<NPCConfig>(petInfo.ID);

                            fightPower.text = petInfo.ShowFightPower.ToString();

                            qualityText.text = tipsModel.GetQualityName(petInfo.Quality);

                            desImg.SetSprite(petInfo.DescribeIconKey);

                            desImg.SetNativeSize();

                            UI3DModelExhibition.Instance.ShowNPC(petInfo.ID, config.UIModeLOffset, config.UIModelRotation,rawImag);

                            break;

                        case 41:

                            titleText.text = Language.Get("StoreMountPush");

                            HorseConfig horseConfig = tipsModel.unlockMountDict[storeConfig.ItemID];

                            fightPower.text = horseConfig.ShowFightPower.ToString();

                            qualityText.text = tipsModel.GetQualityName(horseConfig.Quality);

                            desImg.SetSprite(horseConfig.DescribeIconKey);

                            desImg.SetNativeSize();

                            UI3DModelExhibition.Instance.ShowHourse(horseConfig.Model,rawImag);

                            break;

                    }