SL1900/StellaSora_DataLua
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update - 1.4.0.73

Browse Source 
EN: 1.4.0.73
CN: 1.4.0.74
JP: 1.4.0.77
KR: 1.4.0.80
This commit is contained in:
SL1900
2025-12-25 19:00:00 +09:00
parent 5f417fbe9d
commit 35c8d87e86
1183 changed files with 893278 additions and 92778 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lua/game/ui/activitylist/activitylistctrl.lua
+15 -6
View File
@@ -49,10 +49,12 @@ function ActivityListCtrl:InitActivityList(nCurActId)
self.tbGridCtrl[nInstanceId] = nil
end
for k, v in pairs(tbActList) do
table.insert(self.tbActList, {
nType = AllEnum.ActivityMainType.Activity,
actData = v
})
if not v.actCfg.HideFromActivityList then
table.insert(self.tbActList, {
nType = AllEnum.ActivityMainType.Activity,
actData = v
})
end
end
for k, v in pairs(tbActGroupList) do
table.insert(self.tbActList, {
@@ -147,6 +149,11 @@ function ActivityListCtrl:OnGridBtnClick(goGrid, gridIndex)
self.nSelectIndex = nIndex
self.tbGridCtrl[nInstanceID]:SetSelect(true)
self:RefreshSelectActivity(true)
if self.tbActList[nIndex].nType == AllEnum.ActivityMainType.Activity then
EventManager.Hit("ActivityListChangeTab", actData:GetActId())
else
EventManager.Hit("ActivityListChangeTab", actData:GetActGroupId())
end
end
function ActivityListCtrl:AddPeriodicActivityCtrl(actData, bResetDay)
local actCtrl = self.tbActCtrlObj[actData:GetActId()]
@@ -334,7 +341,7 @@ function ActivityListCtrl:AddBdConvertActivityCtrl(actData)
if sFolder == nil then
return
end
local sPrefabPath = string.format(sEntranceFolder_old, sFolder, BdConvertActCfg.UIAssets)
local sPrefabPath = string.format(sEntranceFolder, BdConvertActCfg.UIAssets)
local goObj = self:CreatePrefabInstance(sPrefabPath, self._mapNode.rtContent)
local sCtrlPath = string.format("Game.UI.Activity.%s.%s", "BdConvert", BdConvertActCfg.CtrlName)
actCtrl = self:BindCtrlByNode(goObj, sCtrlPath)
@@ -409,7 +416,9 @@ end
function ActivityListCtrl:OnDisable()
self.tbActList = {}
for _, v in pairs(self.tbActCtrlObj) do
v:ClearActivity()
if v.ClearActivity ~= nil then
v:ClearActivity()
end
local obj = v.gameObject
self:UnbindCtrlByNode(v)
destroy(obj)
lua/game/ui/activitylist/activitypopupctrl.lua
+2 -11
View File
@@ -46,19 +46,10 @@ function ActivityPopUpCtrl:ShowPopUp()
end
self.tbPopUpCtrlObj = {}
end
local popFloderPath = ""
local ctrlFloderPath = ""
if popUpCfg.PopUpType == GameEnum.PopUpType.ActivityGroup or popUpCfg.PopUpType == GameEnum.PopUpType.Activity then
popFloderPath = "UI_Activity"
ctrlFloderPath = "ActivityPopUp"
elseif popUpCfg.PopUpType == GameEnum.PopUpType.OwnPopUP then
popFloderPath = "UI"
ctrlFloderPath = "OwnPopUp"
end
local sPrefabPath = string.format("%s/%s.prefab", popFloderPath, popUpCfg.PopUpRes)
local sPrefabPath = string.format("%s.prefab", popUpCfg.PopUpRes)
local goObj = self:CreatePrefabInstance(sPrefabPath, self._mapNode.PopUpRoot)
local ctrlName = popUpCfg.ScriptName
local sCtrlPath = string.format("Game.UI.%s.%s", ctrlFloderPath, ctrlName)
local sCtrlPath = string.format("Game.UI.%s", ctrlName)
local popupCtrl = self:BindCtrlByNode(goObj, sCtrlPath)
local callback = function()
self:OnBtnClick_Close()