3335 物品管理相关功能重构。

client_Wu Xijin

2019-02-19 77561bb15f0a5d45146fdf454726393e3987cc23

 System/KnapSack/Logic/ItemTipsModel.cs

@@ -833,8 +833,8 @@
            ItemModel fairyModel2 = null;

            switch ((RoleEquipType)equipPlace)

            {

                case RoleEquipType.retFairyCan:

                    fairyModel2 = playerPack.GetItemModelByIndex(type, (int)RoleEquipType.retFairyCan2);

                case RoleEquipType.FairyCan:

                    fairyModel2 = playerPack.GetItemModelByIndex(type, (int)RoleEquipType.FairyCan2);

                    if (fairyModel2 != null)

                    {

                        if (itemModel != null)

@@ -1052,7 +1052,7 @@
                    {

                        if (attrData.itemConfig.CanSell == 1)

                        {

                            attrData.SetTipsFuncBtn(ItemWinBtnType.sell, (ItemWinBtnType, ItemAttrData) => { ItemLogicUtility.Instance.SellItem(ItemWinBtnType.sell, attrData); });

                            attrData.SetTipsFuncBtn(ItemOperateType.sell, (ItemWinBtnType, ItemAttrData) => { ItemLogicUtility.Instance.SellItem(ItemOperateType.sell, attrData); });

                        }

                    }

                    break;

@@ -1062,7 +1062,7 @@
                    {

                        if (attrData.itemConfig.CanSell == 1)

                        {

                            attrData.SetTipsFuncBtn(ItemWinBtnType.sell, (ItemWinBtnType, ItemAttrData) => { ItemLogicUtility.Instance.SellItem(ItemWinBtnType.sell, attrData); });

                            attrData.SetTipsFuncBtn(ItemOperateType.sell, (ItemWinBtnType, ItemAttrData) => { ItemLogicUtility.Instance.SellItem(ItemOperateType.sell, attrData); });

                        }

                    }

                    break;

@@ -1072,7 +1072,7 @@
                    {

                        if (attrData.itemConfig.CanSell == 1)

                        {

                            attrData.SetTipsFuncBtn(ItemWinBtnType.sell, (ItemWinBtnType, ItemAttrData) => { ItemLogicUtility.Instance.SellItem(ItemWinBtnType.sell, attrData); });

                            attrData.SetTipsFuncBtn(ItemOperateType.sell, (ItemWinBtnType, ItemAttrData) => { ItemLogicUtility.Instance.SellItem(ItemOperateType.sell, attrData); });

                        }

                    }

                    break;

@@ -1082,14 +1082,14 @@
                    {

                        if (attrData.itemConfig.CanSell == 1)

                        {

                            attrData.SetTipsFuncBtn(ItemWinBtnType.sell, (ItemWinBtnType, ItemAttrData) => { ItemLogicUtility.Instance.SellItem(ItemWinBtnType.sell, attrData); });

                            attrData.SetTipsFuncBtn(ItemOperateType.sell, (ItemWinBtnType, ItemAttrData) => { ItemLogicUtility.Instance.SellItem(ItemOperateType.sell, attrData); });

                        }

                    }

                    break;

                default:

                    if (attrData.itemConfig.CanSell == 1)

                    {

                        attrData.SetTipsFuncBtn(ItemWinBtnType.sell, (ItemWinBtnType, ItemAttrData) => { ItemLogicUtility.Instance.SellItem(ItemWinBtnType.sell, attrData); });

                        attrData.SetTipsFuncBtn(ItemOperateType.sell, (ItemWinBtnType, ItemAttrData) => { ItemLogicUtility.Instance.SellItem(ItemOperateType.sell, attrData); });

                    }

                    break;

            }

@@ -1097,36 +1097,36 @@
            List<int> dismantleReturnlist = attrData.GetUseDataModel((int)ItemUseDataKey.itemDecompound);

            if (dismantleReturnlist != null && dismantleReturnlist.Count > 0)

            {

                attrData.SetTipsFuncBtn(ItemWinBtnType.dismantle, (ItemWinBtnType, ItemAttrData) => { ItemLogicUtility.Instance.DismantleItem(ItemWinBtnType.dismantle, attrData); });

                attrData.SetTipsFuncBtn(ItemOperateType.dismantle, (ItemWinBtnType, ItemAttrData) => { ItemLogicUtility.Instance.DismantleItem(ItemOperateType.dismantle, attrData); });

            }



            if (!isOverdue)

            {

                if(attrData.itemConfig.JumpComposeCondi != null && attrData.itemConfig.JumpComposeCondi.Length > 0)

                {

                    attrData.SetTipsFuncBtn(ItemWinBtnType.compose, (ItemWinBtnType, ItemAttrData) => {

                    attrData.SetTipsFuncBtn(ItemOperateType.compose, (ItemWinBtnType, ItemAttrData) => {

                        int jumpId = 0;

                        bool isUnlock = ModelCenter.Instance.GetModel<ComposeWinModel>().CheckComposeItemById(attrData.itemId,out jumpId);

                        if (isUnlock)

                        {

                            ItemLogicUtility.Instance.GotoComposeItem(ItemWinBtnType.compose,jumpId);

                            ItemLogicUtility.Instance.GotoComposeItem(ItemOperateType.compose,jumpId);

                        }

                    });

                }



                if (attrData.itemConfig.Type == 25 && attrData.itemConfig.Effect1 == 225)

                {

                    attrData.SetTipsFuncBtn(ItemWinBtnType.inlay, (ItemWinBtnType, ItemAttrData) => { ItemLogicUtility.Instance.GotoInlayItem(ItemWinBtnType.inlay, attrData.guid); });

                    attrData.SetTipsFuncBtn(ItemOperateType.inlay, (ItemWinBtnType, ItemAttrData) => { ItemLogicUtility.Instance.GotoInlayItem(ItemOperateType.inlay, attrData.guid); });

                }



                if (attrData.itemConfig.CanTrade == 1 && attrData.isBind == 0)

                {

                    attrData.SetTipsFuncBtn(ItemWinBtnType.putAway, (ItemWinBtnType, ItemAttrData) => { ItemLogicUtility.Instance.PutAwayItem(ItemWinBtnType.putAway, attrData.guid); });

                    attrData.SetTipsFuncBtn(ItemOperateType.putAway, (ItemWinBtnType, ItemAttrData) => { ItemLogicUtility.Instance.PutAwayItem(ItemOperateType.putAway, attrData.guid); });

                }



                if((ItemType)attrData.itemConfig.Type == ItemType.WingsMat)

                {

                    attrData.SetTipsFuncBtn(ItemWinBtnType.refine, (ItemWinBtnType, ItemAttrData) =>

                    attrData.SetTipsFuncBtn(ItemOperateType.refine, (ItemWinBtnType, ItemAttrData) =>

                    {

                       // BoxGetItemModel.Instance.SetModel(attrData.guid);

                       WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.StrengthFunc3);

@@ -1137,7 +1137,7 @@


            if (attrData.count > 1)

            {

                attrData.SetTipsFuncBtn(ItemWinBtnType.split, (ItemWinBtnType, ItemAttrData) => { ItemLogicUtility.Instance.OnClickSplitBtn(ItemWinBtnType.split, attrData.guid); });

                attrData.SetTipsFuncBtn(ItemOperateType.split, (ItemWinBtnType, ItemAttrData) => { ItemLogicUtility.Instance.OnClickSplitBtn(ItemOperateType.split, attrData.guid); });

            }



            if(!isOverdue)

@@ -1147,13 +1147,13 @@
                    case ItemWinType.equipWin:

                    case ItemWinType.wingsWin:

                    case ItemWinType.guardWin:

                        attrData.SetTipsFuncBtn(ItemWinBtnType.putOn, (ItemWinBtnType, ItemAttrData) => { ItemLogicUtility.Instance.PutOnItem(ItemWinBtnType.putOn, attrData.guid); });

                        attrData.SetTipsFuncBtn(ItemOperateType.putOn, (ItemWinBtnType, ItemAttrData) => { ItemLogicUtility.Instance.PutOnItem(ItemOperateType.putOn, attrData.guid); });

                        break;

                }



                if (attrData.itemConfig.UseTag == 1)

                {

                    attrData.SetTipsFuncBtn(ItemWinBtnType.makeUse, (ItemWinBtnType, ItemAttrData) => { ItemLogicUtility.Instance.UseItem(ItemWinBtnType.makeUse, attrData.index); });

                    attrData.SetTipsFuncBtn(ItemOperateType.makeUse, (ItemWinBtnType, ItemAttrData) => { ItemLogicUtility.Instance.UseItem(ItemOperateType.makeUse, attrData.index); });

                }

            }



@@ -1163,7 +1163,7 @@
                {

                    if(isOverdue)

                    {

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

                        attrData.SetTipsFuncBtn(ItemOperateType.renewal, (ItemWinBtnType, ItemAttrData) => { ItemLogicUtility.Instance.RenewalItem(ItemOperateType.renewal, attrData.guid); });

                    }

                }

            }

@@ -1174,7 +1174,7 @@
                {

                    if(PlayerDatas.Instance.baseData.coinPointTotal <= 0)

                    {

                        attrData.SetTipsFuncBtn(ItemWinBtnType.renewal, (ItemWinBtnType, ItemAttrData) => { WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.FirstRecharge); });

                        attrData.SetTipsFuncBtn(ItemOperateType.renewal, (ItemWinBtnType, ItemAttrData) => { WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.FirstRecharge); });

                    }

                }

            }

@@ -1188,7 +1188,7 @@
        {

            if (attrData == null) return;



            attrData.SetTipsFuncBtn(ItemWinBtnType.putOut, (ItemWinBtnType, ItemAttrData) => { ItemLogicUtility.Instance.TakeOutFromWarehouse(ItemWinBtnType.putOut,attrData.guid); });

            attrData.SetTipsFuncBtn(ItemOperateType.putOut, (ItemWinBtnType, ItemAttrData) => { ItemLogicUtility.Instance.TakeOutFromWarehouse(ItemOperateType.putOut,attrData.guid); });



        }



@@ -1198,13 +1198,13 @@


            if (attrData.itemConfig.CanSell == 1)

            {

                attrData.SetTipsFuncBtn(ItemWinBtnType.sell, (ItemWinBtnType, ItemAttrData) => { ItemLogicUtility.Instance.SellItem(ItemWinBtnType.sell, attrData); });

                attrData.SetTipsFuncBtn(ItemOperateType.sell, (ItemWinBtnType, ItemAttrData) => { ItemLogicUtility.Instance.SellItem(ItemOperateType.sell, attrData); });

            }



            switch (attrData.winType)

            {

                case ItemWinType.equipWin:

                    attrData.SetTipsFuncBtn(ItemWinBtnType.putOn, (ItemWinBtnType, ItemAttrData) => {

                    attrData.SetTipsFuncBtn(ItemOperateType.putOn, (ItemWinBtnType, ItemAttrData) => {

                        if(dogzModel.CheckIsPutOn(attrData.itemId))

                        {

                            List<int> indexlist = new List<int>();

@@ -1221,13 +1221,13 @@
        {

            if (attrData == null) return;



            attrData.SetTipsFuncBtn(ItemWinBtnType.putOff, (ItemWinBtnType, ItemAttrData) => {

            attrData.SetTipsFuncBtn(ItemOperateType.putOff, (ItemWinBtnType, ItemAttrData) => {

               dogzModel.CheckPutOff(dogzModel.GetDogzEquipPlaceByIndex(attrData.index));

            });



            if(dogzModel.TryGetAssistDogzState(dogzModel.presentSelectDogz))

            {

                attrData.SetTipsFuncBtn(ItemWinBtnType.strength, (ItemWinBtnType, ItemAttrData) => {

                attrData.SetTipsFuncBtn(ItemOperateType.strength, (ItemWinBtnType, ItemAttrData) => {

                    dogzModel.OpenDogzFuncEvent(1, attrData.index);

                });

            }

@@ -1242,7 +1242,7 @@
        {

            if (attrData == null) return;



            attrData.SetTipsFuncBtn(ItemWinBtnType.putIn, (ItemWinBtnType, ItemAttrData) => { ItemLogicUtility.Instance.PutInWareHouse(ItemWinBtnType.putIn, attrData.guid); });

            attrData.SetTipsFuncBtn(ItemOperateType.putIn, (ItemWinBtnType, ItemAttrData) => { ItemLogicUtility.Instance.PutInWareHouse(ItemOperateType.putIn, attrData.guid); });



        }



@@ -1255,21 +1255,21 @@
            if (attrData == null) return;



            RoleEquipType equipType = (RoleEquipType)attrData.itemConfig.EquipPlace;

            if(equipType == RoleEquipType.retWing)

            if(equipType == RoleEquipType.Wing)

            {

                attrData.SetTipsFuncBtn(ItemWinBtnType.refine, (ItemWinBtnType, ItemAttrData) => {

                attrData.SetTipsFuncBtn(ItemOperateType.refine, (ItemWinBtnType, ItemAttrData) => {

                    WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.StrengthFunc3);

                });

            }

            else if(equipType != RoleEquipType.retSpiritAnimal)

            else if(equipType != RoleEquipType.SpiritAnimal)

            {

                attrData.SetTipsFuncBtn(ItemWinBtnType.strength, (ItemWinBtnType, ItemAttrData) => {

                attrData.SetTipsFuncBtn(ItemOperateType.strength, (ItemWinBtnType, ItemAttrData) => {

                    WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.StrengthFunc1);

                });

            }



            attrData.SetTipsFuncBtn(ItemWinBtnType.putOff,(ItemWinBtnType,ItemAttrData) => {

                ItemLogicUtility.Instance.PutOffEquip(ItemWinBtnType.putOff, attrData.guid);

            attrData.SetTipsFuncBtn(ItemOperateType.putOff,(ItemWinBtnType,ItemAttrData) => {

                ItemLogicUtility.Instance.PutOffEquip(ItemOperateType.putOff, attrData.guid);

            });



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

@@ -1278,7 +1278,7 @@
                {

                    if (PlayerDatas.Instance.baseData.coinPointTotal <= 0)

                    {

                        attrData.SetTipsFuncBtn(ItemWinBtnType.renewal, (ItemWinBtnType, ItemAttrData) => { WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.FirstRecharge); });

                        attrData.SetTipsFuncBtn(ItemOperateType.renewal, (ItemWinBtnType, ItemAttrData) => { WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.FirstRecharge); });

                    }

                }

            }

@@ -1291,7 +1291,7 @@
            bool isOverdue = modelInterface.IsOverdue(attrData.guid, attrData.itemId, attrData.useDataDict);

            if (attrData.itemConfig.CanSell == 1)

            {

                attrData.SetTipsFuncBtn(ItemWinBtnType.sell, (ItemWinBtnType, ItemAttrData) => { ItemLogicUtility.Instance.SellItem(ItemWinBtnType.sell, attrData); });

                attrData.SetTipsFuncBtn(ItemOperateType.sell, (ItemWinBtnType, ItemAttrData) => { ItemLogicUtility.Instance.SellItem(ItemOperateType.sell, attrData); });

            }

            //List<int> dismantleReturnlist = attrData.GetUseDataModel((int)ItemUseDataKey.Def_IudetItemDecompound);

            //if (dismantleReturnlist != null && dismantleReturnlist.Count > 0)

@@ -1303,20 +1303,20 @@
            {

                if (attrData.itemConfig.JumpComposeCondi != null && attrData.itemConfig.JumpComposeCondi.Length > 0)

                {

                    attrData.SetTipsFuncBtn(ItemWinBtnType.compose, (ItemWinBtnType, ItemAttrData) =>

                    attrData.SetTipsFuncBtn(ItemOperateType.compose, (ItemWinBtnType, ItemAttrData) =>

                    {

                        int jumpId = 0;

                        bool isUnlock = ModelCenter.Instance.GetModel<ComposeWinModel>().CheckComposeItemById(attrData.itemId, out jumpId);

                        if (isUnlock)

                        {

                            ItemLogicUtility.Instance.GotoComposeItem(ItemWinBtnType.compose, jumpId);

                            ItemLogicUtility.Instance.GotoComposeItem(ItemOperateType.compose, jumpId);

                        }

                    });

                }



                if (attrData.itemConfig.Effect1 == 225)

                {

                    attrData.SetTipsFuncBtn(ItemWinBtnType.inlay, (ItemWinBtnType, ItemAttrData) => { ItemLogicUtility.Instance.GotoInlayItem(ItemWinBtnType.inlay, attrData.guid); });

                    attrData.SetTipsFuncBtn(ItemOperateType.inlay, (ItemWinBtnType, ItemAttrData) => { ItemLogicUtility.Instance.GotoInlayItem(ItemOperateType.inlay, attrData.guid); });

                }



                //    if (attrData.itemConfig.CanTrade == 1 && attrData.isBind == 0)

@@ -1335,7 +1335,7 @@
                    switch (attrData.winType)

                    {

                        case ItemWinType.equipWin:

                            attrData.SetTipsFuncBtn(ItemWinBtnType.putOn, (ItemWinBtnType, ItemAttrData) => { ItemLogicUtility.Instance.PutOnItem(ItemWinBtnType.putOn, attrData.guid); });

                            attrData.SetTipsFuncBtn(ItemOperateType.putOn, (ItemWinBtnType, ItemAttrData) => { ItemLogicUtility.Instance.PutOnItem(ItemOperateType.putOn, attrData.guid); });

                            break;

                    }



@@ -1375,8 +1375,8 @@


            RoleEquipType equipType = (RoleEquipType)attrData.itemConfig.EquipPlace;



            attrData.SetTipsFuncBtn(ItemWinBtnType.putOff, (ItemWinBtnType, ItemAttrData) => {

                ItemLogicUtility.Instance.PutOffEquip(ItemWinBtnType.putOff, attrData.guid);

            attrData.SetTipsFuncBtn(ItemOperateType.putOff, (ItemWinBtnType, ItemAttrData) => {

                ItemLogicUtility.Instance.PutOffEquip(ItemOperateType.putOff, attrData.guid);

            });

        }

        #endregion

@@ -1412,9 +1412,9 @@
        {

            switch ((RoleEquipType)attrData.itemConfig.EquipPlace)

            {

                case RoleEquipType.retWing:

                case RoleEquipType.Wing:

                    return SetWingsBasicAttr(attrData);

                case RoleEquipType.retSpiritAnimal:

                case RoleEquipType.SpiritAnimal:

                    return SetGuardBasicAttr(attrData);

                default:

                    return SetEquipBasicAttr(attrData);

@@ -1587,8 +1587,8 @@


        private string SetAttrColor(string attrStr,int atkSpeed,int equipPlace)

        {

            if ((RoleEquipType)equipPlace != RoleEquipType.retFairyCan

                && (RoleEquipType)equipPlace != RoleEquipType.retFairyCan2)

            if ((RoleEquipType)equipPlace != RoleEquipType.FairyCan

                && (RoleEquipType)equipPlace != RoleEquipType.FairyCan2)

            {

                return attrStr;

            }

@@ -1851,7 +1851,7 @@
                    }

                    else

                    {

                        if (itemConfig.EquipPlace != (int)RoleEquipType.retWing)

                        if (itemConfig.EquipPlace != (int)RoleEquipType.Wing)

                        {

                            if (isCustom || itemConfig.StarLevel >= 3)

                            {

@@ -1904,7 +1904,7 @@
                    }

                    else

                    {

                        if (itemConfig.EquipPlace != (int)RoleEquipType.retWing)

                        if (itemConfig.EquipPlace != (int)RoleEquipType.Wing)

                        {

                            if (isCustom || itemConfig.StarLevel >= 3)

                            {

@@ -2986,7 +2986,7 @@
        public Dictionary<int, int> legendDataDict { get; private set; }

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

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

        public Dictionary<ItemWinBtnType,Action<ItemWinBtnType,string>> tipsFuncBtnDic { get; private set; }

        public Dictionary<ItemOperateType,Action<ItemOperateType,string>> tipsFuncBtnDic { get; private set; }



        public Dictionary<SuitType,ItemSuitAttrData> suitAttrDataDict { get; private set; }

        public Dictionary<SuitType, int> suitTypeCntDict { get; private set; }

@@ -3038,7 +3038,7 @@
        {

            this.packType = type;

            this.itemConfig = ItemConfig.Get(id);

            this.tipsFuncBtnDic = new Dictionary<ItemWinBtnType, Action<ItemWinBtnType,string>>();

            this.tipsFuncBtnDic = new Dictionary<ItemOperateType, Action<ItemOperateType,string>>();

            this.guid = guid;

            this.itemId = id;

            this.count = count;

@@ -3679,7 +3679,7 @@
        /// </summary>

        /// <param name="type"></param>

        /// <param name="func"></param>

        public void SetTipsFuncBtn(ItemWinBtnType type, Action<ItemWinBtnType,string> func)

        public void SetTipsFuncBtn(ItemOperateType type, Action<ItemOperateType,string> func)

        {

            tipsFuncBtnDic.Add(type,func);

        }