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

client_linchunjie

2019-04-17 6d101512ba4cb8e37a98ace6320a0b70c96efa2b

 System/KnapSack/Logic/ItemTipsModel.cs

@@ -18,8 +18,10 @@


        public Dictionary<int, PetInfoConfig> unlockPetDict { get; private set; }

        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>>>(); // 编号 解锁阶级 技能 



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

        string expValueFormula = "";

        Dictionary<int, string> exhaustedAttrFormula { get; set; }

@@ -412,7 +414,14 @@
                    WindowCenter.Instance.Open<BuyBoxInfoWin>();

                    break;

                case ItemWinType.petMatWin:

                    WindowCenter.Instance.Open<PetMatInfoWin>();

                    if (curAttrData.isPreview)

                    {

                        EquipTipUtility.Show(TipType.Normal, curAttrData.itemId);

                    }

                    else

                    {

                        EquipTipUtility.Show(curAttrData.guid);

                    }

                    break;

                case ItemWinType.buyPetMatWin:

                    WindowCenter.Instance.Open<BuyPetMatInfoWin>();

@@ -1573,12 +1582,12 @@
                case 125:

                    PetInfoConfig petInfo = unlockPetDict[config.EffectValueA1];

                    fightPower = petInfo.ShowFightPower;

                    showPerfab.SetModelShow(petInfo.ID, ModelShowType.pet, Language.Get("TreasureEffect103"), fightPower);

                    showPerfab.SetModelShow(petInfo.ID, ModelShowType.Pet, Language.Get("TreasureEffect103"), fightPower);

                    return true;

                case 124:

                    HorseConfig horseConfig = unlockMountDict[config.EffectValueA1];

                    fightPower = horseConfig.ShowFightPower;

                    showPerfab.SetModelShow(horseConfig.Model, ModelShowType.mount, Language.Get("TreasureEffect103"), fightPower);

                    showPerfab.SetModelShow(horseConfig.Model, ModelShowType.Mount, Language.Get("TreasureEffect103"), fightPower);

                    return true;

            }

            bool isFashion = TryGetFashionFightPower(config, out fightPower);