From 8a00efca60f5852151e10185fba3c231bc3af030 Mon Sep 17 00:00:00 2001 From: liujiaqi Date: Fri, 26 Feb 2021 17:26:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=B1=E9=B8=A3=20=20=E8=8B=B1=E9=9B=84?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=20=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../h_hongmengbei_gongmingzhong_zh.png} | Bin .../h_hongmengbei_gongmingzhong_zh.png.meta} | 0 .../Prefabs/UI/RoleInfo/RoleInfoPanel.prefab | 24 +++++++++--------- .../~Lua/Modules/RoleInfo/RoleInfoLayout.lua | 1 + 4 files changed, 13 insertions(+), 12 deletions(-) rename Assets/ManagedResources/Atlas/HongMengZhenAtlas/{h_hongmengbei_gongmingzhong.png => ArtFont/h_hongmengbei_gongmingzhong_zh.png} (100%) rename Assets/ManagedResources/Atlas/HongMengZhenAtlas/{h_hongmengbei_gongmingzhong.png.meta => ArtFont/h_hongmengbei_gongmingzhong_zh.png.meta} (100%) diff --git a/Assets/ManagedResources/Atlas/HongMengZhenAtlas/h_hongmengbei_gongmingzhong.png b/Assets/ManagedResources/Atlas/HongMengZhenAtlas/ArtFont/h_hongmengbei_gongmingzhong_zh.png similarity index 100% rename from Assets/ManagedResources/Atlas/HongMengZhenAtlas/h_hongmengbei_gongmingzhong.png rename to Assets/ManagedResources/Atlas/HongMengZhenAtlas/ArtFont/h_hongmengbei_gongmingzhong_zh.png diff --git a/Assets/ManagedResources/Atlas/HongMengZhenAtlas/h_hongmengbei_gongmingzhong.png.meta b/Assets/ManagedResources/Atlas/HongMengZhenAtlas/ArtFont/h_hongmengbei_gongmingzhong_zh.png.meta similarity index 100% rename from Assets/ManagedResources/Atlas/HongMengZhenAtlas/h_hongmengbei_gongmingzhong.png.meta rename to Assets/ManagedResources/Atlas/HongMengZhenAtlas/ArtFont/h_hongmengbei_gongmingzhong_zh.png.meta diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab index fac82468d3..2546fdd2e8 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab @@ -5308,7 +5308,7 @@ ParticleSystem: --- !u!199 &199793888397422328 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -10774,7 +10774,7 @@ ParticleSystem: --- !u!199 &199786334729933541 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -15693,7 +15693,7 @@ ParticleSystem: --- !u!199 &199812891778826125 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -20542,7 +20542,7 @@ ParticleSystem: --- !u!199 &199314592830468766 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -25352,7 +25352,7 @@ ParticleSystem: --- !u!199 &199738970247411175 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -30962,7 +30962,7 @@ ParticleSystem: --- !u!199 &199312732024159113 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -37181,7 +37181,7 @@ ParticleSystem: --- !u!199 &199309040906483979 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -41937,7 +41937,7 @@ ParticleSystem: --- !u!199 &199592651100025897 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -46974,7 +46974,7 @@ ParticleSystem: --- !u!199 &199310039250832541 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -51730,7 +51730,7 @@ ParticleSystem: --- !u!199 &199031629276305175 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -56773,7 +56773,7 @@ ParticleSystem: --- !u!199 &199224694020007487 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -90147,7 +90147,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: c046dc80bbbcde94591c38d067db5e1f, type: 3} + m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua index 3b5bb28c6d..e5d3c91c47 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua @@ -62,6 +62,7 @@ function RoleInfoLayout:InitComponent(gameObject) this.tipUpLv=Util.GetGameObject(gameObject,"upLv/tip") this.noUpLvText=Util.GetGameObject(gameObject,"noUpLvText") this.gongmingText=Util.GetGameObject(gameObject,"gongmingText") + Util.GetGameObject(this.gongmingText,"Image"):GetComponent("Image").sprite = Util.LoadSprite("h_hongmengbei_gongmingzhong_zh") this.upLv=Util.GetGameObject(gameObject,"upLv") this.lvUpGo=Util.GetGameObject(gameObject,"lvUpGo") this.lvUpGoImage=Util.GetGameObject(gameObject,"lvUpGo/Image")