Major Update - 2.0.0.143

EN: 2.0.0.143
CN: 2.0.0.142
JP: 2.0.0.145
KR: 2.0.0.150
This commit is contained in:
SL1900
2026-10-20 13:00:00 +09:00
parent 4bcada6061
commit 08b515afd9
1773 changed files with 1095195 additions and 65670 deletions
+1 -1
View File
@@ -698,7 +698,7 @@ function BaseCtrl:SetPngSprite(imgObj, sPath, sSurfix)
sPath = sPath .. sSurfix
end
end
if sPath == nil or string.find(sPath, "Icon/") == nil and string.find(sPath, "Image/") == nil and string.find(sPath, "ImageAvg/") == nil and string.find(sPath, "big_sprites/") == nil and string.find(sPath, "Disc/") == nil and string.find(sPath, "Play_") == nil and string.find(sPath, "UI_Activity") == nil then
if sPath == nil or string.find(sPath, "Icon/") == nil and string.find(sPath, "Image/") == nil and string.find(sPath, "ImageAvg/") == nil and string.find(sPath, "big_sprites/") == nil and string.find(sPath, "Disc/") == nil and string.find(sPath, "Play_") == nil and string.find(sPath, "UI_Activity") == nil and string.find(sPath, "Soldier") == nil then
traceback("配置表中 Icon 资源字段内容填写错误,应填路径,如:Icon/Item/item_1,panel id:" .. self._panel._nPanelId .. ",ctrl name:" .. self.__cname)
NovaAPI.SetImageSpriteAsset(imgObj, nil)
return false
+2
View File
@@ -176,6 +176,8 @@ function BasePanel:_Enter(bPlayFadeIn)
end
elseif self._nPanelId == PanelId.ProVideoGUI then
nSortingOrder = AllEnum.UI_SORTING_ORDER.ProVideo
elseif self._nSortingOrderBase ~= nil then
nSortingOrder = self._nSortingOrderBase + i
else
nSortingOrder = self._nIndex * 100 + i
end
+48 -4
View File
@@ -374,6 +374,7 @@ local PanelDefine = {
[PanelId.SoldierTestEnter] = "Game.UI.Soldier.SoldierTestEnterPanel",
[PanelId.SoldierBattlePanel] = "Game.UI.Soldier.Battle.SoldierBattlePanel",
[PanelId.SoldierBattleResult] = "Game.UI.Soldier.Battle.SoldierBattleResultPanel",
[PanelId.SoldierBattleEnding] = "Game.UI.Soldier.Battle.SoldierBattleEndingPanel",
[PanelId.SoldierSelectPolicy] = "Game.UI.Soldier.SelectPolicy.SoldierSelectPolicyPanel",
[PanelId.SoldierMainViewPanel] = "Game.UI.Soldier.SoldierMainViewPanel",
[PanelId.SoldierLevelSelectPanel] = "Game.UI.Soldier.SoldierLevelSelectPanel",
@@ -383,8 +384,7 @@ local PanelDefine = {
[PanelId.SoldierSandtable] = "Game.UI.Soldier.Sandtable.SoldierSandtablePanel",
[PanelId.SoldierBuffTipsPanel] = "Game.UI.Soldier.Sandtable.Components.SoldierBuffTipsPanel",
[PanelId.SoldierHandbookPartnerDetailPanel] = "Game.UI.Soldier.Handbook.SoldierHandbookPartnerDetailPanel",
[PanelId.SoldierSelectStrategyCardItem] = "Game.UI.Soldier.Handbook.SoldierSelectStrategyCardItemPanel",
[PanelId.SoldierSelectStarterCardItem] = "Game.UI.Soldier.Handbook.SoldierSelectStarterCardItemPanel",
[PanelId.SoldierCardTips] = "Game.UI.Soldier.Handbook.SoldierCardTipsPanel",
[PanelId.SoldierRecommendPanel] = "Game.UI.Soldier.Recommend.SoldierRecommendPanel",
[PanelId.SoldierRecommendDetailPanel] = "Game.UI.Soldier.Recommend.SoldierRecommendDetailPanel",
[PanelId.SoldierPartnerTips] = "Game.UI.Soldier.PartnerTipsPanel.SoldierPartnerTipsPanel",
@@ -397,6 +397,7 @@ local PanelDefine = {
[PanelId.SoldierBattleEventPanel] = "Game.UI.Soldier.BattleEvent.SoldierBattleEventPanel",
[PanelId.SoldierResolveadisputePanel] = "Game.UI.Soldier.BattleEvent.SoldierResolveadisputePanel",
[PanelId.SoldierShopProbabilityPanel] = "Game.UI.Soldier.ShopProbability.SoldierShopProbabilityPanel",
[PanelId.SoldierEventPanel] = "Game.UI.Soldier.BattleEvent.SoldierEventPanel",
[PanelId.Task_20103] = "Game.UI.ActivityTheme.20103.Task.SummerCheckinTaskPanel",
[PanelId.Shop_20103] = "Game.UI.ActivityTheme.20103.Shop.ActivityShopPanel",
[PanelId.Main_20103] = "Game.UI.ActivityTheme.20103.SummerCheckinThemePanel",
@@ -404,10 +405,11 @@ local PanelDefine = {
[PanelId.SummerCheckinStory_20103] = "Game.UI.ActivityTheme.20103.Story.SummerCheckinStoryPanel",
[PanelId.IceCreamTruckGamePanel] = "Game.UI.Play_IceCreamTruck.Play.IceCreamTruckGamePanel",
[PanelId.IceCreamLevelsSelectPanel] = "Game.UI.Play_IceCreamTruck.IceCreamLevelsSelectPanel",
[PanelId.IceCreamTruckGamePanel_400020] = "Game.UI.Play_IceCreamTruck.400020.IceCreamTruckGamePanel",
[PanelId.IceCreamLevelsSelectPanel_400020] = "Game.UI.Play_IceCreamTruck.400020.IceCreamLevelsSelectPanel",
[PanelId.ActivityLevelsSelectPanel_10110] = "Game.UI.ActivityTheme.10110.ActivityLevels.ActivityLevelsSelectPanel",
[PanelId.Task_10110] = "Game.UI.ActivityTheme.10110.Task.SummerAdvTaskPanel",
[PanelId.Shop_10110] = "Game.UI.ActivityTheme.10110.Shop.ActivityShopPanel",
[PanelId.CultivationManualPanel] = "Game.UI.ActivityTheme.10110.CultivationManualPanel",
[PanelId.SummerAdvPanel] = "Game.UI.ActivityTheme.10110.SummerAdvPanel",
[PanelId.SummerAdvStory_10110] = "Game.UI.ActivityTheme.10110.Story.SummerAdvStoryPanel",
[PanelId.BreakOutThemePanel_S3] = "Game.UI.ActivityTheme.30103.BreakOutThemePanel",
@@ -439,7 +441,49 @@ local PanelDefine = {
[PanelId.GoldenSpyBuffSelectPanel_400017] = "Game.UI.Activity.GoldenSpy.400017.GoldenSpyBuffSelectPanel",
[PanelId.GoldenSpyResultPanel_400017] = "Game.UI.Activity.GoldenSpy.400017.GoldenSpyResultPanel",
[PanelId.GoldenSpyBuffTipsPanel_400017] = "Game.UI.Activity.GoldenSpy.400017.GoldenSpyBuffTipsPanel",
[PanelId.ChapterPausePanel] = "Game.UI.Battle.ChapterPausePanel"
[PanelId.ChapterPausePanel] = "Game.UI.Battle.ChapterPausePanel",
[PanelId.DormPanel] = "Game.UI.Dorm.DormPanel",
[PanelId.DormRoomSelectPanel] = "Game.UI.Dorm.DormRoomSelectPanel.DormRoomSelectPanel",
[PanelId.DormInteractiveAffinityPanel] = "Game.UI.Dorm.DormInteractive.DormInteractiveAffinityPanel",
[PanelId.DormEditorPresetDetailPanel] = "Game.UI.Dorm.DormEditor.DormEditorPresetDetailPanel",
[PanelId.DormEditorSuitDetailPanel] = "Game.UI.Dorm.DormEditor.DormEditorSuitDetailPanel",
[PanelId.DormFriendPanel] = "Game.UI.Dorm.DormFriend.DormFriendPanel",
[PanelId.DormMainMenuPanel] = "Game.UI.Dorm.DormMainMenuPanel",
[PanelId.DormRenamePanel] = "Game.UI.Dorm.Rename.DormRenamePanel",
[PanelId.DormQuestPanel] = "Game.UI.Dorm.DormQuest.DormQuestPanel",
[PanelId.DormHandbookPanel] = "Game.UI.Dorm.DormHandBook.DormHandbookPanel",
[PanelId.DormMusicSelectPanel] = "Game.UI.Dorm.MusicSelect.DormMusicSelectPanel",
[PanelId.DormPresetRenamePanel] = "Game.UI.Dorm.Rename.DormPresetRenamePanel",
[PanelId.ReengagementPanel] = "Game.UI.Activity.Reengagement.ReengagementPanel",
[PanelId.ReengagementMallPopup] = "Game.UI.Activity.Reengagement.ReengagementMallPopupPanel",
[PanelId.ReengagementPopUpPanel] = "Game.UI.Activity.Reengagement.ActivityReengagementPopUpPanel",
[PanelId.ActivityStoryReview] = "Game.UI.ActivityStoryReview.ActivityStoryReviewPanel",
[PanelId.MathParkourPanel] = "Game.UI.Activity.MathParkour.400018.MathParkourPanel",
[PanelId.MathParkourLevelSelectPanel] = "Game.UI.Activity.MathParkour.400018.MathParkourLevelSelectPanel",
[PanelId.MathParkourSkillDisplayPanel] = "Game.UI.Activity.MathParkour.400018.MathParkourSkillDisplayPanel",
[PanelId.StarTowerAutoDecisionSettingPanel] = "Game.UI.StarTowerFastBattle.StarTowerAutoDecisionSettingPanel",
[PanelId.StarTowerAutoDecisionHUDPanel] = "Game.UI.StarTowerFastBattle.StarTowerAutoDecisionHUDPanel",
[PanelId.StarTowerTokenBuyPanel] = "Game.UI.StarTowerFastBattle.StarTowerTokenBuyPanel",
[PanelId.SoldierTechPanel] = "Game.UI.Soldier.Technology.SoldierTechPanel",
[PanelId.SoldierTechPreviewPanel] = "Game.UI.Soldier.Technology.SoldierTechPreviewPanel",
[PanelId.SoldierStagePanel] = "Game.UI.Soldier.Stage.SoldierStagePanel",
[PanelId.SoldierBossTemplateSelect] = "Game.UI.Soldier.BossTemplate.SoldierBossTemplateSelectPanel",
[PanelId.SoldierBossTemplateTips] = "Game.UI.Soldier.BossTemplate.SoldierBossTemplateTipsPanel",
[PanelId.SoldierLevelRewardPanel] = "Game.UI.Soldier.SoldierLevelPanel",
[PanelId.GuideMission] = "Game.UI.GuideMission.GuideMissionPanel",
[PanelId.BuildModifierMusicPanel] = "Game.UI.BuildModifier.Note.BuildModifierNotePanel",
[PanelId.BuildModifierPotentialPanel] = "Game.UI.BuildModifier.Potential.BuildModifierPotentialPanel",
[PanelId.BuildModifierPopupPanel] = "Game.UI.BuildModifier.Potential.BuildModifierPopupPanel",
[PanelId.ActivityLevelsSelectPanel_20104] = "Game.UI.ActivityTheme.20104.ActivityLevels.ActivityLevelsSelectPanel",
[PanelId.Task_20104] = "Game.UI.ActivityTheme.20104.Task.DustDawnTaskPanel",
[PanelId.Shop_20104] = "Game.UI.ActivityTheme.20104.Shop.ActivityShopPanel",
[PanelId.DustDawnPanel] = "Game.UI.ActivityTheme.20104.DustDawnThemePanel",
[PanelId.DustDawnStory] = "Game.UI.MainlineEx_DustDawnStory.MainlineEx_DustDawnStoryPanel",
[PanelId.ActivityLevelsSelectPanel_10113] = "Game.UI.ActivityTheme.20113.ActivityLevels.ActivityLevelsSelectPanel",
[PanelId.Task_10113] = "Game.UI.ActivityTheme.10113.Task.UnchartedMapTaskPanel",
[PanelId.Shop_10113] = "Game.UI.ActivityTheme.10113.Shop.ActivityShopPanel",
[PanelId.UnchartedMapPanel] = "Game.UI.ActivityTheme.10113.UnchartedMapPanel",
[PanelId.UnchartedMapStory_10113] = "Game.UI.ActivityTheme.10113.Story.UnchartedMapStoryPanel"
}
if NovaAPI.GetClientChannel() == AllEnum.ChannelName.BanShu then
end
+48 -3
View File
@@ -418,8 +418,8 @@ local PanelId = {
SoldierCharSkillDetail = 5004,
SoldierBuffTipsPanel = 5005,
SoldierCharPontentialDetailPanel = 5006,
SoldierSelectStrategyCardItem = 5007,
SoldierSelectStarterCardItem = 5008,
SoldierCardTips = 5007,
SoldierBossTemplateTips = 5008,
CookieBoardPanel_400016 = 500,
CookieGamePanel_400016 = 501,
IceCreamTruckGamePanel = 502,
@@ -465,7 +465,52 @@ local PanelId = {
GoldenSpyBuffTipsPanel_400017 = 543,
CharSystemPresetPotentialPanel = 544,
ChapterPausePanel = 545,
DormPanel = 546,
DormRoomSelectPanel = 547,
DormInteractiveAffinityPanel = 548,
DormEditorPresetDetailPanel = 549,
DormEditorSuitDetailPanel = 550,
DormFriendPanel = 551,
DormMainMenuPanel = 552,
DormRenamePanel = 553,
DormQuestPanel = 554,
DormHandbookPanel = 555,
DormMusicSelectPanel = 556,
DormPresetRenamePanel = 589,
ReengagementPanel = 557,
ReengagementPopUpPanel = 558,
ActivityStoryReview = 559,
MathParkourPanel = 560,
MathParkourLevelSelectPanel = 561,
MathParkourSkillDisplayPanel = 570,
StarTowerAutoDecisionSettingPanel = 562,
StarTowerAutoDecisionHUDPanel = 563,
StarTowerTokenBuyPanel = 564,
GuideMission = 565,
SoldierTechPanel = 566,
SoldierTechPreviewPanel = 567,
SoldierStagePanel = 568,
SoldierBossTemplateSelect = 569,
SoldierLevelRewardPanel = 572,
BuildModifierMusicPanel = 571,
BuildModifierPotentialPanel = 573,
BuildModifierPopupPanel = 574,
ActivityLevelsSelectPanel_20104 = 575,
DustDawnPanel = 576,
DustDawnStory = 577,
Task_20104 = 578,
Shop_20104 = 579,
SoldierBattleEnding = 580,
SoldierEventPanel = 581,
IceCreamTruckGamePanel_400020 = 582,
IceCreamLevelsSelectPanel_400020 = 583,
ActivityLevelsSelectPanel_10113 = 584,
UnchartedMapPanel = 585,
UnchartedMapStory_10113 = 586,
Task_10113 = 587,
Shop_10113 = 588,
SoldierTestEnter = 99998,
GmTools = 99999
GmTools = 99999,
ReengagementMallPopup = 590
}
return PanelId
+11 -1
View File
@@ -281,7 +281,7 @@ local PreExitCurrent = function()
objCurPanel:_PreExit(PreEnterNext, true)
end
end
local OnOpenPanel = function(listener, nPanelId, ...)
local OpenPanel = function(nPanelId, mapOpenContext, ...)
if objNextPanel ~= nil then
printError("[界面切换] 打开界面:" .. GetPanelName(nPanelId) .. " 失败,上一次界面切换流程尚未完成,正在处理:" .. GetPanelName(objNextPanel._nPanelId))
return
@@ -304,6 +304,9 @@ local OnOpenPanel = function(listener, nPanelId, ...)
nIndex = objCurPanel._nIndex + 1
end
local objTempPanel = luaClass.new(nIndex, nPanelId, tbParameter)
if mapOpenContext ~= nil then
objTempPanel._nSortingOrderBase = mapOpenContext.nSortingOrderBase
end
if objTempPanel._bIsMainPanel == true then
objNextPanel = objTempPanel
if objNextPanel._bAddToBackHistory == true then
@@ -336,6 +339,12 @@ local OnOpenPanel = function(listener, nPanelId, ...)
end
CheckThresholdCount()
end
local OnOpenPanel = function(listener, nPanelId, ...)
OpenPanel(nPanelId, nil, ...)
end
function PanelManager.OpenPanelWithContext(nPanelId, mapOpenContext, ...)
OpenPanel(nPanelId, mapOpenContext, ...)
end
local OnOpenLoading = function(listener, objTarget, callbackUpdate, callbackDone)
if objTarget == nil or type(callbackUpdate) == "function" then
else
@@ -460,6 +469,7 @@ local RegisterTextGetContentFun = function()
CS.TextMeshProWrap.GetTextFunc = ConfigTable.GetUIText
end
function PanelManager.Init()
PanelManager.IGNORE_CS_TRANS_EVENT = false
local goUIRoot = GameObject.Find("==== UI ROOT ====")
if goUIRoot ~= nil then
mapUIRootTransform = {}