From ba0680eac65ee6b3c611925b321f7b5e85dfced5 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Tue, 30 Nov 2021 23:14:06 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=88=98=E6=96=97=E3=80=91=E7=9A=AE?= =?UTF-8?q?=E8=82=A4=E6=9C=9D=E5=90=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/Battle/View/Unit/EnemyView.lua | 25 ++++++++-------- .../Modules/Battle/View/Unit/PlayerView.lua | 29 ++++++++++--------- 2 files changed, 28 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 179434864e..8a56fb4969 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua @@ -37,20 +37,20 @@ function EnemyView:onCreate(go, role, position, root, isBoss,enemyId) -- local roleId=role.roleData.roleId local live=HeroConfig[role.roleData.roleId].Live - --如果英雄装备皮肤 - if role.roleData.skinId and role.roleData.skinId>0 then - roleId=role.roleData.skinId - local skin=ConfigManager.GetConfigDataByKey(ConfigName.HeroSkin,"Type",roleId) - if skin then - live=skin.Live - end - end - if not role.roleData.skinId then - self.skinId=0 + -- 判断是否有皮肤 + if not role.roleData.skinId or role.roleData.skinId == 0 then + self.skinId = 0 else - self.skinId=roleId + self.skinId = role.roleData.skinId + end + --如果英雄装备皮肤 + if self.skinId and self.skinId > 0 then + roleId = self.skinId + local skin=ConfigManager.GetConfigDataByKey(ConfigName.HeroSkin,"Type",roleId) + if skin then + live=skin.Live + end end - self.hpCache = self.role:GetRoleData(RoleDataName.Hp) / self.role:GetRoleData(RoleDataName.MaxHp) self.hpSlider.fillAmount = self.hpCache self.hpPassSlider.fillAmount = self.hpCache @@ -114,6 +114,7 @@ function EnemyView:onCreate(go, role, position, root, isBoss,enemyId) if mirrOffset and mirrOffset[1]~=0 and mirrOffset[2]~=0 then self.RoleLiveGO:GetComponent("RectTransform").anchoredPosition = Vector2.New(mirrOffset[1],mirrOffset[2]) self.RoleLiveGO2:GetComponent("RectTransform").anchoredPosition = Vector2.New(mirrOffset[1],mirrOffset[2]+400) + self.outOffset = RoleConfig[roleId].mirrorimage_offset end self.RoleLiveGO:GetComponent("RectTransform").rotation = Quaternion.Euler(Vector3.New(0,180, 0)) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua index f8865ad78e..a6d004963f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua @@ -44,21 +44,21 @@ function PlayerView:onCreate(go, role, position, root) self.hpPassSlider.fillAmount = self.hpCache self.yujiaSlider.fillAmount = 0 local roleId=role.roleData.roleId - - local live=HeroConfig[role.roleData.roleId].Live - --如果英雄装备皮肤 - if role.roleData.skinId and role.roleData.skinId>0 then - roleId=role.roleData.skinId - local skin=ConfigManager.GetConfigDataByKey(ConfigName.HeroSkin,"Type",roleId) - if skin then - live=skin.Live - end - end - if not role.roleData.skinId then - self.skinId=0 - else - self.skinId=roleId + local live=HeroConfig[role.roleData.roleId].Live + -- 判断是否有皮肤 + if not role.roleData.skinId or role.roleData.skinId == 0 then + self.skinId = 0 + else + self.skinId = role.roleData.skinId + end + --如果英雄装备皮肤 + if self.skinId and self.skinId > 0 then + roleId = self.skinId + local skin = ConfigManager.GetConfigDataByKey(ConfigName.HeroSkin,"Type",roleId) + if skin then + live = skin.Live end + end self.livePath = GetResourcePath(live) self.play_liveScale = RoleConfig[roleId].play_liveScale self.enemy_liveScale = RoleConfig[roleId].enemy_liveScale @@ -140,6 +140,7 @@ function PlayerView:onCreate(go, role, position, root) if mirrOffset and mirrOffset[1]~=0 and mirrOffset[2]~=0 then self.RoleLiveGO:GetComponent("RectTransform").anchoredPosition = Vector2.New(mirrOffset[1],mirrOffset[2]) self.RoleLiveGO2:GetComponent("RectTransform").anchoredPosition = Vector2.New(mirrOffset[1],mirrOffset[2]-300) + self.outOffset = RoleConfig[roleId].mirrorimage_offset end self.RoleLiveGO:GetComponent("RectTransform").rotation = Quaternion.Euler(Vector3.New(0,180, 0)) self.RoleLiveGO2:GetComponent("RectTransform").rotation = Quaternion.Euler(Vector3.New(0,180, 0))