From 0b5ca2a4609e297b26f73907728ea156cbe4e37f Mon Sep 17 00:00:00 2001 From: gaoxin Date: Tue, 21 Dec 2021 14:31:26 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=E5=BC=95=E5=AF=BC=E3=80=91?= =?UTF-8?q?=E5=BC=95=E5=AF=BC=E8=A7=A6=E5=8F=91=E6=96=B9=E5=BC=8F=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E5=BC=80=E6=94=BE=E7=BB=99=E5=8A=9F=E8=83=BD=E5=BC=95?= =?UTF-8?q?=E5=AF=BC=E4=BD=BF=E7=94=A8=EF=BC=8C=E6=B7=BB=E5=8A=A0=E8=A7=A6?= =?UTF-8?q?=E5=8F=91=E7=B1=BB=E5=9E=8B37=20=20=E5=8D=81=E8=BF=9E=E7=BB=93?= =?UTF-8?q?=E6=9E=9C=E7=95=8C=E9=9D=A2=E6=89=93=E5=BC=80=E8=A7=A6=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Guide/GuideManager.lua | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua b/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua index 87d143bb4a..d4d42e2b7b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua @@ -262,11 +262,12 @@ end function this.CheckNextGuideListen(nextId) if GuideConfig[nextId] then local type = GuideConfig[nextId].Type - if openDic[type] then + -- 主线引导保存下一步id + if type == GuideType.Force and openDic[type] then openDic[type] = nextId - LogGreen(" GuideConfig[nextId]:"..tostring(GuideConfig[nextId].BehaviorArgs) ) - this.RefreshTriggerListen(nextId, GuideConfig[nextId].OpenType, GuideConfig[nextId].OpenArgs) end + LogGreen(" GuideConfig[nextId]:"..tostring(GuideConfig[nextId].OpenType) ) + this.RefreshTriggerListen(nextId, GuideConfig[nextId].OpenType, GuideConfig[nextId].OpenArgs) end end @@ -795,6 +796,16 @@ function this.RefreshTriggerListen(id, openType, openArgs) end end Game.GlobalEvent:AddEvent(GameEvent.UI.OnOpen, trigger) + -- 十连结果界面触发 + elseif openType == 37 then + local trigger + trigger = function(panelType) + if panelType == UIName.TenRecruitPanel then + Game.GlobalEvent:RemoveEvent(GameEvent.UI.OnOpen, trigger) + this.ShowGuide(id) + end + end + Game.GlobalEvent:AddEvent(GameEvent.UI.OnOpen, trigger) end end From 605dd4e111c25b26dec050bab9729df80cfa84ed Mon Sep 17 00:00:00 2001 From: gaoxin Date: Tue, 21 Dec 2021 15:38:42 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E6=88=98=E6=96=97=E3=80=91?= =?UTF-8?q?=E8=B7=B3=E8=BF=87=E6=8C=89=E9=92=AE=E8=A7=A3=E9=94=81=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua b/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua index b57ca1b4c0..cbb6021100 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua @@ -857,7 +857,7 @@ end -- 是否解锁跳过功能 function this.IsUnlockBattlePass() -- return false - return PrivilegeManager.GetPrivilegeOpenStatus(PRIVILEGE_TYPE.SkipFight), "通关简单3-10或充值任意金额后解锁跳过" + return PrivilegeManager.GetPrivilegeOpenStatus(PRIVILEGE_TYPE.SkipFight), "通关简单3-10或充值6元后解锁跳过" end -- 战斗暂停控制