From abb9873f80123540ebb95898fe10034d010b47b7 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Wed, 4 Aug 2021 17:42:47 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=8E=A9=E5=AE=B6=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E3=80=91=E7=8E=A9=E5=AE=B6=E4=BF=A1=E6=81=AF=E9=9D=A2=E6=9D=BF?= =?UTF-8?q?=E9=9C=80=E8=A6=81=E6=98=BE=E7=A4=BA=E7=A5=9E=E5=B0=86=E4=BD=A9?= =?UTF-8?q?=E6=88=B4=E5=AE=9D=E7=89=A9=E7=9A=84=E5=BC=BA=E5=8C=96=E7=AD=89?= =?UTF-8?q?=E7=BA=A7=E5=92=8C=E7=B2=BE=E7=82=BC=E7=AD=89=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Popup/RoleInfoPopup.prefab | 448 +++++++++++++++--- .../~Lua/Modules/Popup/RoleInfoPopup.lua | 15 + 2 files changed, 399 insertions(+), 64 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/RoleInfoPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/RoleInfoPopup.prefab index 025b4dd201..7cdb1cb9d8 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/RoleInfoPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/RoleInfoPopup.prefab @@ -1029,9 +1029,9 @@ RectTransform: m_Father: {fileID: 4767352897535079369} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 719.8, y: -66.45} m_SizeDelta: {x: 297.6, y: 132.9} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2198174024911992403 @@ -1685,7 +1685,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: 238.85, y: -22.225} + m_AnchoredPosition: {x: 238.85, y: -22.224998} m_SizeDelta: {x: 477.7, y: 44.45} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &828267418783742634 @@ -1837,6 +1837,85 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &854638485262343503 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3007236545954804179} + - component: {fileID: 8379473156159221587} + - component: {fileID: 1894798454153473108} + m_Layer: 5 + m_Name: refine + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3007236545954804179 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 854638485262343503} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 2885743065443971280} + m_RootOrder: 3 + 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.9, y: -43.6} + m_SizeDelta: {x: 126.46, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8379473156159221587 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 854638485262343503} + m_CullTransparentMesh: 0 +--- !u!114 &1894798454153473108 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 854638485262343503} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.8117647, b: 0.95686275, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 28 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: 66666 --- !u!1 &880901799258763040 GameObject: m_ObjectHideFlags: 0 @@ -1983,6 +2062,85 @@ RectTransform: m_AnchoredPosition: {x: 1.6025696, y: -2.5024486} m_SizeDelta: {x: 4.2, y: 0.00010204} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1018092049666368402 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1049415336646892884} + - component: {fileID: 4858534313300401979} + - component: {fileID: 7917446223728336497} + m_Layer: 5 + m_Name: lv + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1049415336646892884 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1018092049666368402} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 3480734674570110925} + m_RootOrder: 2 + 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: -9.1, y: 41.99998} + m_SizeDelta: {x: 122.07, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4858534313300401979 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1018092049666368402} + m_CullTransparentMesh: 0 +--- !u!114 &7917446223728336497 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1018092049666368402} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.95686275, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 28 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 5 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: 66666 --- !u!1 &1197726364895279515 GameObject: m_ObjectHideFlags: 0 @@ -7957,7 +8115,7 @@ ParticleSystem: --- !u!199 &4438878257103928366 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -8203,10 +8361,10 @@ RectTransform: m_Father: {fileID: 2190152846101774229} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 438.5, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 438.5, y: -82.5} + m_SizeDelta: {x: 877, y: 5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5950788119725823789 CanvasRenderer: @@ -8535,10 +8693,10 @@ RectTransform: m_Father: {fileID: 2190152846101774229} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 620, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 438.5, y: -87.5} + m_SizeDelta: {x: 620, y: 5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7280263267776010143 CanvasRenderer: @@ -9616,10 +9774,10 @@ RectTransform: m_Father: {fileID: 277642948085985351} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 467.65, y: -765} + m_SizeDelta: {x: 877.3, y: 250} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6781150477304309977 CanvasRenderer: @@ -9860,10 +10018,10 @@ RectTransform: m_Father: {fileID: 4320458112962310301} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 216.3, y: -66.45} + m_SizeDelta: {x: 130, y: 130} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3224279738133237298 CanvasRenderer: @@ -10103,9 +10261,9 @@ RectTransform: m_Father: {fileID: 800725520187452421} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 80.95, y: -89.95} m_SizeDelta: {x: 152, y: 152} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7234040720317302532 @@ -10471,9 +10629,9 @@ RectTransform: m_Father: {fileID: 800725520187452421} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 262.75, y: -89.95} m_SizeDelta: {x: 181.6, y: 181.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8672316360936894560 @@ -11275,6 +11433,8 @@ RectTransform: m_Children: - {fileID: 1074262243633909606} - {fileID: 956067214865132187} + - {fileID: 3597249710685472363} + - {fileID: 3007236545954804179} m_Father: {fileID: 3893976424482190964} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -11505,6 +11665,85 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &4632162022364166943 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3597249710685472363} + - component: {fileID: 68502004229822455} + - component: {fileID: 5943837253762854855} + m_Layer: 5 + m_Name: lv + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3597249710685472363 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4632162022364166943} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 2885743065443971280} + m_RootOrder: 2 + 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: -9.1, y: 42} + m_SizeDelta: {x: 122.07, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &68502004229822455 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4632162022364166943} + m_CullTransparentMesh: 0 +--- !u!114 &5943837253762854855 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4632162022364166943} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.95686275, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 28 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 5 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: 66666 --- !u!1 &4650818961487588194 GameObject: m_ObjectHideFlags: 0 @@ -12349,10 +12588,10 @@ RectTransform: m_Father: {fileID: 4320458112962310301} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 81.3, y: -66.45} + m_SizeDelta: {x: 130, y: 130} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5753039415573080711 CanvasRenderer: @@ -17476,7 +17715,7 @@ ParticleSystem: --- !u!199 &5360006036325542636 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -17569,10 +17808,10 @@ RectTransform: m_Father: {fileID: 7603097860510337896} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 213.65, y: -66.45} + m_SizeDelta: {x: 130, y: 130} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2099235981827177424 CanvasRenderer: @@ -18266,10 +18505,10 @@ RectTransform: m_Father: {fileID: 7603097860510337896} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 483.65, y: -66.45} + m_SizeDelta: {x: 130, y: 130} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &657113344816791394 CanvasRenderer: @@ -18690,9 +18929,9 @@ RectTransform: m_Father: {fileID: 4767352897535079369} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 289.84998, y: -66.45} m_SizeDelta: {x: 562.3, y: 132.9} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5697136989062052279 @@ -19842,10 +20081,10 @@ RectTransform: m_Father: {fileID: 7603097860510337896} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 78.649994, y: -66.45} + m_SizeDelta: {x: 130, y: 130} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8503794955063177387 CanvasRenderer: @@ -19916,6 +20155,8 @@ RectTransform: m_Children: - {fileID: 2834258544579593036} - {fileID: 5723156027066984007} + - {fileID: 1049415336646892884} + - {fileID: 9119966593433308857} m_Father: {fileID: 4809597655882483266} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -20758,10 +20999,10 @@ RectTransform: m_Father: {fileID: 277642948085985351} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 467.65, y: -110} + m_SizeDelta: {x: 877.3, y: 180} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3408779802112845678 CanvasRenderer: @@ -21729,7 +21970,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -467.5, y: 648.6} - m_SizeDelta: {x: 935, y: 0} + m_SizeDelta: {x: 935, y: 990} m_Pivot: {x: 0, y: 1} --- !u!114 &8743960904103029316 MonoBehaviour: @@ -22074,6 +22315,85 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &8720134049802568555 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9119966593433308857} + - component: {fileID: 6144050316944884461} + - component: {fileID: 1459452790984155363} + m_Layer: 5 + m_Name: refine + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9119966593433308857 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8720134049802568555} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 3480734674570110925} + m_RootOrder: 3 + 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.9, y: -43.59994} + m_SizeDelta: {x: 126.46, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6144050316944884461 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8720134049802568555} + m_CullTransparentMesh: 0 +--- !u!114 &1459452790984155363 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8720134049802568555} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.8117647, b: 0.95686275, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 28 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: 66666 --- !u!1 &8735012240599641820 GameObject: m_ObjectHideFlags: 0 @@ -22455,10 +22775,10 @@ RectTransform: m_Father: {fileID: 277642948085985351} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 467.65, y: -420} + m_SizeDelta: {x: 877.3, y: 400} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6334925928787415273 CanvasRenderer: @@ -22522,10 +22842,10 @@ RectTransform: m_Father: {fileID: 7603097860510337896} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 348.65, y: -66.45} + m_SizeDelta: {x: 130, y: 130} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1202601738595703871 CanvasRenderer: @@ -22940,10 +23260,10 @@ RectTransform: m_Father: {fileID: 277642948085985351} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 467.5, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 467.5, y: -955} + m_SizeDelta: {x: 877, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &214787711278037218 CanvasRenderer: diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua index d9690fe250..785eaad311 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua @@ -388,9 +388,24 @@ function this.EquipInfo() local frame=Util.GetGameObject(o,"Frame"):GetComponent("Image") local icon=Util.GetGameObject(o,"Frame/Icon"):GetComponent("Image") local proIcon=Util.GetGameObject(o,"Frame/proIcon"):GetComponent("Image") + local refineObj = Util.GetGameObject(o,"Frame/refine") + local lvObj = Util.GetGameObject(o,"Frame/lv") frame.sprite=this.spLoader:LoadSprite(data.frame) icon.sprite=this.spLoader:LoadSprite(data.icon) proIcon.sprite = this.spLoader:LoadSprite(data.proIcon) + if data.refineLv > 0 then + refineObj:GetComponent("Text").text = "+" .. data.refineLv + refineObj:SetActive(true) + else + refineObj:SetActive(false) + end + + if data.lv > 0 then + lvObj:GetComponent("Text").text = data.lv + lvObj:SetActive(true) + else + lvObj:SetActive(false) + end Util.AddOnceClick(btn,function() UIManager.OpenPanel(UIName.RewardTalismanSingleShowPopup,0, data.idDyn,data.id, 0, 0) end)