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
This commit is contained in:
Binary file not shown.
@@ -83,6 +83,7 @@ function ScoreBossLevel:CalCharFixedEffect(nCharId, bMainChar, tbDiscId)
|
|||||||
return stActorInfo
|
return stActorInfo
|
||||||
end
|
end
|
||||||
function ScoreBossLevel:OnEvent_LoadLevelRefresh()
|
function ScoreBossLevel:OnEvent_LoadLevelRefresh()
|
||||||
|
EventManager.Hit("ResetBossHUD")
|
||||||
self.isCanPause = true
|
self.isCanPause = true
|
||||||
local mapAllEft, mapDiscEft, mapNoteEffect, tbNoteInfo = PlayerData.Build:GetBuildAllEft(self.mapBuildData.nBuildId)
|
local mapAllEft, mapDiscEft, mapNoteEffect, tbNoteInfo = PlayerData.Build:GetBuildAllEft(self.mapBuildData.nBuildId)
|
||||||
safe_call_cs_func(CS.AdventureModuleHelper.SetNoteInfo, tbNoteInfo)
|
safe_call_cs_func(CS.AdventureModuleHelper.SetNoteInfo, tbNoteInfo)
|
||||||
|
|||||||
@@ -7970,7 +7970,7 @@ return {
|
|||||||
param = {
|
param = {
|
||||||
0,
|
0,
|
||||||
"avg3_999",
|
"avg3_999",
|
||||||
"如果不能满足她的审美要求,就会被她判定为“没品位的人”直接拉黑,不过该交的货也不会差你的,这也算是斯帕克拉的特色了。",
|
"如果不能满足她的审美要求,就会被她判定为“没品味的人”直接拉黑,不过该交的货也不会差你的,这也算是斯帕克拉的特色了。",
|
||||||
0,
|
0,
|
||||||
"",
|
"",
|
||||||
false,
|
false,
|
||||||
|
|||||||
@@ -632,6 +632,10 @@ function BossHUDCtrl:OpenUI(bossId, nDataId, nType, nBloodType, bRefresh)
|
|||||||
printError(string.format("boss血条已被EntityId为%d绑定 %d重复绑定不生效", self.bossId, bossId))
|
printError(string.format("boss血条已被EntityId为%d绑定 %d重复绑定不生效", self.bossId, bossId))
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
local info = AdventureModuleHelper.GetEntityInfo(bossId)
|
||||||
|
if info == nil then
|
||||||
|
return
|
||||||
|
end
|
||||||
if not bRefresh then
|
if not bRefresh then
|
||||||
self:InitUI(bossId, nDataId, nType, nBloodType)
|
self:InitUI(bossId, nDataId, nType, nBloodType)
|
||||||
else
|
else
|
||||||
|
|||||||
@@ -110,6 +110,18 @@ local OnEvent_AvgSTEnd = function(_)
|
|||||||
func_AvgSTEnd()
|
func_AvgSTEnd()
|
||||||
end
|
end
|
||||||
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(_)
|
local function Uninit(_)
|
||||||
if objAvgPanel ~= nil then
|
if objAvgPanel ~= nil then
|
||||||
OnEvent_AvgSTEnd(_)
|
OnEvent_AvgSTEnd(_)
|
||||||
@@ -119,6 +131,7 @@ local function Uninit(_)
|
|||||||
OnEvent_AvgBBEnd(_)
|
OnEvent_AvgBBEnd(_)
|
||||||
EventManager.Remove(EventId.AvgBubbleShow, AvgManager, OnEvent_AvgBBStart)
|
EventManager.Remove(EventId.AvgBubbleShow, AvgManager, OnEvent_AvgBBStart)
|
||||||
EventManager.Remove(EventId.AvgBubbleExit, AvgManager, OnEvent_AvgBBEnd)
|
EventManager.Remove(EventId.AvgBubbleExit, AvgManager, OnEvent_AvgBBEnd)
|
||||||
|
EventManager.Remove("ForceCloseAllBeforeBackLogin", AvgManager, AvgManager.ForceCloseAll)
|
||||||
EventManager.Remove(EventId.CSLuaManagerShutdown, AvgManager, Uninit)
|
EventManager.Remove(EventId.CSLuaManagerShutdown, AvgManager, Uninit)
|
||||||
end
|
end
|
||||||
function AvgManager.Init()
|
function AvgManager.Init()
|
||||||
@@ -126,6 +139,7 @@ function AvgManager.Init()
|
|||||||
EventManager.Add("StoryDialog_DialogEnd", AvgManager, OnEvent_AvgSTEnd)
|
EventManager.Add("StoryDialog_DialogEnd", AvgManager, OnEvent_AvgSTEnd)
|
||||||
EventManager.Add(EventId.AvgBubbleShow, AvgManager, OnEvent_AvgBBStart)
|
EventManager.Add(EventId.AvgBubbleShow, AvgManager, OnEvent_AvgBBStart)
|
||||||
EventManager.Add(EventId.AvgBubbleExit, AvgManager, OnEvent_AvgBBEnd)
|
EventManager.Add(EventId.AvgBubbleExit, AvgManager, OnEvent_AvgBBEnd)
|
||||||
|
EventManager.Add("ForceCloseAllBeforeBackLogin", AvgManager, AvgManager.ForceCloseAll)
|
||||||
EventManager.Add(EventId.CSLuaManagerShutdown, AvgManager, Uninit)
|
EventManager.Add(EventId.CSLuaManagerShutdown, AvgManager, Uninit)
|
||||||
end
|
end
|
||||||
function AvgManager.CheckInAvg()
|
function AvgManager.CheckInAvg()
|
||||||
|
|||||||
@@ -509,11 +509,9 @@ function PanelManager.Home()
|
|||||||
DoBackToTarget(nBackToIdx)
|
DoBackToTarget(nBackToIdx)
|
||||||
end
|
end
|
||||||
function PanelManager.OnConfirmBackToLogIn()
|
function PanelManager.OnConfirmBackToLogIn()
|
||||||
if objCurPanel == nil then
|
EventManager.Hit("ForceCloseAllBeforeBackLogin")
|
||||||
return
|
|
||||||
end
|
|
||||||
PanelManager.CloseAllDisposablePanel()
|
PanelManager.CloseAllDisposablePanel()
|
||||||
if objCurPanel._bAddToBackHistory ~= true then
|
if objCurPanel ~= nil and objCurPanel._bAddToBackHistory ~= true then
|
||||||
objCurPanel:_PreExit()
|
objCurPanel:_PreExit()
|
||||||
objCurPanel:_Exit()
|
objCurPanel:_Exit()
|
||||||
objCurPanel:_Destroy()
|
objCurPanel:_Destroy()
|
||||||
|
|||||||
+4
-4
@@ -1,4 +1,4 @@
|
|||||||
EN: 1.11.0.115
|
EN: 1.11.0.116
|
||||||
CN: 1.11.0.116
|
CN: 1.11.0.117
|
||||||
JP: 1.11.0.120
|
JP: 1.11.0.121
|
||||||
KR: 1.11.0.120
|
KR: 1.11.0.121
|
||||||
|
|||||||
Reference in New Issue
Block a user