Update - 1.9.0.107

EN: 1.9.0.107
CN: 1.9.0.108
JP: 1.9.0.112
KR: 1.9.0.112
This commit is contained in:
SL1900
2026-05-14 16:00:00 +09:00
parent 4b880806ef
commit eafd8f4088
1034 changed files with 809589 additions and 23067 deletions
@@ -1,21 +1,21 @@
local BattlePassBuyLevelItemGridCtrl = class("BattlePassBuyLevelItemGridCtrl", BaseCtrl)
BattlePassBuyLevelItemGridCtrl._mapNodeConfig = {
local BattlePassBuyPremiumItemGridCtrl = class("BattlePassBuyPremiumItemGridCtrl", BaseCtrl)
BattlePassBuyPremiumItemGridCtrl._mapNodeConfig = {
tcItem = {
sCtrlName = "Game.UI.TemplateEx.TemplateItemCtrl"
},
btnGrid = {sComponentName = "UIButton"},
TMPDesc = {sComponentName = "TMP_Text"}
}
BattlePassBuyLevelItemGridCtrl._mapEventConfig = {}
BattlePassBuyLevelItemGridCtrl._mapRedDotConfig = {}
function BattlePassBuyLevelItemGridCtrl:OnEnable()
BattlePassBuyPremiumItemGridCtrl._mapEventConfig = {}
BattlePassBuyPremiumItemGridCtrl._mapRedDotConfig = {}
function BattlePassBuyPremiumItemGridCtrl:OnEnable()
local rtShow = self.gameObject.transform:Find("btnGrid/AnimRoot/rtTopInfo")
if rtShow ~= nil then
local tmpHint = rtShow:Find("TMPRewardHintSPremium")
NovaAPI.SetTMPText(tmpHint:GetComponent("TMP_Text"), ConfigTable.GetUIText("BattlePassRewardPremiumTopGridHint"))
end
end
function BattlePassBuyLevelItemGridCtrl:Refresh(nTid)
function BattlePassBuyPremiumItemGridCtrl:Refresh(nTid)
local rtShow = self.gameObject.transform:Find("btnGrid/AnimRoot/rtTopInfo")
if nTid == nil then
self._mapNode.TMPDesc.gameObject:SetActive(false)
@@ -39,4 +39,4 @@ function BattlePassBuyLevelItemGridCtrl:Refresh(nTid)
NovaAPI.SetTMPText(self._mapNode.TMPDesc, mapItemCfgData.Title)
self._mapNode.tcItem:SetItem(nTid, nil, nil, nil, false, false, false, true, false)
end
return BattlePassBuyLevelItemGridCtrl
return BattlePassBuyPremiumItemGridCtrl
+12 -5
View File
@@ -142,6 +142,9 @@ function BattlePassCtrl:OnEnable()
NovaAPI.SetImageColor(self._mapNode.imgProgressBarFillHighLight, Color(1, 1, 1, 0))
self._mapNode.panelRoot.gameObject:SetActive(false)
local callback = function(mapData)
if self.gameObject == nil then
return
end
self.mapBattlePassInfo = mapData
self._mapNode.panelRoot.gameObject:SetActive(true)
local bHasComplete, nQuestIdx = self:Refresh()
@@ -203,7 +206,7 @@ function BattlePassCtrl:Refresh()
local mapBattlePassCfgData = ConfigTable.GetData("BattlePass", self.mapBattlePassInfo.nSeasonId)
if mapBattlePassCfgData == nil then
printError("BattlePassCfgData missing:" .. self.mapBattlePassInfo.nSeasonId)
return
return false, 0
end
local sTimeStr = PlayerData.BattlePass:GetRefreshTime()
NovaAPI.SetTMPText(self._mapNode.TMPSeasonTImeTitle, orderedFormat(ConfigTable.GetUIText("BattlePass_RemainTimeTitle") or "", sTimeStr))
@@ -211,7 +214,7 @@ function BattlePassCtrl:Refresh()
local nPackageId = mapBattlePassCfgData.OutfitPackageShowItem
local mapItemCfgData = ConfigTable.GetData_Item(nPackageId)
if not mapItemCfgData then
return
return false, 0
end
local mapItemUseCfg = decodeJson(mapItemCfgData.UseArgs)
for sTid, nCount in pairs(mapItemUseCfg) do
@@ -382,7 +385,7 @@ function BattlePassCtrl:OnEvent_BattlePassQuestReceive()
nLevel = beforeLevel,
nExp = beforeExp,
nMaxLevel = -1,
nMaxExp = 0
nMaxExp = 1
}
if ConfigTable.GetData("BattlePassLevel", self.mapBattlePassInfo.nLevel + 1) ~= nil then
mapBefore.nMaxExp = ConfigTable.GetData("BattlePassLevel", self.mapBattlePassInfo.nLevel + 1).Exp
@@ -548,9 +551,12 @@ function BattlePassCtrl:OnEvent_BattlePassBuyLevel()
nLevel = beforeLevel,
nExp = beforeExp,
nMaxLevel = -1,
nMaxExp = 0
nMaxExp = 1
}
local callback = function(mapData)
if not self or not self.gameObject then
return
end
self.mapBattlePassInfo = mapData
local afterLevel = self.mapBattlePassInfo.nLevel
local afterExp = self.mapBattlePassInfo.nExp
@@ -558,10 +564,11 @@ function BattlePassCtrl:OnEvent_BattlePassBuyLevel()
nLevel = afterLevel,
nExp = afterExp,
nMaxLevel = -1,
nMaxExp = 0
nMaxExp = 1
}
if ConfigTable.GetData("BattlePassLevel", self.mapBattlePassInfo.nLevel + 1) ~= nil then
mapAfter.nMaxExp = ConfigTable.GetData("BattlePassLevel", self.mapBattlePassInfo.nLevel + 1).Exp
mapBefore.nMaxExp = ConfigTable.GetData("BattlePassLevel", self.mapBattlePassInfo.nLevel + 1).Exp
else
mapAfter.nExp = 1
mapAfter.nMaxExp = 1
+6 -26
View File
@@ -166,12 +166,12 @@ function BattlePassQuestCtrl:PlayListInAnim()
end
function BattlePassQuestCtrl:OnGridRefreshDaily(goGrid, gridIndex)
if self.mapQuestsGrids[goGrid] == nil then
self.mapQuestsGrids[goGrid] = self:BindCtrlByNode(goGrid, "Game.UI.BattlePass.BattlePassQusetGridCtrl")
self.mapQuestsGrids[goGrid] = self:BindCtrlByNode(goGrid, "Game.UI.BattlePass.BattlePassQuestGridCtrl")
end
local nIdx = gridIndex + 1
local mapQuestData = self.tbDaily[nIdx]
if mapQuestData == nil then
printError("GuideQuestData missing" .. nIdx)
printError("BattlePassQuest missing" .. nIdx)
self.mapQuestsGrids[goGrid]:Refresh(nil, nil)
return
end
@@ -180,12 +180,12 @@ function BattlePassQuestCtrl:OnGridRefreshDaily(goGrid, gridIndex)
end
function BattlePassQuestCtrl:OnGridRefreshWeekly(goGrid, gridIndex)
if self.mapQuestsGrids[goGrid] == nil then
self.mapQuestsGrids[goGrid] = self:BindCtrlByNode(goGrid, "Game.UI.BattlePass.BattlePassQusetGridCtrl")
self.mapQuestsGrids[goGrid] = self:BindCtrlByNode(goGrid, "Game.UI.BattlePass.BattlePassQuestGridCtrl")
end
local nIdx = gridIndex + 1
local mapQuestData = self.tbWeekly[nIdx]
if mapQuestData == nil then
printError("GuideQuestData missing" .. nIdx)
printError("BattlePassQuest missing" .. nIdx)
self.mapQuestsGrids[goGrid]:Refresh(nil, nil)
return
end
@@ -228,27 +228,7 @@ function BattlePassQuestCtrl:OnEvent_QuestReceive(mapData)
bHasComplete = true
end
end
local mapWeeklyQuestData = self.tbWeekly[1]
if mapWeeklyQuestData ~= nil then
local nBattlePassEndTS = PlayerData.BattlePass.nDeadlineTS
if nBattlePassEndTS < 1 then
nBattlePassEndTS = mapWeeklyQuestData.nExpire
end
local curTime = CS.ClientManager.Instance.serverTimeStamp
local sumTime = math.min(mapWeeklyQuestData.nExpire, nBattlePassEndTS) - curTime
local nDay = math.floor(sumTime / 86400)
local nHour = math.floor((sumTime - nDay * 86400) / 3600)
local nHourReal = (sumTime - nDay * 86400) / 3600
if 0 < nDay then
self._mapNode.togWeek:SetText(orderedFormat(ConfigTable.GetUIText("BattlePassQusetWeekly"), nDay, nHour))
elseif 1 < nHourReal then
self._mapNode.togWeek:SetText(orderedFormat(ConfigTable.GetUIText("BattlePassQusetWeeklyHour"), nHour))
else
self._mapNode.togWeek:SetText(ConfigTable.GetUIText("Depot_LeftTime_LessThenHour"))
end
else
self._mapNode.togWeek.gameObject:SetActive(false)
end
self:SetWeeklyTogText()
table.sort(self.tbDaily, sort)
table.sort(self.tbWeekly, sort)
self.enableQuest = not bMaxLevel and not bFullExp
@@ -297,7 +277,7 @@ function BattlePassQuestCtrl:SetWeeklyTogText()
nBattlePassEndTS = mapWeeklyQuestData.nExpire
end
local curTime = CS.ClientManager.Instance.serverTimeStamp
local sumTime = math.min(mapWeeklyQuestData.nExpire, nBattlePassEndTS) - curTime
local sumTime = math.max(0, math.min(mapWeeklyQuestData.nExpire, nBattlePassEndTS) - curTime)
local nDay = math.floor(sumTime / 86400)
local nHour = math.floor((sumTime - nDay * 86400) / 3600)
local nHourReal = (sumTime - nDay * 86400) / 3600
@@ -1,9 +1,9 @@
local BattlePassQusetGridCtrl = class("BattlePassQusetGridCtrl", BaseCtrl)
local BattlePassQuestGridCtrl = class("BattlePassQuestGridCtrl", BaseCtrl)
local LayoutRebuilder = CS.UnityEngine.UI.LayoutRebuilder
local totalLength = 755
local totalHeight = 37
local JumpUtil = require("Game.Common.Utils.JumpUtil")
BattlePassQusetGridCtrl._mapNodeConfig = {
BattlePassQuestGridCtrl._mapNodeConfig = {
rtTitle = {
sComponentName = "RectTransform"
},
@@ -46,8 +46,8 @@ BattlePassQusetGridCtrl._mapNodeConfig = {
sLanguageId = "Quest_Closed"
}
}
BattlePassQusetGridCtrl._mapEventConfig = {}
function BattlePassQusetGridCtrl:OnEnable()
BattlePassQuestGridCtrl._mapEventConfig = {}
function BattlePassQuestGridCtrl:OnEnable()
self.gameObject:SetActive(false)
local waitOpen = function()
self.gameObject:SetActive(true)
@@ -56,7 +56,7 @@ function BattlePassQusetGridCtrl:OnEnable()
end
cs_coroutine.start(waitOpen)
end
function BattlePassQusetGridCtrl:Refresh(mapQuest, mapQuestCfgData, bEnable)
function BattlePassQuestGridCtrl:Refresh(mapQuest, mapQuestCfgData, bEnable)
if mapQuest == nil then
self.gameObject:SetActive(false)
return
@@ -81,7 +81,8 @@ function BattlePassQusetGridCtrl:Refresh(mapQuest, mapQuestCfgData, bEnable)
if not bEnable then
self._mapNode.rtBarFill.sizeDelta = Vector2(0, totalHeight)
else
self._mapNode.rtBarFill.sizeDelta = Vector2(mapQuest.nCurProgress / mapQuest.nGoal * totalLength, totalHeight)
local nGoal = mapQuest.nGoal > 0 and mapQuest.nGoal or 1
self._mapNode.rtBarFill.sizeDelta = Vector2(mapQuest.nCurProgress / nGoal * totalLength, totalHeight)
end
self._mapNode.imgComplete:SetActive(mapQuest.nStatus == 2 and bEnable)
self._mapNode.imgCompleteMask:SetActive(mapQuest.nStatus == 2 or not bEnable)
@@ -91,18 +92,18 @@ function BattlePassQusetGridCtrl:Refresh(mapQuest, mapQuestCfgData, bEnable)
self._mapNode.TMPClose.gameObject:SetActive(not bEnable)
LayoutRebuilder.ForceRebuildLayoutImmediate(self._mapNode.rtTitle)
end
function BattlePassQusetGridCtrl:ShowItemDetail(id, rtIcon)
function BattlePassQuestGridCtrl:ShowItemDetail(id, rtIcon)
UTILS.ClickItemGridWithTips(id, rtIcon.transform, true, false, false)
end
function BattlePassQusetGridCtrl:OnBtnClick_Receive()
function BattlePassQuestGridCtrl:OnBtnClick_Receive()
PlayerData.Quest:ReceiveBattlePassQuestData(self.mapQuest.nTid, nil)
end
function BattlePassQusetGridCtrl:OnBtnClick_JumpTo()
function BattlePassQuestGridCtrl:OnBtnClick_JumpTo()
local nJumptoId = self.mapQuestCfgData.JumpTo
JumpUtil.JumpTo(nJumptoId)
end
function BattlePassQusetGridCtrl:OnBtnClick_Reward()
function BattlePassQuestGridCtrl:OnBtnClick_Reward()
EventManager.Hit("ShowQuestReward", self.gameObject)
self:ShowItemDetail(self.nRewardId, self._mapNode.btnReward)
end
return BattlePassQusetGridCtrl
return BattlePassQuestGridCtrl
@@ -52,7 +52,7 @@ function BattlePassRewardCtrl:Refresh(tbReward, bPremium, nBattlePassLevel)
self.tbFocus = {}
self.curFocus = 0
self.bAllReceive = false
for idx, mapReward in pairs(tbReward) do
for idx, mapReward in ipairs(tbReward) do
if mapReward.bFocus then
table.insert(self.tbFocus, idx)
end
@@ -125,7 +125,7 @@ function BattlePassRewardCtrl:OnGridRefresh(goGrid, gridIndex)
end
local nIdxPrev = #self.tbFocus
if self.tbFocus[nIdxPrev] ~= self.curFocus then
local rewardDataPrev = self.tbReward[nIdxPrev]
local rewardDataPrev = self.tbReward[self.tbFocus[nIdxPrev]]
if rewardDataPrev ~= nil then
self._mapNode.imgPrevReward:Refresh(rewardDataPrev, self.bPremium, self.nBattlePassLevel)
self.curFocus = self.tbFocus[nIdxPrev]
@@ -20,6 +20,9 @@ BattlePassUpgradeCtrl._mapNodeConfig = {
}
BattlePassUpgradeCtrl._mapEventConfig = {}
function BattlePassUpgradeCtrl:SetOldWorldClass()
if self.mapBattlePassClass == nil then
return
end
local nOldBattlePassClass = self.mapBattlePassClass.nOldLevel
local nOldBattlePassExp = self.mapBattlePassClass.nOldExp
local mapOldCfg = ConfigTable.GetData("BattlePassLevel", nOldBattlePassClass + 1)