diff --git a/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua b/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua index 1bb2807b2a..5b7d806d9b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua @@ -38,7 +38,6 @@ function this.HongMengGuideFun(OnOff) -- end -- end end - end function this.OnLevelChange() -- 首充引导特殊处理到十级开放 @@ -47,6 +46,22 @@ function this.OnLevelChange() this.CheckFuncGuide() 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) if not funcId then return end @@ -64,6 +79,8 @@ function this.OnFunctionOpen(funcId) this.CheckFuncGuide() end + + -- 将引导加入引导队列 function this.TestFuncGuide(guideId) if funcDic[guideId] then diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua index ff996976f3..7360095d55 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua @@ -521,8 +521,8 @@ function RewardItemPopup:ItemDataListSort(itemDataList) end --界面关闭时调用(用于子类重写) function RewardItemPopup:OnClose() - compShowType = 0 if compShowType == CompShowType.fourElement then + compShowType = 0 return end BagManager.SetDropIsSHowEquipPrint(true) @@ -540,6 +540,7 @@ function RewardItemPopup:OnClose() return end end + if func and not isPopGetSSR then if fightConFigData and fightConFigData.PicShow == 1 and FightPointPassManager.isOpenNewChapter then func(isBackBattle)