diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/GuideBattleLogic.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/GuideBattleLogic.lua index b6a6b0695e..b0b7ae77f7 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/GuideBattleLogic.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/GuideBattleLogic.lua @@ -31,6 +31,12 @@ function GuideBattleLogic:RoleTurnChange(curRound, role) if _config.TriggerType == 1 then BattleManager.SetGuidePause(true) local storyId = _config.TriggerId + if PlayerManager.jumpToCreateName then + if storyId==1250003 then + BattleManager.SetGuidePause(false) + return + end + end StoryManager.EventTrigger(storyId, function() BattleManager.SetGuidePause(false) end) diff --git a/Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua index 42c833ed9f..2f8ad80116 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua @@ -48,7 +48,7 @@ this.dailyRedPack = 0 this.startWeek = 0 - +this.jumpToCreateName=false this.RewardItemSingleShowPopupIsRoleUpStarLayout = false diff --git a/Assets/ManagedResources/~Lua/Modules/Story/StoryDialoguePanel.lua b/Assets/ManagedResources/~Lua/Modules/Story/StoryDialoguePanel.lua index d7fd0ee908..24d22b869a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Story/StoryDialoguePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Story/StoryDialoguePanel.lua @@ -65,7 +65,11 @@ function StoryDialoguePanel:BindEvent() static_callBack = nil end else + LogError("jumpId=================="..jumpId) self:GoNext(jumpId) + if optionID==300001 then + PlayerManager.jumpToCreateName=true + end end end) end @@ -166,6 +170,8 @@ function this.RefreshPanel(eventId, isFirstOpen) -- 跳转值 optionID = options[1] jumpId = options[2] or 0 + LogError("optionID==================="..optionID.." jumpid==========="..jumpId) + --jumpId=1250010 -- jumpId = chapterEventPointData[eventId].NextOptPanelId -- if jumpId and jumpId ~= 0 then -- -- jumpId = chapterEventPointData[jumpId].Option[1]