Update - 1.12.0.120
EN: 1.12.0.120 CN: 1.12.0.120 JP: 1.12.0.124 KR: 1.12.0.124
This commit is contained in:
@@ -605,7 +605,7 @@ function BaseCtrl:SetPngSprite(imgObj, sPath, sSurfix)
|
||||
sPath = sPath .. sSurfix
|
||||
end
|
||||
end
|
||||
if 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 then
|
||||
traceback("配置表中 Icon 资源字段内容填写错误,应填路径,如:Icon/Item/item_1,panel id:" .. self._panel._nPanelId .. ",ctrl name:" .. self.__cname)
|
||||
NovaAPI.SetImageSpriteAsset(imgObj, nil)
|
||||
return false
|
||||
|
||||
@@ -170,9 +170,6 @@ local PanelDefine = {
|
||||
[PanelId.VampireSurvivorSettle] = "Game.UI.VampireSurvivor.VampireSurvivorSettlelPanel",
|
||||
[PanelId.WeeklyCopiesPanel] = "Game.UI.WeeklyCopies.WeeklyCopiesPanel",
|
||||
[PanelId.CharPlot] = "Game.UI.CharacterRecord.CharPlotPanel",
|
||||
[PanelId.MiningGame] = "Game.UI.Play_Mining.MiningGamePanel",
|
||||
[PanelId.MiningGameStory] = "Game.UI.Play_Mining.MiningGameStoryPanel",
|
||||
[PanelId.MiningGameQuest] = "Game.UI.Play_Mining.MiningGameQuestPanel",
|
||||
[PanelId.LoginSetting] = "Game.UI.Settings.LoginSettingsPanel",
|
||||
[PanelId.ScoreBossBattlePanel] = "Game.UI.Battle.ScoreBossBattlePanel",
|
||||
[PanelId.ScoreBossSelectPanel] = "Game.UI.ScoreBoss.ScoreBossSelectPanel",
|
||||
@@ -228,7 +225,6 @@ local PanelDefine = {
|
||||
[PanelId.ActivityLevelsSelectPanel] = "Game.UI.ActivityTheme.Swim.ActivityLevels.ActivityLevelsSelectPanel",
|
||||
[PanelId.ActivityLevelsInstanceResultPanel] = "Game.UI.ActivityTheme.LevelCommon.ActivityLevelsInstanceResultPanel",
|
||||
[PanelId.SwimTheme] = "Game.UI.ActivityTheme.Swim.SwimThemePanel",
|
||||
[PanelId.MiningGameGuidePanel] = "Game.UI.Play_Mining.MiningGameGuidePanel",
|
||||
[PanelId.SwimThemeStory] = "Game.UI.ActivityTheme.Swim.Story.SwimThemeStoryPanel",
|
||||
[PanelId.CharInfoTrial] = "Game.UI.CharacterInfoTrial.CharacterInfoTrialPanel",
|
||||
[PanelId.CharSkillTrial] = "Game.UI.CharacterInfoTrial.CharSkillTrialPanel",
|
||||
@@ -254,8 +250,6 @@ local PanelDefine = {
|
||||
[PanelId.BdConvertResultPanel] = "Game.UI.Activity.BdConvert._500001.BdConvertResultPanel",
|
||||
[PanelId.BdConvertBuildDetail] = "Game.UI.Activity.BdConvert._500001.BdConvertBuildDetailPanel",
|
||||
[PanelId.Task_10101] = "Game.UI.ActivityTheme.10101.Task.OurRegimentTaskPanel",
|
||||
[PanelId.MiningGame_400002] = "Game.UI.Play_Mining_400002.MiningGamePanel",
|
||||
[PanelId.MiningGameGuidePanel_400002] = "Game.UI.Play_Mining_400002.MiningGameGuidePanel",
|
||||
[PanelId.TowerDefenseGiveupPanel] = "Game.UI.TowerDefense.TowerDefenseGiveUpPanel",
|
||||
[PanelId.BreakOutThemePanel] = "Game.UI.ActivityTheme.30101.BreakOutThemePanel",
|
||||
[PanelId.Shop_30101] = "Game.UI.ActivityTheme.30101.Shop.ActivityShopPanel",
|
||||
@@ -264,8 +258,6 @@ local PanelDefine = {
|
||||
[PanelId.QuestNewbie] = "Game.UI.QuestNewbie.QuestNewbiePanel",
|
||||
[PanelId.TowerDefenseTestPanel] = "Game.Editor.TowerDefense.TowerDefenseTestPanel",
|
||||
[PanelId.TowerDefenseTestResultPanel] = "Game.Editor.TowerDefense.TowerDefenseTestResultPanel",
|
||||
[PanelId.MiningGame_400003] = "Game.UI.Play_Mining.400003.MiningGamePanel",
|
||||
[PanelId.MiningGameGuidePanel_400003] = "Game.UI.Play_Mining.400003.MiningGameGuidePanel",
|
||||
[PanelId.TrekkerVersus] = "Game.UI.TrekkerVersus_600002.TrekkerVersusPanel",
|
||||
[PanelId.ActivityLevelsSelectPanel_20101] = "Game.UI.ActivityTheme.20101.ActivityLevels.ActivityLevelsSelectPanel",
|
||||
[PanelId.ChristmasThemePanel] = "Game.UI.ActivityTheme.20101.ChristmasThemePanel",
|
||||
@@ -310,8 +302,6 @@ local PanelDefine = {
|
||||
[PanelId.Task_10104] = "Game.UI.ActivityTheme.10104.Task.SpringTaskPanel",
|
||||
[PanelId.SpringFestivalThemePanel] = "Game.UI.ActivityTheme.10104.SpringFestivalThemePanel",
|
||||
[PanelId.SpringFestivalStory] = "Game.UI.ActivityTheme.10104.Story.SpringFestivalStoryPanel",
|
||||
[PanelId.MiningGame_400007] = "Game.UI.Play_Mining.400007.MiningGamePanel",
|
||||
[PanelId.MiningGameGuidePanel_400007] = "Game.UI.Play_Mining.400007.MiningGameGuidePanel",
|
||||
[PanelId.WinterNightThemePanel] = "Game.UI.ActivityTheme.10105.WinterNightThemePanel",
|
||||
[PanelId.WinterNightStory] = "Game.UI.ActivityTheme.10105.Story.WinterNightStoryPanel",
|
||||
[PanelId.Task_10105] = "Game.UI.ActivityTheme.10105.Task.WinterNightTaskPanel",
|
||||
@@ -323,15 +313,15 @@ local PanelDefine = {
|
||||
[PanelId.PostalThemePanel] = "Game.UI.ActivityTheme.10106.PostalThemePanel",
|
||||
[PanelId.PostalStory] = "Game.UI.ActivityTheme.10106.Story.PostalStoryPanel",
|
||||
[PanelId.RankBuildDetail] = "Game.UI.StarTower.Build.RankBuildDetailPanel",
|
||||
[PanelId.GoldenSpyPanel] = "Game.UI.Activity.GoldenSpy.GoldenSpyLevelPanel",
|
||||
[PanelId.GoldenSpyLevelSelectPanel] = "Game.UI.Activity.GoldenSpy.GoldenSpyLevelSelectPanel",
|
||||
[PanelId.GoldenSpyBuffSelectPanel] = "Game.UI.Activity.GoldenSpy.GoldenSpyBuffSelectPanel",
|
||||
[PanelId.GoldenSpyResultPanel] = "Game.UI.Activity.GoldenSpy.GoldenSpyResultPanel",
|
||||
[PanelId.GoldenSpyPanel_400008] = "Game.UI.Activity.GoldenSpy.400008.GoldenSpyLevelPanel",
|
||||
[PanelId.GoldenSpyLevelSelectPanel_400008] = "Game.UI.Activity.GoldenSpy.400008.GoldenSpyLevelSelectPanel",
|
||||
[PanelId.GoldenSpyBuffSelectPanel_400008] = "Game.UI.Activity.GoldenSpy.400008.GoldenSpyBuffSelectPanel",
|
||||
[PanelId.GoldenSpyResultPanel_400008] = "Game.UI.Activity.GoldenSpy.400008.GoldenSpyResultPanel",
|
||||
[PanelId.PotentialPreselectionList] = "Game.UI.PotentialPreselection.PotentialPreselectionPanel",
|
||||
[PanelId.PotentialPreselectionEdit] = "Game.UI.PotentialPreselection.PotentialPreselectionEditPanel",
|
||||
[PanelId.ImportPreselection] = "Game.UI.PotentialPreselection.ImportPreselectionPanel",
|
||||
[PanelId.PreselectionRename] = "Game.UI.PotentialPreselection.PreselectionRenamePanel",
|
||||
[PanelId.GoldenSpyBuffTipsPanel] = "Game.UI.Activity.GoldenSpy.GoldenSpyBuffTipsPanel",
|
||||
[PanelId.GoldenSpyBuffTipsPanel_400008] = "Game.UI.Activity.GoldenSpy.400008.GoldenSpyBuffTipsPanel",
|
||||
[PanelId.ActivityLevelsSelectPanel_20102] = "Game.UI.ActivityTheme.20102.ActivityLevels.ActivityLevelsSelectPanel",
|
||||
[PanelId.Task_20102] = "Game.UI.ActivityTheme.20102.Task.SoloDanceTaskPanel",
|
||||
[PanelId.Shop_20102] = "Game.UI.ActivityTheme.20102.Shop.ActivityShopPanel",
|
||||
@@ -359,7 +349,18 @@ local PanelDefine = {
|
||||
[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"
|
||||
[PanelId.TechStory] = "Game.UI.ActivityTheme.10108.Story.TechStoryPanel",
|
||||
[PanelId.DoubleDropActQuestPanel_103001] = "Game.UI.Activity.DoubleDrop.DoubleDropActQuestPanel_103001",
|
||||
[PanelId.ActivityLevelsSelectPanel_10109] = "Game.UI.ActivityTheme.10109.ActivityLevels.ActivityLevelsSelectPanel",
|
||||
[PanelId.GunStormPanel] = "Game.UI.ActivityTheme.10109.GunStormPanel",
|
||||
[PanelId.Task_10109] = "Game.UI.ActivityTheme.10109.Task.GunStormTaskPanel",
|
||||
[PanelId.Shop_10109] = "Game.UI.ActivityTheme.10109.Shop.ActivityShopPanel",
|
||||
[PanelId.GunStormStory_10109] = "Game.UI.ActivityTheme.10109.Story.GunStormStoryPanel",
|
||||
[PanelId.GoldenSpyPanel_400012] = "Game.UI.Activity.GoldenSpy.400012.GoldenSpyLevelPanel",
|
||||
[PanelId.GoldenSpyLevelSelectPanel_400012] = "Game.UI.Activity.GoldenSpy.400012.GoldenSpyLevelSelectPanel",
|
||||
[PanelId.GoldenSpyBuffSelectPanel_400012] = "Game.UI.Activity.GoldenSpy.400012.GoldenSpyBuffSelectPanel",
|
||||
[PanelId.GoldenSpyResultPanel_400012] = "Game.UI.Activity.GoldenSpy.400012.GoldenSpyResultPanel",
|
||||
[PanelId.GoldenSpyBuffTipsPanel_400012] = "Game.UI.Activity.GoldenSpy.400012.GoldenSpyBuffTipsPanel"
|
||||
}
|
||||
if NovaAPI.GetClientChannel() == AllEnum.ChannelName.BanShu then
|
||||
end
|
||||
|
||||
@@ -327,15 +327,15 @@ local PanelId = {
|
||||
PostalThemePanel = 413,
|
||||
PostalStory = 414,
|
||||
RankBuildDetail = 415,
|
||||
GoldenSpyPanel = 416,
|
||||
GoldenSpyLevelSelectPanel = 417,
|
||||
GoldenSpyBuffSelectPanel = 418,
|
||||
GoldenSpyPanel_400008 = 416,
|
||||
GoldenSpyLevelSelectPanel_400008 = 417,
|
||||
GoldenSpyBuffSelectPanel_400008 = 418,
|
||||
PotentialPreselectionList = 419,
|
||||
PotentialPreselectionEdit = 420,
|
||||
ImportPreselection = 421,
|
||||
PreselectionRename = 422,
|
||||
GoldenSpyResultPanel = 423,
|
||||
GoldenSpyBuffTipsPanel = 424,
|
||||
GoldenSpyResultPanel_400008 = 423,
|
||||
GoldenSpyBuffTipsPanel_400008 = 424,
|
||||
ActivityLevelsSelectPanel_20102 = 425,
|
||||
Task_20102 = 426,
|
||||
Shop_20102 = 427,
|
||||
@@ -376,6 +376,17 @@ local PanelId = {
|
||||
JointDrillRanking_510005 = 464,
|
||||
JointDrillRankDetail_510005 = 465,
|
||||
JointDrillRaid_510005 = 466,
|
||||
DoubleDropActQuestPanel_103001 = 467,
|
||||
ActivityLevelsSelectPanel_10109 = 468,
|
||||
GunStormPanel = 469,
|
||||
GunStormStory_10109 = 470,
|
||||
Task_10109 = 471,
|
||||
Shop_10109 = 472,
|
||||
GoldenSpyPanel_400012 = 473,
|
||||
GoldenSpyLevelSelectPanel_400012 = 474,
|
||||
GoldenSpyBuffSelectPanel_400012 = 475,
|
||||
GoldenSpyResultPanel_400012 = 476,
|
||||
GoldenSpyBuffTipsPanel_400012 = 477,
|
||||
GmTools = 99999
|
||||
}
|
||||
return PanelId
|
||||
|
||||
Reference in New Issue
Block a user