Update - 1.14.0.129

EN: 1.14.0.129
CN: 1.14.0.129
JP: 1.14.0.133
KR: 1.14.0.135
This commit is contained in:
SL1900
2026-08-18 12:00:00 +09:00
parent fd7efe05c2
commit a5251d8080
644 changed files with 763314 additions and 862 deletions
@@ -67,6 +67,10 @@ SummerAdvStoryCtrl._mapNodeConfig = {
txtPersonality3 = {
sComponentName = "TMP_Text",
sLanguageId = "Personality_Chaos"
},
txtBtnGo = {
sComponentName = "TMP_Text",
sLanguageId = "InfinityTower_Plot_Review"
}
}
SummerAdvStoryCtrl._mapEventConfig = {
@@ -176,19 +176,26 @@ function SummerAdvCtrl:OnEnable()
nActId
}, self._mapNode.storyRedDot)
elseif i == AllEnum.ActivityThemeFuncIndex.MiniGame then
local nActId = actData.ActivityId
RedDotManager.RegisterNode(RedDotDefine.Activity_IceCreamTruck_New, {nActId}, self._mapNode.miniGameRedDot)
if state == ActivityState.Closed then
self._mapNode.miniGameRedDot:SetActive(false)
else
local nActId = actData.ActivityId
RedDotManager.RegisterNode(RedDotDefine.Activity_ThrowGift_New, {nActId}, self._mapNode.miniGameRedDot)
end
end
end
end
local sAnimName = "SummerAdvPanel_in"
local sSoundName = "mode_10110_activity"
if self.animRoot ~= nil then
self.animRoot = self.gameObject:GetComponent("Animator")
sAnimName = "SummerAdvPanel_in1"
sSoundName = "mode_10110_activity_01"
end
self.animRoot = self.gameObject:GetComponent("Animator")
local nAnimLength = NovaAPI.GetAnimClipLength(self.animRoot, {sAnimName})
self.animRoot:Play(sAnimName, 0, 0)
CS.WwiseAudioManager.Instance:PlaySound(sSoundName)
EventManager.Hit(EventId.TemporaryBlockInput, nAnimLength)
self:AddTimer(1, nAnimLength, function()
for k, v in pairs(self.tbBtnAnimator) do
@@ -343,7 +350,7 @@ function SummerAdvCtrl:RefreshButtonTimer(actData, timer, txtTrans, imgTrans, re
local endTime = CS.ClientManager.Instance:ISO8601StrToTimeStamp(activityData.EndTime)
if curTime < openTime then
state = ActivityState.NotOpen
elseif curTime >= openTime and curTime <= endTime then
elseif curTime >= openTime and curTime < endTime then
state = ActivityState.Open
else
state = ActivityState.Closed
@@ -427,6 +434,9 @@ function SummerAdvCtrl:RefreshMiniGameButtonState(actData)
self._mapNode.txtMiniGameEnd.gameObject:SetActive(state == ActivityState.Closed)
self._mapNode.goMiniGameEnd.gameObject:SetActive(state == ActivityState.Closed)
if state ~= ActivityState.Open then
RedDotManager.SetValid(RedDotDefine.Activity_ThrowGift_New, {
actData.ActivityId
}, false)
end
self.tbActState[activityId] = state
end
@@ -596,11 +606,14 @@ function SummerAdvCtrl:OnBtn_ClickActivityEntrance(btn, nIndex)
end
if actData.PanelId ~= nil and ActivityState.Open == state then
if nIndex == AllEnum.ActivityThemeFuncIndex.MiniGame then
LocalData.SetPlayerLocalData("Activity_MiniGame_10110_New", true)
RedDotManager.SetValid(RedDotDefine.Activity_GroupNew_MiniGame, {
LocalData.SetPlayerLocalData("Activity_ThrowGift_New", true)
RedDotManager.SetValid(RedDotDefine.Activity_ThrowGift_New, {
actData.ActivityId
}, false)
EventManager.Hit(EventId.OpenPanel, actData.PanelId, actData.ActivityId, self.nActId)
local func = function()
EventManager.Hit(EventId.OpenPanel, actData.PanelId, actData.ActivityId, self.nActId)
end
EventManager.Hit(EventId.SetTransition, 37, func)
elseif self.ActivityGroupCfg.TransitionId ~= nil and self.ActivityGroupCfg.TransitionId > 0 then
EventManager.Hit(EventId.SetTransition, self.ActivityGroupCfg.TransitionId, function()
EventManager.Hit(EventId.OpenPanel, actData.PanelId, actData.ActivityId)
@@ -276,12 +276,11 @@ function SummerCheckinThemeCtrl:RegisterReddot()
local nNeedWorldLevel = tonumber(activityData.LimitParam) or 0
if nNeedWorldLevel > PlayerData.Base:GetWorldClass() then
self._mapNode.reddotShow:SetActive(false)
else
RedDotManager.RegisterNode(RedDotDefine.TrekkerVersus, {
self.nActId,
nActId
}, self._mapNode.reddotShow)
end
RedDotManager.RegisterNode(RedDotDefine.TrekkerVersus, {
self.nActId,
nActId
}, self._mapNode.reddotShow)
elseif i == AllEnum.ActivityThemeFuncIndex.FateCard then
RedDotManager.RegisterNode(RedDotDefine.Activity_Group_PenguinCard_Level, {
self.nActId
@@ -163,11 +163,11 @@ end
function ActivityBreakOutCtrl:OnBtnClick_Go()
local actGroupCfg = self.actData:GetActGroupCfgData()
if actGroupCfg ~= nil then
EventManager.Hit(EventId.OpenPanel, PanelId.BreakOutThemePanel_S2, actGroupCfg.Id)
EventManager.Hit(EventId.OpenPanel, PanelId.BreakOutThemePanel_S3, actGroupCfg.Id)
end
end
function ActivityBreakOutCtrl:OnBtnClick_GoTaskPanel()
EventManager.Hit(EventId.OpenPanel, PanelId.Task_30102, self.nActTaskId)
EventManager.Hit(EventId.OpenPanel, PanelId.Task_30103, self.nActTaskId)
end
function ActivityBreakOutCtrl:OnBtnClick_Detail()
local actGroupCfg = self.actData:GetActGroupCfgData()
@@ -390,7 +390,7 @@ function BreakOutThemeCtrl:OnBtn_ClickActivityEntrance(btn, nIndex)
end
function BreakOutThemeCtrl:JumpTo_LevelDetail(nActId, nLevelId)
local OpenPanel = function()
EventManager.Hit(EventId.OpenPanel, PanelId.BreakOutLevelDetailPanelS2, nActId, nLevelId)
EventManager.Hit(EventId.OpenPanel, PanelId.BreakOutLevelDetailPanelS3, nActId, nLevelId)
end
EventManager.Hit(EventId.SetTransition, 3, OpenPanel)
end
@@ -70,6 +70,7 @@ function TaskCommonCtrl_01:OnEnable()
self:refresh_Tab()
self:refresh_Task()
self:refresh_Group()
self:SetEndTimer()
end
function TaskCommonCtrl_01:FadeIn()
EventManager.Hit(EventId.SetTransition)
@@ -428,6 +429,39 @@ function TaskCommonCtrl_01:SetImgBar_FillAmount(mapTask, tr)
NovaAPI.SetTMPText(tr:Find("tmpTaskDesc"):GetComponent("TMP_Text"), mapTask.sDesc)
NovaAPI.SetTMPText(tr:Find("tmpTaskProgress"):GetComponent("TMP_Text"), string.format("%s/%s", tostring(nCur), tostring(nMax)))
end
function TaskCommonCtrl_01:SetEndTimer()
if self.endTimer ~= nil then
self.endTimer:Cancel(false)
self.endTimer = nil
end
if self.ins_ActivityTaskData == nil then
return
end
local nEndTime = self.ins_ActivityTaskData.nEndTime or 0
if nEndTime <= 0 then
return
end
local nRemain = nEndTime - CS.ClientManager.Instance.serverTimeStamp
if nRemain <= 0 then
self:AddTimer(1, 0, function()
self:OnActivityEnd()
end, true, true, true)
return
end
self.endTimer = self:AddTimer(1, nRemain, function()
self:OnActivityEnd()
end, true, true, false)
end
function TaskCommonCtrl_01:OnActivityEnd()
EventManager.Hit(EventId.OpenMessageBox, ConfigTable.GetUIText("Activity_End_Notice"))
EventManager.Hit(EventId.CloesCurPanel)
end
function TaskCommonCtrl_01:OnDisable()
if self.endTimer ~= nil then
self.endTimer:Cancel(false)
self.endTimer = nil
end
end
function TaskCommonCtrl_01:SetBigNum(number)
local nNum = number
if 999999 < nNum then