diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index e0cf03ca61..f1a91ef901 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -1119,7 +1119,11 @@ ItemType = { likeabilityItemChip = 35, --好感度物品碎片 EquipChip = 36, --装备碎片 GMzck =42, --gm直冲卡 - GMzcq=43,--gm真充卡 + GMzcq =43,--gm真充卡 + --GMzcq=44,--gm真充券 + GMxjk=44,--gm现金卡 + GMxck=45,--gm仙充卡 + GMxsZcq=46,--gm限时真充券 GMBigZck =49, --gm直冲卡 CommonChip=50,--通用碎片 } diff --git a/Assets/ManagedResources/~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua b/Assets/ManagedResources/~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua index ae49e4a54f..4ef80a9a66 100644 --- a/Assets/ManagedResources/~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua @@ -113,7 +113,10 @@ function BagResolveAnCompoundPanel:BindEvent() if itemData.itemConfig.ItemType == ItemType.Box or itemData.itemConfig.ItemType == ItemType.GMzck or itemData.itemConfig.ItemType == ItemType.GMBigZck - or itemData.itemConfig.ItemType == ItemType.GMzcq then--宝箱 + or itemData.itemConfig.ItemType == ItemType.GMzcq + or itemData.itemConfig.ItemType == ItemType.GMxck + or itemData.itemConfig.ItemType == ItemType.GMxjk + or itemData.itemConfig.ItemType == ItemType.GMxsZcq then--宝箱 if compoundNum0 then local item={} local itemList = {} @@ -347,7 +353,11 @@ function this.OnShowLayout3Data() elseif itemData.itemConfig.ItemType==ItemType.Box or itemData.itemConfig.ItemType == ItemType.GMzck or itemData.itemConfig.ItemType == ItemType.GMBigZck - or itemData.itemConfig.ItemType == ItemType.GMzcq then--宝箱 + or itemData.itemConfig.ItemType == ItemType.GMzcq + or itemData.itemConfig.ItemType == ItemType.GMxck + or itemData.itemConfig.ItemType == ItemType.GMxjk + or itemData.itemConfig.ItemType == ItemType.GMxsZcq + then--宝箱 this.nameText.text=Language[10194] this.btnCompoundText.text=Language[10195] local maxCompoundValue = itemData.num-- math.floor(itemData.num/itemData.itemConfig.UsePerCount) @@ -499,7 +509,10 @@ function this.ShowCompoundNumData(value) elseif itemData.itemConfig.ItemType==ItemType.Box or itemData.itemConfig.ItemType == ItemType.GMzck or itemData.itemConfig.ItemType == ItemType.GMBigZck - or itemData.itemConfig.ItemType == ItemType.GMzcq then + or itemData.itemConfig.ItemType == ItemType.GMzcq + or itemData.itemConfig.ItemType == ItemType.GMxck + or itemData.itemConfig.ItemType == ItemType.GMxjk + or itemData.itemConfig.ItemType == ItemType.GMxsZcq then this.numText.text= Language[10202]..value..Language[10200]..GetLanguageStrById(itemData.itemConfig.Name).."。" elseif itemData.itemConfig.ItemType==ItemType.TimeIsGold then--挂机奖励 this.numText.text= Language[10202]..value..Language[10200]..GetLanguageStrById(itemData.itemConfig.Name).."。" diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua index 7fadb5b91e..3db5431b11 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua @@ -142,8 +142,10 @@ function RewardItemSingleShowPopup:BindEvent() elseif itemConfigData.ItemType == ItemType.Box or itemConfigData.ItemType == ItemType.GMzck or itemConfigData.ItemType == ItemType.GMBigZck - or itemConfigData.ItemType == ItemType.GMzcq then - LogError("1111111111111111111") + or itemConfigData.ItemType == ItemType.GMzcq + or itemConfigData.ItemType == ItemType.GMxck + or itemConfigData.ItemType == ItemType.GMxjk + or itemConfigData.ItemType == ItemType.GMxsZcq then local _itemData = BagManager.bagDatas[itemSid] if itemConfig[itemSid].UseType ~= 2 then UIManager.OpenPanel(UIName.BagResolveAnCompoundPanel, 4, _itemData, function() @@ -362,7 +364,10 @@ function RewardItemSingleShowPopup:OnShow() elseif isBagPanel and (itemConfigData.ItemType == 10 or itemConfigData.ItemType == ItemType.GMzck or itemConfigData.ItemType == ItemType.GMBigZck - or itemConfigData.ItemType == ItemType.GMzcq) and func then--是否宝箱可使用 + or itemConfigData.ItemType == ItemType.GMzcq) + or itemConfigData.ItemType == ItemType.GMxck + or itemConfigData.ItemType == ItemType.GMxjk + or itemConfigData.ItemType == ItemType.GMxsZcq and func then--是否宝箱可使用 this.btnSure:SetActive(true) this.btnSureText.text = Language[10195] elseif isBagPanel and itemConfigData.ItemType == 12 and func then-- 改名卡