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

client_linchunjie

2019-04-17 6d101512ba4cb8e37a98ace6320a0b70c96efa2b

 System/ItemTip/EquipTipUtility.cs

@@ -26,6 +26,7 @@

            public BaseInfo baseInfo;
            public BaseProperty baseProperty;
            public BaseProperty petMountBaseProperty;
            public LegendProperty legendProperty;
            public SkillInfo skillInfo;
            public SuitInfo suitInfo;
@@ -114,6 +115,8 @@
        static EquipGemModel gemModel { get { return ModelCenter.Instance.GetModel<EquipGemModel>(); } }
        static EquipTrainModel trainModel { get { return ModelCenter.Instance.GetModel<EquipTrainModel>(); } }
        static EquipStrengthModel strengthenModel { get { return ModelCenter.Instance.GetModel<EquipStrengthModel>(); } }
        static MountModel mountModel { get { return ModelCenter.Instance.GetModel<MountModel>(); } }
        static PetModel perModel { get { return ModelCenter.Instance.GetModel<PetModel>(); } }

        public static TipType tipType { get; private set; }
        public static TipData mainTipData { get; private set; }
@@ -134,6 +137,7 @@
                mainTipData = CreateItemData(itemId);
            }

            var config = ItemConfig.Get(itemId);
            switch (type)
            {
                case TipType.Normal:
@@ -143,7 +147,17 @@
                    }
                    else
                    {
                        WindowCenter.Instance.Open<ItemTipWin>();
                        switch (config.Type)
                        {
                            case 26:
                            case 41:
                            case 42:
                                WindowCenter.Instance.Open<PetMountTipWin>();
                                break;
                            default:
                                WindowCenter.Instance.Open<ItemTipWin>();
                                break;
                        }
                    }
                    break;
                case TipType.Good:
@@ -204,7 +218,17 @@
                    }
                    else
                    {
                        WindowCenter.Instance.Open<ItemTipWin>();
                        switch (item.config.Type)
                        {
                            case 26:
                            case 41:
                            case 42:
                                WindowCenter.Instance.Open<PetMountTipWin>();
                                break;
                            default:
                                WindowCenter.Instance.Open<ItemTipWin>();
                                break;
                        }
                    }
                    break;
                case TipType.Good:
@@ -292,6 +316,7 @@
                guid = guid,

                baseInfo = GetBaseInfo(guid),
                petMountBaseProperty=GetPetMountBaseProperty(item.itemId),
                operates = GetOperates(guid),
            };
        }
@@ -302,6 +327,7 @@
            {
                itemId = itemId,
                baseInfo = GetBaseInfo(itemId),
                petMountBaseProperty = GetPetMountBaseProperty(itemId),
            };
        }

@@ -385,7 +411,7 @@
            {
                itemId = item.itemId,
                count = item.count,
                isAuction = item.isAuction,
                isAuction =item.isAuction,
                isEquiped = isEquiped,
                score = item.score,
                auctionSurplusTime = item.isAuction ? item.auctionSurplusTime : 0,
@@ -463,6 +489,38 @@
            return baseProperty;
        }

        private static BaseProperty GetPetMountBaseProperty(int itemId)
        {
            var config = ItemConfig.Get(itemId);
            var baseProperty = new BaseProperty();
            Dictionary<int, int> properties = null;
            switch (config.Type)
            {
                case 26:
                    var petId = PetInfoConfig.GetItemUnLockPet(itemId);
                    properties = perModel.GetPetAttrAddDict(petId);
                    break;
                case 41:
                case 42:
                    var horseId = HorseConfig.GetItemUnLockHorse(itemId);
                    properties = mountModel.GetMountAttrAddDict(horseId);
                    break;
                default:
                    break;
            }

            if (properties != null)
            {
                baseProperty.baseProperties = new List<Int2>();
                foreach (var property in properties)
                {
                    baseProperty.baseProperties.Add(new Int2(property.Key, property.Value));
                }
            }

            return baseProperty;
        }

        private static LegendProperty GetLegendProperty(int itemId)
        {
            var data = new LegendProperty();