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:
@@ -887,7 +887,8 @@ function BaseCtrl:GetGamepadUINode()
|
||||
table.insert(tbNode, {
|
||||
mapNode = mapNode,
|
||||
sComponentName = sComponentName,
|
||||
sAction = mapConfig.sAction
|
||||
sAction = mapConfig.sAction,
|
||||
sActionIconType = mapConfig.sActionIconType
|
||||
})
|
||||
end
|
||||
end
|
||||
@@ -897,7 +898,8 @@ function BaseCtrl:GetGamepadUINode()
|
||||
table.insert(tbNode, {
|
||||
mapNode = mapNode,
|
||||
sComponentName = sComponentName,
|
||||
sAction = mapConfig.sAction
|
||||
sAction = mapConfig.sAction,
|
||||
sActionIconType = mapConfig.sActionIconType
|
||||
})
|
||||
end
|
||||
end
|
||||
|
||||
@@ -122,8 +122,6 @@ local PanelDefine = {
|
||||
[PanelId.CharFavourReward] = "Game.UI.CharacterFavour.CharFavourRewardPanel",
|
||||
[PanelId.CharFavourTask] = "Game.UI.CharacterFavour.CharFavourTaskPanel",
|
||||
[PanelId.CharFavourLevelUp] = "Game.UI.CharacterFavour.CharFavourLevelUpPanel",
|
||||
[PanelId.CharFavourExpUp] = "Game.UI.CharacterFavour.CharFavourExpUpPanel",
|
||||
[PanelId.CharFavourGift] = "Game.UI.CharacterFavour.CharFavourGiftPanel",
|
||||
[PanelId.CharacterStory] = "Game.UI.CharacterRecord.CharacterStoryPanel",
|
||||
[PanelId.ActivityList] = "Game.UI.ActivityList.ActivityListPanel",
|
||||
[PanelId.ActivityPopUp] = "Game.UI.ActivityList.ActivityPopUpPanel",
|
||||
@@ -193,6 +191,8 @@ local PanelDefine = {
|
||||
[PanelId.CookieGamePanel_400004] = "Game.UI.Play_Cookie_400004.CookieGamePanel",
|
||||
[PanelId.CookieBoardPanel_400006] = "Game.UI.Play_Cookie_400006.CookieBoardPanel",
|
||||
[PanelId.CookieGamePanel_400006] = "Game.UI.Play_Cookie_400006.CookieGamePanel",
|
||||
[PanelId.CookieBoardPanel_400010] = "Game.UI.Play_Cookie.400010.CookieBoardPanel",
|
||||
[PanelId.CookieGamePanel_400010] = "Game.UI.Play_Cookie.400010.CookieGamePanel",
|
||||
[PanelId.LampNoticePanel] = "Game.UI.LampNotice.LampNoticePanel",
|
||||
[PanelId.TrialLevelSelect] = "Game.UI.TrialLevelSelect.TrialLevelSelectPanel",
|
||||
[PanelId.TrialFormation] = "Game.UI.TrialLevelSelect.TrialFormationPanel",
|
||||
@@ -200,15 +200,15 @@ local PanelDefine = {
|
||||
[PanelId.TrialDepot] = "Game.UI.TrialBattle.TrialDepotPanel",
|
||||
[PanelId.TrialResult] = "Game.UI.TrialBattle.TrialResultPanel",
|
||||
[PanelId.NpcAffinityRewardPanel] = "Game.UI.StarTowerBook.Affinity.AffinityRewardPanel",
|
||||
[PanelId.JointDrillLevelSelect_1] = "Game.UI.JointDrill.JointDrill_1.JointDrillLevelSelectPanel",
|
||||
[PanelId.JointDrillBuildList_1] = "Game.UI.JointDrill.JointDrill_1.JointDrillBuildListPanel",
|
||||
[PanelId.JointDrillLevelSelect_510001] = "Game.UI.JointDrill.JointDrill_1.JointDrillLevelSelectPanel_510001",
|
||||
[PanelId.JointDrillBuildList_510001] = "Game.UI.JointDrill.JointDrill_1.JointDrillBuildListPanel_510001",
|
||||
[PanelId.JointDrillBattlePanel] = "Game.UI.Battle.JointDrillBattlePanel",
|
||||
[PanelId.JointDrillResult_1] = "Game.UI.JointDrill.JointDrill_1.JointDrillResultPanel",
|
||||
[PanelId.JointDrillRankUp_1] = "Game.UI.JointDrill.JointDrill_1.JointDrillRankUpPanel",
|
||||
[PanelId.JointDrillQuest_1] = "Game.UI.JointDrill.JointDrill_1.JointDrillQuestPanel",
|
||||
[PanelId.JointDrillRanking_1] = "Game.UI.JointDrill.JointDrill_1.JointDrillRankingPanel",
|
||||
[PanelId.JointDrillRankDetail_1] = "Game.UI.JointDrill.JointDrill_1.JointDrillRankDetailPanel",
|
||||
[PanelId.JointDrillRaid_1] = "Game.UI.JointDrill.JointDrill_1.JointDrillRaidPanel",
|
||||
[PanelId.JointDrillResult_510001] = "Game.UI.JointDrill.JointDrill_1.JointDrillResultPanel_510001",
|
||||
[PanelId.JointDrillRankUp_510001] = "Game.UI.JointDrill.JointDrill_1.JointDrillRankUpPanel_510001",
|
||||
[PanelId.JointDrillQuest_510001] = "Game.UI.JointDrill.JointDrill_1.JointDrillQuestPanel_510001",
|
||||
[PanelId.JointDrillRanking_510001] = "Game.UI.JointDrill.JointDrill_1.JointDrillRankingPanel_510001",
|
||||
[PanelId.JointDrillRankDetail_510001] = "Game.UI.JointDrill.JointDrill_1.JointDrillRankDetailPanel_510001",
|
||||
[PanelId.JointDrillRaid_510001] = "Game.UI.JointDrill.JointDrill_1.JointDrillRaidPanel_510001",
|
||||
[PanelId.TowerDefenseSelectPanel] = "Game.UI.TowerDefense.TowerDefenseSelectPanel",
|
||||
[PanelId.TowerDefenseLevelDetailPanel] = "Game.UI.TowerDefense.TowerDefenseLevelDetailPanel",
|
||||
[PanelId.NPCAffinityLevelUp] = "Game.UI.StarTower.NpcAffinityLevelUp.NPCFavorLevelUpPanel",
|
||||
@@ -284,14 +284,24 @@ local PanelDefine = {
|
||||
[PanelId.ActivityShopPopup] = "Game.UI.ActivityTheme.ShopCommon.ActivityShopPopupPanel",
|
||||
[PanelId.ThrowGiftPanel] = "Game.UI.Activity.ThrowGifts.ThrowGiftLevelSelectPanel",
|
||||
[PanelId.ThrowGiftLevelPanel] = "Game.UI.Activity.ThrowGifts.ThrowGiftPanel",
|
||||
[PanelId.JointDrillLevelSelect_2] = "Game.UI.JointDrill.JointDrill_2.JointDrillLevelSelectPanel",
|
||||
[PanelId.JointDrillBuildList_2] = "Game.UI.JointDrill.JointDrill_2.JointDrillBuildListPanel",
|
||||
[PanelId.JointDrillResult_2] = "Game.UI.JointDrill.JointDrill_2.JointDrillResultPanel",
|
||||
[PanelId.JointDrillRankUp_2] = "Game.UI.JointDrill.JointDrill_2.JointDrillRankUpPanel",
|
||||
[PanelId.JointDrillQuest_2] = "Game.UI.JointDrill.JointDrill_2.JointDrillQuestPanel",
|
||||
[PanelId.JointDrillRanking_2] = "Game.UI.JointDrill.JointDrill_2.JointDrillRankingPanel",
|
||||
[PanelId.JointDrillRankDetail_2] = "Game.UI.JointDrill.JointDrill_2.JointDrillRankDetailPanel",
|
||||
[PanelId.JointDrillRaid_2] = "Game.UI.JointDrill.JointDrill_2.JointDrillRaidPanel",
|
||||
[PanelId.ThrowGiftPanel_400009] = "Game.UI.Activity.ThrowGifts.ThrowGiftLevelSelectPanel_400009",
|
||||
[PanelId.ThrowGiftLevelPanel_400009] = "Game.UI.Activity.ThrowGifts.ThrowGiftPanel_400009",
|
||||
[PanelId.JointDrillLevelSelect_510003] = "Game.UI.JointDrill.JointDrill_2.JointDrillLevelSelectPanel_510003",
|
||||
[PanelId.JointDrillBuildList_510003] = "Game.UI.JointDrill.JointDrill_2.JointDrillBuildListPanel_510003",
|
||||
[PanelId.JointDrillResult_510003] = "Game.UI.JointDrill.JointDrill_2.JointDrillResultPanel_510003",
|
||||
[PanelId.JointDrillRankUp_510003] = "Game.UI.JointDrill.JointDrill_2.JointDrillRankUpPanel_510003",
|
||||
[PanelId.JointDrillQuest_510003] = "Game.UI.JointDrill.JointDrill_2.JointDrillQuestPanel_510003",
|
||||
[PanelId.JointDrillRanking_510003] = "Game.UI.JointDrill.JointDrill_2.JointDrillRankingPanel_510003",
|
||||
[PanelId.JointDrillRankDetail_510003] = "Game.UI.JointDrill.JointDrill_2.JointDrillRankDetailPanel_510003",
|
||||
[PanelId.JointDrillRaid_510003] = "Game.UI.JointDrill.JointDrill_2.JointDrillRaidPanel_510003",
|
||||
[PanelId.JointDrillLevelSelect_510005] = "Game.UI.JointDrill.JointDrill_2.JointDrillLevelSelectPanel_510005",
|
||||
[PanelId.JointDrillBuildList_510005] = "Game.UI.JointDrill.JointDrill_2.JointDrillBuildListPanel_510005",
|
||||
[PanelId.JointDrillResult_510005] = "Game.UI.JointDrill.JointDrill_2.JointDrillResultPanel_510005",
|
||||
[PanelId.JointDrillRankUp_510005] = "Game.UI.JointDrill.JointDrill_2.JointDrillRankUpPanel_510005",
|
||||
[PanelId.JointDrillQuest_510005] = "Game.UI.JointDrill.JointDrill_2.JointDrillQuestPanel_510005",
|
||||
[PanelId.JointDrillRanking_510005] = "Game.UI.JointDrill.JointDrill_2.JointDrillRankingPanel_510005",
|
||||
[PanelId.JointDrillRankDetail_510005] = "Game.UI.JointDrill.JointDrill_2.JointDrillRankDetailPanel_510005",
|
||||
[PanelId.JointDrillRaid_510005] = "Game.UI.JointDrill.JointDrill_2.JointDrillRaidPanel_510005",
|
||||
[PanelId.PenguinCard] = "Game.UI.Play_PenguinCard.PenguinCardPanel",
|
||||
[PanelId.PenguinCardQuest] = "Game.UI.Play_PenguinCard.PenguinCardQuestPanel",
|
||||
[PanelId.PenguinCardLevel] = "Game.UI.Play_PenguinCard.PenguinCardSelectPanel",
|
||||
@@ -327,7 +337,29 @@ local PanelDefine = {
|
||||
[PanelId.Shop_20102] = "Game.UI.ActivityTheme.20102.Shop.ActivityShopPanel",
|
||||
[PanelId.SolodanceThemePanel] = "Game.UI.ActivityTheme.20102.SoloDanceThemePanel",
|
||||
[PanelId.SolodanceStory] = "Game.UI.MainlineEx_SolodanceStory.MainlineEx_SolodanceStoryPanel",
|
||||
[PanelId.ActivityLevelsSelectPanel_10107] = "Game.UI.ActivityTheme.10107.ActivityLevels.ActivityLevelsSelectPanel"
|
||||
[PanelId.ActivityLevelsSelectPanel_10107] = "Game.UI.ActivityTheme.10107.ActivityLevels.ActivityLevelsSelectPanel",
|
||||
[PanelId.Task_10107] = "Game.UI.ActivityTheme.10107.Task.ViewfinderTaskPanel",
|
||||
[PanelId.Shop_10107] = "Game.UI.ActivityTheme.10107.Shop.ActivityShopPanel",
|
||||
[PanelId.ViewfinderStory] = "Game.UI.ActivityTheme.10107.Story.ViewfinderStoryPanel",
|
||||
[PanelId.Main_10107] = "Game.UI.ActivityTheme.10107.ViewfinderThemePanel",
|
||||
[PanelId.BreakOutThemePanel_S2] = "Game.UI.ActivityTheme.30102.BreakOutThemePanel",
|
||||
[PanelId.Shop_30102] = "Game.UI.ActivityTheme.30102.Shop.ActivityShopPanel",
|
||||
[PanelId.Task_30102] = "Game.UI.ActivityTheme.30102.Task.BreakOutTaskPanel",
|
||||
[PanelId.BreakOutLevelDetailPanelS2] = "Game.UI.Play_BreakOut_30102.BreakOutLevelDetailPanel",
|
||||
[PanelId.BreakOutResultPanelS2] = "Game.UI.Play_BreakOut_30102.BreakOutResultPanel",
|
||||
[PanelId.BreakOutPlayPanelS2] = "Game.UI.Play_BreakOut_30102.BreakOutPlayPanel",
|
||||
[PanelId.ActivityLevelsSelectPanel_11100] = "Game.UI.ActivityTheme.11100.ActivityLevels.ActivityLevelsSelectPanel",
|
||||
[PanelId.SwimTheme_11100] = "Game.UI.ActivityTheme.11100.SwimTheme_11100Panel",
|
||||
[PanelId.SwimThemeStory_11100] = "Game.UI.ActivityTheme.11100.Story.SwimThemeStory_11100Panel",
|
||||
[PanelId.Task_11100] = "Game.UI.ActivityTheme.11100.Task.SwimTask_11100Panel",
|
||||
[PanelId.Shop_11100] = "Game.UI.ActivityTheme.11100.Shop.ActivityShopPanel",
|
||||
[PanelId.MiningGame_400011] = "Game.UI.Activity.Mining.400011.MiningGamePanel",
|
||||
[PanelId.MiningGameGuidePanel_400011] = "Game.UI.Activity.Mining.400011.MiningGameGuidePanel",
|
||||
[PanelId.ActivityLevelsSelectPanel_10108] = "Game.UI.ActivityTheme.10108.ActivityLevels.ActivityLevelsSelectPanel",
|
||||
[PanelId.Task_10108] = "Game.UI.ActivityTheme.10108.Task.TechTaskPanel",
|
||||
[PanelId.Shop_10108] = "Game.UI.ActivityTheme.10108.Shop.ActivityShopPanel",
|
||||
[PanelId.Main_10108] = "Game.UI.ActivityTheme.10108.TechThemePanel",
|
||||
[PanelId.TechStory] = "Game.UI.ActivityTheme.10108.Story.TechStoryPanel"
|
||||
}
|
||||
if NovaAPI.GetClientChannel() == AllEnum.ChannelName.BanShu then
|
||||
end
|
||||
|
||||
+50
-18
@@ -97,11 +97,9 @@ local PanelId = {
|
||||
CharacterRelation = 213,
|
||||
CharFavourReward = 214,
|
||||
CharFavourTask = 215,
|
||||
CharFavourExpUp = 216,
|
||||
CharFavourLevelUp = 217,
|
||||
CharacterStory = 218,
|
||||
CharEquipment = 219,
|
||||
CharFavourGift = 220,
|
||||
EnergyBuy = 221,
|
||||
PopupFunctionUnlock = 224,
|
||||
Crafting = 231,
|
||||
@@ -212,10 +210,10 @@ local PanelId = {
|
||||
TowerDefenseCharacterDetailPanel = 137,
|
||||
TowerDefenseHUD = 138,
|
||||
TowerDefenseQuest = 139,
|
||||
JointDrillLevelSelect_1 = 140,
|
||||
JointDrillBuildList_1 = 141,
|
||||
JointDrillLevelSelect_510001 = 140,
|
||||
JointDrillBuildList_510001 = 141,
|
||||
JointDrillBattlePanel = 142,
|
||||
JointDrillResult_1 = 144,
|
||||
JointDrillResult_510001 = 144,
|
||||
NPCAffinityLevelUp = 145,
|
||||
StoryEntrance = 146,
|
||||
BuildAttribute = 147,
|
||||
@@ -223,17 +221,17 @@ local PanelId = {
|
||||
SwimTheme = 149,
|
||||
TutorialPanel = 280,
|
||||
CreatePlayer = 150,
|
||||
JointDrillRankUp_1 = 151,
|
||||
JointDrillQuest_1 = 152,
|
||||
JointDrillRankUp_510001 = 151,
|
||||
JointDrillQuest_510001 = 152,
|
||||
TowerDefenseResultPanel = 153,
|
||||
ScoreBossRankingPanel = 154,
|
||||
TowerDefenseTipsPanel = 155,
|
||||
ActivityLevelsBattlePanel = 156,
|
||||
ActivityLevelsSelectPanel = 157,
|
||||
ActivityLevelsInstanceResultPanel = 158,
|
||||
JointDrillRanking_1 = 159,
|
||||
JointDrillRankDetail_1 = 160,
|
||||
JointDrillRaid_1 = 161,
|
||||
JointDrillRanking_510001 = 159,
|
||||
JointDrillRankDetail_510001 = 160,
|
||||
JointDrillRaid_510001 = 161,
|
||||
MiningGameGuidePanel = 162,
|
||||
SwimThemeStory = 163,
|
||||
BuildAttrPreview = 164,
|
||||
@@ -300,14 +298,14 @@ local PanelId = {
|
||||
CookieGamePanel_400004 = 384,
|
||||
Main_10103 = 385,
|
||||
ThrowGiftPanel = 386,
|
||||
JointDrillLevelSelect_2 = 387,
|
||||
JointDrillBuildList_2 = 388,
|
||||
JointDrillResult_2 = 389,
|
||||
JointDrillRankUp_2 = 390,
|
||||
JointDrillQuest_2 = 391,
|
||||
JointDrillRanking_2 = 392,
|
||||
JointDrillRankDetail_2 = 393,
|
||||
JointDrillRaid_2 = 394,
|
||||
JointDrillLevelSelect_510003 = 387,
|
||||
JointDrillBuildList_510003 = 388,
|
||||
JointDrillResult_510003 = 389,
|
||||
JointDrillRankUp_510003 = 390,
|
||||
JointDrillQuest_510003 = 391,
|
||||
JointDrillRanking_510003 = 392,
|
||||
JointDrillRankDetail_510003 = 393,
|
||||
JointDrillRaid_510003 = 394,
|
||||
ActivityLevelsSelectPanel_10104 = 395,
|
||||
Shop_10104 = 396,
|
||||
Task_10104 = 397,
|
||||
@@ -344,6 +342,40 @@ local PanelId = {
|
||||
SolodanceThemePanel = 430,
|
||||
SolodanceStory = 431,
|
||||
ActivityLevelsSelectPanel_10107 = 432,
|
||||
Task_10107 = 433,
|
||||
Shop_10107 = 434,
|
||||
ViewfinderStory = 442,
|
||||
Shop_30102 = 435,
|
||||
BreakOutThemePanel_S2 = 436,
|
||||
Task_30102 = 437,
|
||||
BreakOutLevelDetailPanelS2 = 438,
|
||||
BreakOutResultPanelS2 = 439,
|
||||
BreakOutPlayPanelS2 = 440,
|
||||
Main_10107 = 441,
|
||||
ActivityLevelsSelectPanel_11100 = 443,
|
||||
SwimTheme_11100 = 444,
|
||||
SwimThemeStory_11100 = 445,
|
||||
Task_11100 = 446,
|
||||
Shop_11100 = 447,
|
||||
ActivityLevelsSelectPanel_10108 = 448,
|
||||
MiningGame_400011 = 449,
|
||||
MiningGameGuidePanel_400011 = 450,
|
||||
Task_10108 = 451,
|
||||
Shop_10108 = 452,
|
||||
Main_10108 = 453,
|
||||
ThrowGiftPanel_400009 = 454,
|
||||
ThrowGiftLevelPanel_400009 = 455,
|
||||
TechStory = 456,
|
||||
CookieBoardPanel_400010 = 457,
|
||||
CookieGamePanel_400010 = 458,
|
||||
JointDrillLevelSelect_510005 = 459,
|
||||
JointDrillBuildList_510005 = 460,
|
||||
JointDrillResult_510005 = 461,
|
||||
JointDrillRankUp_510005 = 462,
|
||||
JointDrillQuest_510005 = 463,
|
||||
JointDrillRanking_510005 = 464,
|
||||
JointDrillRankDetail_510005 = 465,
|
||||
JointDrillRaid_510005 = 466,
|
||||
GmTools = 99999
|
||||
}
|
||||
return PanelId
|
||||
|
||||
Reference in New Issue
Block a user