Hotfix - 2.0.2.146

EN: 2.0.2.146
CN: 2.0.2.146
JP: 2.0.2.148
KR: 2.0.2.153
This commit is contained in:
SL1900
2026-11-10 12:13:00 +09:00
parent 00cf81046d
commit c84dd6f891
117 changed files with 3603 additions and 177 deletions
@@ -144,7 +144,6 @@ function PlayerActivityData:CacheAllActivityData(mapNetMsg)
elseif actCfg.ActivityType == GameEnum.activityType.Shop then
self:RefreshActivityShopData(nActId, v.Shop)
elseif actCfg.ActivityType == GameEnum.activityType.Advertise then
self:RefreshInfinityTowerActData(nActId, v.Shop)
elseif actCfg.ActivityType == GameEnum.activityType.BDConvert then
self:RefreshBdConvertData(nActId, v.BdConvert)
elseif actCfg.ActivityType == GameEnum.activityType.Breakout then
@@ -562,6 +561,31 @@ function PlayerActivityData:GetMainviewShowActivityGroup()
end)
return tbShowList
end
function PlayerActivityData:GetMainviewShowActivityAdv()
local actAdv
local tbShowList_Adv = {}
local curTime = CS.ClientManager.Instance.serverTimeStamp
for _, actData in pairs(self.tbAllActivity) do
if actData.actCfg.SpecialParam == "ShowInMainUI" then
local openTime = actData:GetActOpenTime()
local endTime = actData:GetActEndTime()
if curTime > openTime and curTime < endTime and actData.bPlay == true then
table.insert(tbShowList_Adv, actData)
end
end
end
if 0 < #tbShowList_Adv then
table.sort(tbShowList_Adv, function(a, b)
if a:GetActSortId() == b:GetActSortId() then
return a:GetActId() > b:GetActId()
else
return a:GetActSortId() < b:GetActSortId()
end
end)
actAdv = tbShowList_Adv[1]
end
return actAdv
end
function PlayerActivityData:IsActivityInActivityGroup(nActId)
local isInGroup, getActId
for _, actGroupData in pairs(self.tbAllActivityGroup) do
+12 -1
View File
@@ -1301,7 +1301,8 @@ function AvgData:CheckNewStory(nChapterId)
for k, v in ipairs(map) do
local config = ConfigTable.GetData("Story", v)
local bUnlock = self:IsUnlock(config.ConditionId, config.StoryId)
if bUnlock then
local bUnlockByTime = self:CheckStoryUnlockTime(config.StoryId)
if bUnlock == true and bUnlockByTime == true then
local bReaded = self:IsStoryReaded(v)
if not bReaded then
tbNewUnlockStorys[v] = true
@@ -1313,6 +1314,16 @@ function AvgData:CheckNewStory(nChapterId)
end
return tbNewUnlockStorys
end
function AvgData:CheckStoryUnlockTime(sStoryId)
local s = ConfigTable.GetConfigValue("TimeUnlockStory")
if s == sStoryId then
local curTime = CS.ClientManager.Instance.serverTimeStamp
local time = ConfigTable.GetConfigValue("StoryUnlockTime")
local openTime = CS.ClientManager.Instance:ISO8601StrToTimeStamp(time)
return curTime > openTime
end
return true
end
function AvgData:SetNewLockChapterIndex(chapterIndex)
self.nNewLockChapterIndex = chapterIndex
end