Update - 1.13.0.124

EN: 1.13.0.124
CN: 1.13.0.124
JP: 1.13.0.128
KR: 1.13.0.130
This commit is contained in:
SL1900
2026-07-21 12:30:00 +09:00
parent a12087abad
commit 8c4bd41668
1334 changed files with 873026 additions and 95164 deletions
@@ -1,8 +1,8 @@
local ActivityJointDrill_510001PopUpCtrl = class("ActivityJointDrill_510001PopUpCtrl", BaseCtrl)
local ActivityJointDrillPopUpCtrl = class("ActivityJointDrillPopUpCtrl", BaseCtrl)
local TimerManager = require("GameCore.Timer.TimerManager")
local LocalData = require("GameCore.Data.LocalData")
local ClientManager = CS.ClientManager.Instance
ActivityJointDrill_510001PopUpCtrl._mapNodeConfig = {
ActivityJointDrillPopUpCtrl._mapNodeConfig = {
goContent = {
sNodeName = "---Common---"
},
@@ -35,8 +35,8 @@ ActivityJointDrill_510001PopUpCtrl._mapNodeConfig = {
sLanguageId = "JointDrill_Beta_Tip"
}
}
ActivityJointDrill_510001PopUpCtrl._mapEventConfig = {}
function ActivityJointDrill_510001PopUpCtrl:ShowPopUp(actId, callback, index)
ActivityJointDrillPopUpCtrl._mapEventConfig = {}
function ActivityJointDrillPopUpCtrl:ShowPopUp(actId, callback, index)
self.popUpIndex = index
self.dontShowAgain = false
self.nCurActId = actId
@@ -58,12 +58,12 @@ function ActivityJointDrill_510001PopUpCtrl:ShowPopUp(actId, callback, index)
self.anim = self.gameObject:GetComponent("Animator")
self:PlayOpenAnim()
end
function ActivityJointDrill_510001PopUpCtrl:PlayOpenAnim()
function ActivityJointDrillPopUpCtrl:PlayOpenAnim()
if self.anim then
self.anim:Play("open", 0, 0)
end
end
function ActivityJointDrill_510001PopUpCtrl:RefreshDate()
function ActivityJointDrillPopUpCtrl:RefreshDate()
local nOpenMonth = tonumber(os.date("%m", self.nOpenTime))
local nOpenDay = tonumber(os.date("%d", self.nOpenTime))
local nEndMonth = tonumber(os.date("%m", self.nEndTime))
@@ -73,7 +73,7 @@ function ActivityJointDrill_510001PopUpCtrl:RefreshDate()
local dateStr = string.format("%s/%s ~ %s/%s", nOpenMonth, strOpenDay, nEndMonth, strEndDay)
NovaAPI.SetTMPText(self._mapNode.txtDate, dateStr)
end
function ActivityJointDrill_510001PopUpCtrl:RefreshTimeout()
function ActivityJointDrillPopUpCtrl:RefreshTimeout()
local endTime = self.nEndTime
local curTime = ClientManager.serverTimeStamp
local remainTime = endTime - curTime
@@ -115,7 +115,7 @@ function ActivityJointDrill_510001PopUpCtrl:RefreshTimeout()
end
NovaAPI.SetTMPText(self._mapNode.txtTime, sTimeStr)
end
function ActivityJointDrill_510001PopUpCtrl:ClosePopUp(callback)
function ActivityJointDrillPopUpCtrl:ClosePopUp(callback)
if self.anim ~= nil then
self.anim:Play("close", 0, 0)
self:AddTimer(1, 0.1, function()
@@ -128,16 +128,16 @@ function ActivityJointDrill_510001PopUpCtrl:ClosePopUp(callback)
callback()
end
end
function ActivityJointDrill_510001PopUpCtrl:OnBtnClick_DontShowAgain()
function ActivityJointDrillPopUpCtrl:OnBtnClick_DontShowAgain()
self.dontShowAgain = not self.dontShowAgain
self._mapNode.imgDontShow1:SetActive(not self.dontShowAgain)
self._mapNode.imgDontShow2:SetActive(self.dontShowAgain)
LocalData.SetPlayerLocalData("Act_PopUp_DontShow" .. self.nCurActId, self.dontShowAgain)
end
function ActivityJointDrill_510001PopUpCtrl:OnBtnClick_Close()
function ActivityJointDrillPopUpCtrl:OnBtnClick_Close()
self:ClosePopUp(self.callback)
end
function ActivityJointDrill_510001PopUpCtrl:OnBtnClick_Goto()
function ActivityJointDrillPopUpCtrl:OnBtnClick_Goto()
local callback = function()
if nil ~= self.nCurActId then
PopUpManager.InterruptPopUp(self.popUpIndex)
@@ -158,4 +158,4 @@ function ActivityJointDrill_510001PopUpCtrl:OnBtnClick_Goto()
end
self:ClosePopUp(callback)
end
return ActivityJointDrill_510001PopUpCtrl
return ActivityJointDrillPopUpCtrl
@@ -1,8 +1,12 @@
local ActivityJointDrill_510003PopUpCtrl = class("ActivityJointDrill_510003PopUpCtrl", BaseCtrl)
local ActivitySoldierPopUpCtrl = class("ActivitySoldierPopUpCtrl", BaseCtrl)
local TimerManager = require("GameCore.Timer.TimerManager")
local LocalData = require("GameCore.Data.LocalData")
local ClientManager = CS.ClientManager.Instance
ActivityJointDrill_510003PopUpCtrl._mapNodeConfig = {
ActivitySoldierPopUpCtrl._mapNodeConfig = {
btnCloseFullscreen = {
sComponentName = "UIButton",
callback = "OnBtnClick_Close"
},
goContent = {
sNodeName = "---Common---"
},
@@ -29,24 +33,16 @@ ActivityJointDrill_510003PopUpCtrl._mapNodeConfig = {
txtDontShow = {
sComponentName = "TMP_Text",
sLanguageId = "Activity_DontShow_PopUp_Again"
},
txtBeta = {
sComponentName = "TMP_Text",
sLanguageId = "JointDrill_Beta_Tip"
}
}
ActivityJointDrill_510003PopUpCtrl._mapEventConfig = {}
function ActivityJointDrill_510003PopUpCtrl:ShowPopUp(actId, callback, index)
ActivitySoldierPopUpCtrl._mapEventConfig = {}
function ActivitySoldierPopUpCtrl:ShowPopUp(actId, callback, index)
self.popUpIndex = index
self.dontShowAgain = false
self.nCurActId = actId
self.callback = callback
self.actCfg = ConfigTable.GetData("Activity", self.nCurActId)
local actData = PlayerData.Activity:GetActivityDataById(self.nCurActId)
if actData == nil then
return
end
self.nOpenTime = actData:GetChallengeStartTime()
self.nOpenTime = CS.ClientManager.Instance:ISO8601StrToTimeStamp(self.actCfg.StartTime)
self.nEndTime = CS.ClientManager.Instance:ISO8601StrToTimeStamp(self.actCfg.EndTime)
self:RefreshTimeout()
self:RefreshDate()
@@ -58,12 +54,12 @@ function ActivityJointDrill_510003PopUpCtrl:ShowPopUp(actId, callback, index)
self.anim = self.gameObject:GetComponent("Animator")
self:PlayOpenAnim()
end
function ActivityJointDrill_510003PopUpCtrl:PlayOpenAnim()
function ActivitySoldierPopUpCtrl:PlayOpenAnim()
if self.anim then
self.anim:Play("open", 0, 0)
end
end
function ActivityJointDrill_510003PopUpCtrl:RefreshDate()
function ActivitySoldierPopUpCtrl:RefreshDate()
local nOpenMonth = tonumber(os.date("%m", self.nOpenTime))
local nOpenDay = tonumber(os.date("%d", self.nOpenTime))
local nEndMonth = tonumber(os.date("%m", self.nEndTime))
@@ -73,7 +69,7 @@ function ActivityJointDrill_510003PopUpCtrl:RefreshDate()
local dateStr = string.format("%s/%s ~ %s/%s", nOpenMonth, strOpenDay, nEndMonth, strEndDay)
NovaAPI.SetTMPText(self._mapNode.txtDate, dateStr)
end
function ActivityJointDrill_510003PopUpCtrl:RefreshTimeout()
function ActivitySoldierPopUpCtrl:RefreshTimeout()
local endTime = self.nEndTime
local curTime = ClientManager.serverTimeStamp
local remainTime = endTime - curTime
@@ -115,7 +111,7 @@ function ActivityJointDrill_510003PopUpCtrl:RefreshTimeout()
end
NovaAPI.SetTMPText(self._mapNode.txtTime, sTimeStr)
end
function ActivityJointDrill_510003PopUpCtrl:ClosePopUp(callback)
function ActivitySoldierPopUpCtrl:ClosePopUp(callback)
if self.anim ~= nil then
self.anim:Play("close", 0, 0)
self:AddTimer(1, 0.1, function()
@@ -128,16 +124,16 @@ function ActivityJointDrill_510003PopUpCtrl:ClosePopUp(callback)
callback()
end
end
function ActivityJointDrill_510003PopUpCtrl:OnBtnClick_DontShowAgain()
function ActivitySoldierPopUpCtrl:OnBtnClick_DontShowAgain()
self.dontShowAgain = not self.dontShowAgain
self._mapNode.imgDontShow1:SetActive(not self.dontShowAgain)
self._mapNode.imgDontShow2:SetActive(self.dontShowAgain)
LocalData.SetPlayerLocalData("Act_PopUp_DontShow" .. self.nCurActId, self.dontShowAgain)
end
function ActivityJointDrill_510003PopUpCtrl:OnBtnClick_Close()
function ActivitySoldierPopUpCtrl:OnBtnClick_Close()
self:ClosePopUp(self.callback)
end
function ActivityJointDrill_510003PopUpCtrl:OnBtnClick_Goto()
function ActivitySoldierPopUpCtrl:OnBtnClick_Goto()
local callback = function()
if nil ~= self.nCurActId then
PopUpManager.InterruptPopUp(self.popUpIndex)
@@ -158,4 +154,4 @@ function ActivityJointDrill_510003PopUpCtrl:OnBtnClick_Goto()
end
self:ClosePopUp(callback)
end
return ActivityJointDrill_510003PopUpCtrl
return ActivitySoldierPopUpCtrl
@@ -1,8 +1,8 @@
local ActivityJointDrill_510003PopUpCtrl = class("ActivityJointDrill_510003PopUpCtrl", BaseCtrl)
local ActivitySummerAdv_10110PopUpCtrl = class("ActivitySummerAdv_10110PopUpCtrl", BaseCtrl)
local TimerManager = require("GameCore.Timer.TimerManager")
local LocalData = require("GameCore.Data.LocalData")
local ClientManager = CS.ClientManager.Instance
ActivityJointDrill_510003PopUpCtrl._mapNodeConfig = {
ActivitySummerAdv_10110PopUpCtrl._mapNodeConfig = {
goContent = {
sNodeName = "---Common---"
},
@@ -12,12 +12,16 @@ ActivityJointDrill_510003PopUpCtrl._mapNodeConfig = {
},
txtBtnGo = {
sComponentName = "TMP_Text",
sLanguageId = "Activity_PopUp_Goto_1"
sLanguageId = "Activity_PopUp_Goto"
},
btnClose = {
sComponentName = "UIButton",
callback = "OnBtnClick_Close"
},
btnCloseFullscreen = {
sComponentName = "UIButton",
callback = "OnBtnClick_Close"
},
txtDate = {sComponentName = "TMP_Text"},
txtTime = {sComponentName = "TMP_Text"},
btnDontShow = {
@@ -29,25 +33,17 @@ ActivityJointDrill_510003PopUpCtrl._mapNodeConfig = {
txtDontShow = {
sComponentName = "TMP_Text",
sLanguageId = "Activity_DontShow_PopUp_Again"
},
txtBeta = {
sComponentName = "TMP_Text",
sLanguageId = "JointDrill_Beta_Tip"
}
}
ActivityJointDrill_510003PopUpCtrl._mapEventConfig = {}
function ActivityJointDrill_510003PopUpCtrl:ShowPopUp(actId, callback, index)
ActivitySummerAdv_10110PopUpCtrl._mapEventConfig = {}
function ActivitySummerAdv_10110PopUpCtrl:ShowPopUp(actId, callback, index)
self.popUpIndex = index
self.dontShowAgain = false
self.nCurActId = actId
self.callback = callback
self.actCfg = ConfigTable.GetData("Activity", self.nCurActId)
local actData = PlayerData.Activity:GetActivityDataById(self.nCurActId)
if actData == nil then
return
end
self.nOpenTime = actData:GetChallengeStartTime()
self.nEndTime = CS.ClientManager.Instance:ISO8601StrToTimeStamp(self.actCfg.EndTime)
self.actGroupCfg = ConfigTable.GetData("ActivityGroup", self.nCurActId)
self.nOpenTime = CS.ClientManager.Instance:ISO8601StrToTimeStamp(self.actGroupCfg.StartTime)
self.nEndTime = CS.ClientManager.Instance:ISO8601StrToTimeStamp(self.actGroupCfg.EndTime)
self:RefreshTimeout()
self:RefreshDate()
if nil == self.remainTimer then
@@ -58,12 +54,12 @@ function ActivityJointDrill_510003PopUpCtrl:ShowPopUp(actId, callback, index)
self.anim = self.gameObject:GetComponent("Animator")
self:PlayOpenAnim()
end
function ActivityJointDrill_510003PopUpCtrl:PlayOpenAnim()
function ActivitySummerAdv_10110PopUpCtrl:PlayOpenAnim()
if self.anim then
self.anim:Play("open", 0, 0)
end
end
function ActivityJointDrill_510003PopUpCtrl:RefreshDate()
function ActivitySummerAdv_10110PopUpCtrl:RefreshDate()
local nOpenMonth = tonumber(os.date("%m", self.nOpenTime))
local nOpenDay = tonumber(os.date("%d", self.nOpenTime))
local nEndMonth = tonumber(os.date("%m", self.nEndTime))
@@ -73,7 +69,7 @@ function ActivityJointDrill_510003PopUpCtrl:RefreshDate()
local dateStr = string.format("%s/%s ~ %s/%s", nOpenMonth, strOpenDay, nEndMonth, strEndDay)
NovaAPI.SetTMPText(self._mapNode.txtDate, dateStr)
end
function ActivityJointDrill_510003PopUpCtrl:RefreshTimeout()
function ActivitySummerAdv_10110PopUpCtrl:RefreshTimeout()
local endTime = self.nEndTime
local curTime = ClientManager.serverTimeStamp
local remainTime = endTime - curTime
@@ -115,33 +111,30 @@ function ActivityJointDrill_510003PopUpCtrl:RefreshTimeout()
end
NovaAPI.SetTMPText(self._mapNode.txtTime, sTimeStr)
end
function ActivityJointDrill_510003PopUpCtrl:ClosePopUp(callback)
if self.anim ~= nil then
self.anim:Play("close", 0, 0)
self:AddTimer(1, 0.1, function()
if callback ~= nil then
callback()
end
end, true, true, true)
EventManager.Hit(EventId.TemporaryBlockInput, 0.1)
elseif callback ~= nil then
callback()
end
end
function ActivityJointDrill_510003PopUpCtrl:OnBtnClick_DontShowAgain()
function ActivitySummerAdv_10110PopUpCtrl:OnBtnClick_DontShowAgain()
self.dontShowAgain = not self.dontShowAgain
self._mapNode.imgDontShow1:SetActive(not self.dontShowAgain)
self._mapNode.imgDontShow2:SetActive(self.dontShowAgain)
LocalData.SetPlayerLocalData("Act_PopUp_DontShow" .. self.nCurActId, self.dontShowAgain)
end
function ActivityJointDrill_510003PopUpCtrl:OnBtnClick_Close()
self:ClosePopUp(self.callback)
function ActivitySummerAdv_10110PopUpCtrl:OnBtnClick_Close()
if self.callback ~= nil then
if self.anim then
self.anim:Play("close")
self:AddTimer(1, 0.2, function()
self.callback()
end, true, true, true)
else
self.callback()
end
end
end
function ActivityJointDrill_510003PopUpCtrl:OnBtnClick_Goto()
local callback = function()
if nil ~= self.nCurActId then
PopUpManager.InterruptPopUp(self.popUpIndex)
PlayerData.Activity:SendActivityDetailMsg()
function ActivitySummerAdv_10110PopUpCtrl:OnBtnClick_Goto()
if nil ~= self.nCurActId then
PopUpManager.InterruptPopUp(self.popUpIndex)
PlayerData.Activity:SendActivityDetailMsg()
self.anim:Play("close")
self:AddTimer(1, 0.2, function()
local endTime = self.nEndTime
local curTime = ClientManager.serverTimeStamp
local remainTime = endTime - curTime
@@ -153,9 +146,15 @@ function ActivityJointDrill_510003PopUpCtrl:OnBtnClick_Goto()
return
end
EventManager.Hit(EventId.ClosePanel, PanelId.ActivityPopUp)
EventManager.Hit(EventId.OpenPanel, PanelId.ActivityList, self.nCurActId)
end
if self.actGroupCfg.TransitionId ~= nil and 0 < self.actGroupCfg.TransitionId then
local callback = function()
EventManager.Hit(EventId.OpenPanel, self.actGroupCfg.PanelId, self.actGroupCfg.Id, true)
end
EventManager.Hit(EventId.SetTransition, self.actGroupCfg.TransitionId, callback)
else
EventManager.Hit(EventId.OpenPanel, self.actGroupCfg.PanelId, self.actGroupCfg.Id, true)
end
end, true, true, true)
end
self:ClosePopUp(callback)
end
return ActivityJointDrill_510003PopUpCtrl
return ActivitySummerAdv_10110PopUpCtrl
@@ -0,0 +1,160 @@
local ActivitySummerCheckin_20103PopUpCtrl = class("ActivitySummerCheckin_20103PopUpCtrl", BaseCtrl)
local TimerManager = require("GameCore.Timer.TimerManager")
local LocalData = require("GameCore.Data.LocalData")
local ClientManager = CS.ClientManager.Instance
ActivitySummerCheckin_20103PopUpCtrl._mapNodeConfig = {
goContent = {
sNodeName = "---Common---"
},
btnGo = {
sComponentName = "UIButton",
callback = "OnBtnClick_Goto"
},
txtBtnGo = {
sComponentName = "TMP_Text",
sLanguageId = "Activity_PopUp_Goto"
},
btnClose = {
sComponentName = "UIButton",
callback = "OnBtnClick_Close"
},
btnCloseFullscreen = {
sComponentName = "UIButton",
callback = "OnBtnClick_Close"
},
txtDate = {sComponentName = "TMP_Text"},
txtTime = {sComponentName = "TMP_Text"},
btnDontShow = {
sComponentName = "UIButton",
callback = "OnBtnClick_DontShowAgain"
},
imgDontShow1 = {},
imgDontShow2 = {},
txtDontShow = {
sComponentName = "TMP_Text",
sLanguageId = "Activity_DontShow_PopUp_Again"
}
}
ActivitySummerCheckin_20103PopUpCtrl._mapEventConfig = {}
function ActivitySummerCheckin_20103PopUpCtrl:ShowPopUp(actId, callback, index)
self.popUpIndex = index
self.dontShowAgain = false
self.nCurActId = actId
self.callback = callback
self.actGroupCfg = ConfigTable.GetData("ActivityGroup", self.nCurActId)
self.nOpenTime = CS.ClientManager.Instance:ISO8601StrToTimeStamp(self.actGroupCfg.StartTime)
self.nEndTime = CS.ClientManager.Instance:ISO8601StrToTimeStamp(self.actGroupCfg.EndTime)
self:RefreshTimeout()
self:RefreshDate()
if nil == self.remainTimer then
self.remainTimer = self:AddTimer(0, 1, "RefreshTimeout", true, true, true)
end
self._mapNode.imgDontShow1:SetActive(not self.dontShowAgain)
self._mapNode.imgDontShow2:SetActive(self.dontShowAgain)
self.anim = self.gameObject:GetComponent("Animator")
self:PlayOpenAnim()
end
function ActivitySummerCheckin_20103PopUpCtrl:PlayOpenAnim()
if self.anim then
self.anim:Play("open", 0, 0)
end
end
function ActivitySummerCheckin_20103PopUpCtrl:RefreshDate()
local nOpenMonth = tonumber(os.date("%m", self.nOpenTime))
local nOpenDay = tonumber(os.date("%d", self.nOpenTime))
local nEndMonth = tonumber(os.date("%m", self.nEndTime))
local nEndDay = tonumber(os.date("%d", self.nEndTime))
local strOpenDay = string.format("%d", nOpenDay)
local strEndDay = string.format("%d", nEndDay)
local dateStr = string.format("%s/%s ~ %s/%s", nOpenMonth, strOpenDay, nEndMonth, strEndDay)
NovaAPI.SetTMPText(self._mapNode.txtDate, dateStr)
end
function ActivitySummerCheckin_20103PopUpCtrl:RefreshTimeout()
local endTime = self.nEndTime
local curTime = ClientManager.serverTimeStamp
local remainTime = endTime - curTime
if remainTime < 0 then
if self.remainTimer ~= nil then
self.remainTimer:Cancel()
self.remainTimer = nil
end
return
end
local sTimeStr = ""
if remainTime <= 60 then
local sec = math.floor(remainTime)
sTimeStr = orderedFormat(ConfigTable.GetUIText("Activity_Remain_Time_Sec") or "", sec)
elseif 60 < remainTime and remainTime <= 3600 then
local min = math.floor(remainTime / 60)
local sec = math.floor(remainTime - min * 60)
if sec == 0 then
min = min - 1
sec = 60
end
sTimeStr = orderedFormat(ConfigTable.GetUIText("Activity_Remain_Time_Min") or "", min, sec)
elseif 3600 < remainTime and remainTime <= 86400 then
local hour = math.floor(remainTime / 3600)
local min = math.floor((remainTime - hour * 3600) / 60)
if min == 0 then
hour = hour - 1
min = 60
end
sTimeStr = orderedFormat(ConfigTable.GetUIText("Activity_Remain_Time_Hour") or "", hour, min)
elseif 86400 < remainTime then
local day = math.floor(remainTime / 86400)
local hour = math.floor((remainTime - day * 86400) / 3600)
if hour == 0 then
day = day - 1
hour = 24
end
sTimeStr = orderedFormat(ConfigTable.GetUIText("Activity_Remain_Time_Day") or "", day, hour)
end
NovaAPI.SetTMPText(self._mapNode.txtTime, sTimeStr)
end
function ActivitySummerCheckin_20103PopUpCtrl:OnBtnClick_DontShowAgain()
self.dontShowAgain = not self.dontShowAgain
self._mapNode.imgDontShow1:SetActive(not self.dontShowAgain)
self._mapNode.imgDontShow2:SetActive(self.dontShowAgain)
LocalData.SetPlayerLocalData("Act_PopUp_DontShow" .. self.nCurActId, self.dontShowAgain)
end
function ActivitySummerCheckin_20103PopUpCtrl:OnBtnClick_Close()
if self.callback ~= nil then
if self.anim then
self.anim:Play("close")
self:AddTimer(1, 0.2, function()
self.callback()
end, true, true, true)
else
self.callback()
end
end
end
function ActivitySummerCheckin_20103PopUpCtrl:OnBtnClick_Goto()
if nil ~= self.nCurActId then
PopUpManager.InterruptPopUp(self.popUpIndex)
PlayerData.Activity:SendActivityDetailMsg()
self.anim:Play("close")
self:AddTimer(1, 0.2, function()
local endTime = self.nEndTime
local curTime = ClientManager.serverTimeStamp
local remainTime = endTime - curTime
if remainTime <= 0 then
EventManager.Hit(EventId.OpenMessageBox, ConfigTable.GetUIText("Activity_Invalid_Tip_3"))
if self.callback ~= nil then
self.callback()
end
return
end
EventManager.Hit(EventId.ClosePanel, PanelId.ActivityPopUp)
if self.actGroupCfg.TransitionId ~= nil and 0 < self.actGroupCfg.TransitionId then
local callback = function()
EventManager.Hit(EventId.OpenPanel, self.actGroupCfg.PanelId, self.actGroupCfg.Id, true)
end
EventManager.Hit(EventId.SetTransition, self.actGroupCfg.TransitionId, callback)
else
EventManager.Hit(EventId.OpenPanel, self.actGroupCfg.PanelId, self.actGroupCfg.Id, true)
end
end, true, true, true)
end
end
return ActivitySummerCheckin_20103PopUpCtrl