From a81f9de4689611802afd266efce7073b59b77939 Mon Sep 17 00:00:00 2001 From: Fang Date: Wed, 9 Aug 2023 10:19:42 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A3=85=E5=A4=87=E5=89=AF=E6=9C=AC=E6=89=AB?= =?UTF-8?q?=E8=8D=A1=E8=A7=A6=E5=8F=91=E7=A4=BC=E5=8C=85=E6=9C=AA=E7=AB=8B?= =?UTF-8?q?=E5=8D=B3=E5=BC=B9=E5=87=BAfix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/module/common/common_manager.lua | 3 ++- lua/app/module/dungeon_armor/dungeon_armor_manager.lua | 2 +- lua/app/module/dungeon_weapon/dungeon_weapon_manager.lua | 2 +- lua/app/ui/common/mop_up_ui.lua | 8 ++++++++ 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/lua/app/module/common/common_manager.lua b/lua/app/module/common/common_manager.lua index 674bcbb9..7db46857 100644 --- a/lua/app/module/common/common_manager.lua +++ b/lua/app/module/common/common_manager.lua @@ -1,7 +1,8 @@ local CommonManager = class("CommonManager", BaseModule) -function CommonManager:showMopUpUI(rewards, remainCount, callback, customtitleTx, target) +function CommonManager:showMopUpUI(actType, rewards, remainCount, callback, customtitleTx, target) local params = { + actType = actType, customtitleTx = customtitleTx, rewards = rewards, remainCount = remainCount, diff --git a/lua/app/module/dungeon_armor/dungeon_armor_manager.lua b/lua/app/module/dungeon_armor/dungeon_armor_manager.lua index 5fb31485..8849842c 100644 --- a/lua/app/module/dungeon_armor/dungeon_armor_manager.lua +++ b/lua/app/module/dungeon_armor/dungeon_armor_manager.lua @@ -150,7 +150,7 @@ function DungeonArmorManager:rspSweep(result) -- 合并奖励 local newRewards = {} GFunc.mergeRewards2(result.rewards, newRewards) - ModuleManager.CommonManager:showMopUpUI(newRewards, remainCount, function() + ModuleManager.CommonManager:showMopUpUI(ModuleManager.MODULE_KEY.DUNGEON_ARMOR, newRewards, remainCount, function() if result.reqData then self:reqSweep(result.reqData.chapter_armor_id, result.reqData.target) end diff --git a/lua/app/module/dungeon_weapon/dungeon_weapon_manager.lua b/lua/app/module/dungeon_weapon/dungeon_weapon_manager.lua index a75c9e49..a66c3e3b 100644 --- a/lua/app/module/dungeon_weapon/dungeon_weapon_manager.lua +++ b/lua/app/module/dungeon_weapon/dungeon_weapon_manager.lua @@ -150,7 +150,7 @@ function DungeonWeaponManager:rspSweep(result) -- 合并奖励 local newRewards = {} GFunc.mergeRewards2(result.rewards, newRewards) - ModuleManager.CommonManager:showMopUpUI(newRewards, remainCount, function() + ModuleManager.CommonManager:showMopUpUI(ModuleManager.MODULE_KEY.DUNGEON_WEAPON, newRewards, remainCount, function() self:reqSweep(result.reqData.chapter_weapon_id, result.reqData.target) end, nil, result.reqData.target) DataManager.DungeonData:setDirty() diff --git a/lua/app/ui/common/mop_up_ui.lua b/lua/app/ui/common/mop_up_ui.lua index ce3511ef..4a7649de 100644 --- a/lua/app/ui/common/mop_up_ui.lua +++ b/lua/app/ui/common/mop_up_ui.lua @@ -20,6 +20,7 @@ function MopUpUI:onClose() end function MopUpUI:ctor(params) + self.actType = params.actType self.customtitleTx = params.customtitleTx self.rewards = params.rewards self.remainCount = params.remainCount @@ -32,6 +33,13 @@ end function MopUpUI:onLoadRootComplete() self:_display() self:_addListeners() + + -- 检查礼包弹出 + if self.actType == ModuleManager.MODULE_KEY.DUNGEON_WEAPON then + DataManager.ShopData:checkPopGift(PayManager.PURCHARSE_ACT_TYPE.WEAPON_GIFT) + elseif self.actType == ModuleManager.MODULE_KEY.DUNGEON_ARMOR then + DataManager.ShopData:checkPopGift(PayManager.PURCHARSE_ACT_TYPE.ARMOR_GIFT) + end end function MopUpUI:_display()