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
2026-04-18 00:15:00 +09:00
parent 35fe1f046d
commit e0549005e1
1150 changed files with 941124 additions and 19847 deletions
@@ -1,4 +1,5 @@
 local CharBgTrialPanel = class("CharBgTrialPanel", BasePanel)
+local Actor2DManager = require("Game.Actor2D.Actor2DManager")
 CharBgTrialPanel._bIsMainPanel = false
 CharBgTrialPanel._sSortingLayerName = AllEnum.SortingLayerName.UI_Top
 CharBgTrialPanel._tbDefine = {
@@ -138,10 +139,14 @@ function CharBgTrialPanel:Awake()
 		end
 	end
 	table.insert(self.panelStack, self.nPanelId)
+	Actor2DManager.ForceUseL2D(false)
 end
 function CharBgTrialPanel:OnEnable()
 end
 function CharBgTrialPanel:OnDisable()
+	if PanelManager.CheckPanelOpen(PanelId.GachaSpin) then
+		Actor2DManager.ForceUseL2D(true)
+	end
 end
 function CharBgTrialPanel:OnEvent_CharRelatePanelOpen(nPanelId, ncharId, tbCharList, param1)
 	self.nClosePanelId = self.nPanelId
@@ -111,6 +111,10 @@ CharSkillTrialCtrl._mapNodeConfig = {
 	btnSwitch2_off = {
 		sComponentName = "UIButton",
 		callback = "OnEvent_SetSimpleDesc"
+	},
+	btEnergyEff = {
+		sComponentName = "UIButton",
+		callback = "OnBtnClick_ShowEnergyEff"
 	}
 }
 CharSkillTrialCtrl._mapEventConfig = {
@@ -310,4 +314,13 @@ function CharSkillTrialCtrl:OnEvent_SetDesc()
 	PlayerCharData:SetCharPanelSkillDescType(false)
 	self:SetUpgrade()
 end
+function CharSkillTrialCtrl:OnBtnClick_ShowEnergyEff(btn)
+	if self.nCharId ~= nil then
+		local mapData = {
+			nCharId = self.nCharId,
+			bCharSkillEnergyEff = true
+		}
+		EventManager.Hit(EventId.OpenPanel, PanelId.SkillTips, btn.transform, mapData)
+	end
+end
 return CharSkillTrialCtrl