From 1e1c32522981c407ed654b0283652d2cf16683f1 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Wed, 3 Mar 2021 17:45:34 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=A5=9E=E5=B0=86=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/RoleInfo/RoleInfoPanel.prefab | 38 +++++++++---------- .../~Lua/Modules/RoleInfo/RoleInfoPanel.lua | 2 +- .../RoleInfo/RoleUpStarSuccessPanel.lua | 1 + 3 files changed, 21 insertions(+), 20 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab index 20b3ac542b..224053f717 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} @@ -59603,8 +59603,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -95.1} - m_SizeDelta: {x: 160, y: 30} + m_AnchoredPosition: {x: -1.7304, y: -95.1} + m_SizeDelta: {x: 200.31, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1346055835050747244 CanvasRenderer: @@ -59644,7 +59644,7 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u6FC0\u6D3B\u516D\u661F\u5929\u8D4B" @@ -80369,7 +80369,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 484.99997, y: -57} + m_AnchoredPosition: {x: 484.99997, y: -71} m_SizeDelta: {x: 562.1, y: 127.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &8131174916755952753 @@ -80585,7 +80585,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: -27.6, y: 42.85} + m_AnchoredPosition: {x: -27.599998, y: 42.85} m_SizeDelta: {x: 176.41, y: 163.19} m_Pivot: {x: 0, y: 1} --- !u!222 &3127605417484264563 @@ -93305,8 +93305,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 480.99997, y: 9} - m_SizeDelta: {x: 135, y: 135} + m_AnchoredPosition: {x: 480.99997, y: -5} + m_SizeDelta: {x: 583.37, y: 135} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9178239334067249464 CanvasRenderer: @@ -93346,7 +93346,7 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u8FDB\u9636\u540E\uFF0C\u661F\u7EA7\u548C\u6280\u80FD\u5C06\u4F1A\u5F97\u5230\u63D0\u5347" diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua index 4b12997989..692a8c96dc 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua @@ -546,7 +546,7 @@ function this:UpdateHeroInfoData() this.posBgImage.sprite=Util.LoadSprite(GetHeroPosBgStr(curHeroData.heroConfig.Profession)) this.posImage.sprite=Util.LoadSprite(GetHeroPosStr(curHeroData.heroConfig.Profession)) this.posText.text=GetLanguageStrById(curHeroData.heroConfig.HeroLocation) - SetTextVerTial(this.posText.gameObject,Vector3.New(64,0,0),"MiddleLeft") + SetTextVerTial(this.posText.gameObject,Vector3.New(64,21,0),"MiddleLeft") this.unlockImage:SetActive(curHeroData.lockState == 0) this.lockImage:SetActive(curHeroData.lockState == 1) --魂印 diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarSuccessPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarSuccessPanel.lua index 1207d393a7..141da6bf82 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarSuccessPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarSuccessPanel.lua @@ -127,6 +127,7 @@ function RoleUpStarSuccessPanel:OnOpen(...) this.posBgImage.sprite=Util.LoadSprite(GetHeroPosBgStr(curHeroData.heroConfig.Profession)) -- this.posImage.sprite=Util.LoadSprite(GetHeroPosStr(curHeroData.heroConfig.Profession)) this.posText.text=GetLanguageStrById(curHeroData.heroConfig.HeroLocation) + SetTextVerTial(this.posText.gameObject,Vector3.New(64,0,0),"MiddleLeft") this.lvEndInfo.text=string.format(Language[11791],curHeroRankUpConfigOpenLevel) --计算面板属性old