Update - 1.12.0.120

EN: 1.12.0.120
CN: 1.12.0.120
JP: 1.12.0.124
KR: 1.12.0.124
This commit is contained in:
SL1900
2026-06-30 14:30:00 +09:00
parent 061d344bf2
commit 80af235e05
826 changed files with 625145 additions and 81163 deletions
@@ -101,9 +101,11 @@ function JointDrillPauseCtrl:PlayInAni()
self._mapNode.goBlur:SetActive(true)
local wait = function()
coroutine.yield(CS.UnityEngine.WaitForEndOfFrame())
self._mapNode.safeAreaRoot:SetActive(true)
self._mapNode.aniWindow:Play("t_window_04_t_in")
EventManager.Hit(EventId.TemporaryBlockInput, 0.3)
if self.bShow then
self._mapNode.safeAreaRoot:SetActive(true)
self._mapNode.aniWindow:Play("t_window_04_t_in")
EventManager.Hit(EventId.TemporaryBlockInput, 0.3)
end
end
cs_coroutine.start(wait)
end
@@ -153,9 +155,16 @@ function JointDrillPauseCtrl:PlayCloseAni(callback)
self._mapNode.aniWindow:Play("t_window_04_t_out")
self._mapNode.aniBlur:SetTrigger("tOut")
EventManager.Hit(EventId.TemporaryBlockInput, 0.2)
self:AddTimer(1, 0.2, "OnPanelClose", true, true, true, callback)
self:AddTimer(1, 0.2, "ClosePanel", true, true, true, callback)
end
function JointDrillPauseCtrl:OnPanelClose(_, callback)
function JointDrillPauseCtrl:ClosePanel(_, callback)
if self._mapNode == nil or not self.bShow then
return
end
self:OnPanelClose(callback)
end
function JointDrillPauseCtrl:OnPanelClose(callback)
self.bShow = false
PanelManager.InputEnable()
GamepadUIManager.DisableGamepadUI("JointDrillPauseCtrl")
EventManager.Hit(EventId.BattleDashboardVisible, true)
@@ -164,7 +173,6 @@ function JointDrillPauseCtrl:OnPanelClose(_, callback)
if callback then
callback()
end
self.bShow = false
end
function JointDrillPauseCtrl:Awake()
self.nAllChallengeTime = ConfigTable.GetConfigNumber("JointDrill_Challenge_Time_Max")
@@ -299,9 +307,6 @@ function JointDrillPauseCtrl:OnEvent_RefreshChallengeTime(nTime)
NovaAPI.SetTMPText(self._mapNode.txtChallengeTime, string.format("%02d:%02d", nMin, nSec))
end
function JointDrillPauseCtrl:OnEvent_CloseJointDrillPause()
if self._mapNode == nil or not self.bShow then
return
end
self:OnPanelClose()
self:ClosePanel()
end
return JointDrillPauseCtrl
@@ -48,6 +48,19 @@ JointDrillContext.Entries = {
Raid = PanelId.JointDrillRaid_510003
}
},
[510004] = {
nJointDrillMode = GameEnum.JointDrillMode.JointDrill_Mode_1,
tbPanelId = {
LevelSelect = PanelId.JointDrillLevelSelect_510001,
BuildList = PanelId.JointDrillBuildList_510001,
Result = PanelId.JointDrillResult_510001,
RankUp = PanelId.JointDrillRankUp_510001,
Quest = PanelId.JointDrillQuest_510001,
Ranking = PanelId.JointDrillRanking_510001,
RankDetail = PanelId.JointDrillRankDetail_510001,
Raid = PanelId.JointDrillRaid_510001
}
},
[510005] = {
nJointDrillMode = GameEnum.JointDrillMode.JointDrill_Mode_2,
tbPanelId = {