diff --git a/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua b/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua index b01583d6ee..5d8cfa228d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua @@ -79,21 +79,6 @@ function this.OnLevelChange() -- end end end ---gm 用 -function this.AddFuncGuide(funcId) - if not funcId then return end - LogGreen(funcId.."funcId") - if not AppConst.isGuide then - LogGreen("不在引导内") - return - end - local guideId = GlobalSystemConfig[funcId].GuideId - if guideId and guideId ~= 0 then - table.insert(_FuncGuideList, guideId) - end - LogGreen("guideId:"..guideId) - GuideManager.ShowGuide(guideId) -end -- function this.OnFunctionOpen(funcId) @@ -172,8 +157,6 @@ end -- 检测功能引导 function GuideManager.CheckFuncGuide() PlayerPrefs.SetInt(PlayerManager.uid.."MainRightBarSetting",0)--引导开始关闭右侧伸缩条 - for k,v in pairs(funcDic) do - end if not GuideManager.IsInMainGuide() and not _IsFuncGuild and #_FuncGuideList > 0 then local guideId = _FuncGuideList[1] if not funcDic[guideId] then @@ -759,16 +742,13 @@ end --gm 用 function this.AddFuncGuide(funcId) if not funcId then return end - --LogGreen(funcId.."funcId") + LogGreen(funcId.."funcId") if not AppConst.isGuide then - --LogGreen("不在引导内") + LogGreen("请勾选引导选项") return end local guideId = GlobalSystemConfig[funcId].GuideId - -- if guideId and guideId ~= 0 then - -- table.insert(_FuncGuideList, guideId) - -- end - --LogGreen("guideId:"..guideId) + LogGreen("guideId:"..guideId) GuideManager.ShowGuide(guideId) end diff --git a/Assets/ManagedResources/~Lua/Modules/Guide/GuidePanel.lua b/Assets/ManagedResources/~Lua/Modules/Guide/GuidePanel.lua index 2d49000f4f..b4feb3997f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guide/GuidePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guide/GuidePanel.lua @@ -422,7 +422,7 @@ function this.ExecuteBehavior(beType, beArgs) Game.GlobalEvent:AddEvent(GameEvent.UI.OnOpen, OnFocus) Game.GlobalEvent:AddEvent(GameEvent.UI.OnFocus, OnFocus) - elseif beType == 15 then + elseif beType == 15 then -- 强制跳转,关闭目前所有界面,跳转到指定界面 this.dialogRoot:SetActive(false) this.mask:SetActive(false) this.tipButtomRoot:SetActive(false) @@ -496,6 +496,14 @@ function this.ExecuteBehavior(beType, beArgs) end _trigger.onPointerUp = _trigger.onPointerUp + endFunc this.SetBtnGOPosition(HeroLikeAbilityPanel.giveBtn.gameObject:GetComponent("RectTransform").position) + elseif beType == 18 then -- 触发剧情节点 + this.canvas.enabled=false + this.dialogRoot:SetActive(false) + this.mask:SetActive(false) + this.tipButtomRoot:SetActive(false) + StoryManager.EventTrigger(tonumber(beArgs), function() + this.NextGuide() + end) end end