Revert "【战斗界面】上方血条问题修改"

This reverts commit 46d492529f.

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

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])