From 0051c48c6500fee968287691730b1688199c300b Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Mon, 20 Dec 2021 16:31:57 +0800 Subject: [PATCH] =?UTF-8?q?=E7=82=B9=E5=B0=86=E5=8F=B0=E5=BC=95=E5=AF=BC?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua | 1 + Assets/ManagedResources/~Lua/Modules/Guide/GuidePanel.lua | 1 + .../~Lua/Modules/Recruit/RecruitMainPanel.lua | 4 +++- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua b/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua index d29f84ce2b..87d143bb4a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua @@ -22,6 +22,7 @@ function this.Initialize() Game.GlobalEvent:AddEvent(GameEvent.Mission.OnPassFight,this.OnFightPass) end this.IsFirstOpenHarmonyBei = false +this.curId = -1 function this.EndlessGuideFun() if not AppConst.isGuide then diff --git a/Assets/ManagedResources/~Lua/Modules/Guide/GuidePanel.lua b/Assets/ManagedResources/~Lua/Modules/Guide/GuidePanel.lua index a9f1305a79..02480a7e5d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guide/GuidePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guide/GuidePanel.lua @@ -605,6 +605,7 @@ function this.NextGuide(nextId) end GuideManager.SyncServer(curId) local next = type(nextId) == "number" and nextId or GuideConfig[curId].Next + GuideManager.curId = next Log("下一个引导Id = ".. tostring(next)) if next ~= 0 and GuideConfig[next].OpenType == 0 then --触发方式为0时,直接跳转 GuideManager.ShowGuide(next) diff --git a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitMainPanel.lua index bb3a0f4e0c..971e534a6a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitMainPanel.lua @@ -307,8 +307,10 @@ function RecruitMainPanel:OnOpen(_index) self.CurRecruitId = TableRecruitType.Putong elseif GuideManager.IsInMainGuide() and GuideManager.GetCurId(1) == 1003 then self.CurRecruitId = TableRecruitType.Shenjiang - elseif GuideManager.IsFunctionGuideExist() then + elseif GuideManager.IsFunctionGuideExist() and GuideManager.curId == 101402 then self.CurRecruitId = TableRecruitType.Siyuanzhen + elseif GuideManager.IsFunctionGuideExist() and GuideManager.curId == 103705 then + self.CurRecruitId = TableRecruitType.Shenjiang else local data = RecruitManager.GetRecruitData() local isRed = 0