From 31475f51a78ee65189e205ec338d54aa58a23791 Mon Sep 17 00:00:00 2001 From: sean Date: Sun, 14 Jan 2024 11:59:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E4=BC=9A=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/Guild/Aid/GuildAidMainPopup.prefab | 20 +- .../GuildCarDelayRewardSortPopup.prefab | 1595 ++++++++--------- .../Prefabs/UI/Guild/GuildInfoPopup.prefab | 4 +- .../CarDelay/GuildCarDelayRewardSortPopup.lua | 12 +- 4 files changed, 721 insertions(+), 910 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Guild/Aid/GuildAidMainPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Guild/Aid/GuildAidMainPopup.prefab index 1060c8bff4..eaa4d8a8f1 100644 --- a/Assets/ManagedResources/Prefabs/UI/Guild/Aid/GuildAidMainPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Guild/Aid/GuildAidMainPopup.prefab @@ -2020,7 +2020,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 2c2cc5fac629a17409e60bfbf2c63d55, type: 3} + m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -5253,8 +5253,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: -44.6, y: 42.4} - m_SizeDelta: {x: 74, y: 74} + m_AnchoredPosition: {x: -60.8, y: 41.1} + m_SizeDelta: {x: 41, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6496008606312933063 CanvasRenderer: @@ -5282,7 +5282,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 1c666beff78f70943be2712a7f73f982, type: 3} + m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -5810,8 +5810,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: -39.24, y: 39.8} - m_SizeDelta: {x: 74, y: 74} + m_AnchoredPosition: {x: -56.2, y: 36.9} + m_SizeDelta: {x: 41, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6726070347141899913 CanvasRenderer: @@ -5839,7 +5839,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 1c666beff78f70943be2712a7f73f982, type: 3} + m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -5983,7 +5983,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 2c2cc5fac629a17409e60bfbf2c63d55, type: 3} + m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -6207,7 +6207,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 2c2cc5fac629a17409e60bfbf2c63d55, type: 3} + m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -6529,7 +6529,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 2c2cc5fac629a17409e60bfbf2c63d55, type: 3} + m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/ManagedResources/Prefabs/UI/Guild/CarDelay/GuildCarDelayRewardSortPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Guild/CarDelay/GuildCarDelayRewardSortPopup.prefab index 220c960177..0fb876a156 100644 --- a/Assets/ManagedResources/Prefabs/UI/Guild/CarDelay/GuildCarDelayRewardSortPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Guild/CarDelay/GuildCarDelayRewardSortPopup.prefab @@ -1,84 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &597779911571005168 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3957017510564291852} - - component: {fileID: 4241313006670813248} - - component: {fileID: 2334491062589374789} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3957017510564291852 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 597779911571005168} - 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: 4330446539217703807} - 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: -323, y: 0} - m_SizeDelta: {x: 160, y: 30} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4241313006670813248 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 597779911571005168} - m_CullTransparentMesh: 0 ---- !u!114 &2334491062589374789 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 597779911571005168} - 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.98823535, g: 0.7843138, b: 0.38823533, 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: 40 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 2 - m_MaxSize: 45 - m_Alignment: 3 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: "\u79EF\u5206\uFF1A" --- !u!1 &713138423185374048 GameObject: m_ObjectHideFlags: 0 @@ -113,8 +34,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: 613} - m_SizeDelta: {x: 384.31, y: 64.41} + m_AnchoredPosition: {x: 0, y: 581} + m_SizeDelta: {x: 384.31, y: 53.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8157581679687628173 CanvasRenderer: @@ -142,11 +63,9 @@ MonoBehaviour: 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: 50 + m_FontSize: 45 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 4 @@ -195,8 +114,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -42.060028, y: -34.900085} - m_SizeDelta: {x: 154, y: 120} + m_AnchoredPosition: {x: -39.700012, y: -62.900024} + m_SizeDelta: {x: 79, y: 79} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7759041969420336781 CanvasRenderer: @@ -224,9 +143,7 @@ MonoBehaviour: 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: 87b3cd7ab5ab3854db979a44d7e17767, type: 3} + m_Sprite: {fileID: 21300000, guid: 79c6b97568d6fcd49a92af19d2f34f53, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -275,8 +192,6 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null --- !u!95 &7181603499066122128 Animator: serializedVersion: 3 @@ -354,16 +269,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.70980394, g: 0.6156863, b: 0.46666667, a: 1} + m_Color: {r: 0.98823535, g: 0.61960787, b: 0.227451, a: 1} m_RaycastTarget: 0 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: 40 + m_FontSize: 32 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 @@ -401,16 +314,16 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 819313419133942708} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0.00000762776} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 3421734083179396992} + m_Father: {fileID: 2892707779512085620} 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} - m_AnchoredPosition: {x: 4, y: -8.3} - m_SizeDelta: {x: 97.45, y: 101.19} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4554643269411169893 CanvasRenderer: @@ -438,8 +351,6 @@ MonoBehaviour: 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: f5ba695b044676047802f7b7fa302002, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -449,7 +360,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &866466102880954432 +--- !u!1 &828026359866353327 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -457,124 +368,50 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 2784002409931584012} - - component: {fileID: 4066135350327834001} - - component: {fileID: 8327691396579384354} + - component: {fileID: 552315858538093615} + - component: {fileID: 7159348506204315245} + - component: {fileID: 472049573455001714} m_Layer: 5 - m_Name: SortNum (2) + m_Name: bg m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &2784002409931584012 +--- !u!224 &552315858538093615 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 866466102880954432} + m_GameObject: {fileID: 828026359866353327} 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: 2892707779512085620} - m_RootOrder: 1 + m_Father: {fileID: 8510080390074448186} + 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: 4, y: -8.3} - m_SizeDelta: {x: 97.45, y: 101.19} + m_AnchoredPosition: {x: 1, y: -84} + m_SizeDelta: {x: 816.2, y: 1064} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4066135350327834001 +--- !u!222 &7159348506204315245 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 866466102880954432} + m_GameObject: {fileID: 828026359866353327} m_CullTransparentMesh: 0 ---- !u!114 &8327691396579384354 +--- !u!114 &472049573455001714 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 866466102880954432} - 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: 0 - 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: f5ba695b044676047802f7b7fa302002, 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 &1007630804097281313 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8509839612572997999} - - component: {fileID: 3551557813532001454} - - component: {fileID: 883248311487606830} - m_Layer: 5 - m_Name: line - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8509839612572997999 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1007630804097281313} - m_LocalRotation: {x: 0, y: 0, z: -0.7071068, w: 0.7071068} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 2534620332057026838} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: -90} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -247, y: 0} - m_SizeDelta: {x: 80, y: 2} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3551557813532001454 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1007630804097281313} - m_CullTransparentMesh: 0 ---- !u!114 &883248311487606830 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1007630804097281313} + m_GameObject: {fileID: 828026359866353327} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} @@ -586,10 +423,8 @@ MonoBehaviour: 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: 21e18b4111348a64684763f0a33d142c, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: b507c102d640e174494ce23d83f47346, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -597,102 +432,6 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &1012198133190306053 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4482439698407371842} - - component: {fileID: 8082520961542236668} - - component: {fileID: 183385837914082710} - - component: {fileID: 9106927736003558686} - m_Layer: 0 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4482439698407371842 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1012198133190306053} - 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: 328320145731755697} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -10.375, y: -3.2000008} - m_SizeDelta: {x: -20.75, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8082520961542236668 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1012198133190306053} - m_CullTransparentMesh: 0 ---- !u!114 &183385837914082710 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1012198133190306053} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1573420865, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} - m_EffectDistance: {x: 1.5, y: -1.5} - m_UseGraphicAlpha: 1 ---- !u!114 &9106927736003558686 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1012198133190306053} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.9529412, g: 0.92156863, b: 0.7921569, a: 1} - m_RaycastTarget: 0 - 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: 45 - m_FontStyle: 0 - m_BestFit: 1 - m_MinSize: 30 - m_MaxSize: 45 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 0.8 - m_Text: "\u516C\u4F1A\u6392\u884C" - LanguageIndex: 0 --- !u!1 &1436366256487002379 GameObject: m_ObjectHideFlags: 0 @@ -721,16 +460,16 @@ RectTransform: m_LocalScale: {x: 1.0002142, y: 1.0002142, z: 1.0002142} m_Children: - {fileID: 1471586951478334148} - - {fileID: 3421734083179396992} + - {fileID: 2892707779512085620} - {fileID: 1900260735345205632} - - {fileID: 3957017510564291852} + - {fileID: 3890559093366616860} m_Father: {fileID: 9063173392937239258} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: -1151, y: -560.3} - m_SizeDelta: {x: 905, y: 137.6} + m_AnchoredPosition: {x: -1026, y: -654.6809} + m_SizeDelta: {x: 805.97, y: 140.284} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1666056707232141115 GameObject: @@ -761,19 +500,19 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 4548915655133106187} + - {fileID: 552315858538093615} - {fileID: 8511479457220664425} - {fileID: 7140819330323924856} + - {fileID: 2534620332057026838} - {fileID: 8200914219267369976} - {fileID: 2707718736303546503} - - {fileID: 2534620332057026838} m_Father: {fileID: 9063173392937239258} 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} - m_AnchoredPosition: {x: 0, y: -20.000008} - m_SizeDelta: {x: 934.2, y: 1358.4} + m_AnchoredPosition: {x: 8.63, y: 1} + m_SizeDelta: {x: 889.7, y: 1311.4} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &576436720797261142 CanvasRenderer: @@ -801,9 +540,7 @@ MonoBehaviour: 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: 2ac0991f398537e409ada574046b899c, type: 3} + m_Sprite: {fileID: 21300000, guid: 332b02244475f964ebe0df429c1eee8d, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -812,7 +549,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &2023465797228292676 +--- !u!1 &2098576663998627296 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -820,57 +557,71 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 5278002558142939069} - - component: {fileID: 7253399535423557587} - m_Layer: 0 - m_Name: Demons + - component: {fileID: 1533410985949600310} + - component: {fileID: 5775601126580719372} + - component: {fileID: 664882918858521164} + m_Layer: 5 + m_Name: SortNum (4) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &5278002558142939069 +--- !u!224 &1533410985949600310 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2023465797228292676} + m_GameObject: {fileID: 2098576663998627296} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.9997858, y: 0.9997858, z: 0.9997858} - m_Children: [] - m_Father: {fileID: 4581106361157655321} - m_RootOrder: 2 + m_LocalScale: {x: 0.8000001, y: 0.8000001, z: 1} + m_Children: + - {fileID: 534382509781058878} + m_Father: {fileID: 1201951550055243856} + 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} - m_AnchoredPosition: {x: 519, y: -12} - m_SizeDelta: {x: 710, y: 110} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 3.5, y: -9.3} + m_SizeDelta: {x: 183.11, y: 98.39} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &7253399535423557587 +--- !u!222 &5775601126580719372 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2098576663998627296} + m_CullTransparentMesh: 0 +--- !u!114 &664882918858521164 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2023465797228292676} + m_GameObject: {fileID: 2098576663998627296} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: - m_Padding: - m_Left: 5 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_ChildAlignment: 5 - m_Spacing: 5 - m_ChildForceExpandWidth: 0 - m_ChildForceExpandHeight: 0 - m_ChildControlWidth: 0 - m_ChildControlHeight: 0 + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 3c01a305eb51c04478b39d3060aceefe, 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 --- !u!1 &2146911012947840282 GameObject: m_ObjectHideFlags: 0 @@ -897,17 +648,17 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2146911012947840282} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0.00000762776} m_LocalScale: {x: 0.8, y: 0.8, z: 1} m_Children: - {fileID: 2823645416102260763} - m_Father: {fileID: 3421734083179396992} + m_Father: {fileID: 2892707779512085620} 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: 19.3, y: -7.49} - m_SizeDelta: {x: 243.95, y: 98.39} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6724241889980158322 CanvasRenderer: @@ -935,8 +686,6 @@ MonoBehaviour: 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: 3c01a305eb51c04478b39d3060aceefe, type: 3} m_Type: 1 m_PreserveAspect: 0 @@ -972,16 +721,16 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2248089052546141763} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0.00000762776} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 3421734083179396992} + m_Father: {fileID: 2892707779512085620} 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: 4, y: -7.3} - m_SizeDelta: {x: 89.94, y: 93.4} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &456820497321300024 CanvasRenderer: @@ -1009,8 +758,6 @@ MonoBehaviour: 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: c3dd9610bb7d50b47bc158a0e12c6839, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -1083,8 +830,6 @@ MonoBehaviour: 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: 0} m_Type: 0 m_PreserveAspect: 0 @@ -1094,7 +839,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &2708179243167756740 +--- !u!1 &2638561398646875744 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1102,73 +847,57 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 3300298353524561426} - - component: {fileID: 7542905304022172456} - - component: {fileID: 3580614088073361000} - m_Layer: 5 - m_Name: SortNum (4) + - component: {fileID: 8193734011963585433} + - component: {fileID: 6639298184624587767} + m_Layer: 0 + m_Name: Demons m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &3300298353524561426 +--- !u!224 &8193734011963585433 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2708179243167756740} + m_GameObject: {fileID: 2638561398646875744} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.8000001, y: 0.8000001, z: 1} - m_Children: - - {fileID: 4602754653450979610} - m_Father: {fileID: 2892707779512085620} - m_RootOrder: 3 + m_LocalScale: {x: 0.9997858, y: 0.9997858, z: 0.9997858} + m_Children: [] + m_Father: {fileID: 4581106361157655321} + 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: 3.5, y: -9.3} - m_SizeDelta: {x: 183.11, y: 98.39} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 539.1, y: -10} + m_SizeDelta: {x: 470.6, y: 135.8} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7542905304022172456 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2708179243167756740} - m_CullTransparentMesh: 0 ---- !u!114 &3580614088073361000 +--- !u!114 &6639298184624587767 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2708179243167756740} + m_GameObject: {fileID: 2638561398646875744} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - 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: 3c01a305eb51c04478b39d3060aceefe, 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_Padding: + m_Left: 5 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 5 + m_Spacing: 5 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 --- !u!1 &3205216122775585289 GameObject: m_ObjectHideFlags: 0 @@ -1201,8 +930,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: -2.1, y: 13.881} - m_SizeDelta: {x: 903, y: 908.16} + m_AnchoredPosition: {x: 8.8485, y: -43.369} + m_SizeDelta: {x: 819.3, y: 837.66} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3722286397775207687 GameObject: @@ -1238,7 +967,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: -0.000012159, y: 0.61001} + m_AnchoredPosition: {x: -0.0000076293945, y: 0} m_SizeDelta: {x: 109.24, y: 55.8} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9000997439560502532 @@ -1267,8 +996,6 @@ MonoBehaviour: 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: 7481f1ebd61b03a49ba7fa41d24d8db1, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -1278,7 +1005,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &3744597273517501067 +--- !u!1 &3786551621693252708 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1286,42 +1013,148 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4548915655133106187} - - component: {fileID: 6616310670002377289} + - component: {fileID: 2172992894218796584} + - component: {fileID: 65045432633702837} + - component: {fileID: 5411956499602116614} m_Layer: 5 - m_Name: bg + m_Name: SortNum (2) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &4548915655133106187 +--- !u!224 &2172992894218796584 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3744597273517501067} + m_GameObject: {fileID: 3786551621693252708} 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: 8510080390074448186} - m_RootOrder: 0 + m_Father: {fileID: 1201951550055243856} + 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} - m_AnchoredPosition: {x: 0.0005472605, y: 0.005553484} - m_SizeDelta: {x: 934.2, y: 1358.4} + m_AnchoredPosition: {x: 4, y: -8.3} + m_SizeDelta: {x: 97.45, y: 101.19} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6616310670002377289 +--- !u!222 &65045432633702837 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3744597273517501067} + m_GameObject: {fileID: 3786551621693252708} m_CullTransparentMesh: 0 +--- !u!114 &5411956499602116614 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3786551621693252708} + 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: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: f5ba695b044676047802f7b7fa302002, 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 &3929049971861054753 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 485849857865054310} + - component: {fileID: 5233225694880327128} + - component: {fileID: 5109483797325459770} + m_Layer: 0 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &485849857865054310 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3929049971861054753} + 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: 328320145731755697} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5233225694880327128 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3929049971861054753} + m_CullTransparentMesh: 0 +--- !u!114 &5109483797325459770 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3929049971861054753} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 0.95686275, b: 0.8509804, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 40 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 4 + m_MaxSize: 45 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 0.8 + m_Text: "\u516C\u4F1A\u6392\u884C" + LanguageIndex: 0 --- !u!1 &3957489386881022617 GameObject: m_ObjectHideFlags: 0 @@ -1349,7 +1182,6 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 8563776069506225635} - {fileID: 328320145731755697} - {fileID: 2646985033757112727} m_Father: {fileID: 9063173392937239258} @@ -1357,8 +1189,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.3251953, y: -612.7002} - m_SizeDelta: {x: 918.85, y: 99.400024} + m_AnchoredPosition: {x: 8.85, y: 501.3} + m_SizeDelta: {x: 819.27, y: 66.87} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4069987680728025593 GameObject: @@ -1390,12 +1222,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8510080390074448186} - m_RootOrder: 4 + m_RootOrder: 5 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: 84.126, y: 528.7399} - m_SizeDelta: {x: 742.35, y: 70.5} + m_AnchoredPosition: {x: 144.41003, y: 416.18} + m_SizeDelta: {x: 520.42, y: 55.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5842510417692443359 CanvasRenderer: @@ -1418,102 +1250,26 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.9411765, b: 0.80784315, a: 1} + m_Color: {r: 0.53333336, g: 0.34901962, b: 0.13333334, a: 1} m_RaycastTarget: 0 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: 40 + m_FontSize: 32 m_FontStyle: 0 - m_BestFit: 1 - m_MinSize: 26 + m_BestFit: 0 + m_MinSize: 0 m_MaxSize: 40 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u5956\u52B1\u9053\u5177" LanguageIndex: 0 ---- !u!1 &4432600192430987596 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8563776069506225635} - - component: {fileID: 7712301235360589149} - - component: {fileID: 822354344662283004} - m_Layer: 0 - m_Name: BG - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8563776069506225635 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4432600192430987596} - 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: 2783261872438275965} - 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: 455.75, y: 45.33} - m_SizeDelta: {x: 911.49, y: 142.11} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7712301235360589149 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4432600192430987596} - m_CullTransparentMesh: 0 ---- !u!114 &822354344662283004 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4432600192430987596} - 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: 0 - 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: 2609ccd74e672d84c8e128abd8dc9428, 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 &4504884171745002738 GameObject: m_ObjectHideFlags: 0 @@ -1544,12 +1300,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8510080390074448186} - m_RootOrder: 3 + m_RootOrder: 4 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: 95.225006, y: 528.75006} - m_SizeDelta: {x: 169.6, y: 70.52} + m_AnchoredPosition: {x: 167.91, y: 416.18005} + m_SizeDelta: {x: 150.18, y: 55.64} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2521297214468645196 CanvasRenderer: @@ -1572,25 +1328,23 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.9411765, b: 0.80784315, a: 1} + m_Color: {r: 0.53333336, g: 0.34901962, b: 0.13333334, a: 1} m_RaycastTarget: 0 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: 40 + m_FontSize: 32 m_FontStyle: 0 - m_BestFit: 1 - m_MinSize: 26 + m_BestFit: 0 + m_MinSize: 3 m_MaxSize: 40 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u79EF \u5206" LanguageIndex: 0 @@ -1611,7 +1365,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &328320145731755697 RectTransform: m_ObjectHideFlags: 0 @@ -1624,16 +1378,16 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 2635379851760332758} - - {fileID: 4482439698407371842} + - {fileID: 485849857865054310} - {fileID: 422909641573130052} - {fileID: 8409719217564714197} m_Father: {fileID: 2783261872438275965} - m_RootOrder: 1 + 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: -99.7, y: 49.7} - m_SizeDelta: {x: 233.6, y: 83.9} + m_SizeDelta: {x: 217, y: 64} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &351967293252870049 CanvasRenderer: @@ -1683,8 +1437,6 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null --- !u!1 &4921866405002771924 GameObject: m_ObjectHideFlags: 0 @@ -1717,10 +1469,10 @@ RectTransform: m_Father: {fileID: 328320145731755697} 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: -8.04, y: -7.04} - m_SizeDelta: {x: 253.89, y: 106.6} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &277075912272736864 CanvasRenderer: @@ -1748,10 +1500,8 @@ MonoBehaviour: 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: 3c2c09241e35b084583053797b5c3146, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: e25cd75d7b34cb14eac0c8bb3fca0a08, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1791,11 +1541,11 @@ RectTransform: m_Father: {fileID: 328320145731755697} 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: 57.8, y: 43.4} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 26, y: 26} - m_Pivot: {x: 0.5, y: 0.5} + m_Pivot: {x: 1, y: 1} --- !u!222 &5544266867709972363 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1822,8 +1572,6 @@ MonoBehaviour: 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: f9ea4c4aff328ff4abcc21aae0a4fa10, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -1861,133 +1609,6 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 9112203174732935064} - - {fileID: 2784002409931584012} - - {fileID: 7405864734576951600} - - {fileID: 3300298353524561426} - m_Father: {fileID: 4581106361157655321} - 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} - m_AnchoredPosition: {x: -360, y: 4.0000343} - m_SizeDelta: {x: 96, y: 97.99999} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &9176331609199820043 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5211102939773422732} - m_CullTransparentMesh: 0 ---- !u!1 &5455909888419589374 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4602754653450979610} - - component: {fileID: 8842667302362044731} - - component: {fileID: 2106011509556995307} - m_Layer: 5 - m_Name: TitleText - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4602754653450979610 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5455909888419589374} - 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: 3300298353524561426} - 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.3} - m_SizeDelta: {x: 242.11, y: 39.5} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8842667302362044731 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5455909888419589374} - m_CullTransparentMesh: 0 ---- !u!114 &2106011509556995307 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5455909888419589374} - 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.70980394, g: 0.6156863, b: 0.46666667, a: 1} - m_RaycastTarget: 0 - 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: 50 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 0 - m_MaxSize: 50 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: 333 ---- !u!1 &5695094067204120440 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3421734083179396992} - - component: {fileID: 8647025188033638143} - m_Layer: 5 - m_Name: SortNum - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &3421734083179396992 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5695094067204120440} - 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: 223465232759142795} - {fileID: 2448344199093756408} - {fileID: 4168769492157187165} @@ -1997,17 +1618,161 @@ 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: -360, y: 4.0000343} - m_SizeDelta: {x: 96, y: 97.99999} + m_AnchoredPosition: {x: -360, y: 0} + m_SizeDelta: {x: 51.92, y: 53} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8647025188033638143 +--- !u!222 &9176331609199820043 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5695094067204120440} + m_GameObject: {fileID: 5211102939773422732} m_CullTransparentMesh: 0 +--- !u!1 &5435632257286199778 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 102899905682928541} + - component: {fileID: 1165025803681827541} + - component: {fileID: 3759409127325667741} + m_Layer: 5 + m_Name: BG + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &102899905682928541 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5435632257286199778} + 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: 4581106361157655321} + 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, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1165025803681827541 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5435632257286199778} + m_CullTransparentMesh: 0 +--- !u!114 &3759409127325667741 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5435632257286199778} + 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: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: f30bf38c24a00694dba03295d1981811, 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 &5436774030699843394 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5116030307617924028} + - component: {fileID: 5754593183329063508} + - component: {fileID: 578696252711624867} + m_Layer: 5 + m_Name: SortNum (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5116030307617924028 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5436774030699843394} + 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: 1201951550055243856} + 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: 4, y: -7.3} + m_SizeDelta: {x: 89.94, y: 93.4} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5754593183329063508 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5436774030699843394} + m_CullTransparentMesh: 0 +--- !u!114 &578696252711624867 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5436774030699843394} + 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: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: c3dd9610bb7d50b47bc158a0e12c6839, 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 &5725269508344286229 GameObject: m_ObjectHideFlags: 0 @@ -2034,16 +1799,16 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5725269508344286229} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0.00000762776} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 3421734083179396992} + m_Father: {fileID: 2892707779512085620} 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: 4, y: -8.299999} - m_SizeDelta: {x: 97.44, y: 101.19} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &129523870043059003 CanvasRenderer: @@ -2071,8 +1836,6 @@ MonoBehaviour: 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: 0e991e88b403b29409e591653827134c, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -2110,15 +1873,14 @@ RectTransform: 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: 8509839612572997999} + m_Children: [] m_Father: {fileID: 8510080390074448186} - m_RootOrder: 5 + 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.7, y: 534} - m_SizeDelta: {x: 912, y: 80} + m_AnchoredPosition: {x: 1.07, y: 416.18} + m_SizeDelta: {x: 807.11, y: 55.64} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6115955283218971565 CanvasRenderer: @@ -2141,14 +1903,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.627451} + 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: 5eb7fbeffdba3c448a555d0a7da444cf, type: 3} + m_Sprite: {fileID: 21300000, guid: 30d10fcfe7c8c504ab1f0c49ceef56b4, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2157,7 +1917,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &6729904564947447409 +--- !u!1 &6778375260844673504 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2165,72 +1925,75 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 7405864734576951600} - - component: {fileID: 1049500819467126032} - - component: {fileID: 1259227088934195513} + - component: {fileID: 969624218400341816} + - component: {fileID: 7228497895029941536} + - component: {fileID: 5736198753567987169} m_Layer: 5 - m_Name: SortNum (3) + m_Name: Text m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &7405864734576951600 +--- !u!224 &969624218400341816 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6729904564947447409} + m_GameObject: {fileID: 6778375260844673504} 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_LocalScale: {x: 1.0002142, y: 1.0002142, z: 1.0002142} m_Children: [] - m_Father: {fileID: 2892707779512085620} - m_RootOrder: 2 + m_Father: {fileID: 4581106361157655321} + 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: 4, y: -8.299999} - m_SizeDelta: {x: 97.44, y: 101.19} + m_AnchoredPosition: {x: -245, y: 0} + m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1049500819467126032 +--- !u!222 &7228497895029941536 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6729904564947447409} + m_GameObject: {fileID: 6778375260844673504} m_CullTransparentMesh: 0 ---- !u!114 &1259227088934195513 +--- !u!114 &5736198753567987169 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6729904564947447409} + m_GameObject: {fileID: 6778375260844673504} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 + m_Color: {r: 0.53333336, g: 0.34901962, b: 0.13333334, 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: 0e991e88b403b29409e591653827134c, 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_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 32 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 45 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u79EF\u5206\uFF1A" --- !u!1 &6861029645965516395 GameObject: m_ObjectHideFlags: 0 @@ -2265,8 +2028,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 6.75, y: 0} - m_SizeDelta: {x: -75.5, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &698934682144137850 CanvasRenderer: @@ -2294,10 +2057,8 @@ MonoBehaviour: 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: f30bf38c24a00694dba03295d1981811, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 5eb7fbeffdba3c448a555d0a7da444cf, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -2338,8 +2099,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: 519, y: -12} - m_SizeDelta: {x: 710, y: 110} + m_AnchoredPosition: {x: 554.3, y: -10} + m_SizeDelta: {x: 446.9, y: 131.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &3992039072822709648 MonoBehaviour: @@ -2373,7 +2134,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2646985033757112727} - - component: {fileID: 1621670168159900398} + - component: {fileID: 92199164626998344} m_Layer: 0 m_Name: box m_TagString: Untagged @@ -2393,14 +2154,14 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2783261872438275965} - m_RootOrder: 2 + m_RootOrder: 1 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: 3.674988, y: 50} - m_SizeDelta: {x: 911.5, y: 83.95} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1621670168159900398 +--- !u!114 &92199164626998344 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2409,7 +2170,7 @@ MonoBehaviour: m_GameObject: {fileID: 7285344974114212824} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: -2095666955, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: m_Padding: @@ -2417,12 +2178,85 @@ MonoBehaviour: m_Right: 0 m_Top: 0 m_Bottom: 0 - m_ChildAlignment: 4 - m_Spacing: -22.18 - m_ChildForceExpandWidth: 0 - m_ChildForceExpandHeight: 0 - m_ChildControlWidth: 0 - m_ChildControlHeight: 0 + m_ChildAlignment: 0 + m_StartCorner: 0 + m_StartAxis: 0 + m_CellSize: {x: 217, y: 64} + m_Spacing: {x: 10, y: 0} + m_Constraint: 0 + m_ConstraintCount: 2 +--- !u!1 &7345276969693389397 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6794854641811787028} + - component: {fileID: 3898522540666489140} + - component: {fileID: 3022877055989488925} + m_Layer: 5 + m_Name: SortNum (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6794854641811787028 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7345276969693389397} + 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: 1201951550055243856} + 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: 4, y: -8.299999} + m_SizeDelta: {x: 97.44, y: 101.19} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3898522540666489140 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7345276969693389397} + m_CullTransparentMesh: 0 +--- !u!114 &3022877055989488925 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7345276969693389397} + 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: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 0e991e88b403b29409e591653827134c, 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 &7393616006992037316 GameObject: m_ObjectHideFlags: 0 @@ -2448,16 +2282,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7393616006992037316} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.0002142, y: 1.0002142, z: 1.0002142} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 4581106361157655321} + m_Father: {fileID: 4330446539217703807} 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: -323, y: 0} + m_AnchoredPosition: {x: -237.3, y: 0} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6690676133735524612 @@ -2481,16 +2315,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.98823535, g: 0.7843138, b: 0.38823533, a: 1} + m_Color: {r: 0.53333336, g: 0.34901962, b: 0.13333334, 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: 40 + m_FontSize: 32 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 @@ -2502,6 +2334,131 @@ MonoBehaviour: m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u79EF\u5206\uFF1A" +--- !u!1 &8132173217946534056 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1201951550055243856} + - component: {fileID: 5175240762519810351} + m_Layer: 5 + m_Name: SortNum + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1201951550055243856 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8132173217946534056} + 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: 5116030307617924028} + - {fileID: 2172992894218796584} + - {fileID: 6794854641811787028} + - {fileID: 1533410985949600310} + m_Father: {fileID: 4581106361157655321} + 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} + m_AnchoredPosition: {x: -360, y: 4.0000343} + m_SizeDelta: {x: 96, y: 97.99999} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5175240762519810351 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8132173217946534056} + m_CullTransparentMesh: 0 +--- !u!1 &8303951429565685978 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 534382509781058878} + - component: {fileID: 4773166861457429791} + - component: {fileID: 2715891269758953679} + m_Layer: 5 + m_Name: TitleText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &534382509781058878 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8303951429565685978} + 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: 1533410985949600310} + 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.3} + m_SizeDelta: {x: 242.11, y: 39.5} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4773166861457429791 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8303951429565685978} + m_CullTransparentMesh: 0 +--- !u!114 &2715891269758953679 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8303951429565685978} + 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.70980394, g: 0.6156863, b: 0.46666667, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 50 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 50 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: 333 --- !u!1 &8348350367174962818 GameObject: m_ObjectHideFlags: 0 @@ -2529,166 +2486,18 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 100} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 4172396061084663737} - - {fileID: 2892707779512085620} - - {fileID: 5278002558142939069} - - {fileID: 3890559093366616860} + - {fileID: 102899905682928541} + - {fileID: 1201951550055243856} + - {fileID: 8193734011963585433} + - {fileID: 969624218400341816} m_Father: {fileID: 9063173392937239258} m_RootOrder: 4 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: -3.079956, y: -509} - m_SizeDelta: {x: 905, y: 137.59998} + m_AnchoredPosition: {x: 9.8875, y: -555} + m_SizeDelta: {x: 821.35, y: 137.6} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &8351354081270601158 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4172396061084663737} - - component: {fileID: 2927839195915929329} - - component: {fileID: 911658253175086521} - m_Layer: 5 - m_Name: BG - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4172396061084663737 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8351354081270601158} - 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: 4581106361157655321} - 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, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2927839195915929329 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8351354081270601158} - m_CullTransparentMesh: 0 ---- !u!114 &911658253175086521 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8351354081270601158} - 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: 0 - 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: f30bf38c24a00694dba03295d1981811, 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 &8356864359656883046 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 9112203174732935064} - - component: {fileID: 8599248511673884272} - - component: {fileID: 3498513902515235975} - m_Layer: 5 - m_Name: SortNum (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &9112203174732935064 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8356864359656883046} - 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: 2892707779512085620} - 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: 4, y: -7.3} - m_SizeDelta: {x: 89.94, y: 93.4} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8599248511673884272 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8356864359656883046} - m_CullTransparentMesh: 0 ---- !u!114 &3498513902515235975 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8356864359656883046} - 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: 0 - 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: c3dd9610bb7d50b47bc158a0e12c6839, 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 &9142142092972167968 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/Guild/GuildInfoPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Guild/GuildInfoPopup.prefab index a193560523..efa934157c 100644 --- a/Assets/ManagedResources/Prefabs/UI/Guild/GuildInfoPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Guild/GuildInfoPopup.prefab @@ -948,7 +948,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: 249.34, y: -0.8} + m_AnchoredPosition: {x: 250, y: -0.8} m_SizeDelta: {x: 74.65, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1573254629 @@ -3070,7 +3070,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: 286.89, y: -0.8} + m_AnchoredPosition: {x: 250, y: -0.8} m_SizeDelta: {x: 149.75, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2162111280470490533 diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayRewardSortPopup.lua b/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayRewardSortPopup.lua index 083c04a129..42694fc673 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayRewardSortPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayRewardSortPopup.lua @@ -2,11 +2,13 @@ GuildCarDelayRewardSortPopup = Inherit(BasePanel) local this = GuildCarDelayRewardSortPopup local TabBox = require("Modules/Common/TabBox") -local _TabData={ [1] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = Language[11006] }, - [2] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = Language[11007] } +local _TabData={ [1] = { default = "r_hero_xuanze_009", select = "r_hero_xuanze_008", name = Language[11006] }, + [2] = { default = "r_hero_xuanze_009", select = "r_hero_xuanze_008", name = Language[11007] } } -local _TabFontColor = { default = Color.New(130 / 255, 128 / 255, 120 / 255, 1), - select = Color.New(243 / 255, 235 / 255, 202 / 255, 1)} + +local _TabFontColor = TabColor() + + local curIndex = 1 local rewardList = {} local itemList = {} @@ -20,7 +22,7 @@ function GuildCarDelayRewardSortPopup:InitComponent() this.rewardPre = Util.GetGameObject(self.gameObject, "ItemPre") local v2 = Util.GetGameObject(self.gameObject, "scroll"):GetComponent("RectTransform").rect this.ScrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, Util.GetGameObject(self.gameObject, "scroll").transform, - this.rewardPre, nil, Vector2.New(-v2.x*2, -v2.y*2), 1, 1, Vector2.New(50,-8 )) + this.rewardPre, nil, Vector2.New(-v2.x*2, -v2.y*2), 1, 1, Vector2.New(50,10)) this.ScrollView.moveTween.MomentumAmount = 1 this.ScrollView.moveTween.Strength = 1 this.BackBtn = Util.GetGameObject(self.gameObject, "bg/btnBack")