From bf9efec5c6704238a3048701e749cbb7f1099272 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Wed, 29 Jun 2022 14:54:23 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=88=98=E6=96=97]=3D=3D=3D=3D=3D=3D=3D=3D?= =?UTF-8?q?=E6=88=98=E6=96=97=E5=90=8D=E7=A7=B0=E6=98=BE=E7=A4=BA=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/Battle/View/Unit/EnemyView.lua | 29 ++++++++++-------- .../Modules/Battle/View/Unit/PlayerView.lua | 30 ++++++++++--------- 2 files changed, 33 insertions(+), 26 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua index eb7706275b..0ee314ab91 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua @@ -206,22 +206,27 @@ function EnemyView:onCreate(go, role, position, root, isBoss,enemyId) self.level.transform.parent.gameObject:SetActive(not self.isBoss) self.elementImg.transform.parent.gameObject:SetActive(not self.isBoss) self.rageSlider.transform.parent.gameObject:SetActive(not self.isBoss) - if BattlePanel and BattlePanel.guideType then - LogError("BattlePanel.guidetype=="..BattlePanel.guideType) - if BattlePanel.guideType==3 then - self.nameObj:SetActive(true) + -- if BattlePanel and BattlePanel.guideType then + -- LogError("BattlePanel.guidetype=="..BattlePanel.guideType) + -- if BattlePanel.guideType==3 then + -- self.nameObj:SetActive(true) + -- self.nameParent:SetActive(false) + -- self.proPar:SetActive(false) + -- self.nameText.transform.parent.gameObject:SetActive(false) + -- self.elementImg.transform.parent.gameObject:SetActive(false) + -- else + -- self.nameParent:SetActive(true) + -- self.proPar:SetActive(true) + -- self.nameObj:SetActive(false) + -- end + -- else + -- self.nameObj:SetActive(false) + -- end + self.nameObj:SetActive(true) self.nameParent:SetActive(false) self.proPar:SetActive(false) self.nameText.transform.parent.gameObject:SetActive(false) self.elementImg.transform.parent.gameObject:SetActive(false) - else - self.nameParent:SetActive(true) - self.proPar:SetActive(true) - self.nameObj:SetActive(false) - end - else - self.nameObj:SetActive(false) - end end -- diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua index 2c48d89a70..272a9f144d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua @@ -86,20 +86,22 @@ function PlayerView:onCreate(go, role, position, root) Util.GetGameObject(go, "GameObject/pro"):GetComponent("Image").sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(role.roleData.element)) self.nameObj=Util.GetGameObject(go, "GameObject") self.nameObj:SetActive(false) - if BattlePanel and BattlePanel.guideType then - LogError("11111111111111==="..BattlePanel.guideType) - if BattlePanel.guideType==3 then - LogError("222222222") - self.nameParent:SetActive(true) - self.proPar:SetActive(true) - else - self.nameParent:SetActive(false) - self.proPar:SetActive(false) - end - else - self.nameParent:SetActive(false) - self.proPar:SetActive(false) - end + -- if BattlePanel and BattlePanel.guideType then + -- LogError("11111111111111==="..BattlePanel.guideType) + -- if BattlePanel.guideType==3 then + -- LogError("222222222") + -- self.nameParent:SetActive(true) + -- self.proPar:SetActive(true) + -- else + -- self.nameParent:SetActive(false) + -- self.proPar:SetActive(false) + -- end + -- else + -- self.nameParent:SetActive(false) + -- self.proPar:SetActive(false) + -- end + self.nameParent:SetActive(true) + self.proPar:SetActive(true) self.bg1.sprite = self.spLoader:LoadSprite(GetBattleHeroCardStarBg[role.roleData.star]) self.bg2.sprite = self.spLoader:LoadSprite(GetHeroCardStarFg[role.roleData.star]) self.starGrid = Util.GetGameObject(go, "StarGrid")