From 35e2a37420c0ea4422c27270f1988bec8f8792fb Mon Sep 17 00:00:00 2001 From: puxuan <413323644@qq.com> Date: Thu, 9 Oct 2025 19:56:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E6=98=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/prefabs/ui/hero/cell/attr_cell.prefab | 85 +++++++- Assets/prefabs/ui/hero/hero_attr_ui.prefab | 212 ++----------------- Assets/prefabs/ui/hero/hero_detail_ui.prefab | 199 +++++++++++++---- 3 files changed, 263 insertions(+), 233 deletions(-) diff --git a/Assets/prefabs/ui/hero/cell/attr_cell.prefab b/Assets/prefabs/ui/hero/cell/attr_cell.prefab index 73a462edf..96c0e01ba 100644 --- a/Assets/prefabs/ui/hero/cell/attr_cell.prefab +++ b/Assets/prefabs/ui/hero/cell/attr_cell.prefab @@ -31,7 +31,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1133359658523396010} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -76,7 +76,7 @@ MonoBehaviour: m_fontColor32: serializedVersion: 2 rgba: 4292325816 - m_fontColor: {r: 0.54509807, g: 0.5647059, b: 0.6431373, a: 1} + m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -166,6 +166,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 7250244937303953708} - {fileID: 7187943026840596893} - {fileID: 4295941559619963070} - {fileID: 4711147560345600832} @@ -271,7 +272,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1133359658523396010} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -347,7 +348,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1133359658523396010} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -451,3 +452,79 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &9068774854655338321 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7250244937303953708} + - component: {fileID: 5582177524646151538} + - component: {fileID: 1865637364437937069} + m_Layer: 5 + m_Name: bg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7250244937303953708 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9068774854655338321} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1133359658523396010} + m_RootOrder: 0 + 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: -95, y: 0} + m_SizeDelta: {x: 62, y: 62} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5582177524646151538 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9068774854655338321} + m_CullTransparentMesh: 1 +--- !u!114 &1865637364437937069 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9068774854655338321} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: f417fa19e6a36400a9901925363db788, 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 + m_PixelsPerUnitMultiplier: 1 diff --git a/Assets/prefabs/ui/hero/hero_attr_ui.prefab b/Assets/prefabs/ui/hero/hero_attr_ui.prefab index 3347b1cf7..4b0bf05a6 100644 --- a/Assets/prefabs/ui/hero/hero_attr_ui.prefab +++ b/Assets/prefabs/ui/hero/hero_attr_ui.prefab @@ -32,7 +32,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6560854294601134866} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -90,83 +90,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: IsShowClickAnimation: 1 ---- !u!1 &158761425197280769 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3213498024338362444} - - component: {fileID: 4704157058513645797} - - component: {fileID: 2427547161531391170} - m_Layer: 5 - m_Name: bg - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &3213498024338362444 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 158761425197280769} - 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_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 2353404079280390225} - m_Father: {fileID: 6560854294601134866} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 11} - m_SizeDelta: {x: 622, y: 922} - m_Pivot: {x: 0.5, y: 0} ---- !u!222 &4704157058513645797 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 158761425197280769} - m_CullTransparentMesh: 1 ---- !u!114 &2427547161531391170 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 158761425197280769} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: f90c4f99f71e3154e84b7c859c58a6cb, type: 3} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 --- !u!1 &668102351307417079 GameObject: m_ObjectHideFlags: 0 @@ -291,12 +214,12 @@ RectTransform: m_Children: - {fileID: 2428709531264780355} m_Father: {fileID: 6560854294601134866} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: -110} - m_SizeDelta: {x: 600, y: 486} + m_SizeDelta: {x: 600, y: 478} m_Pivot: {x: 0.5, y: 1} --- !u!222 &369209021869002012 CanvasRenderer: @@ -356,82 +279,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] ---- !u!1 &2014416516005520293 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2353404079280390225} - - component: {fileID: 3464914274314992064} - - component: {fileID: 6247174199664446810} - m_Layer: 5 - m_Name: line_1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2353404079280390225 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2014416516005520293} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 3213498024338362444} - m_RootOrder: 0 - 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} - m_SizeDelta: {x: 0, y: 4} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3464914274314992064 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2014416516005520293} - m_CullTransparentMesh: 1 ---- !u!114 &6247174199664446810 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2014416516005520293} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 14da6211cc49d5a4a8c31d4e949b3135, 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 - m_PixelsPerUnitMultiplier: 1 --- !u!1 &2813078528715884589 GameObject: m_ObjectHideFlags: 0 @@ -466,7 +313,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 600, y: 486} + m_SizeDelta: {x: 600, y: 478} m_Pivot: {x: 0.5, y: 1} --- !u!1 &3934872230722155093 GameObject: @@ -499,7 +346,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6560854294601134866} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -617,6 +464,7 @@ GameObject: - component: {fileID: 1652254950293225014} - component: {fileID: 5438448160771658672} - component: {fileID: 5842376029746574301} + - component: {fileID: 756582409981250350} m_Layer: 5 m_Name: hero_attr_ui m_TagString: Untagged @@ -742,42 +590,23 @@ MonoBehaviour: hashName: 1306728399 objectType: 0 gameObject: {fileID: 29320011016380276} - - name: hero_attr_ui.content.ScrollView.Viewport.Content.total_node.tx_title - hashName: 821959303 - objectType: 0 - gameObject: {fileID: 0} - - name: hero_attr_ui.content.ScrollView.Viewport.Content.base_node.tx_title - hashName: 3698830914 - objectType: 0 - gameObject: {fileID: 0} - - name: hero_attr_ui.content.ScrollView.Viewport.Content.weapon_node.tx_title - hashName: 2528636045 - objectType: 0 - gameObject: {fileID: 0} - - name: hero_attr_ui.content.ScrollView.Viewport.Content.armor_node.tx_title - hashName: 2005404994 - objectType: 0 - gameObject: {fileID: 0} - - name: hero_attr_ui.content.ScrollView.Viewport.Content.total_node.items - hashName: 3271351894 - objectType: 0 - gameObject: {fileID: 0} - - name: hero_attr_ui.content.ScrollView.Viewport.Content.base_node.items - hashName: 1411079291 - objectType: 0 - gameObject: {fileID: 0} - - name: hero_attr_ui.content.ScrollView.Viewport.Content.weapon_node.items - hashName: 3492133392 - objectType: 0 - gameObject: {fileID: 0} - - name: hero_attr_ui.content.ScrollView.Viewport.Content.armor_node.items - hashName: 520052091 - objectType: 0 - gameObject: {fileID: 0} - name: hero_attr_ui.content.ScrollView.Viewport.Content hashName: 2811502951 objectType: 0 gameObject: {fileID: 2813078528715884589} +--- !u!114 &756582409981250350 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5997397792976241942} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1069f9c1eb6f9475b8f98a4cbb9dfe01, type: 3} + m_Name: + m_EditorClassIdentifier: + IsShowClickAnimation: 0 --- !u!1 &7661271426827961334 GameObject: m_ObjectHideFlags: 0 @@ -809,7 +638,6 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 3213498024338362444} - {fileID: 8932807397353062362} - {fileID: 8551063414733668803} - {fileID: 4340615646281749055} @@ -819,7 +647,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 620, y: 626} + m_SizeDelta: {x: 620, y: 618} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3174932370424838063 CanvasRenderer: diff --git a/Assets/prefabs/ui/hero/hero_detail_ui.prefab b/Assets/prefabs/ui/hero/hero_detail_ui.prefab index d8d9d96f7..f70a1a066 100644 --- a/Assets/prefabs/ui/hero/hero_detail_ui.prefab +++ b/Assets/prefabs/ui/hero/hero_detail_ui.prefab @@ -1492,7 +1492,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 570, y: 210} + m_SizeDelta: {x: 648, y: 210} m_Pivot: {x: 0.5, y: 1} --- !u!222 &7519258090488002120 CanvasRenderer: @@ -3104,7 +3104,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: 201, y: 0} + m_AnchoredPosition: {x: 262, y: 0} m_SizeDelta: {x: 156, y: 68} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4292038694092296698 @@ -4361,14 +4361,14 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 5353991576024300098} - m_Father: {fileID: 2584119948269024356} - m_RootOrder: 1 + m_Father: {fileID: 1373839795370585509} + m_RootOrder: 0 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: -83} - m_SizeDelta: {x: 570, y: 250} - m_Pivot: {x: 0.5, y: 1} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 680, y: -16} + m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2540933998899479575 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4460,8 +4460,8 @@ MonoBehaviour: downRecoveryOffset: 20 direction: 0 reverse: 0 - cellWidth: 558 - cellHeight: 56 + cellWidth: 648 + cellHeight: 58 perLineNum: 1 --- !u!1 &3124808965501091694 GameObject: @@ -7301,12 +7301,12 @@ RectTransform: - {fileID: 6173089768754037643} - {fileID: 9142004288640535895} m_Father: {fileID: 2584119948269024356} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 620, y: 142} + m_AnchoredPosition: {x: 0, y: 232} + m_SizeDelta: {x: 720, y: 0} m_Pivot: {x: 0.5, y: 0} --- !u!222 &2001920563042114365 CanvasRenderer: @@ -7611,6 +7611,82 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &4906615176319291532 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1936120527436526664} + - component: {fileID: 7114438416014648800} + - component: {fileID: 5449265912111059766} + m_Layer: 5 + m_Name: lock_img + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1936120527436526664 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4906615176319291532} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 9153801184089195370} + 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: 287, y: 0} + m_SizeDelta: {x: 34, y: 34} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7114438416014648800 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4906615176319291532} + m_CullTransparentMesh: 1 +--- !u!114 &5449265912111059766 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4906615176319291532} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: ee4e0eecba15cbc4081e64039cdfbcda, 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 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &5127045946293745891 GameObject: m_ObjectHideFlags: 0 @@ -8590,8 +8666,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 180, y: 0} - m_SizeDelta: {x: 320, y: 42} + m_AnchoredPosition: {x: 127, y: 0} + m_SizeDelta: {x: 460, y: 42} m_Pivot: {x: 0, y: 0.5} --- !u!222 &5138007133390191036 CanvasRenderer: @@ -8719,15 +8795,16 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 8413688087006599144} m_Father: {fileID: 2584119948269024356} m_RootOrder: 0 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: -83} - m_SizeDelta: {x: 574, y: 268} - m_Pivot: {x: 0.5, y: 1} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 283} + m_SizeDelta: {x: 680, y: 228} + m_Pivot: {x: 0.5, y: 0} --- !u!222 &85684085377220066 CanvasRenderer: m_ObjectHideFlags: 0 @@ -10076,7 +10153,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1373839795370585509} - - {fileID: 8413688087006599144} - {fileID: 6005747285658712684} - {fileID: 1443961818954166758} m_Father: {fileID: 962532721520841126} @@ -10124,8 +10200,8 @@ MonoBehaviour: hashName: 862693408 objectType: 1 gameObject: {fileID: 3114180275064170069} - - name: star_info.scrollrect - hashName: 1720986500 + - name: star_info.bg.scrollrect + hashName: 1741371719 objectType: 0 gameObject: {fileID: 3118903644041758996} - name: star_info.upgrade.desc_tx @@ -10156,8 +10232,8 @@ MonoBehaviour: hashName: 2201954456 objectType: 0 gameObject: {fileID: 5544803703955761766} - - name: star_info.scrollrect.viewport.content.vfx_c1_ui_up_b04 - hashName: 3272087494 + - name: star_info.bg.scrollrect.viewport.content.vfx_c1_ui_up_b04 + hashName: 257291465 objectType: 2 gameObject: {fileID: 8734555075045306187} --- !u!1 &6431225084991062311 @@ -13339,13 +13415,14 @@ RectTransform: m_Children: - {fileID: 7654788480847027872} - {fileID: 3419600639906153843} + - {fileID: 1936120527436526664} m_Father: {fileID: 4199406621349083570} m_RootOrder: 0 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: 0} - m_SizeDelta: {x: 558, y: 48} + m_SizeDelta: {x: 648, y: 48} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6316155069894412477 CanvasRenderer: @@ -13388,6 +13465,10 @@ MonoBehaviour: hashName: 1527363174 objectType: 0 gameObject: {fileID: 5530860429340917537} + - name: cell.lock_img + hashName: 995612091 + objectType: 0 + gameObject: {fileID: 4906615176319291532} --- !u!225 &3992321620825332767 CanvasGroup: m_ObjectHideFlags: 0 @@ -13698,7 +13779,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &6005747285658712684 RectTransform: m_ObjectHideFlags: 0 @@ -13719,7 +13800,7 @@ RectTransform: - {fileID: 7387063147962158237} - {fileID: 2028417585878229817} m_Father: {fileID: 2584119948269024356} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -15103,14 +15184,38 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 9153801184089195370} m_Modifications: + - target: {fileID: 132407509915562124, guid: 7f80b9c276e25406cad6f9580bdc8c8e, type: 3} + propertyPath: m_SizeDelta.x + value: 24 + objectReference: {fileID: 0} + - target: {fileID: 132407509915562124, guid: 7f80b9c276e25406cad6f9580bdc8c8e, type: 3} + propertyPath: m_SizeDelta.y + value: 24 + objectReference: {fileID: 0} - target: {fileID: 541976652809946401, guid: 7f80b9c276e25406cad6f9580bdc8c8e, type: 3} propertyPath: spacing - value: -20 + value: -12 objectReference: {fileID: 0} - target: {fileID: 541976652809946401, guid: 7f80b9c276e25406cad6f9580bdc8c8e, type: 3} propertyPath: childAlignment value: 4 objectReference: {fileID: 0} + - target: {fileID: 1188769973866937479, guid: 7f80b9c276e25406cad6f9580bdc8c8e, type: 3} + propertyPath: m_SizeDelta.x + value: 24 + objectReference: {fileID: 0} + - target: {fileID: 1188769973866937479, guid: 7f80b9c276e25406cad6f9580bdc8c8e, type: 3} + propertyPath: m_SizeDelta.y + value: 24 + objectReference: {fileID: 0} + - target: {fileID: 1221723042693176345, guid: 7f80b9c276e25406cad6f9580bdc8c8e, type: 3} + propertyPath: m_SizeDelta.x + value: 24 + objectReference: {fileID: 0} + - target: {fileID: 1221723042693176345, guid: 7f80b9c276e25406cad6f9580bdc8c8e, type: 3} + propertyPath: m_SizeDelta.y + value: 24 + objectReference: {fileID: 0} - target: {fileID: 3101683837968673166, guid: 7f80b9c276e25406cad6f9580bdc8c8e, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -15125,7 +15230,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3101683837968673166, guid: 7f80b9c276e25406cad6f9580bdc8c8e, type: 3} propertyPath: m_AnchorMax.x - value: 0.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3101683837968673166, guid: 7f80b9c276e25406cad6f9580bdc8c8e, type: 3} propertyPath: m_AnchorMax.y @@ -15133,7 +15238,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3101683837968673166, guid: 7f80b9c276e25406cad6f9580bdc8c8e, type: 3} propertyPath: m_AnchorMin.x - value: 0.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3101683837968673166, guid: 7f80b9c276e25406cad6f9580bdc8c8e, type: 3} propertyPath: m_AnchorMin.y @@ -15141,7 +15246,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3101683837968673166, guid: 7f80b9c276e25406cad6f9580bdc8c8e, type: 3} propertyPath: m_SizeDelta.x - value: 110 + value: 72 objectReference: {fileID: 0} - target: {fileID: 3101683837968673166, guid: 7f80b9c276e25406cad6f9580bdc8c8e, type: 3} propertyPath: m_SizeDelta.y @@ -15177,7 +15282,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3101683837968673166, guid: 7f80b9c276e25406cad6f9580bdc8c8e, type: 3} propertyPath: m_AnchoredPosition.x - value: -231 + value: 50 objectReference: {fileID: 0} - target: {fileID: 3101683837968673166, guid: 7f80b9c276e25406cad6f9580bdc8c8e, type: 3} propertyPath: m_AnchoredPosition.y @@ -15199,6 +15304,22 @@ PrefabInstance: propertyPath: m_Name value: star_cell objectReference: {fileID: 0} + - target: {fileID: 8509724669083950070, guid: 7f80b9c276e25406cad6f9580bdc8c8e, type: 3} + propertyPath: m_SizeDelta.x + value: 24 + objectReference: {fileID: 0} + - target: {fileID: 8509724669083950070, guid: 7f80b9c276e25406cad6f9580bdc8c8e, type: 3} + propertyPath: m_SizeDelta.y + value: 24 + objectReference: {fileID: 0} + - target: {fileID: 9038358656544571744, guid: 7f80b9c276e25406cad6f9580bdc8c8e, type: 3} + propertyPath: m_SizeDelta.x + value: 24 + objectReference: {fileID: 0} + - target: {fileID: 9038358656544571744, guid: 7f80b9c276e25406cad6f9580bdc8c8e, type: 3} + propertyPath: m_SizeDelta.y + value: 24 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7f80b9c276e25406cad6f9580bdc8c8e, type: 3} --- !u!224 &7654788480847027872 stripped @@ -15669,7 +15790,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchoredPosition.x - value: -234 + value: -303 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchoredPosition.y @@ -16768,7 +16889,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchoredPosition.x - value: -151 + value: -220 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchoredPosition.y @@ -16794,6 +16915,10 @@ PrefabInstance: propertyPath: m_Name value: reward_cell_2 objectReference: {fileID: 0} + - target: {fileID: 6717709196054680970, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} --- !u!1 &3114180275064170069 stripped