From 9249ed85cbab125e8e0cbb01c7daf0a0cef00780 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Thu, 28 Oct 2021 16:19:59 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A5=9E=E9=AD=82=E9=A2=84=E8=AE=BE=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ArenaTopMatch/ArenaTopMatchPanel.prefab | 44 +- .../UI/GeneralPanel/GeneralBigPopup.prefab | 660 +++++++++--------- .../UI/RoleInfo/RoleGodSoulLayout.prefab | 18 +- .../Prefabs/UI/starGridView/starGrid.prefab | 12 +- .../View/GeneralBigPopup_RoleGodSoulUp.lua | 3 + .../Modules/RoleInfo/RoleGodSoulLayout.lua | 2 + 6 files changed, 372 insertions(+), 367 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/ArenaTopMatch/ArenaTopMatchPanel.prefab b/Assets/ManagedResources/Prefabs/UI/ArenaTopMatch/ArenaTopMatchPanel.prefab index 1e727674dc..e484a70b7c 100644 --- a/Assets/ManagedResources/Prefabs/UI/ArenaTopMatch/ArenaTopMatchPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/ArenaTopMatch/ArenaTopMatchPanel.prefab @@ -5436,7 +5436,7 @@ MonoBehaviour: m_Right: 0 m_Top: -3 m_Bottom: 0 - m_ChildAlignment: 0 + m_ChildAlignment: 6 m_Spacing: -17.78 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 1 @@ -61598,7 +61598,7 @@ MonoBehaviour: m_Right: 0 m_Top: -3 m_Bottom: 0 - m_ChildAlignment: 0 + m_ChildAlignment: 6 m_Spacing: -17.78 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 1 @@ -62078,7 +62078,7 @@ MonoBehaviour: m_Right: 0 m_Top: -3 m_Bottom: 0 - m_ChildAlignment: 0 + m_ChildAlignment: 6 m_Spacing: -17.78 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 1 @@ -62325,7 +62325,7 @@ MonoBehaviour: m_Right: 0 m_Top: -3 m_Bottom: 0 - m_ChildAlignment: 0 + m_ChildAlignment: 6 m_Spacing: -17.78 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 1 @@ -63181,7 +63181,7 @@ MonoBehaviour: m_Right: 0 m_Top: -3 m_Bottom: 0 - m_ChildAlignment: 0 + m_ChildAlignment: 6 m_Spacing: -17.78 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 1 @@ -63506,7 +63506,7 @@ MonoBehaviour: m_Right: 0 m_Top: -3 m_Bottom: 0 - m_ChildAlignment: 0 + m_ChildAlignment: 6 m_Spacing: -17.78 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 1 @@ -67808,7 +67808,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1929561270675379399 RectTransform: m_ObjectHideFlags: 0 @@ -73862,9 +73862,9 @@ RectTransform: m_Father: {fileID: 7593631371174179783} 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: 50, y: -245} m_SizeDelta: {x: 140, y: 140} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2380315871623341868 @@ -83106,7 +83106,7 @@ MonoBehaviour: m_Right: 0 m_Top: -3 m_Bottom: 0 - m_ChildAlignment: 0 + m_ChildAlignment: 6 m_Spacing: -17.78 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 1 @@ -83587,7 +83587,7 @@ MonoBehaviour: m_Right: 0 m_Top: -3 m_Bottom: 0 - m_ChildAlignment: 0 + m_ChildAlignment: 6 m_Spacing: -17.78 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 1 @@ -85227,7 +85227,7 @@ MonoBehaviour: m_Right: 0 m_Top: -3 m_Bottom: 0 - m_ChildAlignment: 0 + m_ChildAlignment: 6 m_Spacing: -17.78 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 1 @@ -85286,7 +85286,7 @@ MonoBehaviour: m_Right: 0 m_Top: -3 m_Bottom: 0 - m_ChildAlignment: 0 + m_ChildAlignment: 6 m_Spacing: -17.78 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 1 @@ -85915,7 +85915,7 @@ MonoBehaviour: m_Right: 0 m_Top: -3 m_Bottom: 0 - m_ChildAlignment: 0 + m_ChildAlignment: 6 m_Spacing: -17.78 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 1 @@ -86235,7 +86235,7 @@ MonoBehaviour: m_Right: 0 m_Top: -3 m_Bottom: 0 - m_ChildAlignment: 0 + m_ChildAlignment: 6 m_Spacing: -17.78 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 1 @@ -86294,7 +86294,7 @@ MonoBehaviour: m_Right: 0 m_Top: -3 m_Bottom: 0 - m_ChildAlignment: 0 + m_ChildAlignment: 6 m_Spacing: -17.78 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 1 @@ -86732,7 +86732,7 @@ MonoBehaviour: m_Right: 0 m_Top: -3 m_Bottom: 0 - m_ChildAlignment: 0 + m_ChildAlignment: 6 m_Spacing: -17.78 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 1 @@ -87243,7 +87243,7 @@ MonoBehaviour: m_Right: 0 m_Top: -3 m_Bottom: 0 - m_ChildAlignment: 0 + m_ChildAlignment: 6 m_Spacing: -17.78 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 1 @@ -88638,7 +88638,7 @@ MonoBehaviour: m_Right: 0 m_Top: -3 m_Bottom: 0 - m_ChildAlignment: 0 + m_ChildAlignment: 6 m_Spacing: -17.78 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 1 @@ -89727,7 +89727,7 @@ MonoBehaviour: m_Right: 0 m_Top: -3 m_Bottom: 0 - m_ChildAlignment: 0 + m_ChildAlignment: 6 m_Spacing: -17.78 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 1 @@ -90247,7 +90247,7 @@ MonoBehaviour: m_Right: 0 m_Top: -3 m_Bottom: 0 - m_ChildAlignment: 0 + m_ChildAlignment: 6 m_Spacing: -17.78 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 1 diff --git a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab index 6a4226982e..fde1dd5b5d 100644 --- a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab @@ -6349,7 +6349,7 @@ MonoBehaviour: m_Top: 0 m_Bottom: 0 m_ChildAlignment: 4 - m_Spacing: 15 + m_Spacing: 0 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 m_ChildControlWidth: 1 @@ -6852,6 +6852,82 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &1421933646064411196 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8283061599103962425} + - component: {fileID: 5005863162004190487} + - component: {fileID: 7324896278694524755} + m_Layer: 5 + m_Name: costPre + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8283061599103962425 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1421933646064411196} + 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: + - {fileID: 6420877835624808000} + - {fileID: 5294737703752221227} + m_Father: {fileID: 1625255851888925010} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: -2295.5, y: 256.17004} + m_SizeDelta: {x: 67.3, y: 78} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &5005863162004190487 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1421933646064411196} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 3 + m_Spacing: -10.7 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 1 + m_ChildControlHeight: 1 +--- !u!114 &7324896278694524755 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1421933646064411196} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 2 --- !u!1 &1422192717058822037 GameObject: m_ObjectHideFlags: 0 @@ -7615,80 +7691,6 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u4EC5\u9650\u7B2C\u4E8C\u5C42" LanguageIndex: 0 ---- !u!1 &1605278196278159077 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8239413484365299418} - - component: {fileID: 2985862884813520727} - - component: {fileID: 532571644483132646} - m_Layer: 5 - m_Name: icon - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &8239413484365299418 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1605278196278159077} - 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: 8953281150311559923} - 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: 31.000002, y: 30.999989} - m_SizeDelta: {x: 40, y: 40} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2985862884813520727 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1605278196278159077} - m_CullTransparentMesh: 0 ---- !u!114 &532571644483132646 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1605278196278159077} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, 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_Sprite: {fileID: 21300000, guid: b6bfe8a51e51bf948815c4dc93b846ff, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 --- !u!1 &1613870877718836234 GameObject: m_ObjectHideFlags: 0 @@ -9671,7 +9673,7 @@ RectTransform: - {fileID: 858130598991419051} - {fileID: 316844683690989597} - {fileID: 7936163679762898668} - - {fileID: 757002088557345578} + - {fileID: 8283061599103962425} - {fileID: 5183788437406042540} - {fileID: 9054384467986536849} - {fileID: 7639897652408278763} @@ -12335,102 +12337,6 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &4030210744037605709 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8953281150311559923} - - component: {fileID: 3366739036116014475} - - component: {fileID: 6268188755858557336} - - component: {fileID: 3228079297347933288} - m_Layer: 5 - m_Name: frame - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8953281150311559923 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4030210744037605709} - 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: - - {fileID: 8239413484365299418} - m_Father: {fileID: 757002088557345578} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 31, y: -31} - m_SizeDelta: {x: 62, y: 62} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3366739036116014475 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4030210744037605709} - m_CullTransparentMesh: 0 ---- !u!114 &6268188755858557336 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4030210744037605709} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, 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_Sprite: {fileID: 21300000, guid: c19e641937f5b4f49bb71341c135fbba, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 ---- !u!114 &3228079297347933288 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4030210744037605709} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreLayout: 0 - m_MinWidth: -1 - m_MinHeight: -1 - m_PreferredWidth: 62 - m_PreferredHeight: 62 - m_FlexibleWidth: -1 - m_FlexibleHeight: -1 - m_LayoutPriority: 1 --- !u!1 &4100753364990555046 GameObject: m_ObjectHideFlags: 0 @@ -13557,7 +13463,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 30 + m_FontSize: 34 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 @@ -14104,6 +14010,102 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: LanguageIndex: 0 +--- !u!1 &4784196672071775568 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6420877835624808000} + - component: {fileID: 3428873483374110163} + - component: {fileID: 2416491769847487097} + - component: {fileID: 2957764200772588945} + m_Layer: 5 + m_Name: frame + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6420877835624808000 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4784196672071775568} + 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: + - {fileID: 8965269701179444490} + m_Father: {fileID: 8283061599103962425} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 39, y: -39} + m_SizeDelta: {x: 78, y: 78} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3428873483374110163 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4784196672071775568} + m_CullTransparentMesh: 0 +--- !u!114 &2416491769847487097 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4784196672071775568} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, 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_Sprite: {fileID: 21300000, guid: c19e641937f5b4f49bb71341c135fbba, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!114 &2957764200772588945 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4784196672071775568} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: 78 + m_PreferredHeight: 78 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 --- !u!1 &4812263035724145991 GameObject: m_ObjectHideFlags: 0 @@ -15381,6 +15383,85 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!1 &5083880161830746655 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5294737703752221227} + - component: {fileID: 2428509319226706224} + - component: {fileID: 8548507346888484678} + m_Layer: 5 + m_Name: num + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5294737703752221227 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5083880161830746655} + 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: 8283061599103962425} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 67.3, y: -39} + m_SizeDelta: {x: 0, y: 33} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2428509319226706224 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5083880161830746655} + m_CullTransparentMesh: 0 +--- !u!114 &8548507346888484678 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5083880161830746655} + 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.3803922, g: 0.7843138, b: 0.5294118, 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: 30 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: --- !u!1 &5154603853819430979 GameObject: m_ObjectHideFlags: 0 @@ -16516,6 +16597,80 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &5609569512460932048 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8965269701179444490} + - component: {fileID: 760239931111878242} + - component: {fileID: 6447133519943376959} + m_Layer: 5 + m_Name: icon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &8965269701179444490 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5609569512460932048} + 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: 6420877835624808000} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -0.52000046, y: -0.3600006} + m_SizeDelta: {x: -29.86, y: -29.849998} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &760239931111878242 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5609569512460932048} + m_CullTransparentMesh: 0 +--- !u!114 &6447133519943376959 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5609569512460932048} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, 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_Sprite: {fileID: 21300000, guid: b6bfe8a51e51bf948815c4dc93b846ff, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &5680038674497881281 GameObject: m_ObjectHideFlags: 0 @@ -18101,82 +18256,6 @@ MonoBehaviour: m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u6D3B\u52A8\u8BE6\u60C5" ---- !u!1 &6234629449347898963 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 757002088557345578} - - component: {fileID: 2085220266436213419} - - component: {fileID: 2937991623644774369} - m_Layer: 5 - m_Name: costPre - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &757002088557345578 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6234629449347898963} - 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: - - {fileID: 8953281150311559923} - - {fileID: 3385652597303373028} - m_Father: {fileID: 1625255851888925010} - 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: -2753.5, y: 211.84998} - m_SizeDelta: {x: 72, y: 62} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &2085220266436213419 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6234629449347898963} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_ChildAlignment: 3 - m_Spacing: 10 - m_ChildForceExpandWidth: 0 - m_ChildForceExpandHeight: 0 - m_ChildControlWidth: 1 - m_ChildControlHeight: 1 ---- !u!114 &2937991623644774369 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6234629449347898963} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 2 - m_VerticalFit: 2 --- !u!1 &6258464718727877792 GameObject: m_ObjectHideFlags: 0 @@ -20491,7 +20570,7 @@ MonoBehaviour: m_Top: 0 m_Bottom: 0 m_ChildAlignment: 4 - m_Spacing: 0 + m_Spacing: -18.7 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 m_ChildControlWidth: 1 @@ -23094,7 +23173,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u9009\u62E9\u89C9\u9192\u795E\u5C06" + m_Text: "\u9009\u62E9\u795E\u5C06" LanguageIndex: 0 --- !u!1 &8052020371798592084 GameObject: @@ -23320,85 +23399,6 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u4EC5\u9650\u7B2C\u4E8C\u5C42" LanguageIndex: 0 ---- !u!1 &8239499774664461520 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3385652597303373028} - - component: {fileID: 4579686295789554606} - - component: {fileID: 6166807037965765985} - m_Layer: 5 - m_Name: num - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3385652597303373028 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8239499774664461520} - 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: 757002088557345578} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 72, y: -31} - m_SizeDelta: {x: 0, y: 33} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4579686295789554606 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8239499774664461520} - m_CullTransparentMesh: 0 ---- !u!114 &6166807037965765985 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8239499774664461520} - 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.3803922, g: 0.7843138, b: 0.5294118, 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: 30 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 40 - m_Alignment: 3 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: --- !u!1 &8261860062318454447 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleGodSoulLayout.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleGodSoulLayout.prefab index 8abbcd78b9..19d8d28848 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleGodSoulLayout.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleGodSoulLayout.prefab @@ -108,7 +108,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0.00006592118} + m_AnchoredPosition: {x: 0, y: 0.00006233553} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!114 &3981280066466389833 @@ -294,7 +294,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 30 + m_FontSize: 34 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 @@ -304,7 +304,7 @@ MonoBehaviour: m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 1 - m_LineSpacing: 1 + m_LineSpacing: 1.1 m_Text: --- !u!1 &1956657142415125405 GameObject: @@ -444,7 +444,7 @@ MonoBehaviour: m_Top: 22 m_Bottom: 0 m_ChildAlignment: 3 - m_Spacing: 0 + m_Spacing: 10 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 @@ -579,7 +579,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 126.33, y: 0} + m_AnchoredPosition: {x: 146.33, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0.5} --- !u!114 &7791366892849227651 @@ -595,7 +595,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: -11 + m_Left: -22 m_Right: 0 m_Top: 0 m_Bottom: 0 @@ -676,7 +676,7 @@ MonoBehaviour: m_Top: 0 m_Bottom: 0 m_ChildAlignment: 3 - m_Spacing: 0 + m_Spacing: -10.7 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 m_ChildControlWidth: 1 @@ -875,7 +875,7 @@ MonoBehaviour: m_Top: 0 m_Bottom: 11 m_ChildAlignment: 0 - m_Spacing: 13.01 + m_Spacing: 2.7 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 @@ -1288,7 +1288,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 30 + m_FontSize: 34 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 diff --git a/Assets/ManagedResources/Prefabs/UI/starGridView/starGrid.prefab b/Assets/ManagedResources/Prefabs/UI/starGridView/starGrid.prefab index 3a06703976..c3f8532784 100644 --- a/Assets/ManagedResources/Prefabs/UI/starGridView/starGrid.prefab +++ b/Assets/ManagedResources/Prefabs/UI/starGridView/starGrid.prefab @@ -2008,7 +2008,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -0.125, y: 8.200001} + m_AnchoredPosition: {x: -0.125, y: 4} m_SizeDelta: {x: -14.629999, y: -37.219982} m_Pivot: {x: 0.5, y: 0} --- !u!95 &2655531992509407668 @@ -2102,7 +2102,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -0.125, y: 8.200001} + m_AnchoredPosition: {x: -0.125, y: 4} m_SizeDelta: {x: -14.629999, y: -37.219982} m_Pivot: {x: 0.5, y: 0} --- !u!95 &4642416904858124546 @@ -2270,7 +2270,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -0.125, y: 8.200001} + m_AnchoredPosition: {x: -0.125, y: 4} m_SizeDelta: {x: -14.629999, y: -37.219982} m_Pivot: {x: 0.5, y: 0} --- !u!95 &4787264721783863393 @@ -3052,7 +3052,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -0.125, y: 8.200001} + m_AnchoredPosition: {x: -0.125, y: 4} m_SizeDelta: {x: -14.629999, y: -37.219982} m_Pivot: {x: 0.5, y: 0} --- !u!95 &4874594261059891495 @@ -3146,7 +3146,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -0.125, y: 8.200001} + m_AnchoredPosition: {x: -0.125, y: 4} m_SizeDelta: {x: -14.629999, y: -37.219982} m_Pivot: {x: 0.5, y: 0} --- !u!95 &745703553484805016 @@ -3315,7 +3315,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -0.125, y: 8.200001} + m_AnchoredPosition: {x: -0.125, y: 4} m_SizeDelta: {x: -14.629999, y: -37.219982} m_Pivot: {x: 0.5, y: 0} --- !u!95 &5179213922337160743 diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_RoleGodSoulUp.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_RoleGodSoulUp.lua index 8d6cd072b6..dca2230809 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_RoleGodSoulUp.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_RoleGodSoulUp.lua @@ -19,6 +19,7 @@ function GeneralBigPopup_RoleGodSoulUp:InitComponent(gameObject) self.ScrollView.elastic = false self.costItemPre = Util.GetGameObject(gameObject, "costPre") + self.costItem1 = Util.GetGameObject(gameObject, "costItem") self.costGrid = Util.GetGameObject(gameObject, "costItem/costGrid") self.oneKeyBtn = Util.GetGameObject(gameObject, "oneKey") @@ -188,6 +189,7 @@ function GeneralBigPopup_RoleGodSoulUp:SetSingleData(index,go,heroData) self.itemlist[index].mask.gameObject:SetActive(true) elseif self.itemlist[index]._data.state == 0 or self.itemlist[index]._data.state == 664 then self.itemlist[index].using.gameObject:SetActive(true) + self.itemlist[index].mask.gameObject:SetActive(true) end -- 点击事件 @@ -277,6 +279,7 @@ function GeneralBigPopup_RoleGodSoulUp:RefreshCostItemNums() end end end + ForceRebuildLayout(self.costItem1.transform) end --界面关闭时调用(用于子类重写) diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleGodSoulLayout.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleGodSoulLayout.lua index 2b1897d34c..4d7c6bfa37 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleGodSoulLayout.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleGodSoulLayout.lua @@ -178,6 +178,7 @@ function RoleGodSoulLayout:UpdataSingleGod(index) --Util.SetGray(self.gridList[index].des.gameObject,false) self.gridList[index].des.text = string.format("%s",self.godDatas[index].skill) --神魂效果 绿色 未激活时置灰 end + Util.SetGray(self.gridList[index].add,false) else self.gridList[index].costGrid.gameObject:SetActive(false) self.gridList[index].add.gameObject:SetActive(true) @@ -186,6 +187,7 @@ function RoleGodSoulLayout:UpdataSingleGod(index) Util.SetGray(self.gridList[index].godGrid,true) --Util.SetGray(self.gridList[index].des.gameObject,true) self.gridList[index].des.text = string.format("%s",self.godDatas[index].skill) --神魂效果 绿色 未激活时置灰 + Util.SetGray(self.gridList[index].add,true) end Util.AddOnceClick(self.gridList[index].add,function()