Update - 1.9.0.103
EN: 1.9.0.103 CN: 1.9.0.104 JP: 1.9.0.106 KR: 1.9.0.108
This commit is contained in:
@@ -608,11 +608,9 @@ function BaseCtrl:SetPngSprite(imgObj, sPath, sSurfix)
|
||||
return false
|
||||
else
|
||||
local sFullPath = sRootPath .. sPath .. ".png"
|
||||
local bSuc = NovaAPI.SetImageSprite(imgObj, sFullPath)
|
||||
if not bSuc then
|
||||
traceback(string.format("icon设置失败:%s,panel id:%s,ctrl name:%s", sFullPath, tostring(self._panel._nPanelId), tostring(self.__cname)))
|
||||
end
|
||||
return bSuc
|
||||
local _sprite = GameResourceLoader.LoadAsset(ResType.Any, sFullPath, typeof(Sprite), "UI", self._panel._nPanelId)
|
||||
NovaAPI.SetImageSpriteAsset(imgObj, _sprite)
|
||||
return true
|
||||
end
|
||||
end
|
||||
function BaseCtrl:SetSprite_FrameColor(imgObj, nRarity, sFrameType, bBigSprites)
|
||||
@@ -803,6 +801,7 @@ function BaseCtrl:DespawnPrefabInstance(objCtrl, sPoolName)
|
||||
objCtrl:_Exit()
|
||||
objCtrl:_Destroy()
|
||||
AdventureModuleHelper.DespawnPrefabInstance(objCtrl.gameObject, sPoolName)
|
||||
objCtrl.gameObject = nil
|
||||
end
|
||||
end
|
||||
function BaseCtrl:BindCtrlByNode(goNode, sCtrlName)
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
local PanelDefine = {
|
||||
[PanelId.GMPresetTempPanel] = "Game.Editor.BattlePresetTeamTest.BattlePresetTeamTempPanel",
|
||||
[PanelId.ExeEditor] = "Game.Actor2D.Editor_BBV.ExeEditorPanel",
|
||||
[PanelId.BBVEditor] = "Game.Actor2D.Editor_BBV.BBVEditorPanel",
|
||||
[PanelId.Actor2DEditor] = "Game.Actor2D.Editor.Actor2DEditorPanel",
|
||||
@@ -105,7 +104,7 @@ local PanelDefine = {
|
||||
[PanelId.FRQuestComplete] = "Game.UI.FixedRoguelikeEx.FixedRoguelikeQuestCompletePanel",
|
||||
[PanelId.PopupSkillPanel] = "Game.UI.CommonTipsEx.PopupSkillPanel",
|
||||
[PanelId.TravelerDuelLevelQuestPanel] = "Game.UI.TravelerDuelLevelSelect.TravelerDuelQuest.TravelerDuelQuestPanel",
|
||||
[PanelId.TDBattleResultPanel] = "Game.UI.TrekkerVersus.TDBattleResultPanel",
|
||||
[PanelId.TDBattleResultPanel] = "Game.UI.TrekkerVersus_600002.TDBattleResultPanel",
|
||||
[PanelId.TDLevelUpgrade] = "Game.UI.TravelerDuelLevelSelect.TDClassUpgradePanel",
|
||||
[PanelId.CharacterRelation] = "Game.UI.CharacterInfoEx.CharacterPlotPanel",
|
||||
[PanelId.ExChangePanel] = "Game.UI.ExChange.ExChangePanel",
|
||||
@@ -138,10 +137,10 @@ local PanelDefine = {
|
||||
[PanelId.PhonePopUp] = "Game.UI.Phone.PhonePopUpPanel",
|
||||
[PanelId.DatingLandmark] = "Game.UI.Phone.Dating.DatingLandmarkPanel",
|
||||
[PanelId.Dating] = "Game.UI.Phone.Dating.DatingPanel",
|
||||
[PanelId.DatingTest] = "Game.Editor.Phone.DatingTestPanel",
|
||||
[PanelId.Equipment] = "Game.UI.Equipment.EquipmentPanel",
|
||||
[PanelId.EquipmentInfo] = "Game.UI.Equipment.EquipmentInfoPanel",
|
||||
[PanelId.EquipmentInstanceResult] = "Game.UI.BattleResult.EquipmentInstanceResultPanel",
|
||||
[PanelId.EquipmentUpgrade] = "Game.UI.Equipment.EquipmentUpgradePanel",
|
||||
[PanelId.EquipmentRename] = "Game.UI.Equipment.EquipmentRenamePanel",
|
||||
[PanelId.EquipmentAttrPreview] = "Game.UI.Equipment.EquipmentAttrPreviewPanel",
|
||||
[PanelId.EquipmentRoll] = "Game.UI.Equipment.EquipmentRollPanel",
|
||||
@@ -267,7 +266,7 @@ local PanelDefine = {
|
||||
[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.TrekkerVersusPanel",
|
||||
[PanelId.TrekkerVersus] = "Game.UI.TrekkerVersus_600002.TrekkerVersusPanel",
|
||||
[PanelId.ActivityLevelsSelectPanel_20101] = "Game.UI.ActivityTheme.20101.ActivityLevels.ActivityLevelsSelectPanel",
|
||||
[PanelId.ChristmasThemePanel] = "Game.UI.ActivityTheme.20101.ChristmasThemePanel",
|
||||
[PanelId.BreakOutLevelDetailPanel] = "Game.UI.Play_BreakOut_30101.BreakOutLevelDetailPanel",
|
||||
@@ -312,7 +311,23 @@ local PanelDefine = {
|
||||
[PanelId.ActivityLevelsSelectPanel_10106] = "Game.UI.ActivityTheme.10106.ActivityLevels.ActivityLevelsSelectPanel",
|
||||
[PanelId.Task_10106] = "Game.UI.ActivityTheme.10106.Task.PostalTaskPanel",
|
||||
[PanelId.PostalThemePanel] = "Game.UI.ActivityTheme.10106.PostalThemePanel",
|
||||
[PanelId.PostalStory] = "Game.UI.ActivityTheme.10106.Story.PostalStoryPanel"
|
||||
[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.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.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",
|
||||
[PanelId.SolodanceThemePanel] = "Game.UI.ActivityTheme.20102.SoloDanceThemePanel",
|
||||
[PanelId.SolodanceStory] = "Game.UI.MainlineEx_SolodanceStory.MainlineEx_SolodanceStoryPanel",
|
||||
[PanelId.ActivityLevelsSelectPanel_10107] = "Game.UI.ActivityTheme.10107.ActivityLevels.ActivityLevelsSelectPanel"
|
||||
}
|
||||
if NovaAPI.GetClientChannel() == AllEnum.ChannelName.BanShu then
|
||||
end
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
local SpringFestivalThemeCtrl = require("Game.UI.ActivityTheme.10104.SpringFestivalThemeCtrl")
|
||||
local PanelId = {
|
||||
GMPresetTempPanel = -5,
|
||||
AvgEditorMultiLanTool = -6,
|
||||
ExeEditor = -4,
|
||||
BBVEditor = -3,
|
||||
Actor2DEditor = -2,
|
||||
@@ -130,6 +129,7 @@ local PanelId = {
|
||||
Equipment = 271,
|
||||
EquipmentInfo = 272,
|
||||
EquipmentInstanceLevelSelect = 273,
|
||||
EquipmentUpgrade = 274,
|
||||
EquipmentTips = 275,
|
||||
EquipmentInstanceResult = 276,
|
||||
StarTowerQuest = 277,
|
||||
@@ -270,7 +270,6 @@ local PanelId = {
|
||||
MiningGameGuidePanel_400002 = 353,
|
||||
BdConvertActPanel = 354,
|
||||
TowerDefenseGiveupPanel = 355,
|
||||
DatingTest = 356,
|
||||
BdConvertBuildDetail = 357,
|
||||
Shop_30101 = 358,
|
||||
ShopPopup_30101 = 359,
|
||||
@@ -328,6 +327,23 @@ local PanelId = {
|
||||
Shop_10106 = 411,
|
||||
Task_10106 = 412,
|
||||
PostalThemePanel = 413,
|
||||
PostalStory = 414
|
||||
PostalStory = 414,
|
||||
RankBuildDetail = 415,
|
||||
GoldenSpyPanel = 416,
|
||||
GoldenSpyLevelSelectPanel = 417,
|
||||
GoldenSpyBuffSelectPanel = 418,
|
||||
PotentialPreselectionList = 419,
|
||||
PotentialPreselectionEdit = 420,
|
||||
ImportPreselection = 421,
|
||||
PreselectionRename = 422,
|
||||
GoldenSpyResultPanel = 423,
|
||||
GoldenSpyBuffTipsPanel = 424,
|
||||
ActivityLevelsSelectPanel_20102 = 425,
|
||||
Task_20102 = 426,
|
||||
Shop_20102 = 427,
|
||||
SolodanceThemePanel = 430,
|
||||
SolodanceStory = 431,
|
||||
ActivityLevelsSelectPanel_10107 = 432,
|
||||
GmTools = 99999
|
||||
}
|
||||
return PanelId
|
||||
|
||||
@@ -445,11 +445,11 @@ local ResetTouchEffect = function()
|
||||
local sPathFormat = Settings.AB_ROOT_PATH .. "UI/CommonEx/TouchEffect/%s.prefab"
|
||||
local sValue_Main = ConfigTable.GetConfigValue("TouchEffect_Main")
|
||||
if type(sValue_Main) == "string" and sValue_Main ~= "" then
|
||||
objMain = GameResourceLoader.LoadAsset(ResType.Any, string.format(sPathFormat, sValue_Main), typeof(GameObject), "UI")
|
||||
objMain = GameResourceLoader.LoadAsset(ResType.Any, string.format(sPathFormat, sValue_Main), typeof(GameObject))
|
||||
end
|
||||
local sValue_Slide = ConfigTable.GetConfigValue("TouchEffect_Slide")
|
||||
if type(sValue_Slide) == "string" and sValue_Main ~= "" then
|
||||
objSlide = GameResourceLoader.LoadAsset(ResType.Any, string.format(sPathFormat, sValue_Slide), typeof(GameObject), "UI")
|
||||
objSlide = GameResourceLoader.LoadAsset(ResType.Any, string.format(sPathFormat, sValue_Slide), typeof(GameObject))
|
||||
end
|
||||
if objMain ~= nil or objSlide ~= nil then
|
||||
local trNode = mapUIRootTransform[AllEnum.SortingLayerName.Overlay]
|
||||
|
||||
Reference in New Issue
Block a user