diff --git a/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassManager.lua b/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassManager.lua index 2d979ad137..57ad86464e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassManager.lua @@ -140,6 +140,7 @@ function this.RefreshFightId(msg) PlayerPrefs.SetInt(PlayerManager.uid .. OLD_ID, oldFight) -- 最后一关更新 --if data.NextLevel ~= -1 then + Game.GlobalEvent:DispatchEvent(GameEvent.Mission.OnPassFight, oldFight) -- 服务器更新关卡状态 this.curOpenFight = msg.fightId diff --git a/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua b/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua index 5d8cfa228d..22b33ad1bc 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua @@ -3,6 +3,7 @@ local this = GuideManager local GuideConfig = ConfigManager.GetConfig(ConfigName.GuideConfig) local GlobalSystemConfig = ConfigManager.GetConfig(ConfigName.GlobalSystemConfig) local SpecialConfig = ConfigManager.GetConfig(ConfigName.SpecialConfig) +local MainLevelConfig = ConfigManager.GetConfig(ConfigName.MainLevelConfig) local openDic = {} local funcDic = {} @@ -18,6 +19,7 @@ function this.Initialize() Game.GlobalEvent:AddEvent(GameEvent.Player.OnLevelChange, this.OnLevelChange) Game.GlobalEvent:AddEvent(GameEvent.Practice.PracticeGuide,this.PracticeGuideFun) Game.GlobalEvent:AddEvent(GameEvent.EndLess.GuidePanel,this.EndlessGuideFun) + Game.GlobalEvent:AddEvent(GameEvent.Mission.OnPassFight,this.OnFightPass) end this.IsFirstOpenHarmonyBei = false @@ -106,6 +108,22 @@ function this.OnFunctionOpen(funcId) this.CheckFuncGuide() end +-- 通过关卡时判断 +function this.OnFightPass(fightId) + if not fightId then return end + if not AppConst.isGuide then + return + end + local guideId = MainLevelConfig[fightId].PassGuideId + if not guideId or guideId == 0 then + return + end + -- if not funcDic[guideId] then + table.insert(_FuncGuideList, guideId) + -- end + -- + this.CheckFuncGuide() +end -- 将引导加入引导队列 diff --git a/Assets/ManagedResources/~Lua/Modules/Story/StoryDialoguePanel.lua b/Assets/ManagedResources/~Lua/Modules/Story/StoryDialoguePanel.lua index e44d76296d..d7fd0ee908 100644 --- a/Assets/ManagedResources/~Lua/Modules/Story/StoryDialoguePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Story/StoryDialoguePanel.lua @@ -211,7 +211,11 @@ function this.RefreshPanel(eventId, isFirstOpen) -- 显示立绘 if resId > 0 and resId ~= 999 then local data = artResConfig[resId] - this.RoleName.text =string.gsub(GetLanguageStrById(data.Desc), Language[11252], NameManager.roleName) + if NameManager.roleName == tostring(PlayerManager.uid) then + this.RoleName.text =string.gsub(GetLanguageStrById(data.Desc), Language[11252], "??????") + else + this.RoleName.text =string.gsub(GetLanguageStrById(data.Desc), Language[11252], NameManager.roleName) + end -- 初始化特效 StoryManager.InitEffect(this.effectRoot)