From ba7a5fbb18644766cf5195d90ce5c91497bfcfb0 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Thu, 4 Mar 2021 19:04:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E5=8C=96=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Chat/ChatPanel.prefab | 10 +- .../Prefabs/UI/DynamicActicity/page4.prefab | 12 +- .../Prefabs/UI/Main/MainRechargePanel.prefab | 360 +++---- .../UI/Pokemon/PokemonMainPanel.prefab | 969 +++++++++++------- .../Prefabs/UI/Resolve/ResolvePanel.prefab | 6 +- .../Prefabs/UI/RoleInfo/RoleInfoPanel.prefab | 36 +- .../~Lua/Framework/Manager/UIManager.lua | 4 +- .../~Lua/Modules/Chat/ChatManager.lua | 6 +- .../Modules/Popup/DropGetSSRHeroShopPanel.lua | 4 +- 9 files changed, 831 insertions(+), 576 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Chat/ChatPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Chat/ChatPanel.prefab index 6de55791f8..fd78810eb4 100644 --- a/Assets/ManagedResources/Prefabs/UI/Chat/ChatPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Chat/ChatPanel.prefab @@ -2554,7 +2554,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &224829210538350360 RectTransform: m_ObjectHideFlags: 0 @@ -4914,8 +4914,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: 3.7, y: 2.1} - m_SizeDelta: {x: 160, y: 100} + m_AnchoredPosition: {x: 0.000044405, y: 3.75} + m_SizeDelta: {x: 150, y: 92.51} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1632204577602264684 CanvasRenderer: @@ -4964,8 +4964,8 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 52 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 2 + m_BestFit: 1 + m_MinSize: 30 m_MaxSize: 52 m_Alignment: 4 m_AlignByGeometry: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page4.prefab b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page4.prefab index eed1faa950..786f7ff697 100644 --- a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page4.prefab +++ b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page4.prefab @@ -1814,7 +1814,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: ba6ed8a4d9b6f524cb6c4e211a923855, type: 3} + m_Sprite: {fileID: 21300000, guid: 1db8e275983ce714ca79e8c463e82bec, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -4173,7 +4173,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &8661499499538550451 RectTransform: m_ObjectHideFlags: 0 @@ -6418,9 +6418,9 @@ RectTransform: m_Father: {fileID: 8305649059906842239} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 92, y: -90.95} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 184, y: 188} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3042156634390851169 @@ -7807,7 +7807,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 184, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0.5} --- !u!114 &8720036019275723153 MonoBehaviour: diff --git a/Assets/ManagedResources/Prefabs/UI/Main/MainRechargePanel.prefab b/Assets/ManagedResources/Prefabs/UI/Main/MainRechargePanel.prefab index f52eed4e63..e3053c004e 100644 --- a/Assets/ManagedResources/Prefabs/UI/Main/MainRechargePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Main/MainRechargePanel.prefab @@ -4665,7 +4665,7 @@ MonoBehaviour: m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 1 - m_LineSpacing: 1.3 + m_LineSpacing: 1 m_Text: "\u5FC5\u8D2D\u793C\u5305\uFF0C\u8D85\u503C\u4F18\u60E0\uFF0C\u6BCF" LanguageIndex: 0 --- !u!1 &1505358539907469629 @@ -8014,7 +8014,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0.000001379375, y: 0} + m_AnchoredPosition: {x: 0.000027624856, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0.5} --- !u!114 &6954504526559241720 @@ -11574,7 +11574,7 @@ MonoBehaviour: m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 1 - m_LineSpacing: 1.3 + m_LineSpacing: 1 m_Text: "\u7D2F\u8BA1\u8D44\u6E90\u5FC5\u5907\u7279\u6743\uFF0C\u6BCF\u5929" LanguageIndex: 0 --- !u!1 &5744721822292471445 @@ -14192,7 +14192,7 @@ MonoBehaviour: m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 1 - m_LineSpacing: 1.3 + m_LineSpacing: 1 m_Text: "\u9AD8\u7EA7\u793C\u5305\u5185\u542B\u9AD8\u7EA7\u5BFB\u5B9D\u7279\u6743\uFF0C\u6BCF\u5929" LanguageIndex: 0 --- !u!1 &7993559501960941660 @@ -15161,7 +15161,7 @@ MonoBehaviour: m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 1 - m_LineSpacing: 1.3 + m_LineSpacing: 1 m_Text: "\u8C6A\u534E\u793C\u5305\u5185\u542B\u8C6A\u534E\u5BFB\u5B9D\u7279\u6743\uFF0C\u6BCF\u5929" LanguageIndex: 0 --- !u!1 &8491038565068444751 @@ -15900,11 +15900,186 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 53820364} m_Modifications: + - target: {fileID: 153608685421150090, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 153608685421150090, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 153608685421150090, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 82 + objectReference: {fileID: 0} + - target: {fileID: 153608685421150090, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -20 + objectReference: {fileID: 0} + - target: {fileID: 153608685421150090, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_SizeDelta.x + value: 46 + objectReference: {fileID: 0} + - target: {fileID: 256774881259618482, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 256774881259618482, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 256774881259618482, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 166 + objectReference: {fileID: 0} + - target: {fileID: 256774881259618482, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -20 + objectReference: {fileID: 0} + - target: {fileID: 256774881259618482, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_SizeDelta.x + value: 46 + objectReference: {fileID: 0} + - target: {fileID: 524268788072612413, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 524268788072612413, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 524268788072612413, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 145 + objectReference: {fileID: 0} + - target: {fileID: 524268788072612413, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -20 + objectReference: {fileID: 0} + - target: {fileID: 524268788072612413, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_SizeDelta.x + value: 46 + objectReference: {fileID: 0} + - target: {fileID: 730693154722722739, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -2 + objectReference: {fileID: 0} + - target: {fileID: 730693154722722739, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 730693154722722739, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 730693154722722739, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -20 + objectReference: {fileID: 0} + - target: {fileID: 730693154722722739, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_SizeDelta.x + value: 46 + objectReference: {fileID: 0} + - target: {fileID: 1075896065980774447, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1075896065980774447, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1075896065980774447, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 187 + objectReference: {fileID: 0} + - target: {fileID: 1075896065980774447, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -20 + objectReference: {fileID: 0} + - target: {fileID: 1075896065980774447, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_SizeDelta.x + value: 46 + objectReference: {fileID: 0} - target: {fileID: 4066533111738427026, guid: f668b18eb108cc14485203ad2dcd9229, type: 3} propertyPath: m_Name value: NumTextPre objectReference: {fileID: 0} + - target: {fileID: 4381843785078956127, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4381843785078956127, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4381843785078956127, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 19 + objectReference: {fileID: 0} + - target: {fileID: 4381843785078956127, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -20 + objectReference: {fileID: 0} + - target: {fileID: 4381843785078956127, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_SizeDelta.x + value: 46 + objectReference: {fileID: 0} + - target: {fileID: 4707470063994619095, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4707470063994619095, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4707470063994619095, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 103 + objectReference: {fileID: 0} + - target: {fileID: 4707470063994619095, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -20 + objectReference: {fileID: 0} + - target: {fileID: 4707470063994619095, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_SizeDelta.x + value: 46 + objectReference: {fileID: 0} - target: {fileID: 5986877063528201156, guid: f668b18eb108cc14485203ad2dcd9229, type: 3} propertyPath: m_LocalPosition.x @@ -16010,181 +16185,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 256774881259618482, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 256774881259618482, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 256774881259618482, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 166 - objectReference: {fileID: 0} - - target: {fileID: 256774881259618482, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -20 - objectReference: {fileID: 0} - - target: {fileID: 256774881259618482, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_SizeDelta.x - value: 46 - objectReference: {fileID: 0} - - target: {fileID: 153608685421150090, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 153608685421150090, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 153608685421150090, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 82 - objectReference: {fileID: 0} - - target: {fileID: 153608685421150090, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -20 - objectReference: {fileID: 0} - - target: {fileID: 153608685421150090, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_SizeDelta.x - value: 46 - objectReference: {fileID: 0} - - target: {fileID: 524268788072612413, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 524268788072612413, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 524268788072612413, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 145 - objectReference: {fileID: 0} - - target: {fileID: 524268788072612413, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -20 - objectReference: {fileID: 0} - - target: {fileID: 524268788072612413, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_SizeDelta.x - value: 46 - objectReference: {fileID: 0} - - target: {fileID: 730693154722722739, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchoredPosition.x - value: -2 - objectReference: {fileID: 0} - - target: {fileID: 730693154722722739, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 730693154722722739, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 730693154722722739, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -20 - objectReference: {fileID: 0} - - target: {fileID: 730693154722722739, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_SizeDelta.x - value: 46 - objectReference: {fileID: 0} - - target: {fileID: 1075896065980774447, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1075896065980774447, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1075896065980774447, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 187 - objectReference: {fileID: 0} - - target: {fileID: 1075896065980774447, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -20 - objectReference: {fileID: 0} - - target: {fileID: 1075896065980774447, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_SizeDelta.x - value: 46 - objectReference: {fileID: 0} - - target: {fileID: 4381843785078956127, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4381843785078956127, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4381843785078956127, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 19 - objectReference: {fileID: 0} - - target: {fileID: 4381843785078956127, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -20 - objectReference: {fileID: 0} - - target: {fileID: 4381843785078956127, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_SizeDelta.x - value: 46 - objectReference: {fileID: 0} - - target: {fileID: 4707470063994619095, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4707470063994619095, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4707470063994619095, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 103 - objectReference: {fileID: 0} - - target: {fileID: 4707470063994619095, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -20 - objectReference: {fileID: 0} - - target: {fileID: 4707470063994619095, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_SizeDelta.x - value: 46 - objectReference: {fileID: 0} - target: {fileID: 8296019811080805730, guid: f668b18eb108cc14485203ad2dcd9229, type: 3} propertyPath: m_AnchorMin.y diff --git a/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonMainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonMainPanel.prefab index a54e4c17c4..ab4bad2fb1 100644 --- a/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonMainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonMainPanel.prefab @@ -112,9 +112,9 @@ RectTransform: m_Father: {fileID: 3607560475747824595} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 39.279907, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1948848601210916 @@ -406,9 +406,9 @@ RectTransform: m_Father: {fileID: 600614828319903808} m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 845.54004, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5870708292154310322 @@ -602,6 +602,85 @@ MonoBehaviour: m_LineSpacing: 1.2 m_Text: "\u9752\u9E3E" LanguageIndex: 0 +--- !u!1 &190299284935038575 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2619308842337433548} + - component: {fileID: 4080359047322964826} + - component: {fileID: 1168802334248275515} + m_Layer: 5 + m_Name: sortText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2619308842337433548 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 190299284935038575} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.3, y: 1.3, z: 1} + m_Children: [] + m_Father: {fileID: 1261184328925540136} + m_RootOrder: 1 + 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: 2.2, y: -43} + m_SizeDelta: {x: 52.12, y: 58.429993} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4080359047322964826 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 190299284935038575} + m_CullTransparentMesh: 0 +--- !u!114 &1168802334248275515 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 190299284935038575} + 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: 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_FontData: + m_Font: {fileID: 12800000, guid: 634137158f07dff488d018d707aa403a, type: 2} + m_FontSize: 0 + m_FontStyle: 0 + 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_LineSpacing: 1 + m_Text: 1 --- !u!1 &195500401346536409 GameObject: m_ObjectHideFlags: 0 @@ -1012,9 +1091,9 @@ RectTransform: m_Father: {fileID: 600614828319903808} m_RootOrder: 16 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 960.7201, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3582123596347280528 @@ -1133,6 +1212,101 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: 1 +--- !u!1 &371588819345517068 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5096480466696711097} + - component: {fileID: 262269613969773304} + - component: {fileID: 5800812809502947532} + - component: {fileID: 7762806659636752358} + m_Layer: 5 + m_Name: nameText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5096480466696711097 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 371588819345517068} + 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: 1261184328925540136} + 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: -50.000008, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0.5} +--- !u!222 &262269613969773304 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 371588819345517068} + m_CullTransparentMesh: 0 +--- !u!114 &5800812809502947532 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 371588819345517068} + 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.99215686, g: 0.92156863, b: 0.7607843, 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: 0 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u51B0\u51E4" + LanguageIndex: 0 +--- !u!114 &7762806659636752358 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 371588819345517068} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 2 --- !u!1 &379646750792064677 GameObject: m_ObjectHideFlags: 0 @@ -1166,9 +1340,9 @@ RectTransform: m_Father: {fileID: 7146178783884306696} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 442.40988, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2090286200503132763 @@ -1796,9 +1970,9 @@ RectTransform: m_Father: {fileID: 6074500179972168732} m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 787.95, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5455824219885281992 @@ -1946,9 +2120,9 @@ RectTransform: m_Father: {fileID: 7146178783884306696} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 39.279907, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2023412556487254895 @@ -2615,9 +2789,9 @@ RectTransform: m_Father: {fileID: 6074500179972168732} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 442.40988, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1354482848106037300 @@ -3140,9 +3314,9 @@ RectTransform: m_Father: {fileID: 600614828319903808} m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 615.17993, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6369154875711936926 @@ -3388,9 +3562,9 @@ RectTransform: m_Father: {fileID: 6074500179972168732} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 212.0499, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5871983620459118718 @@ -3882,9 +4056,9 @@ RectTransform: m_Father: {fileID: 600614828319903808} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 96.8699, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1422059525411865617 @@ -3957,9 +4131,9 @@ RectTransform: m_Father: {fileID: 600614828319903808} m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 499.99988, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1422178855946772217 @@ -4032,9 +4206,9 @@ RectTransform: m_Father: {fileID: 600614828319903808} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 384.8199, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1422274569196428115 @@ -4106,9 +4280,9 @@ RectTransform: m_Father: {fileID: 600614828319903808} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 212.0499, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1422885560268036093 @@ -4181,9 +4355,9 @@ RectTransform: m_Father: {fileID: 600614828319903808} m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 672.76996, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1422542346079572483 @@ -4255,9 +4429,9 @@ RectTransform: m_Father: {fileID: 600614828319903808} 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: 154.4599, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1422819225441892169 @@ -4330,9 +4504,9 @@ RectTransform: m_Father: {fileID: 600614828319903808} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 442.40988, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1419262486613152395 @@ -4553,9 +4727,9 @@ RectTransform: m_Father: {fileID: 7146178783884306696} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 384.8199, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4535719172906215329 @@ -4628,9 +4802,9 @@ RectTransform: m_Father: {fileID: 3607560475747824595} m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 787.95, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &787804104687398112 @@ -5045,9 +5219,9 @@ RectTransform: m_Father: {fileID: 8512068613467362800} m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 787.95, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5539304392887434307 @@ -5199,9 +5373,9 @@ RectTransform: m_Father: {fileID: 8512068613467362800} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 327.2299, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1602151572044527408 @@ -5273,7 +5447,7 @@ RectTransform: - {fileID: 214223304250658255} - {fileID: 257064185959873084} m_Father: {fileID: 132052803270414521} - m_RootOrder: 1 + 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} @@ -5349,9 +5523,9 @@ RectTransform: m_Father: {fileID: 6074500179972168732} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 39.279907, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8625333662977026203 @@ -6325,9 +6499,9 @@ RectTransform: m_Father: {fileID: 7146178783884306696} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 269.6399, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5462053228719636622 @@ -6477,9 +6651,9 @@ RectTransform: m_Father: {fileID: 2876317608405077811} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 384.8199, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7010746232845501332 @@ -6698,7 +6872,7 @@ RectTransform: m_Children: - {fileID: 127384412100606154} m_Father: {fileID: 132052803270414521} - m_RootOrder: 3 + 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} @@ -6771,7 +6945,7 @@ RectTransform: m_Children: - {fileID: 600614828319903808} m_Father: {fileID: 132052803270414521} - m_RootOrder: 2 + 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} @@ -6810,9 +6984,9 @@ RectTransform: m_Father: {fileID: 2876317608405077811} 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: 154.4599, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8868652613741356672 @@ -7049,7 +7223,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 132052803270414521} - 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} @@ -7239,9 +7413,9 @@ RectTransform: m_Father: {fileID: 2876317608405077811} m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 787.95, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6944200637755043749 @@ -7915,9 +8089,9 @@ RectTransform: m_Father: {fileID: 3607560475747824595} m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 672.76996, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6797249545824727617 @@ -8323,9 +8497,9 @@ RectTransform: m_Father: {fileID: 8512068613467362800} m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 730.36, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5464076947928833160 @@ -8849,6 +9023,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 113409475805070294} + - {fileID: 1261184328925540136} - {fileID: 113963860761908622} - {fileID: 485862348544057545} - {fileID: 73996336767233232} @@ -8893,9 +9068,9 @@ RectTransform: m_Father: {fileID: 600614828319903808} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 269.6399, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8180908958252999453 @@ -8967,9 +9142,9 @@ RectTransform: m_Father: {fileID: 7146178783884306696} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 327.2299, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3913395270948825780 @@ -9263,9 +9438,9 @@ RectTransform: m_Father: {fileID: 8512068613467362800} 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: 154.4599, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6632065484533881732 @@ -9337,9 +9512,9 @@ RectTransform: m_Father: {fileID: 7146178783884306696} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 212.0499, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8236965070034706309 @@ -9675,9 +9850,9 @@ RectTransform: m_Father: {fileID: 7146178783884306696} m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 903.13007, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5383712239428468763 @@ -10126,9 +10301,9 @@ RectTransform: m_Father: {fileID: 600614828319903808} m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 787.95, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3507079847582863219 @@ -10427,9 +10602,9 @@ RectTransform: m_Father: {fileID: 7146178783884306696} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 96.8699, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4438405292232766122 @@ -10501,9 +10676,9 @@ RectTransform: m_Father: {fileID: 3607560475747824595} 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: 154.4599, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7858718859200283358 @@ -10800,9 +10975,9 @@ RectTransform: m_Father: {fileID: 6074500179972168732} m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 615.17993, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2127642749446829719 @@ -11178,9 +11353,9 @@ RectTransform: m_Father: {fileID: 8512068613467362800} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 442.40988, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2865700865289990268 @@ -11628,9 +11803,9 @@ RectTransform: m_Father: {fileID: 8512068613467362800} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 39.279907, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1093091145141438779 @@ -11778,9 +11953,9 @@ RectTransform: m_Father: {fileID: 7146178783884306696} m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 615.17993, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7072544497911396877 @@ -12008,9 +12183,9 @@ RectTransform: m_Father: {fileID: 2876317608405077811} m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 845.54004, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7727476798684601633 @@ -12083,9 +12258,9 @@ RectTransform: m_Father: {fileID: 8512068613467362800} m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 615.17993, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5918699776635549506 @@ -12238,9 +12413,9 @@ RectTransform: m_Father: {fileID: 3607560475747824595} m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 615.17993, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1665689691143364736 @@ -12723,9 +12898,9 @@ RectTransform: m_Father: {fileID: 7146178783884306696} m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 499.99988, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9214073216898174769 @@ -12797,9 +12972,9 @@ RectTransform: m_Father: {fileID: 3607560475747824595} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 96.8699, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2872020388697133091 @@ -12872,9 +13047,9 @@ RectTransform: m_Father: {fileID: 8512068613467362800} m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 499.99988, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7302682340802094203 @@ -12946,9 +13121,9 @@ RectTransform: m_Father: {fileID: 600614828319903808} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 39.279907, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4198372266758603703 @@ -13731,9 +13906,9 @@ RectTransform: m_Father: {fileID: 2876317608405077811} m_RootOrder: 16 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 960.7201, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &861088355599003395 @@ -14029,9 +14204,9 @@ RectTransform: m_Father: {fileID: 600614828319903808} m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 557.5899, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1391177830536173041 @@ -14104,9 +14279,9 @@ RectTransform: m_Father: {fileID: 8512068613467362800} m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 903.13007, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1159008582023675861 @@ -14252,9 +14427,9 @@ RectTransform: m_Father: {fileID: 3607560475747824595} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 269.6399, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3078450533695027930 @@ -14663,9 +14838,9 @@ RectTransform: m_Father: {fileID: 3607560475747824595} m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 730.36, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8226638529370358032 @@ -14738,9 +14913,9 @@ RectTransform: m_Father: {fileID: 8512068613467362800} m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 672.76996, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4909809848503648096 @@ -14813,9 +14988,9 @@ RectTransform: m_Father: {fileID: 6074500179972168732} m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 730.36, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1679740495182023081 @@ -15215,9 +15390,9 @@ RectTransform: m_Father: {fileID: 7146178783884306696} m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 787.95, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6085809382277887532 @@ -15356,7 +15531,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &2852318978939148568 RectTransform: m_ObjectHideFlags: 0 @@ -15626,9 +15801,9 @@ RectTransform: m_Father: {fileID: 7146178783884306696} m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 730.36, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3113039134053692892 @@ -15776,9 +15951,9 @@ RectTransform: m_Father: {fileID: 3607560475747824595} m_RootOrder: 16 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 960.7201, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3387248649652324864 @@ -15850,9 +16025,9 @@ RectTransform: m_Father: {fileID: 3607560475747824595} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 212.0499, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6243668844972390772 @@ -16371,9 +16546,9 @@ RectTransform: m_Father: {fileID: 8512068613467362800} m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 845.54004, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6528539461330475160 @@ -16445,9 +16620,9 @@ RectTransform: m_Father: {fileID: 2876317608405077811} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 327.2299, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7688014245495113340 @@ -16784,9 +16959,9 @@ RectTransform: m_Father: {fileID: 3607560475747824595} m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 557.5899, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8712887013144680888 @@ -16858,9 +17033,9 @@ RectTransform: m_Father: {fileID: 6074500179972168732} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 327.2299, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8725919259284345356 @@ -16933,9 +17108,9 @@ RectTransform: m_Father: {fileID: 3607560475747824595} m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 845.54004, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6005394828806342696 @@ -17008,9 +17183,9 @@ RectTransform: m_Father: {fileID: 8512068613467362800} m_RootOrder: 16 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 960.7201, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7447904619856545548 @@ -17157,9 +17332,9 @@ RectTransform: m_Father: {fileID: 600614828319903808} m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 903.13007, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &325329722862176908 @@ -17643,9 +17818,9 @@ RectTransform: m_Father: {fileID: 3607560475747824595} m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 499.99988, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6854459372333308353 @@ -18053,9 +18228,9 @@ RectTransform: m_Father: {fileID: 2876317608405077811} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 212.0499, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5156107855602938575 @@ -18907,9 +19082,9 @@ RectTransform: m_Father: {fileID: 6074500179972168732} m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 557.5899, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5228893917279411185 @@ -18982,9 +19157,9 @@ RectTransform: m_Father: {fileID: 7146178783884306696} m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 672.76996, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6170972539264396501 @@ -19594,9 +19769,9 @@ RectTransform: m_Father: {fileID: 3607560475747824595} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 442.40988, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7055035079612133062 @@ -19744,9 +19919,9 @@ RectTransform: m_Father: {fileID: 7146178783884306696} m_RootOrder: 16 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 960.7201, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4125974113329305842 @@ -19819,9 +19994,9 @@ RectTransform: m_Father: {fileID: 7146178783884306696} m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 557.5899, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4007729089623916722 @@ -20075,9 +20250,9 @@ RectTransform: m_Father: {fileID: 8512068613467362800} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 269.6399, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4589728288001661195 @@ -20224,9 +20399,9 @@ RectTransform: m_Father: {fileID: 6074500179972168732} m_RootOrder: 16 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 960.7201, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1784295433961759533 @@ -20372,9 +20547,9 @@ RectTransform: m_Father: {fileID: 7146178783884306696} 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: 154.4599, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2774478747811584624 @@ -20447,9 +20622,9 @@ RectTransform: m_Father: {fileID: 7146178783884306696} m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 845.54004, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1330651913026805959 @@ -20522,9 +20697,9 @@ RectTransform: m_Father: {fileID: 2876317608405077811} m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 499.99988, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1693532476182773004 @@ -20597,9 +20772,9 @@ RectTransform: m_Father: {fileID: 6074500179972168732} m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 845.54004, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &316613678954028351 @@ -21005,9 +21180,9 @@ RectTransform: m_Father: {fileID: 2876317608405077811} m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 730.36, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6595911791705385774 @@ -21233,9 +21408,9 @@ RectTransform: m_Father: {fileID: 3607560475747824595} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 327.2299, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2181192194417374203 @@ -21865,9 +22040,9 @@ RectTransform: m_Father: {fileID: 2876317608405077811} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 96.8699, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8511111850206178979 @@ -22051,10 +22226,10 @@ RectTransform: m_Father: {fileID: 5632829283226798929} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 1017.5, y: -38.5} - m_SizeDelta: {x: 123, y: 123} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2625978376404045698 CanvasRenderer: @@ -22414,9 +22589,9 @@ RectTransform: m_Father: {fileID: 8512068613467362800} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 96.8699, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6806525030493851243 @@ -23154,9 +23329,9 @@ RectTransform: m_Father: {fileID: 2876317608405077811} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 442.40988, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1956808938396396257 @@ -23345,6 +23520,82 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &7717860975017316347 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1261184328925540136} + - component: {fileID: 707511857879575046} + - component: {fileID: 9083019370890933665} + m_Layer: 5 + m_Name: titleImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1261184328925540136 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7717860975017316347} + 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: 5096480466696711097} + - {fileID: 2619308842337433548} + m_Father: {fileID: 132052803270414521} + 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: -89.005005, y: 241.59998} + m_SizeDelta: {x: 57.41, y: 202.84} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &707511857879575046 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7717860975017316347} + m_CullTransparentMesh: 0 +--- !u!114 &9083019370890933665 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7717860975017316347} + 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: 0} + 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 &7763469910769962106 GameObject: m_ObjectHideFlags: 0 @@ -23648,9 +23899,9 @@ RectTransform: m_Father: {fileID: 2876317608405077811} m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 615.17993, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2552092929662285936 @@ -23723,10 +23974,10 @@ RectTransform: m_Father: {fileID: 7859614189258735607} 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: 448, y: -1157.9} - m_SizeDelta: {x: 400, y: 500} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4499455109871748351 CanvasRenderer: @@ -23837,10 +24088,10 @@ RectTransform: m_Father: {fileID: 5632829283226798929} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 617.69, y: -38.5} - m_SizeDelta: {x: 123, y: 123} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7859614189585410598 CanvasRenderer: @@ -23973,10 +24224,10 @@ RectTransform: m_Father: {fileID: 7859614189258735607} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 929.32, y: -1698.8} - m_SizeDelta: {x: 400, y: 500} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &559688128674590087 CanvasRenderer: @@ -24019,10 +24270,10 @@ RectTransform: m_Father: {fileID: 7859614189258735607} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 448, y: -617} - m_SizeDelta: {x: 400, y: 500} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &395789774285708987 CanvasRenderer: @@ -24067,10 +24318,10 @@ RectTransform: m_Father: {fileID: 5632829283226798929} 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: 750.96, y: -38.5} - m_SizeDelta: {x: 123, y: 123} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7859614190214280336 CanvasRenderer: @@ -24203,10 +24454,10 @@ RectTransform: m_Father: {fileID: 7859614189258735607} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 929.32, y: -617} - m_SizeDelta: {x: 400, y: 500} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4826209148240724100 CanvasRenderer: @@ -24251,10 +24502,10 @@ RectTransform: m_Father: {fileID: 5632829283226798929} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 484.42, y: -38.5} - m_SizeDelta: {x: 123, y: 123} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7859614190496320348 CanvasRenderer: @@ -24387,10 +24638,10 @@ RectTransform: m_Father: {fileID: 7859614189258735607} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 929.32, y: -1157.9} - m_SizeDelta: {x: 400, y: 500} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &180940976784238415 CanvasRenderer: @@ -24435,10 +24686,10 @@ RectTransform: m_Father: {fileID: 5632829283226798929} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 884.23004, y: -38.5} - m_SizeDelta: {x: 123, y: 123} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7859614190979638764 CanvasRenderer: @@ -24571,10 +24822,10 @@ RectTransform: m_Father: {fileID: 7859614189258735607} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 448, y: -1698.8} - m_SizeDelta: {x: 400, y: 500} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5371495566325172163 CanvasRenderer: @@ -24619,10 +24870,10 @@ RectTransform: m_Father: {fileID: 5632829283226798929} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 351.15002, y: -38.5} - m_SizeDelta: {x: 123, y: 123} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7859614191144760452 CanvasRenderer: @@ -24754,9 +25005,9 @@ RectTransform: m_Father: {fileID: 2876317608405077811} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 269.6399, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2602284173633224472 @@ -24828,9 +25079,9 @@ RectTransform: m_Father: {fileID: 6074500179972168732} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 269.6399, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7913194853186709448 @@ -24903,9 +25154,9 @@ RectTransform: m_Father: {fileID: 2876317608405077811} m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 903.13007, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1019664869432964349 @@ -25280,9 +25531,9 @@ RectTransform: m_Father: {fileID: 6074500179972168732} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 384.8199, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6853123316272448457 @@ -25619,9 +25870,9 @@ RectTransform: m_Father: {fileID: 6074500179972168732} m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 903.13007, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2013620632999040779 @@ -25694,9 +25945,9 @@ RectTransform: m_Father: {fileID: 2876317608405077811} m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 557.5899, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6029427333397486508 @@ -25844,9 +26095,9 @@ RectTransform: m_Father: {fileID: 3607560475747824595} m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 903.13007, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8292398522362591407 @@ -26520,9 +26771,9 @@ RectTransform: m_Father: {fileID: 600614828319903808} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 327.2299, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5833323820228158959 @@ -27305,9 +27556,9 @@ RectTransform: m_Father: {fileID: 8512068613467362800} m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 557.5899, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2957464174128985698 @@ -27453,9 +27704,9 @@ RectTransform: m_Father: {fileID: 8512068613467362800} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 212.0499, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7836884927938477574 @@ -27645,9 +27896,9 @@ RectTransform: m_Father: {fileID: 3607560475747824595} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 384.8199, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3463798330306786564 @@ -27719,9 +27970,9 @@ RectTransform: m_Father: {fileID: 6074500179972168732} 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: 154.4599, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1307861433061398513 @@ -27941,9 +28192,9 @@ RectTransform: m_Father: {fileID: 6074500179972168732} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 96.8699, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6716029376670409598 @@ -28094,9 +28345,9 @@ RectTransform: m_Father: {fileID: 2876317608405077811} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 39.279907, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8380814409515268182 @@ -28398,9 +28649,9 @@ RectTransform: m_Father: {fileID: 6074500179972168732} m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 499.99988, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1072977396442099743 @@ -28661,9 +28912,9 @@ RectTransform: m_Father: {fileID: 2876317608405077811} m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 672.76996, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3181617336425862858 @@ -28736,9 +28987,9 @@ RectTransform: m_Father: {fileID: 6074500179972168732} m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 672.76996, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3262355644280649457 @@ -28885,9 +29136,9 @@ RectTransform: m_Father: {fileID: 8512068613467362800} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 384.8199, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6199552251598282972 @@ -28960,9 +29211,9 @@ RectTransform: m_Father: {fileID: 600614828319903808} m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 730.36, y: -25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3245637611587299898 diff --git a/Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab b/Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab index 2de15805f0..e63c6b7882 100644 --- a/Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab @@ -7873,8 +7873,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: 308, y: 490.8} - m_SizeDelta: {x: 279.99, y: 54.3} + m_AnchoredPosition: {x: 302.5, y: 490.8} + m_SizeDelta: {x: 373.3, y: 54.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1072802345564235561 CanvasRenderer: @@ -11490,7 +11490,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 0/100 + m_Text: --- !u!1 &7085036036722072500 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab index 224053f717..07967e62b7 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab @@ -5308,7 +5308,7 @@ ParticleSystem: --- !u!199 &199793888397422328 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -10774,7 +10774,7 @@ ParticleSystem: --- !u!199 &199786334729933541 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -15693,7 +15693,7 @@ ParticleSystem: --- !u!199 &199812891778826125 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -20542,7 +20542,7 @@ ParticleSystem: --- !u!199 &199314592830468766 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -25352,7 +25352,7 @@ ParticleSystem: --- !u!199 &199738970247411175 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -30962,7 +30962,7 @@ ParticleSystem: --- !u!199 &199312732024159113 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -37181,7 +37181,7 @@ ParticleSystem: --- !u!199 &199309040906483979 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -41937,7 +41937,7 @@ ParticleSystem: --- !u!199 &199592651100025897 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -46974,7 +46974,7 @@ ParticleSystem: --- !u!199 &199310039250832541 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -51730,7 +51730,7 @@ ParticleSystem: --- !u!199 &199031629276305175 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -56773,7 +56773,7 @@ ParticleSystem: --- !u!199 &199224694020007487 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -59603,8 +59603,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -1.7304, y: -95.1} - m_SizeDelta: {x: 200.31, y: 30} + m_AnchoredPosition: {x: 48.3, y: -95.1} + m_SizeDelta: {x: 318.1, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1346055835050747244 CanvasRenderer: @@ -59641,10 +59641,10 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 2 m_MaxSize: 40 - m_Alignment: 4 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 + m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u6FC0\u6D3B\u516D\u661F\u5929\u8D4B" @@ -68298,11 +68298,11 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 2 m_MaxSize: 40 - m_Alignment: 4 + m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u67E5\u770B\u6CD5\u5B9D\u7279\u6027" LanguageIndex: 11549 diff --git a/Assets/ManagedResources/~Lua/Framework/Manager/UIManager.lua b/Assets/ManagedResources/~Lua/Framework/Manager/UIManager.lua index 42be2547d8..6fbee5da0c 100644 --- a/Assets/ManagedResources/~Lua/Framework/Manager/UIManager.lua +++ b/Assets/ManagedResources/~Lua/Framework/Manager/UIManager.lua @@ -594,8 +594,10 @@ function UIManager.CreatePanel(uiConfig, parent) if GetCurLanguage()~=0 then local textArr=gameObject:GetComponentsInChildren(typeof(UnityEngine.UI.Text),true); for i = 0, textArr.Length-1 do - local textStr=textArr[i].text + local textStr=textArr[i].text + LogGreen("textStr:"..textStr) textArr[i].text=GetLanguageStrById(textStr) + LogGreen("GetLanguageStrById:"..textArr[i].text) if GetCurLanguage() == 2 and textArr[i].font and (string.find(textArr[i].font.name,"kaiu",1) or string.find(textArr[i].font.name,"FZJinLS",1)) then textArr[i].font = Util.LoadFont() end diff --git a/Assets/ManagedResources/~Lua/Modules/Chat/ChatManager.lua b/Assets/ManagedResources/~Lua/Modules/Chat/ChatManager.lua index 13d53423b9..e2f2bbcc8e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Chat/ChatManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Chat/ChatManager.lua @@ -254,8 +254,8 @@ function this.ChatDataAdapter(channel, data) local newMsgId = tonumber(newChat.messageId) -- 新消息的消息号 local msgIdFlag = this.GetMsgIdFlag(channel) -- 获取当前最新消息号 __DebugLog("--") - __DebugLog(Language[10359]..newChat.msg) - __DebugLog(Language[10360]..msgIdFlag..Language[10361]..newMsgId) + LogGreen(Language[10359]..newChat.msg) + LogGreen(Language[10360]..msgIdFlag..Language[10361]..newMsgId) local msgStr = string.split(newChat.msg,"|") if channel == CHAT_CHANNEL.SYSTEM then for i = 2, #msgStr do @@ -278,7 +278,7 @@ function this.ChatDataAdapter(channel, data) tostring(msgStr[6]) ) end - + LogGreen(Language[10359]..newChat.msg) if msgIdFlag < newMsgId or newMsgId == -1 then __DebugLog(Language[10362]..tostring(newMsgId == -1)) if newMsgId ~= -1 then -- 消息号为-1表示屏蔽消息，保存数据但不保存消息号， diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/DropGetSSRHeroShopPanel.lua b/Assets/ManagedResources/~Lua/Modules/Popup/DropGetSSRHeroShopPanel.lua index 52229b878b..ab4275ee3c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/DropGetSSRHeroShopPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/DropGetSSRHeroShopPanel.lua @@ -27,7 +27,8 @@ function DropGetSSRHeroShopPanel:InitComponent() Util.GetGameObject(self.transform,"quality"):SetActive(false) self.doubleQuality=Util.GetGameObject(self.transform,"quality/qualityDoubleText") self.posImage=Util.GetGameObject(self.transform,"Pos/PosImage"):GetComponent("Image") - self.posText=Util.GetGameObject(self.transform,"Pos/PosText"):GetComponent("Text") + self.pos = Util.GetGameObject(self.transform,"Pos") + self.posText=Util.GetGameObject(self.pos ,"PosText"):GetComponent("Text") end --绑定事件（用于子类重写） @@ -91,6 +92,7 @@ function DropGetSSRHeroShopPanel:OnShow() --self.dragView:SetDragGO(testLiveGO) self.posImage.sprite=Util.LoadSprite(GetHeroPosStr(heroStaticData.Profession)) self.posText.text=GetLanguageStrById(heroStaticData.HeroLocation) + SetTextVerTial(self.posText.transform,Vector3.New(67.01,0.3,0),"MiddleLeft") local starSize = Vector2.New(60,60) SetHeroStars(self.starGrid, heroBackData.star,2,starSize,-10,Vector2.New(0.5,0.5)) --self.profession.sprite = Util.LoadSprite(GetJobSpriteStrByJobNum(heroStaticData.Profession))