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

Update - 1.9.0.107

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
lua/game/ui/activitylist/activitylistctrl.lua
+8 -6
View File
@@ -49,7 +49,7 @@ function ActivityListCtrl:InitActivityList(nCurActId)
self:UnbindCtrlByNode(objCtrl)
self.tbGridCtrl[nInstanceId] = nil
end
for k, v in pairs(tbActList) do
for k, v in ipairs(tbActList) do
if not v.actCfg.HideFromActivityList then
table.insert(self.tbActList, {
nType = AllEnum.ActivityMainType.Activity,
@@ -57,7 +57,7 @@ function ActivityListCtrl:InitActivityList(nCurActId)
})
end
end
for k, v in pairs(tbActGroupList) do
for k, v in ipairs(tbActGroupList) do
table.insert(self.tbActList, {
nType = AllEnum.ActivityMainType.ActivityGroup,
actData = v
@@ -234,7 +234,13 @@ function ActivityListCtrl:AddCookieActivityCtrl(actData)
local actCtrl = self.tbActCtrlObj[actData:GetActId()]
if nil == actCtrl then
local mapActCfg = actData:GetCookieControlCfg()
if mapActCfg == nil then
return
end
local sFolder = sActTypePath[GameEnum.activityType.Cookie]
if sFolder == nil then
return
end
local sPrefabPath = string.format(sEntranceFolder_old, sFolder, mapActCfg.UIAssets)
local goObj = self:CreatePrefabInstance(sPrefabPath, self._mapNode.rtContent)
local sCtrlPath = string.format("Game.UI.Activity.%s.%s", sFolder, mapActCfg.CtrlName)
@@ -345,10 +351,6 @@ function ActivityListCtrl:AddBdConvertActivityCtrl(actData)
local actCtrl = self.tbActCtrlObj[actData:GetActId()]
if nil == actCtrl then
local BdConvertActCfg = actData:GetActConfig()
local sFolder = "_" .. actData:GetActId()
if sFolder == nil then
return
end
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)
lua/game/ui/activitylist/activitylistpanel.lua
-2
View File
@@ -6,7 +6,6 @@ ActivityListPanel._tbDefine = {
}
}
function ActivityListPanel:Awake()
self.nSelectGroup = nil
end
function ActivityListPanel:OnEnable()
end
@@ -15,7 +14,6 @@ end
function ActivityListPanel:OnDisable()
end
function ActivityListPanel:OnDestroy()
self.nSelectGroup = nil
end
function ActivityListPanel:OnRelease()
end
lua/game/ui/activitylist/activitypopupctrl.lua
+31 -31
View File
@@ -35,37 +35,37 @@ function ActivityPopUpCtrl:ShowPopUp()
self.popUpIndex = self.popUpIndex + 1
self.nCurActId = table.remove(self.tbPopUpAct, 1)
local popUpCfg = PlayerData.PopUp:GetPopUpConfigData(self.nCurActId)
self.curType = popUpCfg.PopUpType
if popUpCfg ~= nil then
if self.tbPopUpCtrlObj ~= nil then
if self.tbPopUpCtrlObj.go ~= nil then
destroy(self.tbPopUpCtrlObj.go)
end
if self.tbPopUpCtrlObj.ctrl ~= nil then
self:UnbindCtrlByNode(self.tbPopUpCtrlObj.ctrl)
end
self.tbPopUpCtrlObj = {}
end
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", ctrlName)
local popupCtrl = self:BindCtrlByNode(goObj, sCtrlPath)
local callback = function()
self:OnBtnClick_Close()
end
popupCtrl:ShowPopUp(self.nCurActId, callback, self.popUpIndex)
self.tbPopUpCtrlObj = {go = goObj, ctrl = popupCtrl}
local saveTime = CS.ClientManager.Instance.serverTimeStamp
if popUpCfg ~= nil then
if popUpCfg.PopRefreshType == GameEnum.PopRefreshType.WeeklyFirst then
saveTime = GetNextWeekRefreshTime()
end
LocalData.SetPlayerLocalData("Act_PopUp" .. self.nCurActId, saveTime)
self._mapNode.btnGoto.gameObject:SetActive(popUpCfg.PopJumpType ~= GameEnum.PopJumpType.None)
PlayerData.PopUp:ReleaseCachedPopUpData(popUpCfg.Id)
end
if popUpCfg == nil then
self:ShowPopUp()
return
end
self.curType = popUpCfg.PopUpType
if self.tbPopUpCtrlObj ~= nil then
if self.tbPopUpCtrlObj.go ~= nil then
destroy(self.tbPopUpCtrlObj.go)
end
if self.tbPopUpCtrlObj.ctrl ~= nil then
self:UnbindCtrlByNode(self.tbPopUpCtrlObj.ctrl)
end
self.tbPopUpCtrlObj = {}
end
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", ctrlName)
local popupCtrl = self:BindCtrlByNode(goObj, sCtrlPath)
local callback = function()
self:OnBtnClick_Close()
end
popupCtrl:ShowPopUp(self.nCurActId, callback, self.popUpIndex)
self.tbPopUpCtrlObj = {go = goObj, ctrl = popupCtrl}
local saveTime = CS.ClientManager.Instance.serverTimeStamp
if popUpCfg.PopRefreshType == GameEnum.PopRefreshType.WeeklyFirst then
saveTime = GetNextWeekRefreshTime()
end
LocalData.SetPlayerLocalData("Act_PopUp" .. self.nCurActId, saveTime)
self._mapNode.btnGoto.gameObject:SetActive(popUpCfg.PopJumpType ~= GameEnum.PopJumpType.None)
PlayerData.PopUp:ReleaseCachedPopUpData(popUpCfg.Id)
end
function ActivityPopUpCtrl:IsPopUpType()
return self.curType == GameEnum.PopUpType.ActivityGroup or self.curType == GameEnum.PopUpType.Activity or self.curType == GameEnum.PopUpType.OwnPopUP
@@ -85,7 +85,7 @@ function ActivityPopUpCtrl:OnEnable()
local wait = function()
coroutine.yield(CS.UnityEngine.WaitForSeconds(0.1))
self._mapNode.PopUpRoot.gameObject:SetActive(self:IsPopUpType())
if self.tbPopUpCtrlObj.ctrl ~= nil and self.tbPopUpCtrlObj.ctrl.PlayOpenAnim ~= nil then
if self.tbPopUpCtrlObj ~= nil and self.tbPopUpCtrlObj.ctrl ~= nil and self.tbPopUpCtrlObj.ctrl.PlayOpenAnim ~= nil then
self.tbPopUpCtrlObj.ctrl:PlayOpenAnim()
end
end