From 171da338dfd96524015291c083b1d208ee70c478 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Mon, 26 Apr 2021 20:44:08 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"=E3=80=90=E6=88=98=E6=96=97=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E3=80=91=E4=B8=8A=E6=96=B9=E8=A1=80=E6=9D=A1=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 46d492529fe45553ce836d10410fe8661a36c0b8. --- Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab | 2 +- .../ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab b/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab index 60547c4d25..e2c52f2b8f 100644 --- a/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab @@ -142612,7 +142612,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &5251286333026968868 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua index 214167754e..17126c1c5a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua @@ -286,8 +286,6 @@ end -- 初始化 function this.InitPanelData() - this.dmg2:SetActive(fightType == BATTLE_TYPE.XINJIANG) - this.dmg3:SetActive(fightType == BATTLE_TYPE.TASUILINGXIAO) if fightType == BATTLE_TYPE.GUILD_BOSS and fightType == BATTLE_TYPE.GUILD_CAR_DELAY then this.myDamage = 0 this.myDamageLevel = 0 @@ -301,6 +299,7 @@ function this.InitPanelData() end) end elseif fightType == BATTLE_TYPE.XINJIANG then + this.dmg2:SetActive(fightType == BATTLE_TYPE.XINJIANG) boxList[1]:SetActive(true) this.myDamage = 0 this.myDamageLevel = 0 @@ -320,6 +319,7 @@ function this.InitPanelData() local actData = CommonActPageManager.GetData(ActivityTypeDef.TaSuiLingXiao) local boxs = ConfigManager.GetConfigDataByKey(ConfigName.NewHeroConfig,"Id",actData.activityId).BoxList local maxDmg = actData.value + this.dmg3:SetActive(fightType == BATTLE_TYPE.TASUILINGXIAO) this.myDamage = 0 this.myDamageLevel = 0 this.dmg3Text.text = string.format("0/%s",boxs[1][1])