From 41977a85f5bc6e8730651a15e29f64c2173e76b8 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Wed, 23 Dec 2020 14:52:13 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E5=8D=81=E7=BB=9D=E9=98=B5=E6=95=8C=E6=96=B9=E9=98=B5?= =?UTF-8?q?=E5=AE=B9=E4=B8=8A=E7=9A=84=E8=A1=80=E6=9D=A1=E5=92=8C=E6=80=92?= =?UTF-8?q?=E6=B0=94=E6=9D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/Guild/DeathPos/DeathPosInfoPanel.prefab | 12 ++++++------ .../Modules/Guild/DeathPos/DeathPosInfoPanel.lua | 16 +++++++--------- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Guild/DeathPos/DeathPosInfoPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Guild/DeathPos/DeathPosInfoPanel.prefab index d321e4467f..b3b67dd013 100644 --- a/Assets/ManagedResources/Prefabs/UI/Guild/DeathPos/DeathPosInfoPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Guild/DeathPos/DeathPosInfoPanel.prefab @@ -5527,7 +5527,7 @@ PrefabInstance: - target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y - value: 15 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59, type: 3} @@ -5687,7 +5687,7 @@ PrefabInstance: - target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y - value: 15 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59, type: 3} @@ -5847,7 +5847,7 @@ PrefabInstance: - target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y - value: 15 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59, type: 3} @@ -6007,7 +6007,7 @@ PrefabInstance: - target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y - value: 15 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59, type: 3} @@ -6167,7 +6167,7 @@ PrefabInstance: - target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y - value: 15 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59, type: 3} @@ -6327,7 +6327,7 @@ PrefabInstance: - target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y - value: 15 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59, type: 3} diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosInfoPanel.lua index 5bcf557687..f4f6378780 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosInfoPanel.lua @@ -172,6 +172,7 @@ function this.SetFormation() for i, v in pairs(monsterGroup[monsterGroupId].Contents[1]) do local o=this.heroPreList[i] + o.transform.parent:GetComponent("Image").sprite=Util.LoadSprite("t_chengyuankuang_kuang") if v ~= 0 then local id=monsterConfig[v].MonsterId this.SetCardSingleData(o, id, i, monsterConfig[v]) @@ -185,6 +186,7 @@ end --设置单个上阵英雄信息 function this.SetCardSingleData(o, heroId, _pos, heroData) + local bg=Util.GetGameObject(o,"Bg1"):GetComponent("Image") local fg=Util.GetGameObject(o,"Bg2"):GetComponent("Image") -- local live=Util.GetGameObject(o,"Mask/Live") @@ -194,9 +196,10 @@ function this.SetCardSingleData(o, heroId, _pos, heroData) local name=Util.GetGameObject(o,"Name/Text"):GetComponent("Text") -- local pos=Util.GetGameObject(o,"Pos"):GetComponent("Image") local yuanImage=Util.GetGameObject(o,"yuanImage") - local hp = Util.GetGameObject(o,"hpProgress/hp"):GetComponent("Image") - local hpPass = Util.GetGameObject(o,"hpProgress/hpPass"):GetComponent("Image") - local rage = Util.GetGameObject(o,"rageProgress/rage"):GetComponent("Image") + local hp = Util.GetGameObject(o,"hpProgress") + hp.gameObject:SetActive(false) + local rage = Util.GetGameObject(o,"rageProgress") + rage.gameObject:SetActive(false) local live = Util.GetGameObject(o, "Mask/icon"):GetComponent("RawImage") local config = heroConfig[heroId] local liveName = GetResourcePath(config.Live) @@ -219,17 +222,12 @@ function this.SetCardSingleData(o, heroId, _pos, heroData) yuanImage:SetActive(false) lv.text=heroData.Level - bg.sprite = Util.LoadSprite(GetBattleHeroCardStarBg[heroData.Star]) + bg.sprite = Util.LoadSprite(GetHeroCardStarBg[heroData.Star]) fg.sprite = Util.LoadSprite(GetHeroCardStarFg[heroData.Star]) pro.sprite=Util.LoadSprite(GetProStrImageByProNum(heroData.PropertyName)) SetCardStars(starGrid,heroData.Star) name.text=heroData.ReadingName - - hp.fillAmount = 1 - hpPass.fillAmount = 1 - rage.fillAmount = 0.5 - end --刷新排行榜 index当前排行类型索引