From 9ea60affccdfc96f8dc899251df6e2cdd30098ef Mon Sep 17 00:00:00 2001 From: SL1900 <43700351+SL1900@users.noreply.github.com> Date: Fri, 5 Jun 2026 18:00:00 +0900 Subject: [PATCH] Hotfix - 1.11.0.116 EN: 1.11.0.116 CN: 1.11.0.117 JP: 1.11.0.121 KR: 1.11.0.121 --- data/bin/character.bytes | Bin 13793 -> 13793 bytes .../adventure/scoreboss/scorebosslevel.lua | 1 + lua/game/ui/avg/_cn/config/stev_08_03.lua | 2 +- lua/game/ui/battle/bosshudctrl.lua | 4 ++++ lua/gamecore/module/avgmanager.lua | 14 ++++++++++++++ lua/gamecore/ui/panelmanager.lua | 6 ++---- versions.txt | 8 ++++---- 7 files changed, 26 insertions(+), 9 deletions(-) diff --git a/data/bin/character.bytes b/data/bin/character.bytes index 173eeecdf3b42b4ca64c971af090d1c79ef57d45..40546a34622e366aef84edc7511fe42fb94766f0 100644 GIT binary patch delta 14 VcmaEu{V;n&j|wC6=3bQ$K>#$(1;zjX delta 14 VcmaEu{V;n&j|wBp=3bQ$K>#$<1;+pY diff --git a/lua/game/adventure/scoreboss/scorebosslevel.lua b/lua/game/adventure/scoreboss/scorebosslevel.lua index fe29878e..a8060ede 100644 --- a/lua/game/adventure/scoreboss/scorebosslevel.lua +++ b/lua/game/adventure/scoreboss/scorebosslevel.lua @@ -83,6 +83,7 @@ function ScoreBossLevel:CalCharFixedEffect(nCharId, bMainChar, tbDiscId) return stActorInfo end function ScoreBossLevel:OnEvent_LoadLevelRefresh() + EventManager.Hit("ResetBossHUD") self.isCanPause = true local mapAllEft, mapDiscEft, mapNoteEffect, tbNoteInfo = PlayerData.Build:GetBuildAllEft(self.mapBuildData.nBuildId) safe_call_cs_func(CS.AdventureModuleHelper.SetNoteInfo, tbNoteInfo) diff --git a/lua/game/ui/avg/_cn/config/stev_08_03.lua b/lua/game/ui/avg/_cn/config/stev_08_03.lua index 2b0d7a83..23a9864b 100644 --- a/lua/game/ui/avg/_cn/config/stev_08_03.lua +++ b/lua/game/ui/avg/_cn/config/stev_08_03.lua @@ -7970,7 +7970,7 @@ return { param = { 0, "avg3_999", - "如果不能满足她的审美要求，就会被她判定为“没品位的人”直接拉黑，不过该交的货也不会差你的，这也算是斯帕克拉的特色了。", + "如果不能满足她的审美要求，就会被她判定为“没品味的人”直接拉黑，不过该交的货也不会差你的，这也算是斯帕克拉的特色了。", 0, "", false, diff --git a/lua/game/ui/battle/bosshudctrl.lua b/lua/game/ui/battle/bosshudctrl.lua index b4b33149..2cb28787 100644 --- a/lua/game/ui/battle/bosshudctrl.lua +++ b/lua/game/ui/battle/bosshudctrl.lua @@ -632,6 +632,10 @@ function BossHUDCtrl:OpenUI(bossId, nDataId, nType, nBloodType, bRefresh) printError(string.format("boss血条已被EntityId为%d绑定 %d重复绑定不生效", self.bossId, bossId)) return end + local info = AdventureModuleHelper.GetEntityInfo(bossId) + if info == nil then + return + end if not bRefresh then self:InitUI(bossId, nDataId, nType, nBloodType) else diff --git a/lua/gamecore/module/avgmanager.lua b/lua/gamecore/module/avgmanager.lua index a47086e9..75db8901 100644 --- a/lua/gamecore/module/avgmanager.lua +++ b/lua/gamecore/module/avgmanager.lua @@ -110,6 +110,18 @@ local OnEvent_AvgSTEnd = function(_) func_AvgSTEnd() end end +function AvgManager.ForceCloseAll(_) + if objAvgPanel ~= nil then + objAvgPanel:_PreExit() + objAvgPanel:_Exit() + objAvgPanel:_Destroy() + objAvgPanel = nil + end + OnEvent_AvgBBEnd(_) + bInAvg = false + nTransitionType = 0 + NovaAPI.SetScreenSleepTimeout(false) +end local function Uninit(_) if objAvgPanel ~= nil then OnEvent_AvgSTEnd(_) @@ -119,6 +131,7 @@ local function Uninit(_) OnEvent_AvgBBEnd(_) EventManager.Remove(EventId.AvgBubbleShow, AvgManager, OnEvent_AvgBBStart) EventManager.Remove(EventId.AvgBubbleExit, AvgManager, OnEvent_AvgBBEnd) + EventManager.Remove("ForceCloseAllBeforeBackLogin", AvgManager, AvgManager.ForceCloseAll) EventManager.Remove(EventId.CSLuaManagerShutdown, AvgManager, Uninit) end function AvgManager.Init() @@ -126,6 +139,7 @@ function AvgManager.Init() EventManager.Add("StoryDialog_DialogEnd", AvgManager, OnEvent_AvgSTEnd) EventManager.Add(EventId.AvgBubbleShow, AvgManager, OnEvent_AvgBBStart) EventManager.Add(EventId.AvgBubbleExit, AvgManager, OnEvent_AvgBBEnd) + EventManager.Add("ForceCloseAllBeforeBackLogin", AvgManager, AvgManager.ForceCloseAll) EventManager.Add(EventId.CSLuaManagerShutdown, AvgManager, Uninit) end function AvgManager.CheckInAvg() diff --git a/lua/gamecore/ui/panelmanager.lua b/lua/gamecore/ui/panelmanager.lua index 17771b9e..3b47a190 100644 --- a/lua/gamecore/ui/panelmanager.lua +++ b/lua/gamecore/ui/panelmanager.lua @@ -509,11 +509,9 @@ function PanelManager.Home() DoBackToTarget(nBackToIdx) end function PanelManager.OnConfirmBackToLogIn() - if objCurPanel == nil then - return - end + EventManager.Hit("ForceCloseAllBeforeBackLogin") PanelManager.CloseAllDisposablePanel() - if objCurPanel._bAddToBackHistory ~= true then + if objCurPanel ~= nil and objCurPanel._bAddToBackHistory ~= true then objCurPanel:_PreExit() objCurPanel:_Exit() objCurPanel:_Destroy() diff --git a/versions.txt b/versions.txt index 2f1481fb..72291458 100644 --- a/versions.txt +++ b/versions.txt @@ -1,4 +1,4 @@ -EN: 1.11.0.115 -CN: 1.11.0.116 -JP: 1.11.0.120 -KR: 1.11.0.120 +EN: 1.11.0.116 +CN: 1.11.0.117 +JP: 1.11.0.121 +KR: 1.11.0.121