From 6f05841519089428f38ab8c883657ecbd580cbd4 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Tue, 11 Aug 2020 11:00:30 +0800 Subject: [PATCH] no message --- .../UI/Carbon/XuanYuanMirrorPanelList.prefab | 98 +- .../XuanYuanMirrorRankPopup.prefab | 1335 +++++++++-------- .../XuanYuanMirrorRankPopup.prefab.meta | 0 .../Carbon/XuanYuanMirrorPanelList.lua | 11 +- .../Carbon/XuanYuanMirrorRankPopup.lua | 98 ++ .../XuanYuanMirrorRankPopup.lua.meta | 0 .../DeathPos/XuanYuanMirrorRankPopup.lua | 169 --- 7 files changed, 892 insertions(+), 819 deletions(-) rename Assets/ManagedResources/Prefabs/UI/{Guild/DeathPos => Carbon}/XuanYuanMirrorRankPopup.prefab (91%) rename Assets/ManagedResources/Prefabs/UI/{Guild/DeathPos => Carbon}/XuanYuanMirrorRankPopup.prefab.meta (100%) create mode 100644 Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorRankPopup.lua rename Assets/ManagedResources/~Lua/Modules/{Guild/DeathPos => Carbon}/XuanYuanMirrorRankPopup.lua.meta (100%) delete mode 100644 Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/XuanYuanMirrorRankPopup.lua diff --git a/Assets/ManagedResources/Prefabs/UI/Carbon/XuanYuanMirrorPanelList.prefab b/Assets/ManagedResources/Prefabs/UI/Carbon/XuanYuanMirrorPanelList.prefab index e93edb40a7..127346d8e9 100644 --- a/Assets/ManagedResources/Prefabs/UI/Carbon/XuanYuanMirrorPanelList.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Carbon/XuanYuanMirrorPanelList.prefab @@ -1102,7 +1102,7 @@ RectTransform: 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: 248.1, y: -38.1} + m_AnchoredPosition: {x: 248.1, y: -136.9} m_SizeDelta: {x: 220.99, y: 42.04} m_Pivot: {x: 0.36038244, y: 0.5} --- !u!222 &5939520279966165509 @@ -1257,9 +1257,9 @@ RectTransform: m_Father: {fileID: 3408442198697653928} m_RootOrder: 3 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: 273.8, y: 21.07} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 273.8, y: -32.8} m_SizeDelta: {x: 209.89, y: 72.88} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5679312751743760484 @@ -2126,6 +2126,21 @@ PrefabInstance: propertyPath: m_Pivot.y value: 1 objectReference: {fileID: 0} + - target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973, + type: 3} + propertyPath: m_LocalScale.x + value: 0.78 + objectReference: {fileID: 0} + - target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973, + type: 3} + propertyPath: m_LocalScale.y + value: 0.78 + objectReference: {fileID: 0} + - target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973, + type: 3} + propertyPath: m_LocalScale.z + value: 0.78 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: cc289befb290a5544b9c25eae7cf8973, type: 3} --- !u!224 &34096667903366304 stripped @@ -2250,6 +2265,21 @@ PrefabInstance: propertyPath: m_Pivot.y value: 1 objectReference: {fileID: 0} + - target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973, + type: 3} + propertyPath: m_LocalScale.x + value: 0.78 + objectReference: {fileID: 0} + - target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973, + type: 3} + propertyPath: m_LocalScale.y + value: 0.78 + objectReference: {fileID: 0} + - target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973, + type: 3} + propertyPath: m_LocalScale.z + value: 0.78 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: cc289befb290a5544b9c25eae7cf8973, type: 3} --- !u!224 &1767756772196429038 stripped @@ -2374,6 +2404,21 @@ PrefabInstance: propertyPath: m_Pivot.y value: 1 objectReference: {fileID: 0} + - target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973, + type: 3} + propertyPath: m_LocalScale.x + value: 0.78 + objectReference: {fileID: 0} + - target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973, + type: 3} + propertyPath: m_LocalScale.y + value: 0.78 + objectReference: {fileID: 0} + - target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973, + type: 3} + propertyPath: m_LocalScale.z + value: 0.78 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: cc289befb290a5544b9c25eae7cf8973, type: 3} --- !u!224 &4219484961250095739 stripped @@ -2498,6 +2543,21 @@ PrefabInstance: propertyPath: m_Pivot.y value: 1 objectReference: {fileID: 0} + - target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973, + type: 3} + propertyPath: m_LocalScale.x + value: 0.78 + objectReference: {fileID: 0} + - target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973, + type: 3} + propertyPath: m_LocalScale.y + value: 0.78 + objectReference: {fileID: 0} + - target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973, + type: 3} + propertyPath: m_LocalScale.z + value: 0.78 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: cc289befb290a5544b9c25eae7cf8973, type: 3} --- !u!224 &6054075901445166563 stripped @@ -2746,6 +2806,21 @@ PrefabInstance: propertyPath: m_Pivot.y value: 1 objectReference: {fileID: 0} + - target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973, + type: 3} + propertyPath: m_LocalScale.x + value: 0.78 + objectReference: {fileID: 0} + - target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973, + type: 3} + propertyPath: m_LocalScale.y + value: 0.78 + objectReference: {fileID: 0} + - target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973, + type: 3} + propertyPath: m_LocalScale.z + value: 0.78 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: cc289befb290a5544b9c25eae7cf8973, type: 3} --- !u!224 &6083692090863145194 stripped @@ -2870,6 +2945,21 @@ PrefabInstance: propertyPath: m_Pivot.y value: 1 objectReference: {fileID: 0} + - target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973, + type: 3} + propertyPath: m_LocalScale.x + value: 0.78 + objectReference: {fileID: 0} + - target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973, + type: 3} + propertyPath: m_LocalScale.y + value: 0.78 + objectReference: {fileID: 0} + - target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973, + type: 3} + propertyPath: m_LocalScale.z + value: 0.78 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: cc289befb290a5544b9c25eae7cf8973, type: 3} --- !u!224 &8951759513183077380 stripped diff --git a/Assets/ManagedResources/Prefabs/UI/Guild/DeathPos/XuanYuanMirrorRankPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Carbon/XuanYuanMirrorRankPopup.prefab similarity index 91% rename from Assets/ManagedResources/Prefabs/UI/Guild/DeathPos/XuanYuanMirrorRankPopup.prefab rename to Assets/ManagedResources/Prefabs/UI/Carbon/XuanYuanMirrorRankPopup.prefab index c153f3f76c..a45fa3ea9b 100644 --- a/Assets/ManagedResources/Prefabs/UI/Guild/DeathPos/XuanYuanMirrorRankPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Carbon/XuanYuanMirrorRankPopup.prefab @@ -555,159 +555,6 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: 10 ---- !u!1 &1072253236509637423 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3539699813640144317} - - component: {fileID: 8514142092706373878} - - component: {fileID: 6338253334057463037} - m_Layer: 5 - m_Name: SortNum (2) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &3539699813640144317 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1072253236509637423} - 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: 5435887552348843137} - 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: 0} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8514142092706373878 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1072253236509637423} - m_CullTransparentMesh: 0 ---- !u!114 &6338253334057463037 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1072253236509637423} - 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 &1319556241617491024 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4783408367611681077} - - component: {fileID: 389853773487373592} - - component: {fileID: 5880337118813058499} - m_Layer: 5 - m_Name: TitleText - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4783408367611681077 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1319556241617491024} - 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: 6483965989537943645} - 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 &389853773487373592 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1319556241617491024} - m_CullTransparentMesh: 0 ---- !u!114 &5880337118813058499 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1319556241617491024} - 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: 5 --- !u!1 &1619439027523198803 GameObject: m_ObjectHideFlags: 0 @@ -828,6 +675,86 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &1750499208849773062 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 624109657358843173} + - component: {fileID: 8928054832701159433} + - component: {fileID: 357045025654752673} + m_Layer: 5 + m_Name: Name + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &624109657358843173 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1750499208849773062} + 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: 224115370092718564} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 365.58, y: 94.2} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8928054832701159433 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1750499208849773062} + m_CullTransparentMesh: 0 +--- !u!114 &357045025654752673 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1750499208849773062} + 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.8627451, g: 0.6666667, b: 0.41568628, 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: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_FontSize: 35 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u6492\u6253\u53D1\u58EB\u5927\u592B" + LanguageIndex: 10739 --- !u!1 &1908839802608714758 GameObject: m_ObjectHideFlags: 0 @@ -950,6 +877,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &2168926709883586858 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8585782256854322273} + - component: {fileID: 8103823146069539210} + - component: {fileID: 7632645800198150130} + m_Layer: 5 + m_Name: SortNum (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &8585782256854322273 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2168926709883586858} + 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: 4208273427081277667} + 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: -0.00001168251, y: 0.0000014901161} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8103823146069539210 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2168926709883586858} + m_CullTransparentMesh: 0 +--- !u!114 &7632645800198150130 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2168926709883586858} + 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: 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 &2527063295781923264 GameObject: m_ObjectHideFlags: 0 @@ -1024,76 +1025,6 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &2553510442479396052 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 43283598409455616} - - component: {fileID: 5717821184918441897} - - component: {fileID: 478112683319909375} - m_Layer: 5 - m_Name: Grid - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &43283598409455616 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2553510442479396052} - 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: 3663755049458912201} - - {fileID: 8166152288212357271} - m_Father: {fileID: 8041249401685665856} - 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: -0.000030518} - m_SizeDelta: {x: 534.47, y: 94.2} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5717821184918441897 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2553510442479396052} - m_CullTransparentMesh: 0 ---- !u!114 &478112683319909375 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2553510442479396052} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_ChildAlignment: 4 - m_Spacing: 50 - m_ChildForceExpandWidth: 0 - m_ChildForceExpandHeight: 0 - m_ChildControlWidth: 0 - m_ChildControlHeight: 0 --- !u!1 &2776356905966546296 GameObject: m_ObjectHideFlags: 0 @@ -1302,6 +1233,159 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &3441628723369960642 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6361599288351790115} + - component: {fileID: 5627986229667167197} + - component: {fileID: 5424603027710815728} + m_Layer: 5 + m_Name: TitleText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6361599288351790115 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3441628723369960642} + 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: 1243159690381008251} + 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 &5627986229667167197 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3441628723369960642} + m_CullTransparentMesh: 0 +--- !u!114 &5424603027710815728 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3441628723369960642} + 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: 5 +--- !u!1 &3652196568813225678 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3939103061253270906} + - component: {fileID: 6947067674423324363} + - component: {fileID: 5069684753649736352} + m_Layer: 5 + m_Name: Bg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3939103061253270906 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3652196568813225678} + 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: 4723061883012791635} + 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 &6947067674423324363 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3652196568813225678} + m_CullTransparentMesh: 0 +--- !u!114 &5069684753649736352 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3652196568813225678} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.3490566, g: 0.3490566, b: 0.3490566, 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: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &3672556585227416517 GameObject: m_ObjectHideFlags: 0 @@ -1530,6 +1614,81 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &3820115484598494600 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1243159690381008251} + - component: {fileID: 5449401908531125488} + - component: {fileID: 8194615064212836594} + m_Layer: 5 + m_Name: SortNum (4) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1243159690381008251 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3820115484598494600} + 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: 6361599288351790115} + m_Father: {fileID: 4208273427081277667} + 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.8, y: 0.4} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5449401908531125488 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3820115484598494600} + m_CullTransparentMesh: 0 +--- !u!114 &8194615064212836594 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3820115484598494600} + 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: 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 &3845797319282499302 GameObject: m_ObjectHideFlags: 0 @@ -1605,85 +1764,6 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &4009100688181964562 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8166152288212357271} - - component: {fileID: 6797977827189806262} - - component: {fileID: 6712026969591348076} - m_Layer: 5 - m_Name: Num - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8166152288212357271 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4009100688181964562} - 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: 43283598409455616} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 112.7, y: 94.2} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6797977827189806262 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4009100688181964562} - m_CullTransparentMesh: 0 ---- !u!114 &6712026969591348076 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4009100688181964562} - 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: 0.8784314, b: 0.72156864, 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: 35 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 2 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: 10 --- !u!1 &4108108778845752991 GameObject: m_ObjectHideFlags: 0 @@ -1759,6 +1839,54 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &4306300471802078337 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4208273427081277667} + - component: {fileID: 1292026718246856164} + m_Layer: 5 + m_Name: SortNum + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4208273427081277667 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4306300471802078337} + 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: 1891433374984190916} + - {fileID: 5318536227229638724} + - {fileID: 8585782256854322273} + - {fileID: 1243159690381008251} + m_Father: {fileID: 224115370092718564} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1292026718246856164 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4306300471802078337} + m_CullTransparentMesh: 0 --- !u!1 &4537258075272470864 GameObject: m_ObjectHideFlags: 0 @@ -1833,6 +1961,53 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &4714556603120575798 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4723061883012791635} + - component: {fileID: 1670815456581548744} + m_Layer: 5 + m_Name: MyInfo + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4723061883012791635 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4714556603120575798} + 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: 3939103061253270906} + - {fileID: 224115370092718564} + - {fileID: 8233258345342616269} + m_Father: {fileID: 3401751871378385210} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 912.33, y: 100} + m_Pivot: {x: 0.5, y: 0} +--- !u!222 &1670815456581548744 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4714556603120575798} + m_CullTransparentMesh: 0 --- !u!1 &4755711722138899841 GameObject: m_ObjectHideFlags: 0 @@ -1880,7 +2055,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4755711722138899841} m_CullTransparentMesh: 0 ---- !u!1 &4991769199314479217 +--- !u!1 &4917514553996843100 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1888,53 +2063,50 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 8041249401685665856} - - component: {fileID: 1037912112311072140} - - component: {fileID: 5730902197677323240} + - component: {fileID: 5318536227229638724} + - component: {fileID: 2716869580674377711} + - component: {fileID: 86164721643392441} m_Layer: 5 - m_Name: MyInfo + m_Name: SortNum (2) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8041249401685665856 + m_IsActive: 0 +--- !u!224 &5318536227229638724 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4991769199314479217} + m_GameObject: {fileID: 4917514553996843100} 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: 5435887552348843137} - - {fileID: 43283598409455616} - - {fileID: 2112757698104296243} - m_Father: {fileID: 3401751871378385210} - m_RootOrder: 3 + m_Children: [] + m_Father: {fileID: 4208273427081277667} + 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.000061035156, y: -626.34} - m_SizeDelta: {x: 912.33, y: 94.19995} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1037912112311072140 +--- !u!222 &2716869580674377711 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4991769199314479217} + m_GameObject: {fileID: 4917514553996843100} m_CullTransparentMesh: 0 ---- !u!114 &5730902197677323240 +--- !u!114 &86164721643392441 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4991769199314479217} + m_GameObject: {fileID: 4917514553996843100} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} @@ -1942,13 +2114,13 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 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: a428c01c55a7c42408afbbcf729965ec, type: 3} + m_Sprite: {fileID: 21300000, guid: f5ba695b044676047802f7b7fa302002, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1957,54 +2129,6 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &5162792233157464240 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5435887552348843137} - - component: {fileID: 5482042537422377734} - m_Layer: 5 - m_Name: SortNum - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5435887552348843137 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5162792233157464240} - 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: 5075257469730990191} - - {fileID: 3539699813640144317} - - {fileID: 694978079448453868} - - {fileID: 6483965989537943645} - m_Father: {fileID: 8041249401685665856} - m_RootOrder: 0 - 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: 50, y: 0} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5482042537422377734 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5162792233157464240} - m_CullTransparentMesh: 0 --- !u!1 &5166953870896639638 GameObject: m_ObjectHideFlags: 0 @@ -2084,160 +2208,6 @@ MonoBehaviour: m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: 5 ---- !u!1 &5403197815301022776 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3663755049458912201} - - component: {fileID: 8197229901558156750} - - component: {fileID: 6275533149183323676} - m_Layer: 5 - m_Name: Name - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3663755049458912201 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5403197815301022776} - 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: 43283598409455616} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 365.58, y: 94.2} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8197229901558156750 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5403197815301022776} - m_CullTransparentMesh: 0 ---- !u!114 &6275533149183323676 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5403197815301022776} - 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.8784314, b: 0.72156864, 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: 6fa15837529b0e640af6620b07d3207d, type: 3} - m_FontSize: 35 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 2 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: "\u6211\u7684\u540D\u5B57\u516D\u5B57\uFF0816\u4EBA\uFF09" - LanguageIndex: 10739 ---- !u!1 &5524028270008527617 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5075257469730990191} - - component: {fileID: 7244775036378950129} - - component: {fileID: 7592495021278862698} - 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 &5075257469730990191 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5524028270008527617} - 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: 5435887552348843137} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7244775036378950129 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5524028270008527617} - m_CullTransparentMesh: 0 ---- !u!114 &7592495021278862698 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5524028270008527617} - 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 &5659773042697834802 GameObject: m_ObjectHideFlags: 0 @@ -2418,7 +2388,7 @@ RectTransform: - {fileID: 6766772671487099538} - {fileID: 4686122961679901497} - {fileID: 8592434668345412448} - - {fileID: 8041249401685665856} + - {fileID: 4723061883012791635} - {fileID: 6244248580153433941} m_Father: {fileID: 3512015996234104856} m_RootOrder: 1 @@ -2557,7 +2527,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u516C\u4F1A\u540D\u79F0" + m_Text: "\u73A9\u5BB6\u540D\u79F0" LanguageIndex: 10729 --- !u!114 &3757380131301848174 MonoBehaviour: @@ -2573,80 +2543,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 2 m_VerticalFit: 0 ---- !u!1 &6632331417853787247 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 694978079448453868} - - component: {fileID: 1911775998906518559} - - component: {fileID: 8755863982375148552} - m_Layer: 5 - m_Name: SortNum (3) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &694978079448453868 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6632331417853787247} - 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: 5435887552348843137} - 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: -0.00001168251, y: 0.0000014901161} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1911775998906518559 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6632331417853787247} - m_CullTransparentMesh: 0 ---- !u!114 &8755863982375148552 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6632331417853787247} - 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: 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 &6708611957450758773 GameObject: m_ObjectHideFlags: 0 @@ -2798,7 +2694,7 @@ MonoBehaviour: m_BlockingMask: serializedVersion: 2 m_Bits: 4294967295 ---- !u!1 &7370189792413652083 +--- !u!1 &7048986575483064576 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2806,51 +2702,50 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 6483965989537943645} - - component: {fileID: 7031245654504351206} - - component: {fileID: 7613100885291352826} + - component: {fileID: 1891433374984190916} + - component: {fileID: 6473181960890983641} + - component: {fileID: 1604118164419735535} m_Layer: 5 - m_Name: SortNum (4) + m_Name: SortNum (1) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &6483965989537943645 + m_IsActive: 1 +--- !u!224 &1891433374984190916 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7370189792413652083} + m_GameObject: {fileID: 7048986575483064576} 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: 4783408367611681077} - m_Father: {fileID: 5435887552348843137} - m_RootOrder: 3 + m_Children: [] + m_Father: {fileID: 4208273427081277667} + 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.8, y: 0.4} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7031245654504351206 +--- !u!222 &6473181960890983641 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7370189792413652083} + m_GameObject: {fileID: 7048986575483064576} m_CullTransparentMesh: 0 ---- !u!114 &7613100885291352826 +--- !u!114 &1604118164419735535 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7370189792413652083} + m_GameObject: {fileID: 7048986575483064576} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} @@ -2864,8 +2759,8 @@ 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: 3c01a305eb51c04478b39d3060aceefe, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: c3dd9610bb7d50b47bc158a0e12c6839, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -2969,7 +2864,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 2 m_VerticalFit: 0 ---- !u!1 &7620327906983688881 +--- !u!1 &7484295301091975939 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2977,57 +2872,131 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 2112757698104296243} - - component: {fileID: 6119236962571409926} - - component: {fileID: 2878442061000780571} + - component: {fileID: 8233258345342616269} + - component: {fileID: 7028882662289396419} + - component: {fileID: 886236544951389343} m_Layer: 5 - m_Name: Hurt + m_Name: Line (1) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &2112757698104296243 +--- !u!224 &8233258345342616269 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7620327906983688881} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 7484295301091975939} + 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: 8041249401685665856} + m_Father: {fileID: 4723061883012791635} 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: 342, y: 0.000030517} - m_SizeDelta: {x: 160, y: 94.2} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 1010, y: 4} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6119236962571409926 +--- !u!222 &7028882662289396419 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7620327906983688881} + m_GameObject: {fileID: 7484295301091975939} m_CullTransparentMesh: 0 ---- !u!114 &2878442061000780571 +--- !u!114 &886236544951389343 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7620327906983688881} + m_GameObject: {fileID: 7484295301091975939} + 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: 26ce1a2f8851e004e88e569a15a5a1f8, 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 &8054662875856799796 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7746106862294967845} + - component: {fileID: 6886136565528130134} + - component: {fileID: 4706698218653906070} + m_Layer: 5 + m_Name: Num + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7746106862294967845 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8054662875856799796} + 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: 224115370092718564} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 112.7, y: 94.2} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6886136565528130134 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8054662875856799796} + m_CullTransparentMesh: 0 +--- !u!114 &4706698218653906070 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8054662875856799796} 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: 0.8784314, b: 0.72156864, a: 1} + m_Color: {r: 0.8627451, g: 0.6666667, b: 0.41568628, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -3047,7 +3016,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 666 + m_Text: 10 --- !u!1 &8175137801625236023 GameObject: m_ObjectHideFlags: 0 @@ -3185,6 +3154,92 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &8630990970844034826 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 224115370092718564} + - component: {fileID: 1412926872196851615} + - component: {fileID: 8369617892496721800} + - component: {fileID: 4799887469434519211} + m_Layer: 5 + m_Name: Grid + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &224115370092718564 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8630990970844034826} + 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: 4208273427081277667} + - {fileID: 624109657358843173} + - {fileID: 7746106862294967845} + m_Father: {fileID: 4723061883012791635} + 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.0025635, y: 0} + m_SizeDelta: {x: 0, y: 94.2} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1412926872196851615 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8630990970844034826} + m_CullTransparentMesh: 0 +--- !u!114 &8369617892496721800 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8630990970844034826} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_Spacing: 135.1 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 +--- !u!114 &4799887469434519211 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8630990970844034826} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 --- !u!1 &9110371546659898457 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/Guild/DeathPos/XuanYuanMirrorRankPopup.prefab.meta b/Assets/ManagedResources/Prefabs/UI/Carbon/XuanYuanMirrorRankPopup.prefab.meta similarity index 100% rename from Assets/ManagedResources/Prefabs/UI/Guild/DeathPos/XuanYuanMirrorRankPopup.prefab.meta rename to Assets/ManagedResources/Prefabs/UI/Carbon/XuanYuanMirrorRankPopup.prefab.meta diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanelList.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanelList.lua index 7b37ab6dcd..c95c01bda7 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanelList.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanelList.lua @@ -45,8 +45,8 @@ local difficult = { function this:InitComponent() this.UpView = SubUIManager.Open(SubUIConfig.UpView, self.gameObject.transform) - this.remainTimesTip = Util.GetGameObject(self.gameObject,"Panel/remainTimesTip"): GetComponent("Text") - this.vipTips = Util.GetGameObject(self.gameObject,"Panel/vipTips") : GetComponent("Text") + this.remainTimesTip = Util.GetGameObject(self.gameObject,"Panel/tip/remainTimesTip"): GetComponent("Text") + this.vipTips = Util.GetGameObject(self.gameObject,"Panel/tip/vipTips") : GetComponent("Text") this.btnBack = Util.GetGameObject(self.gameObject,"Panel/BackBtn") this.levelPre = Util.GetGameObject(self.gameObject,"Panel/Pre") @@ -226,9 +226,7 @@ function this:SetLevelData(go, data) end --界面打开时调用(用于子类重写) -function this:OnShow(...) - -- this.remainTimesTip.text = XuanYuanMirrorManager.GetTimeTip() - -- this.vipTips.text = Language[12257] +function this:OnShow(...) local curFormationForce = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL) if PlayerManager.maxForce < curFormationForce then PlayerManager.maxForce = curFormationForce @@ -239,7 +237,8 @@ end --界面打开时调用(用于子类重写) function this:RefreshTimes() - +-- this.remainTimesTip.text = XuanYuanMirrorManager.GetTimeTip() + -- this.vipTips.text = Language[12257] end function this:OnSortingOrderChange() diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorRankPopup.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorRankPopup.lua new file mode 100644 index 0000000000..6bd281dda7 --- /dev/null +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorRankPopup.lua @@ -0,0 +1,98 @@ +----- 公会十绝阵排行弹窗 ----- +require("Base/BasePanel") +local XuanYuanMirrorRankPopup = Inherit(BasePanel) +local this = XuanYuanMirrorRankPopup + +function XuanYuanMirrorRankPopup:InitComponent() + this.panel=Util.GetGameObject(this.gameObject,"Panel") + this.backBtn=Util.GetGameObject(this.panel,"BackBtn") + + this.rankScroll=Util.GetGameObject(this.panel,"Scroll/Root") + this.rankPre=Util.GetGameObject(this.panel,"Scroll/Root/Pre") + this.scrollView=SubUIManager.Open(SubUIConfig.ScrollCycleView,this.rankScroll.transform,this.rankPre, nil, + Vector2.New(this.rankScroll.transform.rect.width,this.rankScroll.transform.rect.height),1,1,Vector2.New(0,10)) + this.scrollView.gameObject:GetComponent("RectTransform").anchoredPosition= Vector2.New(0,0) + this.scrollView.gameObject:GetComponent("RectTransform").anchorMin = Vector2.New(0.5, 0.5) + this.scrollView.gameObject:GetComponent("RectTransform").anchorMax = Vector2.New(0.5, 0.5) + this.scrollView.gameObject:GetComponent("RectTransform").pivot = Vector2.New(0.5, 0.5) + this.scrollView.moveTween.MomentumAmount = 1 + this.scrollView.moveTween.Strength = 2 + + --我的排名 + this.mRRank=Util.GetGameObject(this.panel,"MyInfo") + this.mRName=Util.GetGameObject(this.mRRank,"Grid/Name"):GetComponent("Text") + this.mRNum=Util.GetGameObject(this.mRRank,"Grid/Num"):GetComponent("Text") + + this.empty=Util.GetGameObject(this.panel,"Scroll/Empty") +end + +function XuanYuanMirrorRankPopup:BindEvent() + Util.AddClick(this.backBtn,function() + PlaySoundWithoutClick(SoundConfig.Sound_UICancel) + self:ClosePanel() + end) +end +function XuanYuanMirrorRankPopup:OnOpen(...) + +end + +function XuanYuanMirrorRankPopup:OnShow() + this.RefreshRank() +end + +function XuanYuanMirrorRankPopup:OnClose() + this.empty:SetActive(false) +end + +function XuanYuanMirrorRankPopup:OnDestroy() + this.scrollView=nil +end + +--刷新排行榜 index当前排行类型索引 +function this.RefreshRank() + NetManager.RequestRankInfo(RANK_TYPE.XUANYUANMIRROR_RANK,function(msg) + this.empty:SetActive(#msg.ranks <= 0) + this.scrollView:SetData(msg.ranks,function(index,root) + this.SetScrollPre(root,msg.ranks[index]) + end) + this.scrollView:SetIndex(1) + this.mRRank.gameObject:SetActive((not msg.myRankInfo) or msg.myRankInfo.rank~=-1) + if msg.myRankInfo and msg.myRankInfo.rank ~= -1 then + this.SetMyRank(msg.myRankInfo) + end + end) +end + +--设置每条数据 +function this.SetScrollPre(root,data) + local name=Util.GetGameObject(root,"Grid/Name"):GetComponent("Text") + local num=Util.GetGameObject(root,"Grid/Num"):GetComponent("Text") + this.SetRankingNum(root,data.rankInfo.rank,false) + name.text=data.userName + num.text=data.rankInfo.param1 +end +--设置我的名次 +function this.SetMyRank(data,curRankType) + this.SetRankingNum(this.mRRank,data.rank,true) + this.mRName.text = PlayerManager.nickName + this.mRNum.text = data.param1 +end +--设置名次 isMy 是否是设置我的名次 +function this.SetRankingNum(root,rank,isMy) + local sortNumTabs={} + for i = 1, 4 do + sortNumTabs[i]=Util.GetGameObject(root,"SortNum/SortNum ("..i..")") + sortNumTabs[i]:SetActive(false) + end + if rank < 4 then + sortNumTabs[rank]:SetActive(true) + else + sortNumTabs[4]:SetActive(true) + if rank > 100 and isMy then + rank="100+" + end + Util.GetGameObject(sortNumTabs[4], "TitleText"):GetComponent("Text").text = rank + end +end + +return XuanYuanMirrorRankPopup \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/XuanYuanMirrorRankPopup.lua.meta b/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorRankPopup.lua.meta similarity index 100% rename from Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/XuanYuanMirrorRankPopup.lua.meta rename to Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorRankPopup.lua.meta diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/XuanYuanMirrorRankPopup.lua b/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/XuanYuanMirrorRankPopup.lua deleted file mode 100644 index 653182141c..0000000000 --- a/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/XuanYuanMirrorRankPopup.lua +++ /dev/null @@ -1,169 +0,0 @@ ------ 公会十绝阵排行弹窗 ----- -require("Base/BasePanel") -local XuanYuanMirrorRankPopup = Inherit(BasePanel) -local this = XuanYuanMirrorRankPopup - -function XuanYuanMirrorRankPopup:InitComponent() - this.panel=Util.GetGameObject(this.gameObject,"Panel") - this.backBtn=Util.GetGameObject(this.panel,"BackBtn") - this.upName=Util.GetGameObject(this.panel,"Scroll/UpInfo/Grid/Name"):GetComponent("Text") - this.upNum=Util.GetGameObject(this.panel,"Scroll/UpInfo/Grid/Num") - - this.tabbox = Util.GetGameObject(this.panel, "TabBox") - - this.rankScroll=Util.GetGameObject(this.panel,"Scroll/Root") - this.rankPre=Util.GetGameObject(this.panel,"Scroll/Root/Pre") - this.scrollView=SubUIManager.Open(SubUIConfig.ScrollCycleView,this.rankScroll.transform,this.rankPre, nil, - Vector2.New(this.rankScroll.transform.rect.width,this.rankScroll.transform.rect.height),1,1,Vector2.New(0,10)) - this.scrollView.gameObject:GetComponent("RectTransform").anchoredPosition= Vector2.New(0,0) - this.scrollView.gameObject:GetComponent("RectTransform").anchorMin = Vector2.New(0.5, 0.5) - this.scrollView.gameObject:GetComponent("RectTransform").anchorMax = Vector2.New(0.5, 0.5) - this.scrollView.gameObject:GetComponent("RectTransform").pivot = Vector2.New(0.5, 0.5) - this.scrollView.moveTween.MomentumAmount = 1 - this.scrollView.moveTween.Strength = 2 - - --我的排名 - this.mRRank=Util.GetGameObject(this.panel,"Scroll/MyInfo") - this.mRSortNum=Util.GetGameObject(this.panel,"Scroll/MyInfo/SortNum") - this.mRName=Util.GetGameObject(this.panel,"Scroll/MyInfo/Grid/Name"):GetComponent("Text") - this.mRNum=Util.GetGameObject(this.panel,"Scroll/MyInfo/Grid/Num"):GetComponent("Text") - this.mRHurt=Util.GetGameObject(this.panel,"Scroll/MyInfo/Hurt"):GetComponent("Text") - - this.empty=Util.GetGameObject(this.panel,"Scroll/Empty") -end - -function XuanYuanMirrorRankPopup:BindEvent() - Util.AddClick(this.backBtn,function() - PlaySoundWithoutClick(SoundConfig.Sound_UICancel) - self:ClosePanel() - end) -end - -function XuanYuanMirrorRankPopup:AddListener() - Game.GlobalEvent:AddEvent(GameEvent.Guild.RefreshDeathPosStatus, this.RefreshPanel) -end - -function XuanYuanMirrorRankPopup:RemoveListener() - Game.GlobalEvent:RemoveEvent(GameEvent.Guild.RefreshDeathPosStatus, this.RefreshPanel) -end -function XuanYuanMirrorRankPopup:OnOpen(...) - -end - -function XuanYuanMirrorRankPopup:OnShow() - this.RefreshPanel() -end - -function XuanYuanMirrorRankPopup:OnClose() - this.empty:SetActive(false) -end - -function XuanYuanMirrorRankPopup:OnDestroy() - this.scrollView=nil -end - - -function this.RefreshPanel() - if DeathPosManager.status==DeathPosStatus.Close then - this:ClosePanel() - return - end - this.TabCtrl = TabBox.New() - this.TabCtrl:SetTabAdapter(this.TabAdapter) - this.TabCtrl:SetChangeTabCallBack(this.OnTabChange) - this.TabCtrl:Init(this.tabbox, _TabData) -end - --- tab按钮自定义显示设置 -function this.TabAdapter(tab, index, status) - local img = Util.GetGameObject(tab, "Image") - local txt = Util.GetGameObject(tab, "Text") - img:GetComponent("Image").sprite = Util.LoadSprite(_TabImgData[status]) - txt:GetComponent("Text").text = _TabData[index].txt - txt:GetComponent("Text").color = _TabFontColor[status] -end - --- tab改变回调事件 -function this.OnTabChange(index, lastIndex) - this.RefreshRank(index) -end - - - ---刷新排行榜 index当前排行类型索引 -function this.RefreshRank(index) - this.upName.text=index==1 and Language[11046] or Language[11051] - this.upNum:SetActive(index==1) - local curRankType=RANK_TYPE.GUILD_DEATHPOS_ALLGUILD --默认公会排行 - if index==1 then - curRankType=RANK_TYPE.GUILD_DEATHPOS_ALLGUILD --公会排行 - elseif index==2 then - curRankType=RANK_TYPE.GUILD_DEATHPOS_ALLPERSON --个人排行 - end - NetManager.RequestRankInfo(curRankType,function(msg) - this.empty:SetActive(#msg.ranks<=0) - this.scrollView:SetData(msg.ranks,function(index,root) - this.SetScrollPre(root,msg.ranks[index],curRankType) - end) - this.scrollView:SetIndex(1) - - --当我的排名没数据时 - this.mRSortNum:SetActive(msg.myRankInfo.rank~=-1) - this.mRNum.gameObject:SetActive(msg.myRankInfo.rank~=-1) - if msg.myRankInfo.rank==-1 then - this.mRName.text=Language[10041] - this.mRHurt.text="" - return - end - this.SetMyRank(msg.myRankInfo,curRankType) - end) -end - ---设置每条数据 -function this.SetScrollPre(root,data,curRankType) - local name=Util.GetGameObject(root,"Grid/Name"):GetComponent("Text") - local num=Util.GetGameObject(root,"Grid/Num"):GetComponent("Text") - local hurt=Util.GetGameObject(root,"Hurt"):GetComponent("Text") - - this.SetRankingNum(root,data.rankInfo.rank,false) - num.gameObject:SetActive(curRankType==RANK_TYPE.GUILD_DEATHPOS_ALLGUILD) - if curRankType==RANK_TYPE.GUILD_DEATHPOS_ALLGUILD then - name.text=string.format(Language[11052],data.guildName,data.rankInfo.param3) --公会名称 人数 - num.text=data.rankInfo.param2 -- param2 挑战人数 - elseif curRankType==RANK_TYPE.GUILD_DEATHPOS_ALLPERSON then - name.text=data.userName - end - hurt.text= DeathPosManager.ChangeDamageForm(data.rankInfo.param1) -end ---设置我的名次 -function this.SetMyRank(data,curRankType) - local guildData = MyGuildManager.GetMyGuildInfo() - this.SetRankingNum(this.mRRank,data.rank,true) - this.mRNum.gameObject:SetActive(curRankType==RANK_TYPE.GUILD_DEATHPOS_ALLGUILD) - if curRankType==RANK_TYPE.GUILD_DEATHPOS_ALLGUILD then - this.mRName.text=guildData.name - this.mRNum.text= data.param2..Language[11057] --param2 人数 - elseif curRankType==RANK_TYPE.GUILD_DEATHPOS_ALLPERSON then - this.mRName.text=PlayerManager.nickName - end - this.mRHurt.text= DeathPosManager.ChangeDamageForm(data.param1) --param1 伤害 -end ---设置名次 isMy 是否是设置我的名次 -function this.SetRankingNum(root,rank,isMy) - local sortNumTabs={} - for i = 1, 4 do - sortNumTabs[i]=Util.GetGameObject(root,"SortNum/SortNum ("..i..")") - sortNumTabs[i]:SetActive(false) - end - if rank < 4 then - sortNumTabs[rank]:SetActive(true) - else - sortNumTabs[4]:SetActive(true) - if rank>100 and isMy then - rank="100+" - end - Util.GetGameObject(sortNumTabs[4], "TitleText"):GetComponent("Text").text = rank - end -end - -return XuanYuanMirrorRankPopup \ No newline at end of file