guodong 2 жил өмнө
parent
commit
3f4e454172

+ 2 - 2
GameClient/Assets/Game/HotUpdate/Data/ItemDataManager.cs

@@ -60,7 +60,7 @@ namespace GFGGame
                     FunctionOpenDataManager.Instance.CheckHasSpecialFunOpen();
                 }
             }
-            if ((itemCfg.itemType == ConstItemType.ITEM || itemCfg.itemType == ConstItemType.GIFT_BAG) &&
+            if ((itemCfg.itemType == ConstItemType.ITEM || itemCfg.itemType == ConstItemType.USEABLE) &&
                 itemData.num > 0)
             {
                 BagDataManager.Instance.Add(itemData);
@@ -100,7 +100,7 @@ namespace GFGGame
                     {
                         BagDataManager.Instance.Remove(itemID);
                     }
-                    if (itemCfg.itemType == ConstItemType.GIFT_BAG)
+                    if (itemCfg.itemType == ConstItemType.USEABLE)
                     {
                         BagDataManager.Instance.Remove(itemID);
                     }

+ 2 - 3
GameClient/Assets/Game/HotUpdate/ServerProxy/ShopSProxy.cs

@@ -39,9 +39,8 @@ namespace GFGGame
                     }
 
                     List<ItemData> itemDatas;
-                    if (itemCfg.itemType == ConstItemType.GIFT_BAG &&
-                        (itemCfg.subType == ConstItemSubType.GIFT_BAG_AUTO ||
-                         itemCfg.subType == ConstItemSubType.CONTINUOUS_REWARD_GIFT))
+                    if (itemCfg.itemType == ConstItemType.USEABLE &&
+                        (itemCfg.subType == ConstItemSubType.USEABLE_AUTO))
                     {
                         itemDatas = ItemUtil.CreateItemDataList(itemCfg.itemsArr, response.Times * shopCfg.itemNum);
                     }

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/Bag/BagExchangeView.cs

@@ -81,7 +81,7 @@ namespace GFGGame
             _ui.m_txtExchangeCount.visible = false;
             _ui.m_comCost.target.visible = false;
             _ui.m_listItem.numItems = itemCfg.itemsArr.Length;
-            _ui.m_listItem.visible = itemCfg.itemType == ConstItemType.GIFT_BAG && itemCfg.subType != ConstItemSubType.GIFT_BAG_AUTO;
+            _ui.m_listItem.visible = itemCfg.itemType == ConstItemType.USEABLE && itemCfg.subType != ConstItemSubType.USEABLE_AUTO;
         }
 
         private void UpdateUseView()

+ 2 - 2
GameClient/Assets/Game/HotUpdate/Views/EnduringGiftBox/EnduringGiftBoxView.cs

@@ -509,8 +509,8 @@ namespace GFGGame
             ShopCfg shopCfg = context.data as ShopCfg;
             var itemCfg = ItemCfgArray.Instance.GetCfg(shopCfg.itemId);
 
-            if (itemCfg.itemType == ConstItemType.GIFT_BAG &&
-                itemCfg.subType == ConstItemSubType.CONTINUOUS_REWARD_GIFT)
+            if (itemCfg.itemType == ConstItemType.USEABLE &&
+                itemCfg.funType == ConstItemFuncType.CONTINUOUS_REWARD_GIFT)
             {
                 int dayNum = EnduringGiftBoxDataManager.Instance.GetItemRebateDay(itemCfg.id);
                 int totalDayNum = dayNum + itemCfg.param2Arr[0];