From b279baaa4109162fd79442542a5c8df2bf097418 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Sat, 22 Aug 2020 13:49:47 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E4=BC=9A=E5=89=AF=E6=9C=AC=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/Ranking/RankingSingleListPanel.prefab | 3938 ++++++++--------- .../~Lua/Common/GlobalDefine.lua | 14 +- .../ManagedResources/~Lua/Logic/GameEvent.lua | 1 + .../~Lua/Modules/Expert/Expert.lua | 3 +- .../Modules/Expert/ExpertRewardSortPanel.lua | 9 +- .../Transcript/GuildTranscriptMainPopup.lua | 100 +- .../Modules/Ranking/RankingListMainPanel.lua | 2 +- .../~Lua/Modules/Ranking/RankingManager.lua | 551 +-- .../Ranking/RankingSingleListPanel.lua | 465 +- 9 files changed, 2027 insertions(+), 3056 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Ranking/RankingSingleListPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Ranking/RankingSingleListPanel.prefab index 874282faa9..8058a9df47 100644 --- a/Assets/ManagedResources/Prefabs/UI/Ranking/RankingSingleListPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Ranking/RankingSingleListPanel.prefab @@ -80,6 +80,85 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u70BC\u72F15-5" LanguageIndex: 11440 +--- !u!1 &240915894018313511 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 681387831103450937} + - component: {fileID: 3841044667372432993} + - component: {fileID: 6404836033272961134} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &681387831103450937 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 240915894018313511} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.7, y: 0.7, z: 1} + m_Children: [] + m_Father: {fileID: 2905530097823807365} + 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: 44.1, y: 0.6} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3841044667372432993 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 240915894018313511} + m_CullTransparentMesh: 0 +--- !u!114 &6404836033272961134 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 240915894018313511} + 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.9882353, g: 0.92156863, b: 0.7921569, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 50 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 50 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: 123 --- !u!1 &257576625667045967 GameObject: m_ObjectHideFlags: 0 @@ -225,7 +304,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 757358635486648959} + - {fileID: 6807019927217198876} - {fileID: 7102133301290758835} - {fileID: 4736655608709707325} - {fileID: 838499302217432034} @@ -247,85 +326,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 327544136351406303} m_CullTransparentMesh: 0 ---- !u!1 &422269218111575654 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3328223206316954161} - - component: {fileID: 4440340600760340467} - - component: {fileID: 3550445844419891692} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3328223206316954161 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 422269218111575654} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.7, y: 0.7, z: 1} - m_Children: [] - m_Father: {fileID: 2636399030825652164} - 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: 44.1, y: 0.6} - m_SizeDelta: {x: 160, y: 30} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4440340600760340467 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 422269218111575654} - m_CullTransparentMesh: 0 ---- !u!114 &3550445844419891692 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 422269218111575654} - 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.9882353, g: 0.92156863, b: 0.7921569, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_FontData: - m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 50 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 0 - m_MaxSize: 50 - m_Alignment: 3 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: 123 --- !u!1 &443208468622437792 GameObject: m_ObjectHideFlags: 0 @@ -400,7 +400,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &485015251537201959 +--- !u!1 &598423421115134424 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -408,51 +408,51 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 6619555056324006340} - - component: {fileID: 3010203995127160377} - - component: {fileID: 3087887583936472597} + - component: {fileID: 935658931973507275} + - component: {fileID: 2164410450865079312} + - component: {fileID: 4116205923128466657} m_Layer: 5 m_Name: goldExper m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6619555056324006340 + m_IsActive: 0 +--- !u!224 &935658931973507275 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 485015251537201959} + m_GameObject: {fileID: 598423421115134424} 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: 966481933898560697} - m_Father: {fileID: 1661457884122057613} + - {fileID: 1566886584408286340} + m_Father: {fileID: 3245842208257657378} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 4.9, y: 4} + m_AnchoredPosition: {x: -61.8, y: -13.6} m_SizeDelta: {x: 197.42, y: 79.69} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3010203995127160377 +--- !u!222 &2164410450865079312 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 485015251537201959} + m_GameObject: {fileID: 598423421115134424} m_CullTransparentMesh: 0 ---- !u!114 &3087887583936472597 +--- !u!114 &4116205923128466657 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 485015251537201959} + m_GameObject: {fileID: 598423421115134424} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} @@ -479,82 +479,8 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\u70B9\u91D1\u6B21\u6570" - LanguageIndex: 11447 ---- !u!1 &611934040330089414 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3698967887912241928} - - component: {fileID: 305946902062119544} - - component: {fileID: 8512590111914319409} - m_Layer: 0 - m_Name: Icon - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3698967887912241928 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 611934040330089414} - 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: 8680697175201693075} - 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: 80, y: 80} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &305946902062119544 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 611934040330089414} - m_CullTransparentMesh: 0 ---- !u!114 &8512590111914319409 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 611934040330089414} - 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: 2c2cc5fac629a17409e60bfbf2c63d55, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 + m_Text: "\u70B9\u91D1\u6B21\u6570\uFF1A" + LanguageIndex: 11445 --- !u!1 &613418214590886862 GameObject: m_ObjectHideFlags: 0 @@ -672,6 +598,86 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &630431458361268289 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3654639885268044388} + - component: {fileID: 8679466312410521379} + - component: {fileID: 9195332368874402519} + m_Layer: 5 + m_Name: fight + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &3654639885268044388 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 630431458361268289} + 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: 4898621174299674350} + 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: 300.59998, y: 41.9} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8679466312410521379 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 630431458361268289} + m_CullTransparentMesh: 0 +--- !u!114 &9195332368874402519 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 630431458361268289} + 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.9372549, g: 0.8, b: 0.7411765, 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: 36 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u70BC\u72F15-5" + LanguageIndex: 11440 --- !u!1 &672464993227932073 GameObject: m_ObjectHideFlags: 0 @@ -682,6 +688,7 @@ GameObject: m_Component: - component: {fileID: 7192617622825626711} - component: {fileID: 4776911606634480073} + - component: {fileID: 6583841100835536731} m_Layer: 5 m_Name: BG m_TagString: Untagged @@ -696,18 +703,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 672464993227932073} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 3177873219708070726} - m_Father: {fileID: 6913215175904765234} + m_Children: [] + m_Father: {fileID: 3542290585148391186} 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.82501, y: -629} - m_SizeDelta: {x: 909.49, y: 85.3} + 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 &4776911606634480073 CanvasRenderer: @@ -717,61 +723,16 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 672464993227932073} m_CullTransparentMesh: 0 ---- !u!1 &675783922532356506 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 252906993991913938} - - component: {fileID: 4946646436199513293} - - component: {fileID: 4297449005178531254} - m_Layer: 5 - m_Name: Info1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &252906993991913938 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 675783922532356506} - 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: 6913215175904765234} - 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: 86.4, y: -629} - m_SizeDelta: {x: 187.38, y: 59.08} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4946646436199513293 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 675783922532356506} - m_CullTransparentMesh: 0 ---- !u!114 &4297449005178531254 +--- !u!114 &6583841100835536731 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 675783922532356506} + m_GameObject: {fileID: 672464993227932073} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} @@ -782,21 +743,89 @@ MonoBehaviour: 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: 36 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 1 - m_MaxSize: 50 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: "\u6211\u7684\u5173\u5361\uFF1A" - LanguageIndex: 11240 + m_Sprite: {fileID: 21300000, guid: f30bf38c24a00694dba03295d1981811, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!1 &718144433704402455 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6939821104278945874} + - component: {fileID: 1914773542816877018} + - component: {fileID: 5860476134901401323} + m_Layer: 5 + m_Name: icon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6939821104278945874 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 718144433704402455} + 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: 1206143511832642564} + 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: 140, y: 140} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1914773542816877018 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 718144433704402455} + m_CullTransparentMesh: 0 +--- !u!114 &5860476134901401323 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 718144433704402455} + 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: 157e394dc0ac8c142b13d5bb396503dc, 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 &725949604685737584 GameObject: m_ObjectHideFlags: 0 @@ -832,7 +861,7 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &791727277857778753 +--- !u!1 &828078537337979999 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -840,9 +869,10 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 7251375515082801726} - - component: {fileID: 1928983174566965685} - - component: {fileID: 3385604700113818152} + - component: {fileID: 1566886584408286340} + - component: {fileID: 2860304800835001844} + - component: {fileID: 747809830790734774} + - component: {fileID: 3148084311403830289} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -850,40 +880,40 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &7251375515082801726 +--- !u!224 &1566886584408286340 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 791727277857778753} + m_GameObject: {fileID: 828078537337979999} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.7, y: 0.7, z: 1} + m_LocalScale: {x: 0.8, y: 0.8, z: 1} m_Children: [] - m_Father: {fileID: 4935494681454572907} + m_Father: {fileID: 935658931973507275} 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: 44.1, y: 0.6} + m_AnchoredPosition: {x: 127.4, y: 1.5} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1928983174566965685 +--- !u!222 &2860304800835001844 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 791727277857778753} + m_GameObject: {fileID: 828078537337979999} m_CullTransparentMesh: 0 ---- !u!114 &3385604700113818152 +--- !u!114 &747809830790734774 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 791727277857778753} + m_GameObject: {fileID: 828078537337979999} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} @@ -898,8 +928,8 @@ MonoBehaviour: 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_Font: {fileID: 12800000, guid: 634137158f07dff488d018d707aa403a, type: 2} + m_FontSize: 0 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 @@ -910,81 +940,20 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 123 ---- !u!1 &837802167460712210 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2924312443349633183} - - component: {fileID: 2948030518778733279} - - component: {fileID: 9054637520380735791} - m_Layer: 0 - m_Name: Icon - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2924312443349633183 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 837802167460712210} - 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: 4180827490713499375} - 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: 80, y: 80} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2948030518778733279 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 837802167460712210} - m_CullTransparentMesh: 0 ---- !u!114 &9054637520380735791 + m_Text: 99 +--- !u!114 &3148084311403830289 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 837802167460712210} + m_GameObject: {fileID: 828078537337979999} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 72f543c75b355a741976183c1e74debc, 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: 2c2cc5fac629a17409e60bfbf2c63d55, 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 + _textSpacing: -31.45 --- !u!1 &939269812365812779 GameObject: m_ObjectHideFlags: 0 @@ -1060,80 +1029,6 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &1025385088573215938 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 946289741621033644} - - component: {fileID: 948904331620717066} - - component: {fileID: 1129077206340071992} - m_Layer: 5 - m_Name: BG - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &946289741621033644 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1025385088573215938} - 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: 3542290585148391186} - 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 &948904331620717066 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1025385088573215938} - m_CullTransparentMesh: 0 ---- !u!114 &1129077206340071992 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1025385088573215938} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: f30bf38c24a00694dba03295d1981811, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 --- !u!1 &1025674031813834032 GameObject: m_ObjectHideFlags: 0 @@ -1213,6 +1108,173 @@ MonoBehaviour: m_BlockingMask: serializedVersion: 2 m_Bits: 4294967295 +--- !u!1 &1317191894699200250 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5046731618082499953} + - component: {fileID: 2709073344717538767} + - component: {fileID: 8305762119522550362} + m_Layer: 0 + m_Name: Icon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5046731618082499953 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1317191894699200250} + 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: 8087570311705215702} + 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: 80, y: 80} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2709073344717538767 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1317191894699200250} + m_CullTransparentMesh: 0 +--- !u!114 &8305762119522550362 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1317191894699200250} + 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: 2c2cc5fac629a17409e60bfbf2c63d55, 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 &1472944889777867819 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6457153712955849178} + - component: {fileID: 186679837332118225} + - component: {fileID: 3255490839346436755} + - component: {fileID: 765045773829564653} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6457153712955849178 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1472944889777867819} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.8, y: 0.8, z: 1} + m_Children: [] + m_Father: {fileID: 1092311363681623207} + 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: -11.3, y: -40.9} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &186679837332118225 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1472944889777867819} + m_CullTransparentMesh: 0 +--- !u!114 &3255490839346436755 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1472944889777867819} + 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.9882353, g: 0.92156863, b: 0.7921569, 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: 50 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: 99 +--- !u!114 &765045773829564653 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1472944889777867819} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 72f543c75b355a741976183c1e74debc, type: 3} + m_Name: + m_EditorClassIdentifier: + _textSpacing: -31.45 --- !u!1 &1474127388749341805 GameObject: m_ObjectHideFlags: 0 @@ -1396,7 +1458,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 100} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 1640973378095603040} + - {fileID: 4769349054851846147} m_Father: {fileID: 3128544740893925850} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1556,7 +1618,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null ---- !u!1 &1865983225929553813 +--- !u!1 &1773483040117091775 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1564,9 +1626,10 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1945240633628526579} - - component: {fileID: 1942404469635548927} - - component: {fileID: 1669657234741331472} + - component: {fileID: 7154144425580113870} + - component: {fileID: 6424538401592640304} + - component: {fileID: 6633218921014164602} + - component: {fileID: 4554155519038093337} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -1574,47 +1637,139 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1945240633628526579 +--- !u!224 &7154144425580113870 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1865983225929553813} + m_GameObject: {fileID: 1773483040117091775} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 0.7, y: 0.7, z: 1} m_Children: [] - m_Father: {fileID: 6578960951442613540} + m_Father: {fileID: 5092152720033678508} 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.79999995, y: 15.299999} - m_SizeDelta: {x: 229.5, y: 64.4} + m_AnchoredPosition: {x: 18.5, y: 0.6} + m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1942404469635548927 +--- !u!222 &6424538401592640304 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1865983225929553813} + m_GameObject: {fileID: 1773483040117091775} m_CullTransparentMesh: 0 ---- !u!114 &1669657234741331472 +--- !u!114 &6633218921014164602 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1865983225929553813} + m_GameObject: {fileID: 1773483040117091775} + 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: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: 9999 +--- !u!114 &4554155519038093337 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1773483040117091775} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 72f543c75b355a741976183c1e74debc, type: 3} + m_Name: + m_EditorClassIdentifier: + _textSpacing: -30.8 +--- !u!1 &1779930078004745782 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9005876869221352173} + - component: {fileID: 2158215088639064304} + - component: {fileID: 2644959424838386026} + m_Layer: 5 + m_Name: arenaScore + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &9005876869221352173 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1779930078004745782} + 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: 4898621174299674350} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -0.00000047683716, y: 0.000012040138} + m_SizeDelta: {x: 300.59998, y: 41.9} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2158215088639064304 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1779930078004745782} + m_CullTransparentMesh: 0 +--- !u!114 &2644959424838386026 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1779930078004745782} 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.9882353, g: 0.92156863, b: 0.7921569, a: 1} + m_Color: {r: 0.9372549, g: 0.8, b: 0.7411765, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -1623,19 +1778,19 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} - m_FontSize: 35 + m_FontSize: 36 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 10 - m_MaxSize: 51 - m_Alignment: 4 + m_MinSize: 0 + m_MaxSize: 40 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\u699C\u5355\u4E3A\u7A7A" - LanguageIndex: 10239 + m_Text: "\u70BC\u72F15-5" + LanguageIndex: 11440 --- !u!1 &1874764521608510820 GameObject: m_ObjectHideFlags: 0 @@ -1663,12 +1818,10 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 7192617622825626711} + - {fileID: 3973448909949542708} - {fileID: 1658163793548663411} - {fileID: 4054095999741318010} - - {fileID: 252906993991913938} - - {fileID: 1351652527864633715} - - {fileID: 8790539866172688193} + - {fileID: 3245842208257657378} m_Father: {fileID: 3058096646243646816} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1757,129 +1910,6 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u70BC\u72F15-5" LanguageIndex: 11440 ---- !u!1 &2038844224890316750 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 757358635486648959} - - component: {fileID: 3514387854966421323} - - component: {fileID: 3003908913951315582} - m_Layer: 5 - m_Name: bg - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &757358635486648959 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2038844224890316750} - 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: 5838072232418814881} - 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: -2} - m_SizeDelta: {x: 917, y: 1336} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3514387854966421323 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2038844224890316750} - m_CullTransparentMesh: 0 ---- !u!114 &3003908913951315582 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2038844224890316750} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 3e71ed27c496acc4b92fe95a6e2d6339, 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 &2126182673979644680 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8790539866172688193} - - component: {fileID: 832195552557906640} - m_Layer: 5 - m_Name: infoGo - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8790539866172688193 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2126182673979644680} - 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: 5375814140823306435} - - {fileID: 3574257153817449386} - - {fileID: 2636399030825652164} - - {fileID: 6343858779078722984} - - {fileID: 7874033753268375199} - m_Father: {fileID: 6913215175904765234} - m_RootOrder: 5 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 319.7, y: -618} - m_SizeDelta: {x: 300.59998, y: 41.9} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &832195552557906640 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2126182673979644680} - m_CullTransparentMesh: 0 --- !u!1 &2205207881053315068 GameObject: m_ObjectHideFlags: 0 @@ -1957,7 +1987,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 2924312443349633183} + - {fileID: 8962435430428755452} m_Father: {fileID: 8169141433332227} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2003,7 +2033,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &2246235818238980508 +--- !u!1 &2287553346423885058 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2011,139 +2041,50 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 7893012631599524591} - - component: {fileID: 135377115098751718} - - component: {fileID: 7254064608512955048} + - component: {fileID: 2063961932793240932} + - component: {fileID: 2066737641789217896} + - component: {fileID: 5494576899438086887} m_Layer: 5 - m_Name: Head + m_Name: bg m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &7893012631599524591 +--- !u!224 &2063961932793240932 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2246235818238980508} + m_GameObject: {fileID: 2287553346423885058} 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: 4920424518308432231} - m_Father: {fileID: 3542290585148391186} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 209.1, y: 0.1} - m_SizeDelta: {x: 110, y: 109.99999} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &135377115098751718 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2246235818238980508} - m_CullTransparentMesh: 0 ---- !u!114 &7254064608512955048 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2246235818238980508} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 0} - m_OnClick: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null ---- !u!1 &2268658506915096767 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3574257153817449386} - - component: {fileID: 8443296214487056742} - - component: {fileID: 5647767836089123273} - m_Layer: 5 - m_Name: warPower - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &3574257153817449386 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2268658506915096767} - 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: 4054639222727463020} - m_Father: {fileID: 8790539866172688193} - m_RootOrder: 1 + m_Children: [] + m_Father: {fileID: 8830212790296371356} + 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: -56.6, y: -13.22} - m_SizeDelta: {x: 197.42, y: 79.69} + m_AnchoredPosition: {x: 50.3, y: 177.5} + m_SizeDelta: {x: 522, y: 106} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8443296214487056742 +--- !u!222 &2066737641789217896 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2268658506915096767} + m_GameObject: {fileID: 2287553346423885058} m_CullTransparentMesh: 0 ---- !u!114 &5647767836089123273 +--- !u!114 &5494576899438086887 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2268658506915096767} + m_GameObject: {fileID: 2287553346423885058} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} @@ -2157,7 +2098,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: 7f7cdabfab0b95c41828e1ddca64a2b6, type: 3} + m_Sprite: {fileID: 21300000, guid: 8181bd02d033477489a1812a27509767, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2203,6 +2144,85 @@ RectTransform: m_AnchoredPosition: {x: -2.1, y: 46.7} m_SizeDelta: {x: 903, y: 571.1} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &2362189994961034925 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 701288472701698032} + - component: {fileID: 4132870026552039017} + - component: {fileID: 2142219562059796690} + m_Layer: 5 + m_Name: lv + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &701288472701698032 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2362189994961034925} + 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: 8747925616295963100} + 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.000014663001, y: 0.0000038147} + m_SizeDelta: {x: 131.69, y: 47.77} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4132870026552039017 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2362189994961034925} + m_CullTransparentMesh: 0 +--- !u!114 &2142219562059796690 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2362189994961034925} + 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: 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: 34 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 300 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 100 --- !u!1 &2541852913773742530 GameObject: m_ObjectHideFlags: 0 @@ -2232,7 +2252,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 1368072356890861586} + - {fileID: 5046731618082499953} m_Father: {fileID: 8169141433332227} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2460,7 +2480,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 3698967887912241928} + - {fileID: 7467133760243156587} m_Father: {fileID: 8169141433332227} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2506,6 +2526,44 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &2834758439039588434 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1206143511832642564} + m_Layer: 5 + m_Name: PlayerHead + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1206143511832642564 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2834758439039588434} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.6, y: 0.6, z: 0.7} + m_Children: + - {fileID: 6939821104278945874} + - {fileID: 7807930465390581536} + - {fileID: 8747925616295963100} + m_Father: {fileID: 4142278180492928908} + 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: 200, y: 200} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &2947308749935651746 GameObject: m_ObjectHideFlags: 0 @@ -2580,6 +2638,81 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &3012056847522907702 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8747925616295963100} + - component: {fileID: 788050001929028845} + - component: {fileID: 5013550712795586965} + m_Layer: 5 + m_Name: lvRoot + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8747925616295963100 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3012056847522907702} + 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: 701288472701698032} + m_Father: {fileID: 1206143511832642564} + 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: -57.4, y: 55.5} + m_SizeDelta: {x: 60, y: 40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &788050001929028845 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3012056847522907702} + m_CullTransparentMesh: 0 +--- !u!114 &5013550712795586965 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3012056847522907702} + 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: c73ac4f44d9a7194488674d4fa335c10, 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 &3257036955517639690 GameObject: m_ObjectHideFlags: 0 @@ -2654,7 +2787,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &3335870744239533689 +--- !u!1 &3330568140307706486 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2662,152 +2795,91 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4469335405778636002} - - component: {fileID: 2819789102237053343} - - component: {fileID: 4705483544948377750} - m_Layer: 0 - m_Name: Icon + - component: {fileID: 4769349054851846147} + - component: {fileID: 1428500268201271436} + - component: {fileID: 2155600350738858689} + - component: {fileID: 3312361569128241552} + m_Layer: 5 + m_Name: Text m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &4469335405778636002 +--- !u!224 &4769349054851846147 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3335870744239533689} + m_GameObject: {fileID: 3330568140307706486} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 0.8, y: 0.8, z: 1} m_Children: [] - m_Father: {fileID: 7278217084202990297} + m_Father: {fileID: 3939068427722580484} 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: 80, y: 80} + m_AnchoredPosition: {x: 127.4, y: 1.5} + m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2819789102237053343 +--- !u!222 &1428500268201271436 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3335870744239533689} + m_GameObject: {fileID: 3330568140307706486} m_CullTransparentMesh: 0 ---- !u!114 &4705483544948377750 +--- !u!114 &2155600350738858689 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3335870744239533689} + m_GameObject: {fileID: 3330568140307706486} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_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: 2c2cc5fac629a17409e60bfbf2c63d55, 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 &3351054403331314855 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5375814140823306435} - - component: {fileID: 3953945161857196349} - - component: {fileID: 2256295015594102302} - m_Layer: 5 - m_Name: fight - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &5375814140823306435 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3351054403331314855} - 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: 8790539866172688193} - 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: 300.59998, y: 41.9} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3953945161857196349 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3351054403331314855} - m_CullTransparentMesh: 0 ---- !u!114 &2256295015594102302 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3351054403331314855} - 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.9372549, g: 0.8, b: 0.7411765, a: 1} - m_RaycastTarget: 0 + m_Color: {r: 0.9882353, g: 0.92156863, b: 0.7921569, 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: 6fa15837529b0e640af6620b07d3207d, type: 3} - m_FontSize: 36 + m_Font: {fileID: 12800000, guid: 634137158f07dff488d018d707aa403a, type: 2} + m_FontSize: 0 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 - m_MaxSize: 40 + m_MaxSize: 50 m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\u70BC\u72F15-5" - LanguageIndex: 11440 + m_Text: 99 +--- !u!114 &3312361569128241552 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3330568140307706486} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 72f543c75b355a741976183c1e74debc, type: 3} + m_Name: + m_EditorClassIdentifier: + _textSpacing: -31.45 --- !u!1 &3499112422512556151 GameObject: m_ObjectHideFlags: 0 @@ -2888,6 +2960,155 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u901A\u5173\u5173\u5361" LanguageIndex: 11239 +--- !u!1 &3508632145326835312 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7807930465390581536} + - component: {fileID: 4731188905033026624} + - component: {fileID: 1434723487391718622} + m_Layer: 5 + m_Name: frame + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7807930465390581536 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3508632145326835312} + 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: 1206143511832642564} + 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: 200, y: 200} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4731188905033026624 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3508632145326835312} + m_CullTransparentMesh: 0 +--- !u!114 &1434723487391718622 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3508632145326835312} + 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: 235f511e5ae0aec4f905c2f4df405d91, 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 &3534212493636510032 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5092152720033678508} + - component: {fileID: 8110139630821537658} + - component: {fileID: 1031973669735799563} + m_Layer: 5 + m_Name: warPower + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &5092152720033678508 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3534212493636510032} + 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: 7154144425580113870} + m_Father: {fileID: 4898621174299674350} + 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: -56.6, y: -13.22} + m_SizeDelta: {x: 197.42, y: 79.69} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8110139630821537658 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3534212493636510032} + m_CullTransparentMesh: 0 +--- !u!114 &1031973669735799563 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3534212493636510032} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: 7f7cdabfab0b95c41828e1ddca64a2b6, 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 &3681050714732390577 GameObject: m_ObjectHideFlags: 0 @@ -2991,7 +3212,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 8963285287283966624} + - {fileID: 2924583690799615939} m_Father: {fileID: 8169141433332227} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3037,7 +3258,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &3870696472722962375 +--- !u!1 &3860992064991431389 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -3045,47 +3266,79 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1661457884122057613} - - component: {fileID: 7294337294344738370} + - component: {fileID: 8098483503836218023} + - component: {fileID: 8847213993362880457} + - component: {fileID: 9187182763114968024} m_Layer: 5 - m_Name: infoGo + m_Name: trial m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1661457884122057613 + m_IsActive: 0 +--- !u!224 &8098483503836218023 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3870696472722962375} + m_GameObject: {fileID: 3860992064991431389} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.99978584, y: 0.99978584, z: 0.99978584} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 7368498915872114439} - - {fileID: 1323843675036142031} - - {fileID: 8982232778493311718} - - {fileID: 6619555056324006340} - - {fileID: 2886390000781381518} - m_Father: {fileID: 3542290585148391186} - m_RootOrder: 6 + - {fileID: 8846741453283729234} + m_Father: {fileID: 3245842208257657378} + 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: 321.1, y: 8.6} - m_SizeDelta: {x: 300.59998, y: 41.9} + m_AnchoredPosition: {x: -53.1, y: -1} + m_SizeDelta: {x: 197.42, y: 79.69} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7294337294344738370 +--- !u!222 &8847213993362880457 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3870696472722962375} + m_GameObject: {fileID: 3860992064991431389} m_CullTransparentMesh: 0 +--- !u!114 &9187182763114968024 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3860992064991431389} + 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.9882353, g: 0.92156863, b: 0.7921569, 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: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_FontSize: 38 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u5C42\u6570:" + LanguageIndex: 11441 --- !u!1 &3927683736205112192 GameObject: m_ObjectHideFlags: 0 @@ -3101,7 +3354,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &3542290585148391186 RectTransform: m_ObjectHideFlags: 0 @@ -3113,13 +3366,13 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.0002142, y: 1.0002142, z: 1.0002142} m_Children: - - {fileID: 946289741621033644} + - {fileID: 7192617622825626711} - {fileID: 4288678787939920442} - {fileID: 5978631769506800921} - - {fileID: 7893012631599524591} + - {fileID: 4142278180492928908} - {fileID: 5724275852518584896} - {fileID: 1819559674412029490} - - {fileID: 1661457884122057613} + - {fileID: 4898621174299674350} - {fileID: 8169141433332227} - {fileID: 6746075743845253643} m_Father: {fileID: 2953731360110064277} @@ -3127,7 +3380,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 451.44998, y: -192.9} + m_AnchoredPosition: {x: -840, y: -192.9} m_SizeDelta: {x: 903.1, y: 131.7} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3974428329528298239 @@ -3210,7 +3463,7 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u6392\u540D" LanguageIndex: 10250 ---- !u!1 &4286029307860954911 +--- !u!1 &4096891670417894744 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -3218,91 +3471,72 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4062430642178948985} - - component: {fileID: 4065215249390468725} - - component: {fileID: 4245258670070591489} - - component: {fileID: 4021269114615827077} - m_Layer: 5 - m_Name: Text + - component: {fileID: 2924583690799615939} + - component: {fileID: 3580808928937341630} + - component: {fileID: 6331302251538680759} + m_Layer: 0 + m_Name: Icon m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &4062430642178948985 +--- !u!224 &2924583690799615939 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4286029307860954911} + m_GameObject: {fileID: 4096891670417894744} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.7, y: 0.7, z: 1} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 4440706391705485068} + m_Father: {fileID: 8818123660937077498} 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: 18.5, y: 0.6} - m_SizeDelta: {x: 160, y: 30} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 80, y: 80} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4065215249390468725 +--- !u!222 &3580808928937341630 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4286029307860954911} + m_GameObject: {fileID: 4096891670417894744} m_CullTransparentMesh: 0 ---- !u!114 &4245258670070591489 +--- !u!114 &6331302251538680759 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4286029307860954911} + m_GameObject: {fileID: 4096891670417894744} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_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: 634137158f07dff488d018d707aa403a, type: 2} - m_FontSize: 0 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 0 - m_MaxSize: 40 - m_Alignment: 3 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: 9999 ---- !u!114 &4021269114615827077 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4286029307860954911} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 72f543c75b355a741976183c1e74debc, type: 3} - m_Name: - m_EditorClassIdentifier: - _textSpacing: -30.8 + m_Sprite: {fileID: 21300000, guid: 2c2cc5fac629a17409e60bfbf2c63d55, 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 &4343409457213315450 GameObject: m_ObjectHideFlags: 0 @@ -3457,7 +3691,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &4487017081131425909 +--- !u!1 &4457086584487533139 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -3465,58 +3699,59 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 7874033753268375199} - - component: {fileID: 8799657971638144051} - - component: {fileID: 2632570842379578499} + - component: {fileID: 2905530097823807365} + - component: {fileID: 9071367287944662733} + - component: {fileID: 6039011073842255523} m_Layer: 5 - m_Name: arenaScore + m_Name: trial m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 0 ---- !u!224 &7874033753268375199 +--- !u!224 &2905530097823807365 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4487017081131425909} + m_GameObject: {fileID: 4457086584487533139} 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: 8790539866172688193} - m_RootOrder: 4 + m_Children: + - {fileID: 681387831103450937} + m_Father: {fileID: 4898621174299674350} + 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.000010967255, y: 0.0000021457672} - m_SizeDelta: {x: 300.59998, y: 41.9} + m_AnchoredPosition: {x: -53.1, y: -1} + m_SizeDelta: {x: 197.42, y: 79.69} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8799657971638144051 +--- !u!222 &9071367287944662733 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4487017081131425909} + m_GameObject: {fileID: 4457086584487533139} m_CullTransparentMesh: 0 ---- !u!114 &2632570842379578499 +--- !u!114 &6039011073842255523 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4487017081131425909} + m_GameObject: {fileID: 4457086584487533139} 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.9372549, g: 0.8, b: 0.7411765, a: 1} - m_RaycastTarget: 0 + m_Color: {r: 0.9882353, g: 0.92156863, b: 0.7921569, a: 1} + m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -3524,10 +3759,10 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} - m_FontSize: 36 + m_FontSize: 38 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 0 + m_MinSize: 1 m_MaxSize: 40 m_Alignment: 3 m_AlignByGeometry: 0 @@ -3535,9 +3770,9 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\u70BC\u72F15-5" - LanguageIndex: 11440 ---- !u!1 &4529726933452628595 + m_Text: "\u5C42\u6570:" + LanguageIndex: 11441 +--- !u!1 &4492902763928419014 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -3545,84 +3780,10 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 3177873219708070726} - - component: {fileID: 7733145014918899585} - - component: {fileID: 3787404714791840128} - m_Layer: 5 - m_Name: Image (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3177873219708070726 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4529726933452628595} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 2.3111718, y: 1.839375, z: 1} - m_Children: [] - m_Father: {fileID: 7192617622825626711} - 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: 45} - m_SizeDelta: {x: 430.82, y: 2} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7733145014918899585 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4529726933452628595} - m_CullTransparentMesh: 0 ---- !u!114 &3787404714791840128 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4529726933452628595} - 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 &4649186749458088264 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 966481933898560697} - - component: {fileID: 6224803129353852850} - - component: {fileID: 8779796671279175664} - - component: {fileID: 6802744645371471246} + - component: {fileID: 7832095934455586063} + - component: {fileID: 6658721862883894702} + - component: {fileID: 7184138469328656173} + - component: {fileID: 5225419935573389435} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -3630,47 +3791,47 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &966481933898560697 +--- !u!224 &7832095934455586063 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4649186749458088264} + m_GameObject: {fileID: 4492902763928419014} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.8, y: 0.8, z: 1} + m_LocalScale: {x: 0.7, y: 0.7, z: 1} m_Children: [] - m_Father: {fileID: 6619555056324006340} + m_Father: {fileID: 7309208965910945481} 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: -11.3, y: -40.9} + m_AnchoredPosition: {x: 18.5, y: 0.6} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6224803129353852850 +--- !u!222 &6658721862883894702 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4649186749458088264} + m_GameObject: {fileID: 4492902763928419014} m_CullTransparentMesh: 0 ---- !u!114 &8779796671279175664 +--- !u!114 &7184138469328656173 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4649186749458088264} + m_GameObject: {fileID: 4492902763928419014} 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.9882353, g: 0.92156863, b: 0.7921569, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -3683,27 +3844,27 @@ MonoBehaviour: m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 - m_MaxSize: 50 - m_Alignment: 4 + m_MaxSize: 40 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 99 ---- !u!114 &6802744645371471246 + m_Text: 9999 +--- !u!114 &5225419935573389435 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4649186749458088264} + m_GameObject: {fileID: 4492902763928419014} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 72f543c75b355a741976183c1e74debc, type: 3} m_Name: m_EditorClassIdentifier: - _textSpacing: -31.45 + _textSpacing: -30.8 --- !u!1 &4674859891010462116 GameObject: m_ObjectHideFlags: 0 @@ -3980,7 +4141,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 8087570311705215702} + m_Father: {fileID: 7278217084202990297} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -4153,7 +4314,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5146752833819691693} m_CullTransparentMesh: 0 ---- !u!1 &5425373566773411937 +--- !u!1 &5241810775004768941 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -4161,9 +4322,9 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 5211055459982184455} - - component: {fileID: 5213848726670315787} - - component: {fileID: 1780436642899412868} + - component: {fileID: 6807019927217198876} + - component: {fileID: 7219362595024714280} + - component: {fileID: 9026847632734706461} m_Layer: 5 m_Name: bg m_TagString: Untagged @@ -4171,40 +4332,40 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &5211055459982184455 +--- !u!224 &6807019927217198876 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5425373566773411937} + m_GameObject: {fileID: 5241810775004768941} 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: 8830212790296371356} + m_Father: {fileID: 5838072232418814881} 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.3, y: 177.5} - m_SizeDelta: {x: 522, y: 106} + m_AnchoredPosition: {x: 0, y: -2} + m_SizeDelta: {x: 917, y: 1336} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5213848726670315787 +--- !u!222 &7219362595024714280 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5425373566773411937} + m_GameObject: {fileID: 5241810775004768941} m_CullTransparentMesh: 0 ---- !u!114 &1780436642899412868 +--- !u!114 &9026847632734706461 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5425373566773411937} + m_GameObject: {fileID: 5241810775004768941} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} @@ -4218,7 +4379,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: 8181bd02d033477489a1812a27509767, type: 3} + m_Sprite: {fileID: 21300000, guid: 3e71ed27c496acc4b92fe95a6e2d6339, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -4227,6 +4388,218 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &5292994846996125291 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3245842208257657378} + - component: {fileID: 6879605049238452147} + m_Layer: 5 + m_Name: infoGo + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3245842208257657378 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5292994846996125291} + 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: 2193098395500105120} + - {fileID: 7309208965910945481} + - {fileID: 8098483503836218023} + - {fileID: 935658931973507275} + - {fileID: 4157920728525014012} + m_Father: {fileID: 6913215175904765234} + 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: 319.7, y: -618} + m_SizeDelta: {x: 300.59998, y: 41.9} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6879605049238452147 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5292994846996125291} + m_CullTransparentMesh: 0 +--- !u!1 &5444339310555784668 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7309208965910945481} + - component: {fileID: 2439073073965435909} + - component: {fileID: 1915489760826150058} + m_Layer: 5 + m_Name: warPower + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &7309208965910945481 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5444339310555784668} + 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: 7832095934455586063} + m_Father: {fileID: 3245842208257657378} + 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: -56.6, y: -13.22} + m_SizeDelta: {x: 197.42, y: 79.69} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2439073073965435909 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5444339310555784668} + m_CullTransparentMesh: 0 +--- !u!114 &1915489760826150058 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5444339310555784668} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: 7f7cdabfab0b95c41828e1ddca64a2b6, 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 &5465666489726827775 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4142278180492928908} + - component: {fileID: 6130874505639587717} + - component: {fileID: 3485316029547880395} + m_Layer: 5 + m_Name: Head + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4142278180492928908 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5465666489726827775} + 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: 1206143511832642564} + m_Father: {fileID: 3542290585148391186} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 209.1, y: 0.1} + m_SizeDelta: {x: 110, y: 109.99999} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6130874505639587717 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5465666489726827775} + m_CullTransparentMesh: 0 +--- !u!114 &3485316029547880395 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5465666489726827775} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 0} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!1 &5490176762111594418 GameObject: m_ObjectHideFlags: 0 @@ -4331,7 +4704,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Delegates: [] delegates: [] ---- !u!1 &5496183595523988309 +--- !u!1 &5553084567496596214 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -4339,90 +4712,9 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 2886390000781381518} - - component: {fileID: 5261976870595917203} - - component: {fileID: 8088748264479296521} - m_Layer: 5 - m_Name: arenaScore - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &2886390000781381518 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5496183595523988309} - 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: 1661457884122057613} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -0.00000047683716, y: 0.000012040138} - m_SizeDelta: {x: 300.59998, y: 41.9} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5261976870595917203 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5496183595523988309} - m_CullTransparentMesh: 0 ---- !u!114 &8088748264479296521 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5496183595523988309} - 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.9372549, g: 0.8, b: 0.7411765, 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: 36 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 0 - m_MaxSize: 40 - m_Alignment: 3 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: "\u70BC\u72F15-5" - LanguageIndex: 11440 ---- !u!1 &5506042280547655900 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4016482264824406701} - - component: {fileID: 999027838587883091} - - component: {fileID: 646306487433048345} - - component: {fileID: 7765988569976321402} + - component: {fileID: 5623636016358050448} + - component: {fileID: 5620782294404615068} + - component: {fileID: 4890374064719514483} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -4430,139 +4722,47 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &4016482264824406701 +--- !u!224 &5623636016358050448 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5506042280547655900} + m_GameObject: {fileID: 5553084567496596214} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.7, y: 0.7, z: 1} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 1323843675036142031} + m_Father: {fileID: 6578960951442613540} 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: 18.5, y: 0.6} - m_SizeDelta: {x: 160, y: 30} + m_AnchoredPosition: {x: 0.79999995, y: 15.299999} + m_SizeDelta: {x: 229.5, y: 64.4} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &999027838587883091 +--- !u!222 &5620782294404615068 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5506042280547655900} + m_GameObject: {fileID: 5553084567496596214} m_CullTransparentMesh: 0 ---- !u!114 &646306487433048345 +--- !u!114 &4890374064719514483 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5506042280547655900} - 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: 3 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: 9999 ---- !u!114 &7765988569976321402 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5506042280547655900} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 72f543c75b355a741976183c1e74debc, type: 3} - m_Name: - m_EditorClassIdentifier: - _textSpacing: -30.8 ---- !u!1 &5678024245988805516 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1351652527864633715} - - component: {fileID: 6582158758996727411} - - component: {fileID: 2475053453778601732} - m_Layer: 5 - m_Name: Rank1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &1351652527864633715 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5678024245988805516} - 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: 6913215175904765234} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 354, y: -628} - m_SizeDelta: {x: 300.59998, y: 41.9} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6582158758996727411 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5678024245988805516} - m_CullTransparentMesh: 0 ---- !u!114 &2475053453778601732 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5678024245988805516} + m_GameObject: {fileID: 5553084567496596214} 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.9372549, g: 0.8, b: 0.7411765, a: 1} + m_Color: {r: 0.9882353, g: 0.92156863, b: 0.7921569, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -4571,10 +4771,170 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} - m_FontSize: 36 + m_FontSize: 35 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 51 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u699C\u5355\u4E3A\u7A7A" + LanguageIndex: 10239 +--- !u!1 &5848481260608396037 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8846741453283729234} + - component: {fileID: 7596036989721789072} + - component: {fileID: 7327495727618202767} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8846741453283729234 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5848481260608396037} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.7, y: 0.7, z: 1} + m_Children: [] + m_Father: {fileID: 8098483503836218023} + 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: 44.1, y: 0.6} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7596036989721789072 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5848481260608396037} + m_CullTransparentMesh: 0 +--- !u!114 &7327495727618202767 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5848481260608396037} + 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.9882353, g: 0.92156863, b: 0.7921569, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 50 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 + m_MaxSize: 50 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: 123 +--- !u!1 &5930915153503405636 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1092311363681623207} + - component: {fileID: 9021745450516796250} + - component: {fileID: 9092671166150585206} + m_Layer: 5 + m_Name: goldExper + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1092311363681623207 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5930915153503405636} + 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: 6457153712955849178} + m_Father: {fileID: 4898621174299674350} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 4.9, y: 4} + m_SizeDelta: {x: 197.42, y: 79.69} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &9021745450516796250 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5930915153503405636} + m_CullTransparentMesh: 0 +--- !u!114 &9092671166150585206 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5930915153503405636} + 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.9882353, g: 0.92156863, b: 0.7921569, 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: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_FontSize: 38 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 m_MaxSize: 40 m_Alignment: 3 m_AlignByGeometry: 0 @@ -4582,8 +4942,8 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\u70BC\u72F15-5" - LanguageIndex: 11440 + m_Text: "\u70B9\u91D1\u6B21\u6570" + LanguageIndex: 11447 --- !u!1 &5945729312647218302 GameObject: m_ObjectHideFlags: 0 @@ -4601,7 +4961,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &2333648513030445856 RectTransform: m_ObjectHideFlags: 0 @@ -4688,7 +5048,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 4469335405778636002} + - {fileID: 1368072356890861586} m_Father: {fileID: 8169141433332227} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -4734,85 +5094,6 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &6314660888980602948 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6737683812756038234} - - component: {fileID: 7042478506699956994} - - component: {fileID: 871241286589584653} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6737683812756038234 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6314660888980602948} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.7, y: 0.7, z: 1} - m_Children: [] - m_Father: {fileID: 8982232778493311718} - 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: 44.1, y: 0.6} - m_SizeDelta: {x: 160, y: 30} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7042478506699956994 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6314660888980602948} - m_CullTransparentMesh: 0 ---- !u!114 &871241286589584653 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6314660888980602948} - 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.9882353, g: 0.92156863, b: 0.7921569, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_FontData: - m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 50 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 0 - m_MaxSize: 50 - m_Alignment: 3 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: 123 --- !u!1 &6386940073127162942 GameObject: m_ObjectHideFlags: 0 @@ -4921,7 +5202,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 5211055459982184455} + - {fileID: 2063961932793240932} - {fileID: 618109845203557499} - {fileID: 8877777530771163856} - {fileID: 3128544740893925850} @@ -4944,7 +5225,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6475515671209916733} m_CullTransparentMesh: 0 ---- !u!1 &6650258880789091618 +--- !u!1 &6668652242499862181 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -4952,211 +5233,50 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 7368498915872114439} - - component: {fileID: 3208359010557891136} - - component: {fileID: 3128219671470292916} - m_Layer: 5 - m_Name: fight - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &7368498915872114439 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6650258880789091618} - 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: 1661457884122057613} - 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: 300.59998, y: 41.9} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3208359010557891136 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6650258880789091618} - m_CullTransparentMesh: 0 ---- !u!114 &3128219671470292916 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6650258880789091618} - 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.9372549, g: 0.8, b: 0.7411765, 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: 36 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 0 - m_MaxSize: 40 - m_Alignment: 3 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: "\u70BC\u72F15-5" - LanguageIndex: 11440 ---- !u!1 &6682162946272902331 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6343858779078722984} - - component: {fileID: 5403280462564821363} - - component: {fileID: 7920277447040733570} - m_Layer: 5 - m_Name: goldExper - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &6343858779078722984 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6682162946272902331} - 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: 4704988575550400999} - m_Father: {fileID: 8790539866172688193} - 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: -61.8, y: -13.6} - m_SizeDelta: {x: 197.42, y: 79.69} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5403280462564821363 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6682162946272902331} - m_CullTransparentMesh: 0 ---- !u!114 &7920277447040733570 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6682162946272902331} - 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.9882353, g: 0.92156863, b: 0.7921569, 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: 6fa15837529b0e640af6620b07d3207d, type: 3} - m_FontSize: 38 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 1 - m_MaxSize: 40 - m_Alignment: 3 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: "\u70B9\u91D1\u6B21\u6570\uFF1A" - LanguageIndex: 11445 ---- !u!1 &6702083757879800692 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3799625913579506993} - - component: {fileID: 5649604387725788345} - - component: {fileID: 405709736340294536} - m_Layer: 5 - m_Name: icon + - component: {fileID: 7467133760243156587} + - component: {fileID: 5821808738063087387} + - component: {fileID: 2510478338727809874} + m_Layer: 0 + m_Name: Icon m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &3799625913579506993 +--- !u!224 &7467133760243156587 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6702083757879800692} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_GameObject: {fileID: 6668652242499862181} + 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: 4920424518308432231} + m_Father: {fileID: 8680697175201693075} 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: 140, y: 140} + m_SizeDelta: {x: 80, y: 80} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5649604387725788345 +--- !u!222 &5821808738063087387 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6702083757879800692} + m_GameObject: {fileID: 6668652242499862181} m_CullTransparentMesh: 0 ---- !u!114 &405709736340294536 +--- !u!114 &2510478338727809874 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6702083757879800692} + m_GameObject: {fileID: 6668652242499862181} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} @@ -5170,7 +5290,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: 157e394dc0ac8c142b13d5bb396503dc, type: 3} + m_Sprite: {fileID: 21300000, guid: 2c2cc5fac629a17409e60bfbf2c63d55, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -5179,7 +5299,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &6883791816046348604 +--- !u!1 &6746632470633139402 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -5187,10 +5307,54 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4704988575550400999} - - component: {fileID: 8305782486006599831} - - component: {fileID: 6815362620541595349} - - component: {fileID: 9171007954885562738} + - component: {fileID: 3973448909949542708} + - component: {fileID: 1639089166357318826} + m_Layer: 5 + m_Name: BG + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3973448909949542708 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6746632470633139402} + 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: 8714425690753459749} + m_Father: {fileID: 6913215175904765234} + 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.82501, y: -629} + m_SizeDelta: {x: 909.49, y: 85.3} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1639089166357318826 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6746632470633139402} + m_CullTransparentMesh: 0 +--- !u!1 &6775963495977181474 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3483471335109234525} + - component: {fileID: 5634239390173379798} + - component: {fileID: 8793802382655201099} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -5198,40 +5362,40 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &4704988575550400999 +--- !u!224 &3483471335109234525 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6883791816046348604} + m_GameObject: {fileID: 6775963495977181474} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.8, y: 0.8, z: 1} + m_LocalScale: {x: 0.7, y: 0.7, z: 1} m_Children: [] - m_Father: {fileID: 6343858779078722984} + m_Father: {fileID: 4935494681454572907} 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: 127.4, y: 1.5} + m_AnchoredPosition: {x: 44.1, y: 0.6} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8305782486006599831 +--- !u!222 &5634239390173379798 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6883791816046348604} + m_GameObject: {fileID: 6775963495977181474} m_CullTransparentMesh: 0 ---- !u!114 &6815362620541595349 +--- !u!114 &8793802382655201099 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6883791816046348604} + m_GameObject: {fileID: 6775963495977181474} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} @@ -5246,8 +5410,8 @@ MonoBehaviour: 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_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 50 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 @@ -5258,20 +5422,130 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 99 ---- !u!114 &9171007954885562738 + m_Text: 123 +--- !u!1 &6869591989005091441 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8962435430428755452} + - component: {fileID: 8943105451975372732} + - component: {fileID: 2980611081044458572} + m_Layer: 0 + m_Name: Icon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8962435430428755452 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6869591989005091441} + 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: 4180827490713499375} + 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: 80, y: 80} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8943105451975372732 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6869591989005091441} + m_CullTransparentMesh: 0 +--- !u!114 &2980611081044458572 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6883791816046348604} + m_GameObject: {fileID: 6869591989005091441} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 72f543c75b355a741976183c1e74debc, type: 3} + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: - _textSpacing: -31.45 + 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: 2c2cc5fac629a17409e60bfbf2c63d55, 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 &7008358354809174692 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4898621174299674350} + - component: {fileID: 3589219622068788001} + m_Layer: 5 + m_Name: infoGo + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4898621174299674350 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7008358354809174692} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.99978584, y: 0.99978584, z: 0.99978584} + m_Children: + - {fileID: 3654639885268044388} + - {fileID: 5092152720033678508} + - {fileID: 2905530097823807365} + - {fileID: 1092311363681623207} + - {fileID: 9005876869221352173} + m_Father: {fileID: 3542290585148391186} + m_RootOrder: 6 + 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: 321.1, y: 8.6} + m_SizeDelta: {x: 300.59998, y: 41.9} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3589219622068788001 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7008358354809174692} + m_CullTransparentMesh: 0 --- !u!1 &7010845611176224476 GameObject: m_ObjectHideFlags: 0 @@ -5352,161 +5626,6 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u6218\u529B\u6392\u884C\u699C" LanguageIndex: 11444 ---- !u!1 &7016950125505431486 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2636399030825652164} - - component: {fileID: 3328819166039423658} - - component: {fileID: 3137503887318580923} - m_Layer: 5 - m_Name: trial - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &2636399030825652164 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7016950125505431486} - 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: 3328223206316954161} - m_Father: {fileID: 8790539866172688193} - 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: -53.1, y: -1} - m_SizeDelta: {x: 197.42, y: 79.69} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3328819166039423658 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7016950125505431486} - m_CullTransparentMesh: 0 ---- !u!114 &3137503887318580923 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7016950125505431486} - 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.9882353, g: 0.92156863, b: 0.7921569, 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: 6fa15837529b0e640af6620b07d3207d, type: 3} - m_FontSize: 38 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 1 - m_MaxSize: 40 - m_Alignment: 3 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: "\u5C42\u6570:" - LanguageIndex: 11441 ---- !u!1 &7225149828935830291 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4084375936823630403} - - component: {fileID: 1539463731938558243} - - component: {fileID: 5124217095745982909} - m_Layer: 5 - m_Name: frame - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4084375936823630403 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7225149828935830291} - 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: 4920424518308432231} - 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: 200, y: 200} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1539463731938558243 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7225149828935830291} - m_CullTransparentMesh: 0 ---- !u!114 &5124217095745982909 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7225149828935830291} - 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: 235f511e5ae0aec4f905c2f4df405d91, 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 &7291039171695906314 GameObject: m_ObjectHideFlags: 0 @@ -5586,81 +5705,6 @@ MonoBehaviour: m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: 35 ---- !u!1 &7348118311642295347 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1323843675036142031} - - component: {fileID: 2628070438624279065} - - component: {fileID: 6532338975936370280} - m_Layer: 5 - m_Name: warPower - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &1323843675036142031 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7348118311642295347} - 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: 4016482264824406701} - m_Father: {fileID: 1661457884122057613} - 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: -56.6, y: -13.22} - m_SizeDelta: {x: 197.42, y: 79.69} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2628070438624279065 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7348118311642295347} - m_CullTransparentMesh: 0 ---- !u!114 &6532338975936370280 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7348118311642295347} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 7f7cdabfab0b95c41828e1ddca64a2b6, 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 &7436511982450282019 GameObject: m_ObjectHideFlags: 0 @@ -5901,7 +5945,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 4062430642178948985} + - {fileID: 1640973378095603040} m_Father: {fileID: 3128544740893925850} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -5947,87 +5991,6 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &7579287177046071088 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8982232778493311718} - - component: {fileID: 2960608067357672366} - - component: {fileID: 521056046975572928} - m_Layer: 5 - m_Name: trial - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &8982232778493311718 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7579287177046071088} - 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: 6737683812756038234} - m_Father: {fileID: 1661457884122057613} - 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: -53.1, y: -1} - m_SizeDelta: {x: 197.42, y: 79.69} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2960608067357672366 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7579287177046071088} - m_CullTransparentMesh: 0 ---- !u!114 &521056046975572928 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7579287177046071088} - 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.9882353, g: 0.92156863, b: 0.7921569, 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: 6fa15837529b0e640af6620b07d3207d, type: 3} - m_FontSize: 38 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 1 - m_MaxSize: 40 - m_Alignment: 3 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: "\u5C42\u6570:" - LanguageIndex: 11441 --- !u!1 &7609199283579707025 GameObject: m_ObjectHideFlags: 0 @@ -6251,7 +6214,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &7686578484073346981 +--- !u!1 &7649675682577805072 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -6259,143 +6222,50 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4054639222727463020} - - component: {fileID: 620724224224045261} - - component: {fileID: 3983124883994663502} - - component: {fileID: 2049598093662387480} + - component: {fileID: 8714425690753459749} + - component: {fileID: 4585912705090202338} + - component: {fileID: 6951967518844413155} m_Layer: 5 - m_Name: Text + m_Name: Image (1) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &4054639222727463020 +--- !u!224 &8714425690753459749 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7686578484073346981} + m_GameObject: {fileID: 7649675682577805072} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.7, y: 0.7, z: 1} + m_LocalScale: {x: 2.3111718, y: 1.839375, z: 1} m_Children: [] - m_Father: {fileID: 3574257153817449386} + m_Father: {fileID: 3973448909949542708} 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: 18.5, y: 0.6} - m_SizeDelta: {x: 160, y: 30} + m_AnchoredPosition: {x: 0, y: 45} + m_SizeDelta: {x: 430.82, y: 2} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &620724224224045261 +--- !u!222 &4585912705090202338 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7686578484073346981} + m_GameObject: {fileID: 7649675682577805072} m_CullTransparentMesh: 0 ---- !u!114 &3983124883994663502 +--- !u!114 &6951967518844413155 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7686578484073346981} - 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: 3 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: 9999 ---- !u!114 &2049598093662387480 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7686578484073346981} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 72f543c75b355a741976183c1e74debc, type: 3} - m_Name: - m_EditorClassIdentifier: - _textSpacing: -30.8 ---- !u!1 &7795410314422067259 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8963285287283966624} - - component: {fileID: 7297062412062277597} - - component: {fileID: 227578016020088532} - m_Layer: 0 - m_Name: Icon - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8963285287283966624 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7795410314422067259} - 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: 8818123660937077498} - 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: 80, y: 80} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7297062412062277597 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7795410314422067259} - m_CullTransparentMesh: 0 ---- !u!114 &227578016020088532 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7795410314422067259} + m_GameObject: {fileID: 7649675682577805072} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} @@ -6409,7 +6279,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: 2c2cc5fac629a17409e60bfbf2c63d55, type: 3} + m_Sprite: {fileID: 21300000, guid: 26ce1a2f8851e004e88e569a15a5a1f8, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -6418,6 +6288,86 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &7687890195298528534 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4157920728525014012} + - component: {fileID: 3380905247615861072} + - component: {fileID: 8105648227947979232} + m_Layer: 5 + m_Name: arenaScore + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &4157920728525014012 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7687890195298528534} + 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: 3245842208257657378} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0.000010967255, y: -12.999979} + m_SizeDelta: {x: 300.59998, y: 41.9} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3380905247615861072 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7687890195298528534} + m_CullTransparentMesh: 0 +--- !u!114 &8105648227947979232 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7687890195298528534} + 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.9372549, g: 0.8, b: 0.7411765, 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: 36 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u70BC\u72F15-5" + LanguageIndex: 11440 --- !u!1 &8006837061636153058 GameObject: m_ObjectHideFlags: 0 @@ -6614,7 +6564,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 1945240633628526579} + - {fileID: 5623636016358050448} m_Father: {fileID: 2333648513030445856} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -6699,123 +6649,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: -405} m_SizeDelta: {x: 932.16, y: 94.84} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &8332465125453075761 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4920424518308432231} - m_Layer: 5 - m_Name: PlayerHead - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4920424518308432231 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8332465125453075761} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.6, y: 0.6, z: 0.7} - m_Children: - - {fileID: 3799625913579506993} - - {fileID: 4084375936823630403} - - {fileID: 3283993680852329663} - m_Father: {fileID: 7893012631599524591} - 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: 200, y: 200} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &8376104239460160462 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6723508123127853715} - - component: {fileID: 7903586732001893130} - - component: {fileID: 5282573322918256049} - m_Layer: 5 - m_Name: lv - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6723508123127853715 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8376104239460160462} - 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: 3283993680852329663} - 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.000014663001, y: 0.0000038147} - m_SizeDelta: {x: 131.69, y: 47.77} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7903586732001893130 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8376104239460160462} - m_CullTransparentMesh: 0 ---- !u!114 &5282573322918256049 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8376104239460160462} - 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: 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: 34 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 2 - m_MaxSize: 300 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 0 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: 100 --- !u!1 &8458691605757713339 GameObject: m_ObjectHideFlags: 0 @@ -6865,6 +6698,86 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8458691605757713339} m_CullTransparentMesh: 0 +--- !u!1 &8823852513382537668 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2193098395500105120} + - component: {fileID: 7073735581978045534} + - component: {fileID: 5456728295748944765} + m_Layer: 5 + m_Name: fight + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &2193098395500105120 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8823852513382537668} + 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: 3245842208257657378} + 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: -13} + m_SizeDelta: {x: 300.59998, y: 41.9} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7073735581978045534 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8823852513382537668} + m_CullTransparentMesh: 0 +--- !u!114 &5456728295748944765 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8823852513382537668} + 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.9372549, g: 0.8, b: 0.7411765, 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: 36 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u70BC\u72F15-5" + LanguageIndex: 11440 --- !u!1 &8848807141185617685 GameObject: m_ObjectHideFlags: 0 @@ -6893,14 +6806,14 @@ RectTransform: m_GameObject: {fileID: 8848807141185617685} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.8, y: 0.8, z: 1} + m_LocalScale: {x: 0.7, y: 0.7, z: 1} m_Children: [] - m_Father: {fileID: 3939068427722580484} + m_Father: {fileID: 4440706391705485068} 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: 127.4, y: 1.5} + m_AnchoredPosition: {x: 18.5, y: 0.6} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5127001045509549551 @@ -6924,7 +6837,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9882353, g: 0.92156863, b: 0.7921569, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -6937,14 +6850,14 @@ MonoBehaviour: m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 - m_MaxSize: 50 + m_MaxSize: 40 m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 99 + m_Text: 9999 --- !u!114 &8719556471731492083 MonoBehaviour: m_ObjectHideFlags: 0 @@ -6957,82 +6870,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 72f543c75b355a741976183c1e74debc, type: 3} m_Name: m_EditorClassIdentifier: - _textSpacing: -31.45 ---- !u!1 &9023296770975337301 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3283993680852329663} - - component: {fileID: 6780871177208400270} - - component: {fileID: 1253826894569057526} - m_Layer: 5 - m_Name: lvRoot - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3283993680852329663 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9023296770975337301} - 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: 6723508123127853715} - m_Father: {fileID: 4920424518308432231} - 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: -57.4, y: 55.5} - m_SizeDelta: {x: 60, y: 40} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6780871177208400270 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9023296770975337301} - m_CullTransparentMesh: 0 ---- !u!114 &1253826894569057526 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9023296770975337301} - 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: c73ac4f44d9a7194488674d4fa335c10, 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 + _textSpacing: -30.8 --- !u!1 &9190241788720526697 GameObject: m_ObjectHideFlags: 0 @@ -7062,7 +6900,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 7251375515082801726} + - {fileID: 3483471335109234525} m_Father: {fileID: 3128544740893925850} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index e7c95d5c9e..232a7d8c4e 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -2021,13 +2021,13 @@ BATTLE_TYPE = { Xuanyuan = 13, --轩辕宝镜 GuildTranscript = 14, --公会副本 } -rankKingList={ [1] = { bgImage = "r_zjm_paihangbang_banner04", name = Language[12164] ,Id = 26 ,rankType = RANK_TYPE.FIGHT_LEVEL_RANK,activiteId = 0,isRankingMainPanelShow = true}, - [2] = { bgImage = "r_zjm_paihangbang_banner02", name = Language[12165] ,Id = 55,rankType = RANK_TYPE.FORCE_CURR_RANK,activiteId = 0,isRankingMainPanelShow = true}, - [3] = { bgImage = "r_zjm_paihangbang_banner03", name = Language[12166] ,Id = 4,rankType = RANK_TYPE.GUILD_FORCE_RANK,activiteId = 0,isRankingMainPanelShow = true}, - [4] = { bgImage = "r_zjm_paihangbang_banner01", name = Language[12167] ,Id = 44,rankType = RANK_TYPE.MONSTER_RANK,activiteId = 0,isRankingMainPanelShow = true}, - [5] = { bgImage = "r_zjm_paihangbang_banner01", name = Language[12168] ,Id = 42,rankType = RANK_TYPE.GOLD_EXPER,activiteId = ActivityTypeDef.GoldExper,isRankingMainPanelShow = false}, - [6] = { bgImage = "r_zjm_paihangbang_banner01", name = Language[12240] ,Id = 8,rankType = RANK_TYPE.ARENA_RANK,activiteId = 0,isRankingMainPanelShow = false}, - [7] = { bgImage = "r_zjm_paihangbang_banner01", name = "极速排名" ,Id = 42,rankType = RANK_TYPE.FAST_EXPLORE,activiteId = ActivityTypeDef.FastExplore,isRankingMainPanelShow = false}, +rankKingList={ [1] = { bgImage = "r_zjm_paihangbang_banner04", name = Language[12164] ,rankType = RANK_TYPE.FIGHT_LEVEL_RANK,activiteId = 0,isRankingMainPanelShow = true}, + [2] = { bgImage = "r_zjm_paihangbang_banner02", name = Language[12165] ,rankType = RANK_TYPE.FORCE_CURR_RANK,activiteId = 0,isRankingMainPanelShow = true}, + [3] = { bgImage = "r_zjm_paihangbang_banner03", name = Language[12166] ,rankType = RANK_TYPE.GUILD_FORCE_RANK,activiteId = 0,isRankingMainPanelShow = true}, + [4] = { bgImage = "r_zjm_paihangbang_banner01", name = Language[12167] ,rankType = RANK_TYPE.MONSTER_RANK,activiteId = 0,isRankingMainPanelShow = true}, + [5] = { bgImage = "r_zjm_paihangbang_banner01", name = Language[12168] ,rankType = RANK_TYPE.GOLD_EXPER,activiteId = ActivityTypeDef.GoldExper,isRankingMainPanelShow = false}, + [6] = { bgImage = "r_zjm_paihangbang_banner01", name = Language[12240] ,rankType = RANK_TYPE.ARENA_RANK,activiteId = 0,isRankingMainPanelShow = false}, + [7] = { bgImage = "r_zjm_paihangbang_banner01", name = "极速排名" ,rankType = RANK_TYPE.FAST_EXPLORE,activiteId = ActivityTypeDef.FastExplore,isRankingMainPanelShow = false}, } SoulPrintSpriteByQuantity={ diff --git a/Assets/ManagedResources/~Lua/Logic/GameEvent.lua b/Assets/ManagedResources/~Lua/Logic/GameEvent.lua index 8a4538c1a1..d609cb2c2c 100644 --- a/Assets/ManagedResources/~Lua/Logic/GameEvent.lua +++ b/Assets/ManagedResources/~Lua/Logic/GameEvent.lua @@ -324,6 +324,7 @@ GameEvent = { }, RankingList={ + AllRankingList="RankingList.AllRankingList", OnWarPowerChange="RankingList.OnWarPowerChange", OnArenaChange="RankingList.OnArenaChange", OnTrialChange="RankingList.OnTrialChange", diff --git a/Assets/ManagedResources/~Lua/Modules/Expert/Expert.lua b/Assets/ManagedResources/~Lua/Modules/Expert/Expert.lua index 676f492c6f..a1b7217b68 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expert/Expert.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expert/Expert.lua @@ -86,7 +86,8 @@ function Expert:OnShowData(index) this.rewardBtn:SetActive(true) this.sortBtn:SetActive(true) Util.AddClick(this.sortBtn, function() - if index == 5 then + LogGreen("index "..index) + if index == 13 then UIManager.OpenPanel(UIName.RankingSingleListPanel,rankKingList[5]) elseif index == 10 then UIManager.OpenPanel(UIName.RankingSingleListPanel,rankKingList[7]) diff --git a/Assets/ManagedResources/~Lua/Modules/Expert/ExpertRewardSortPanel.lua b/Assets/ManagedResources/~Lua/Modules/Expert/ExpertRewardSortPanel.lua index fcd0a2c082..f45e489c7a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expert/ExpertRewardSortPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expert/ExpertRewardSortPanel.lua @@ -59,7 +59,6 @@ end --界面打开时调用(用于子类重写) function ExpertRewardSortPanel:OnOpen(_activeId,_type) - RankingManager.ClearData() activeId = _activeId type = _type --设置信息方法的列表 @@ -157,7 +156,9 @@ function ExpertRewardSortPanel:ActivitySortRewardShow() self:ActivityRewardSingleShow(expertRewardSortTabs[i],rewardTabs[i]) end -- - RankingManager.InitData(rankKingList[5].Id, this.SetInfoFuncList[rankKingList[5].Id])--算是半个策略模式吧 + RankingManager.InitData(rankKingList[5].rankType, function() + this.SetGoldExperSortInfo() + end) end function this.SetGoldExperSortInfo() local sortNumTabs = {} @@ -165,7 +166,7 @@ function this.SetGoldExperSortInfo() sortNumTabs[i] = Util.GetGameObject(this.myActivityRewardGo, "SortNum/SortNum ("..i..")") sortNumTabs[i]:SetActive(false) end - local data,myData=RankingManager.GetGoldExperSortInfo() + local data,myData=RankingManager.GetRankingInfo() local rewardData = nil if not myData.myRank or myData.myRank < 0 then Util.GetGameObject(sortNumTabs[4], "TitleText"):GetComponent("Text").text = Language[10041] @@ -231,8 +232,6 @@ function ExpertRewardSortPanel:ActivityRewardSingleShow(activityRewardGo,rewardD end --界面关闭时调用(用于子类重写) function ExpertRewardSortPanel:OnClose() - RankingManager.ClearData() - RankingManager.isRequest=0 end --界面销毁时调用(用于子类重写) diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptMainPopup.lua b/Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptMainPopup.lua index 618f54ee5a..254752078d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptMainPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptMainPopup.lua @@ -59,54 +59,56 @@ function GuildTranscriptMainPopup:BindEvent() self:ClosePanel() end) Util.AddClick(this.warbtn,function() - -- if GuildTranscriptManager.GetCanBattleCount() <=0 then --今日已无剩余次数! - -- if GuildTranscriptManager.GetCanBuyBattleCount() <= 0 then - -- PopupTipPanel.ShowTip("今日已无剩余次数!") - -- else--是否花费XX妖晶购买1次挑战次数并发起挑战? - -- local costId, finalNum, oriCostNum = ShopManager.calculateBuyCost(SHOP_TYPE.FUNCTION_SHOP, GuildTranscriptManager.shopGoodId, 1) - -- local itemName = ConfigManager.GetConfigData(ConfigName.ItemConfig,costId).Name - -- if finalNum > BagManager.GetItemCountById(costId) then - -- PopupTipPanel.ShowTip(string.format("%s数量不足!",itemName) ) - -- return - -- end - -- MsgPanel.ShowTwo(string.format( "是否花费%s%s购买1次挑战次数并发起挑战?",finalNum,itemName), nil, function() - -- --买东西 - -- ShopManager.RequestBuyShopItem(SHOP_TYPE.FUNCTION_SHOP,GuildTranscriptManager.shopGoodId,1,function() - -- PopupTipPanel.ShowTip("成功购买1次挑战次数!") - -- UIManager.OpenPanel(UIName.FormationPanelV2, FORMATION_TYPE.GUILD_TRANSCRIPT) - -- this.ShowEndNumInfo() - -- end) - -- end) - -- end - -- else + if GuildTranscriptManager.GetCanBattleCount() <=0 then --今日已无剩余次数! + if GuildTranscriptManager.GetCanBuyBattleCount() <= 0 then + PopupTipPanel.ShowTip("今日已无剩余次数!") + else--是否花费XX妖晶购买1次挑战次数并发起挑战? + local costId, finalNum, oriCostNum = ShopManager.calculateBuyCost(SHOP_TYPE.FUNCTION_SHOP, GuildTranscriptManager.shopGoodId, 1) + local itemName = ConfigManager.GetConfigData(ConfigName.ItemConfig,costId).Name + if finalNum > BagManager.GetItemCountById(costId) then + PopupTipPanel.ShowTip(string.format("%s数量不足!",itemName) ) + return + end + MsgPanel.ShowTwo(string.format( "是否花费%s%s购买1次挑战次数并发起挑战?",finalNum,itemName), nil, function() + --买东西 + ShopManager.RequestBuyShopItem(SHOP_TYPE.FUNCTION_SHOP,GuildTranscriptManager.shopGoodId,1,function() + PopupTipPanel.ShowTip("成功购买1次挑战次数!") + UIManager.OpenPanel(UIName.FormationPanelV2, FORMATION_TYPE.GUILD_TRANSCRIPT) + PrivilegeManager.RefreshPrivilegeUsedTimes(PRIVILEGE_TYPE.GUILDTRANSCRIPT_BUY_BATTLENUM, 1)--更新特权 + this.ShowEndNumInfo() + end) + end) + end + else UIManager.OpenPanel(UIName.FormationPanelV2, FORMATION_TYPE.GUILD_TRANSCRIPT) - -- end + end end) Util.AddClick(this.quickWarbtn,function() - -- if GuildTranscriptManager.GetCanBattleCount() <=0 then --今日已无剩余次数! - -- if GuildTranscriptManager.GetCanBuyBattleCount() <= 0 then - -- PopupTipPanel.ShowTip("今日已无剩余次数!") - -- else--是否花费XX妖晶购买1次挑战次数并发起挑战? - -- local costId, finalNum, oriCostNum = ShopManager.calculateBuyCost(SHOP_TYPE.FUNCTION_SHOP, GuildTranscriptManager.shopGoodId, 1) - -- local itemName = ConfigManager.GetConfigData(ConfigName.ItemConfig,costId).Name - -- if finalNum > BagManager.GetItemCountById(costId) then - -- PopupTipPanel.ShowTip(string.format("%s数量不足!",itemName) ) - -- return - -- end - -- MsgPanel.ShowTwo(string.format( "是否花费%s%s购买1次挑战次数并发起扫荡?",finalNum,itemName), nil, function() - -- --买东西 - -- ShopManager.RequestBuyShopItem(SHOP_TYPE.FUNCTION_SHOP,GuildTranscriptManager.shopGoodId,1,function() - -- PopupTipPanel.ShowTip("成功购买1次扫荡次数!") - -- this.QuickWar() - -- this.ShowEndNumInfo() - -- end) - -- end) - -- end - -- else - -- MsgPanel.ShowTwo(string.format( "确定以上次挑战的%s伤害进行挑战吗?",GuildTranscriptManager.damage), nil, function() + if GuildTranscriptManager.GetCanBattleCount() <=0 then --今日已无剩余次数! + if GuildTranscriptManager.GetCanBuyBattleCount() <= 0 then + PopupTipPanel.ShowTip("今日已无剩余次数!") + else--是否花费XX妖晶购买1次挑战次数并发起挑战? + local costId, finalNum, oriCostNum = ShopManager.calculateBuyCost(SHOP_TYPE.FUNCTION_SHOP, GuildTranscriptManager.shopGoodId, 1) + local itemName = ConfigManager.GetConfigData(ConfigName.ItemConfig,costId).Name + if finalNum > BagManager.GetItemCountById(costId) then + PopupTipPanel.ShowTip(string.format("%s数量不足!",itemName) ) + return + end + MsgPanel.ShowTwo(string.format( "是否花费%s%s购买1次挑战次数并发起扫荡?",finalNum,itemName), nil, function() + --买东西 + ShopManager.RequestBuyShopItem(SHOP_TYPE.FUNCTION_SHOP,GuildTranscriptManager.shopGoodId,1,function() + PopupTipPanel.ShowTip("成功购买1次扫荡次数!") + PrivilegeManager.RefreshPrivilegeUsedTimes(PRIVILEGE_TYPE.GUILDTRANSCRIPT_BUY_BATTLENUM, 1)--更新特权 + this.QuickWar() + this.ShowEndNumInfo() + end) + end) + end + else + MsgPanel.ShowTwo(string.format( "确定以上次挑战的%s伤害进行挑战吗?",GuildTranscriptManager.damage), nil, function() this.QuickWar() - -- end) - -- end + end) + end end) Util.AddClick(this.endNumBtn,function() local costId, finalNum, oriCostNum = ShopManager.calculateBuyCost(SHOP_TYPE.FUNCTION_SHOP, GuildTranscriptManager.shopGoodId, 1) @@ -159,10 +161,16 @@ function GuildTranscriptMainPopup:BindEvent() Util.AddClick(this.attackInfoBtn,function() local curguildCheckpointConfig = guildCheckpointConfig[GuildTranscriptManager.GetCurBoss()] local nextBuyIndex = curBuyIndex + 1 + local itemId = curguildCheckpointConfig.AttributePromotePrice[1][1] + local buyNum = curguildCheckpointConfig.AttributePromotePrice[2][nextBuyIndex] + local itemName = ConfigManager.GetConfigData(ConfigName.ItemConfig,itemId).Name + if buyNum > BagManager.GetItemCountById(itemId) then + PopupTipPanel.ShowTip(string.format("%s数量不足!",itemName) ) + return + end if curguildCheckpointConfig.AttributePromotePrice[2][nextBuyIndex] then local addNum = ConfigManager.GetConfigData(ConfigName.FoodsConfig,curguildCheckpointConfig.AttributePromote[nextBuyIndex]).EffectPara - MsgPanel.ShowTwo(string.format("是否消耗%s%s购买一次强攻效果?购买后攻击力加成提升至%s",curguildCheckpointConfig.AttributePromotePrice[2][nextBuyIndex] - ,ConfigManager.GetConfigData(ConfigName.ItemConfig,curguildCheckpointConfig.AttributePromotePrice[1][1]).Name,math.floor(addNum[1][2]/100) ).."%", nil, function() + MsgPanel.ShowTwo(string.format("是否消耗%s%s购买一次强攻效果?购买后攻击力加成提升至%s",buyNum,itemName,math.floor(addNum[1][2]/100) ).."%", nil, function() --买东西 NetManager.GuildChallengeBuyBuffRequest() end) diff --git a/Assets/ManagedResources/~Lua/Modules/Ranking/RankingListMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Ranking/RankingListMainPanel.lua index 052f71efc4..007ad811a5 100644 --- a/Assets/ManagedResources/~Lua/Modules/Ranking/RankingListMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Ranking/RankingListMainPanel.lua @@ -164,7 +164,7 @@ function this.SetInfoShow(go,data,rankType,nameText) if nameText then nameText:GetComponent("Text").text = data.userName end - Util.GetGameObject(go,"fight"):GetComponent("Text").text = RankingManager.mainLevelConfig[data.rankInfo.param1].Name + Util.GetGameObject(go,"fight"):GetComponent("Text").text = ConfigManager.GetConfigData(ConfigName.MainLevelConfig,data.rankInfo.param1).Name elseif rankType == RANK_TYPE.FORCE_CURR_RANK then warPower:SetActive(true) if nameText then diff --git a/Assets/ManagedResources/~Lua/Modules/Ranking/RankingManager.lua b/Assets/ManagedResources/~Lua/Modules/Ranking/RankingManager.lua index 8abce36026..26387ffe71 100644 --- a/Assets/ManagedResources/~Lua/Modules/Ranking/RankingManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Ranking/RankingManager.lua @@ -1,562 +1,41 @@ RankingManager = {} local this = RankingManager - ---需要显示的排行 -local NeedRanking={ - --[1]={Id=53,OpenLv=0,Name="外敌",PanelType=0}, - [1]={Id=8,OpenLv=0,Name=Language[11725],PanelType=0,Des=Language[11725]}, - [2]={Id=30,OpenLv=0,Name=Language[11726],PanelType=0,Des=Language[11259]}, - [3]={Id=55,OpenLv=0,Name=Language[11727],PanelType=0,Des=""}, - [4]={Id=44,OpenLv=0,Name=Language[11728],PanelType=0,Des=Language[11728]}, - [5]={Id=26,OpenLv=0,Name=Language[11729],PanelType=0,Des=""}, -} ---Tab按钮显示文字 -local TabTextData={ - -- [1]={txt=""}, - [1]={txt=""}, - [2]={txt=""}, - [3]={txt=""}, - [4]={txt=""}, - [5]={txt=""}, -} - this.CurPage=0 -this.WarPowerData={}--战力排行滚动数据 -this.WarPowerMyRankData={} --我的数据 -this.ArenaData={}--逐胜场 -this.ArenaMyRankData={} -this.TrialData={}--试炼 -this.TrialMyRankData={} -this.MonsterData={}--兽潮 -this.MonsterMyRankData={} -this.AdventureData={}--外敌 -this.AdventureMyRankData={} -this.CustomsPassData={}--关卡 -this.CustomsPassMyRankData={} -this.GuildData={}--公会 -this.GuildMyRankData={} -this.GoldExperData={}--点金 -this.GoldExperMyRankData={} - ---是否加载完成 -this.LoadCompleted={ - WarPower=0, - Arena=0, - Trial=0, - Monster=0, - FightAlien=0, - CustomsPass=0, - GuildForce=0, - GoldExperSort=0, -} - +this.curRankingData={}--战力排行滚动数据 +this.curRankingMyRankData={} --我的数据 this.mainLevelConfig={} this.isRequest=0--防止连续请求 function this.Initialize() - this.InitNeedRanking() -end - ---初始化需要显示的排行 -function this.InitNeedRanking() - this.mainLevelConfig=ConfigManager.GetConfig(ConfigName.MainLevelConfig) - --开启等级赋值 - for i = 1, #NeedRanking do - NeedRanking[i].OpenLv=ConfigManager.GetConfigData(ConfigName.GlobalSystemConfig,NeedRanking[i].Id).OpenRules[2] - end - --排序 - table.sort(NeedRanking,function(a,b) - return a.OpenLv= page then return end - --this.CurPage=page - --if page==1 then - -- this.WarPowerData={} - --end - +function this.ReceiveRankingData(msg,fun) --自身数据 - this.WarPowerMyRankData.myRank=msg.myRankInfo.rank - this.WarPowerMyRankData.myForce=msg.myRankInfo.param1 + this.curRankingData = {} + this.curRankingMyRankData=msg.myRankInfo --滚动数据 - local length=#this.WarPowerData + local length=#this.curRankingData for i, rank in ipairs(msg.ranks) do - this.WarPowerData[length+i]=rank + this.curRankingData[length+i]=rank end - this.LoadCompleted.WarPower=1 - Game.GlobalEvent:DispatchEvent(GameEvent.RankingList.OnWarPowerChange) -end ---请求下一页数据 -function this.RequestNextWarPowerPageData() - Log(Language[11738]) - --if not ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.ALLRANKING) then - -- PopupTipPanel.ShowTip("本赛季已结束") - -- return - --end - ----判断是否符合刷新条件 - --local rankNum = #this.WarPowerData - ---- 最多显示100 - --local config = ConfigManager.GetConfigData(ConfigName.SpecialConfig, 7) - --local MaxNum = config and tonumber(config.Value) or 100 - --if rankNum >= MaxNum then return end - ---- 上一页数据少于20条,则没有下一页数,不再刷新 - --if rankNum % 20 > 0 then - -- return - --end - -- - -- 请求下一页 - --NetManager.RequestWarPowerSortData(this.CurPage + 1,ActivityTypeDef.WarPowerSort,function(page,msg) - -- this.ReceiveWarPowerData(page,msg) - --end) + if fun then fun() end + -- Game.GlobalEvent:DispatchEvent(GameEvent.RankingList.AllRankingList) end --获取排行榜信息 -function this.GetWarPowerInfo() - return this.WarPowerData, this.WarPowerMyRankData +function this.GetRankingInfo() + return this.curRankingData, this.curRankingMyRankData end ----逐胜场 -function this.ReceiveArenaData(page,msg) - if this.CurPage >= page then return end - this.CurPage=page - if page==1 then - this.ArenaData={} - end - --自身数据 - this.ArenaMyRankData.myRank=msg.myRank - this.ArenaMyRankData.myScore=msg.myscore - --滚动数据 - local length=#this.ArenaData - for i, rank in ipairs(msg.rankInfos) do - this.ArenaData[length+i]=rank - end - this.LoadCompleted.Arena=1 Log(Language[11739]) - Game.GlobalEvent:DispatchEvent(GameEvent.RankingList.OnArenaChange) -end -function this.RequestNextArenaPageData() - if not ActTimeCtrlManager.IsQualifiled(FUNCTION_OPEN_TYPE.ARENA) then - --PopupTipPanel.ShowTip("本赛季已结束") - return - end - --判断是否符合刷新条件 - local rankNum = #this.ArenaData - -- 最多显示100 - local config = ConfigManager.GetConfigData(ConfigName.SpecialConfig, 3) - local MaxNum = config and tonumber(config.Value) or 100 - if rankNum >= MaxNum then return end - -- 上一页数据少于20条,则没有下一页数,不再刷新 - if rankNum % 20 > 0 then - return - end - -- 请求下一页 - NetManager.RequestArenaRankData(this.CurPage + 1,function(page,msg) - this.ReceiveArenaData(page,msg) - end) -end -function this.GetArenaInfo() - return this.ArenaData, this.ArenaMyRankData -end - ----试炼 -function this.ReceiveTrialData(msg) - --自身数据 - this.TrialMyRankData.rank=msg.myRankInfo.rank - this.TrialMyRankData.highestTower=msg.myRankInfo.param1 - --滚动数据 - local length=#this.TrialData - for i, rank in ipairs(msg.ranks) do - this.TrialData[length+i]=rank - end - this.LoadCompleted.Trial=1 Log(Language[11740]) - Game.GlobalEvent:DispatchEvent(GameEvent.RankingList.OnTrialChange) -end -function this.GetTrialInfo() - return this.TrialData, this.TrialMyRankData -end - ----兽潮 -function this.ReceiveMonsterData(msg) - --自身数据 - this.MonsterMyRankData.myRank=msg.myRankInfo.rank - this.MonsterMyRankData.myScore=msg.myRankInfo.param1 - --滚动数据 - local length=#this.MonsterData - for i, rank in ipairs(msg.ranks) do - this.MonsterData[length+i]=rank - end - this.LoadCompleted.Monster=1 - Log(Language[11741]) - Game.GlobalEvent:DispatchEvent(GameEvent.RankingList.OnMonsterChange) -end -function this.GetMonsterInfo() - return this.MonsterData, this.MonsterMyRankData -end - ----外敌 -function this.ReceiveAdventureData(page,msg) - if this.CurPage >= page then return end - this.CurPage=page - if page==1 then - this.AdventureData={} - end - --自身数据 - this.AdventureMyRankData.rank=msg.myInfo.rank - this.AdventureMyRankData.hurt=msg.myInfo.hurt - --滚动数据 - local length=#this.AdventureData - for i, rank in ipairs(msg.adventureRankItemInfo) do - this.AdventureData[length+i]=rank - end - this.LoadCompleted.FightAlien=1 - Log(Language[11742]) - Game.GlobalEvent:DispatchEvent(GameEvent.RankingList.OnAdventureChange) -end -function this.RequestNextAdventurePageData() - if not ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.FIGHT_ALIEN) then - PopupTipPanel.ShowTip(Language[10082]) - return - end - --判断是否符合刷新条件 - local rankNum = #this.AdventureData - -- 最多显示100 - local config = ConfigManager.GetConfigData(ConfigName.SpecialConfig, 6) - local MaxNum = config and tonumber(config.Value) or 100 - if rankNum >= MaxNum then return end - -- 上一页数据少于20条,则没有下一页数,不再刷新 - if rankNum % 20 > 0 then - return - end - -- 请求下一页 - NetManager.GetAdventureRankRequest(this.CurPage + 1,function(page,msg) - this.ReceiveAdventureData(page,msg) - end) -end -function this.GetAdventureInfo() - return this.AdventureData,this.AdventureMyRankData -end - ----关卡 -function this.ReceiveCustomsPassData(msg) - if this.LoadCompleted.CustomsPass==1 then - return - end - --自身数据 - - this.CustomsPassMyRankData.myRank=msg.myRankInfo.rank - this.CustomsPassMyRankData.fightId=msg.myRankInfo.param1 - --滚动数据 - local length=#this.CustomsPassData - for i, rank in ipairs(msg.ranks) do - this.CustomsPassData[length+i]=rank - end - this.LoadCompleted.CustomsPass=1 - Log(Language[11743]) - Game.GlobalEvent:DispatchEvent(GameEvent.RankingList.OnCustomsPassChange) -end -function this.GetCustomsPassInfo() - return this.CustomsPassData,this.CustomsPassMyRankData -end ----公会 -function this.ReceiveGuildForeData(msg) - --this.GuildData={}--公会 - --this.GuildMyRankData={} - if this.LoadCompleted.GuildForce==1 then - return - end - --自身数据 - - this.GuildMyRankData.myRank=msg.myRankInfo.rank - this.GuildMyRankData.myForce=msg.myRankInfo.param1 - --滚动数据 - local length=#this.GuildData - for i, rank in ipairs(msg.ranks) do - this.GuildData[length+i]=rank - end - this.LoadCompleted.GuildForce=1 - Log(Language[11743]) - Game.GlobalEvent:DispatchEvent(GameEvent.RankingList.OnGuildForceChange) -end -function this.GetGuildForeInfo() - return this.GuildData,this.GuildMyRankData -end ----点金 -function this.ReceiveGoldExperSortData(msg) - if this.LoadCompleted.GoldExperSort==1 then - return - end - --自身数据 - - this.GoldExperMyRankData.myRank=msg.myRankInfo.rank - this.GoldExperMyRankData.myNum=msg.myRankInfo.param1 - --滚动数据 - local length=#this.GoldExperData - for i, rank in ipairs(msg.ranks) do - this.GoldExperData[length+i]=rank - end - this.LoadCompleted.GoldExperSort=1 - Log(Language[11744]) - Game.GlobalEvent:DispatchEvent(GameEvent.RankingList.OnGoldExperSortChange) -end function this.GetGoldExperSortInfo() return this.GoldExperData,this.GoldExperMyRankData end diff --git a/Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua b/Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua index 26a5c0e0e5..95527c227c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua @@ -35,9 +35,7 @@ function RankingSingleListPanel:InitComponent() this.record=Util.GetGameObject(self.gameObject,"RankList/Record") this.info0=Util.GetGameObject(this.record,"Info0"):GetComponent("Text") this.rank0=Util.GetGameObject(this.record,"Rank0"):GetComponent("Text") - this.info1=Util.GetGameObject(this.record,"Info1"):GetComponent("Text") this.infoGo=Util.GetGameObject(this.record,"infoGo") - --this.rank1=Util.GetGameObject(this.record,"Rank1"):GetComponent("Text") this.noneImage=Util.GetGameObject(self.gameObject,"RankList/NoneImage")--无信息图片 end @@ -53,26 +51,12 @@ end --添加事件监听(用于子类重写) function RankingSingleListPanel:AddListener() - Game.GlobalEvent:AddEvent(GameEvent.RankingList.OnWarPowerChange, this.SetWarPowerInfo) - Game.GlobalEvent:AddEvent(GameEvent.RankingList.OnArenaChange, this.SetArenaInfo) - Game.GlobalEvent:AddEvent(GameEvent.RankingList.OnTrialChange, this.SetTrialInfo) - Game.GlobalEvent:AddEvent(GameEvent.RankingList.OnMonsterChange, this.SetMonsterInfo) - Game.GlobalEvent:AddEvent(GameEvent.RankingList.OnAdventureChange, this.SetAdventureInfo) - Game.GlobalEvent:AddEvent(GameEvent.RankingList.OnCustomsPassChange,this.SetCustomsPassInfo) - Game.GlobalEvent:AddEvent(GameEvent.RankingList.OnGuildForceChange,this.SetGuildForceInfo) - Game.GlobalEvent:AddEvent(GameEvent.RankingList.OnGoldExperSortChange,this.SetGoldExperSortInfo) + Game.GlobalEvent:AddEvent(GameEvent.RankingList.AllRankingList, this.SetRankingInfo) end --移除事件监听(用于子类重写) function RankingSingleListPanel:RemoveListener() - Game.GlobalEvent:RemoveEvent(GameEvent.RankingList.OnWarPowerChange, this.SetWarPowerInfo) - Game.GlobalEvent:RemoveEvent(GameEvent.RankingList.OnArenaChange, this.SetArenaInfo) - Game.GlobalEvent:RemoveEvent(GameEvent.RankingList.OnTrialChange, this.SetTrialInfo) - Game.GlobalEvent:RemoveEvent(GameEvent.RankingList.OnMonsterChange, this.SetMonsterInfo) - Game.GlobalEvent:RemoveEvent(GameEvent.RankingList.OnAdventureChange, this.SetAdventureInfo) - Game.GlobalEvent:RemoveEvent(GameEvent.RankingList.OnCustomsPassChange, this.SetCustomsPassInfo) - Game.GlobalEvent:RemoveEvent(GameEvent.RankingList.OnGuildForceChange,this.SetGuildForceInfo) - Game.GlobalEvent:RemoveEvent(GameEvent.RankingList.OnGoldExperSortChange,this.SetGoldExperSortInfo) + Game.GlobalEvent:RemoveEvent(GameEvent.RankingList.AllRankingList, this.SetRankingInfo) end local sData = nil --界面打开时调用(用于子类重写) @@ -80,19 +64,7 @@ function RankingSingleListPanel:OnOpen(_sData) SoundManager.PlayMusic(SoundConfig.BGM_Rank) sData = _sData this.name.text = sData.name - --设置信息方法的列表 - this.SetInfoFuncList ={ - [FUNCTION_OPEN_TYPE.ALLRANKING] = this.SetWarPowerInfo, - [FUNCTION_OPEN_TYPE.ARENA] = this.SetArenaInfo, - [FUNCTION_OPEN_TYPE.TRIAL] = this.SetTrialInfo, - [FUNCTION_OPEN_TYPE.MONSTER_COMING] = this.SetMonsterInfo, - [FUNCTION_OPEN_TYPE.FIGHT_ALIEN] = this.SetAdventureInfo, - [FUNCTION_OPEN_TYPE.CUSTOMSPASS] = this.SetCustomsPassInfo, - [FUNCTION_OPEN_TYPE.GUILD] = this.SetGuildForceInfo, - [FUNCTION_OPEN_TYPE.EXPERT] = this.SetGoldExperSortInfo, - } - RankingManager.ClearData() - this.GetRankInfo(sData.Id) + this.GetRankInfo(sData.rankType) end --界面打开或者重新打开后,界面刷新时调用(用于子类重写) @@ -105,7 +77,6 @@ end --界面关闭时调用(用于子类重写) function RankingSingleListPanel:OnClose() - RankingManager.ClearData() RankingManager.isRequest=0 this.noneImage:SetActive(false) -- if this.liveNode then @@ -131,368 +102,68 @@ end --点击获取对应排行信息 -function this.GetRankInfo(key) +function this.GetRankInfo(rankType) RankingManager.CurPage=0 - --local key = RankingManager.GetCurRankingInfo("Id",index) this.istop=true - --LogGreen("key "..key) - RankingManager.InitData(key, this.SetInfoFuncList[key])--算是半个策略模式吧 + RankingManager.InitData(rankType,function() + this.SetRankingInfo() + end) end ----设置战力排名信息 -function this.SetWarPowerInfo() - local warPowerData,myRankData=RankingManager.GetWarPowerInfo() - this.noneImage:SetActive(#warPowerData==0) +---设置排名信息 +function this.SetRankingInfo() + local rankingData,myRankData=RankingManager.GetRankingInfo() + LogGreen("#rankingData "..#rankingData) + this.noneImage:SetActive(#rankingData==0) + this.firsthead:SetActive(#rankingData~=0) + this.scrollParentView:SetActive(#rankingData~=0) -- 没有排行数据需要立刻刷新,只在打开界面时有用 - if #warPowerData == 0 then - this.isRefreshNow = true - end - this.InitNotRollingInfo() - this.SetNotRollingInfo(Language[11713],Language[11714],Language[10104],Language[11716],myRankData.myRank,Language[10041],FormationManager.GetFormationPower(1),myRankData.myRank,myRankData.myForce) - local dData = { - rankInfo = {param1 = myRankData.myForce}, - force = myRankData.myForce - } + -- this.SetNotRollingInfo(Language[11713],Language[11714],Language[10104],Language[11716],myRankData.myRank,Language[10041],FormationManager.GetFormationPower(1),myRankData.myRank,myRankData.myForce) + this.SetNotRollingInfo(myRankData) + local dData + if sData.rankType == RANK_TYPE.FIGHT_LEVEL_RANK then + LogGreen(" myRankData.fightId ".. myRankData.param1) + dData = { rankInfo = {param1 = myRankData.param1}, + force = myRankData.param1} + elseif sData.rankType == RANK_TYPE.FORCE_CURR_RANK then + dData = {rankInfo = {param1 = myRankData.param1}, + force = myRankData.param1} + elseif sData.rankType == RANK_TYPE.GUILD_FORCE_RANK then + dData = {rankInfo = {rank = myRankData.rank ,param1= myRankData.param1}, + guildName = PlayerManager.familyId == 0 and "" or MyGuildManager.GetMyGuildInfo().name} + elseif sData.rankType == RANK_TYPE.MONSTER_RANK then + dData = {rankInfo = {param1 = myRankData.param1}, + force = myRankData.param1} + elseif sData.rankType == RANK_TYPE.GOLD_EXPER then + dData = {rankInfo = {rank = myRankData.rank ,param1= myRankData.myNum}, + userName = PlayerManager.nickName} + elseif sData.rankType == RANK_TYPE.ARENA_RANK then + dData = { rankInfo = {param1 = myRankData.param1}, + score = myRankData.param1} + end this.SetInfoShow(this.infoGo,dData,sData.rankType) --数据拆分 - if not warPowerData or (warPowerData and #warPowerData <= 0) then + if not rankingData or (rankingData and #rankingData <= 0) then return end - local dt,db=RankingManager.CutDate(warPowerData) + local dt,db=RankingManager.CutDate(rankingData) this.SetHeadsInfo(dt[1],this.firstHeadinfoGo,1,dt[1].userName,dt[1].level) --设置滚动区信息 this.scrollView:SetData(db,function(index,root) this.ShowWarPowerInfo(root,db[index],myRankData) - if index==#db then - RankingManager.RequestNextWarPowerPageData() - end + -- if index==#db then + -- RankingManager.RequestNextWarPowerPageData() + -- end end) - this.CheckIsTop() end --显示每条数据 function this.ShowWarPowerInfo(root,data,myRankData) - --local info1,info2=this.InitRollingInfo(root) this.AddPlayerInfoClick(root,data.uid) this.SetSelfBG(root,myRankData.myRank, data.rankInfo.rank) this.SetRankingNum(root, data.rankInfo.rank) this.SetHeadInfo(root,data.head, data.headFrame,data.level) - --this.SetShowInfo(info1,info2,data.userName,data.force) - --Util.GetGameObject(root,"Value0"):GetComponent("Text").text = ""..data.userName.."" this.SetInfoShow(Util.GetGameObject(root,"infoGo"),data,sData.rankType,Util.GetGameObject(root,"Value0")) end - ----设置逐胜场排名信息 -function this.SetArenaInfo() - local arenaData,myRankData=RankingManager.GetArenaInfo() - this.noneImage:SetActive(#arenaData==0) - if #arenaData == 0 then - this.isRefreshNow = true - end - this.InitNotRollingInfo() - this.SetNotRollingInfo(Language[11713],Language[11717],Language[10104],Language[11718],myRankData.myRank,Language[10041],"",myRankData.myRank,myRankData.myScore) - local dData = { - rankInfo = {param1 = myRankData.myScore}, - score = myRankData.myScore - } - this.SetInfoShow(this.infoGo,dData,sData.rankType) - --数据拆分 - if not arenaData or (arenaData and #arenaData <= 0) then - return - end - local dt,db=RankingManager.CutDate(arenaData) - this.SetHeadsInfo(dt[1].personInfo,this.firstHeadinfoGo,1,dt[1].personInfo.name,dt[1].personInfo.level) - --设置滚动区信息 - this.scrollView:SetData(db,function(index,root) - this.ShowArenaInfo(root,db[index],myRankData) - if index==#db then - RankingManager.RequestNextArenaPageData() - end - end) - this.CheckIsTop() -end ---显示每条数据 -function this.ShowArenaInfo(root,data,myRankData) - --local info1,info2=this.InitRollingInfo(root) - this.AddPlayerInfoClick(root,data.personInfo.uid) - this.SetSelfBG(root,myRankData.myRank,data.personInfo.rank) - this.SetRankingNum(root,data.personInfo.rank) - this.SetHeadInfo(root,data.personInfo.head,data.personInfo.headFrame,data.personInfo.level) - --this.SetShowInfo(info1,info2,data.personInfo.name,data.personInfo.score) - --Util.GetGameObject(root,"Value0"):GetComponent("Text").text = ""..data.userName.."" - this.SetInfoShow(Util.GetGameObject(root,"infoGo"),data,sData.rankType,Util.GetGameObject(root,"Value0")) - --设置出战角色头像 - --for i = 1, 5 do - -- local heroHeadBg = Util.GetGameObject(root, "Demons/Head_"..i) - -- local hearIcon = Util.GetGameObject(heroHeadBg, "Icon") - -- local heroTId = data.team.heroTid[i] - -- if heroTId then - -- heroHeadBg:SetActive(true) - -- local demonData = ConfigManager.GetConfigData(ConfigName.HeroConfig, heroTId) - -- heroHeadBg:GetComponent("Image").sprite = Util.LoadSprite(GetQuantityImageByquality(demonData.Star)) - -- hearIcon:GetComponent("Image").sprite = Util.LoadSprite(GetResourcePath(demonData.Icon)) - -- else - -- heroHeadBg:SetActive(false) - -- end - --end -end - ----设置试炼排名信息 -function this.SetTrialInfo() - local trialData,myRankData=RankingManager.GetTrialInfo() - this.noneImage:SetActive(#trialData==0) - if #trialData == 0 then - this.isRefreshNow = true - end - this.InitNotRollingInfo() - this.SetNotRollingInfo(Language[11713],Language[11719],Language[10104],Language[11720],myRankData.rank,Language[10041],myRankData.highestTower,myRankData.rank,myRankData.highestTower..Language[10319]) - local dData = { - rankInfo = {param1 = myRankData.highestTower}, - force = myRankData.highestTower - } - this.SetInfoShow(this.infoGo,dData,sData.rankType) - --数据拆分 - if not trialData or (trialData and #trialData <= 0) then - return - end - local dt,db=RankingManager.CutDate(trialData) - LogGreen("db "..#db) - this.SetHeadsInfo(dt[1],this.firstHeadinfoGo,1,dt[1].userName,dt[1].level) - this.scrollView:SetData(db,function(index,root) - this.ShowTrialInfo(root,db[index],myRankData) - end) - this.CheckIsTop() -end ---显示每条数据 -function this.ShowTrialInfo(root,data,myRankData) - --local info1,info2=this.InitRollingInfo(root) - this.AddPlayerInfoClick(root,data.uid) - this.SetSelfBG(root,myRankData.rank,data.rankInfo.rank) - this.SetRankingNum(root,data.rankInfo.rank) - this.SetHeadInfo(root,data.head,data.headFrame,data.level) - --this.SetShowInfo(info1,info2,data.userName,data.rankInfo.param1.."层") - --Util.GetGameObject(root,"Value0"):GetComponent("Text").text = ""..data.userName.."" - this.SetInfoShow(Util.GetGameObject(root,"infoGo"),data,sData.rankType,Util.GetGameObject(root,"Value0")) -end - ----设置兽潮玩家排名信息 -function this.SetMonsterInfo() - local monsterData,myRankData=RankingManager.GetMonsterInfo() - this.noneImage:SetActive(#monsterData==0) - if #monsterData == 0 then - this.isRefreshNow = true - end - this.InitNotRollingInfo() - local myScore = myRankData.myScore and myRankData.myScore or 0 - this.SetNotRollingInfo(Language[11713],Language[11719],Language[10104],Language[11721],myRankData.myRank,Language[10041],"0",myRankData.myRank,Language[10311] .. myScore .. Language[10316]) - local dData = { - rankInfo = {param1 = myRankData.myScore}, - force = myRankData.myScore - } - this.SetInfoShow(this.infoGo,dData,sData.rankType) - --数据拆分 - if not monsterData or (monsterData and #monsterData <= 0) then - return - end - local dt,db=RankingManager.CutDate(monsterData) - this.SetHeadsInfo(dt[1],this.firstHeadinfoGo,1,dt[1].userName,dt[1].level) - this.scrollView:SetData(db,function(index,root) - this.ShowMonsterInfo(root,db[index],myRankData) - end) - this.CheckIsTop() -end ---显示每条数据 -function this.ShowMonsterInfo(root,data,myRankData) - --local info1,info2=this.InitRollingInfo(root) - this.AddPlayerInfoClick(root,data.uid) - this.SetSelfBG(root,myRankData.myRank,data.rankInfo.rank) - this.SetRankingNum(root,data.rankInfo.rank) - this.SetHeadInfo(root,data.head,data.headFrame,data.level) - --this.SetShowInfo(info1,info2,data.userName,"第"..data.rankInfo.param1.."波") - --Util.GetGameObject(root,"Value0"):GetComponent("Text").text = ""..data.userName.."" - this.SetInfoShow(Util.GetGameObject(root,"infoGo"),data,sData.rankType,Util.GetGameObject(root,"Value0")) -end - ----设置外敌排名信息 -function this.SetAdventureInfo() - local adventureData,myRankData=RankingManager.GetAdventureInfo() - this.noneImage:SetActive(#adventureData==0) - if #adventureData == 0 then - this.isRefreshNow = true - end - this.InitNotRollingInfo() - this.SetNotRollingInfo(Language[11713],Language[11722],Language[10104],Language[11722],myRankData.rank,Language[10041],myRankData.hurt,myRankData.rank,myRankData.hurt) - local dData = { - rankInfo = {param1 = myRankData.hurt}, - force = myRankData.hurt - } - this.SetInfoShow(this.infoGo,dData,sData.rankType) - --数据拆分 - if not adventureData or (adventureData and #adventureData <= 0) then - return - end - local dt,db=RankingManager.CutDate(adventureData) - this.SetHeadsInfo(dt[1],this.firstHeadinfoGo,1,dt[1].name,dt[1].level) - this.scrollView:SetData(db,function(index,root) - this.ShowAdventureInfo(root,db[index],myRankData) - if index==#db then - RankingManager.RequestNextAdventurePageData() - end - end) - this.CheckIsTop() -end ---显示每条数据 -function this.ShowAdventureInfo(root,data,myRankData) - --local info1,info2=this.InitRollingInfo(root) - this.AddPlayerInfoClick(root,data.uid) - this.SetSelfBG(root,myRankData.rank,data.rank) - this.SetRankingNum(root,data.rank) - this.SetHeadInfo(root,data.head,data.headFrame,data.level) - --this.SetShowInfo(info1,info2,data.name,data.hurt) - --Util.GetGameObject(root,"Value0"):GetComponent("Text").text = ""..data.userName.."" - this.SetInfoShow(Util.GetGameObject(root,"infoGo"),data,sData.rankType,Util.GetGameObject(root,"Value0")) -end - ----设置关卡排名信息 -function this.SetCustomsPassInfo() - local data,myData=RankingManager.GetCustomsPassInfo() - this.noneImage:SetActive(#data==0) - if #data==0 then - this.isRefreshNow = true - end - this.InitNotRollingInfo() - - local myRankText = "" - if myData.fightId < 0 then - myRankText = Language[10041] - else - myRankText = RankingManager.mainLevelConfig[myData.fightId].Name - end - this.SetNotRollingInfo(Language[11713],Language[11723],Language[10104],Language[11724], myData.myRank,Language[10041],"",myData.myRank, myRankText) - --LogGreen("myData.fightId "..myData.fightId) - local dData = { - rankInfo = {param1 = myData.fightId}, - force = myData.fightId - } - this.SetInfoShow(this.infoGo,dData,sData.rankType) - --LogGreen("data "..#data) - --local curdata = table.remove(data,1) - --LogGreen("curdata "..#curdata) - --数据拆分 - if not data or (data and #data <= 0) then - return - end - local dt,db=RankingManager.CutDate(data) - this.SetHeadsInfo(dt[1],this.firstHeadinfoGo,1,dt[1].userName,dt[1].level) - this.scrollView:SetData(db,function(index,root) - this.ShowCustomsPassInfo(root,db[index],myData) - end) - this.CheckIsTop() -end ---显示每条数据 -function this.ShowCustomsPassInfo(root,data,myRankData) - if data.rankInfo.param1 > 0 then - --local info1,info2=this.InitRollingInfo(root) - this.AddPlayerInfoClick(root,data.uid) - this.SetSelfBG(root,myRankData.myRank,data.rankInfo.rank) - this.SetRankingNum(root,data.rankInfo.rank) - this.SetHeadInfo(root,data.head,data.headFrame,data.level) - --this.SetShowInfo(info1,info2,data.userName,RankingManager.mainLevelConfig[data.rankInfo.param1].Name) - --Util.GetGameObject(root,"Value0"):GetComponent("Text").text = ""..data.userName.."" - this.SetInfoShow(Util.GetGameObject(root,"infoGo"),data,sData.rankType,Util.GetGameObject(root,"Value0")) - end -end ----设置公会战力信息 -function this.SetGuildForceInfo() - local data,myData=RankingManager.GetGuildForeInfo() - this.noneImage:SetActive(#data==0) - if #data==0 then - this.isRefreshNow = true - end - this.InitNotRollingInfo() - - local myRankText = "" - if not myData.myRank or myData.myRank < 0 then - myRankText = Language[10041] - else - myRankText = myData.myRank - end - this.SetNotRollingInfo("","",Language[10104],"", myData.myRank,Language[10041],"",myData.myRank, myRankText) - local dData = { - rankInfo = {rank = myData.myRank ,param1= myData.myForce}, - guildName = PlayerManager.familyId == 0 and "" or MyGuildManager.GetMyGuildInfo().name - } - this.SetInfoShow(this.infoGo,dData,sData.rankType) - --数据拆分 - if not data or (data and #data <= 0) then - return - end - local dt,db=RankingManager.CutDate(data) - this.SetHeadsInfo(dt[1],this.firstHeadinfoGo,1,dt[1].guildName,dt[1].level) - this.scrollView:SetData(db,function(index,root) - this.ShowGuildForceInfo(root,db[index],myData) - end) - this.CheckIsTop() -end ---显示每条数据 -function this.ShowGuildForceInfo(root,data,myRankData) - if data.rankInfo.param1 > 0 then - --local info1,info2=this.InitRollingInfo(root) - this.AddPlayerInfoClick(root,data.uid) - this.SetSelfBG(root,myRankData.myRank,data.rankInfo.rank) - this.SetRankingNum(root,data.rankInfo.rank) - this.SetHeadInfo(root,data.head,data.headFrame,data.level) - --this.SetShowInfo(info1,info2,data.userName,RankingManager.mainLevelConfig[data.rankInfo.param1].Name) - --Util.GetGameObject(root,"Value0"):GetComponent("Text").text = ""..data.userName.."" - this.SetInfoShow(Util.GetGameObject(root,"infoGo"),data,sData.rankType,Util.GetGameObject(root,"Value0")) - end -end ---设置点金信息 -function this.SetGoldExperSortInfo() - LogGreen("sssssssssssssssssssssssssss") - local data,myData=RankingManager.GetGoldExperSortInfo() - this.noneImage:SetActive(#data==0) - if #data==0 then - this.isRefreshNow = true - end - this.InitNotRollingInfo() - - local myRankText = "" - if not myData.myRank or myData.myRank < 0 then - myRankText = Language[10041] - else - myRankText = myData.myRank - end - - this.SetNotRollingInfo("","",Language[10104],"", myData.myRank,Language[10041],"",myData.myRank, myRankText) - local dData = { - rankInfo = {rank = myData.myRank ,param1= myData.myNum}, - userName = PlayerManager.nickName - } - this.SetInfoShow(this.infoGo,dData,sData.rankType) - --数据拆分 - if not data or (data and #data <= 0) then - return - end - local dt,db=RankingManager.CutDate(data) - this.SetHeadsInfo(dt[1],this.firstHeadinfoGo,1,dt[1].userName,dt[1].level) - this.scrollView:SetData(db,function(index,root) - this.ShowGoldExperSortInfo(root,db[index],myData) - end) - this.CheckIsTop() -end ---显示每条数据 -function this.ShowGoldExperSortInfo(root,data,myRankData) - if data.rankInfo.param1 > 0 then - --local info1,info2=this.InitRollingInfo(root) - this.AddPlayerInfoClick(root,data.uid) - this.SetSelfBG(root,myRankData.myRank,data.rankInfo.rank) - this.SetRankingNum(root,data.rankInfo.rank) - this.SetHeadInfo(root,data.head,data.headFrame,data.level) - --this.SetShowInfo(info1,info2,data.userName,RankingManager.mainLevelConfig[data.rankInfo.param1].Name) - --Util.GetGameObject(root,"Value0"):GetComponent("Text").text = ""..data.userName.."" - this.SetInfoShow(Util.GetGameObject(root,"infoGo"),data,sData.rankType,Util.GetGameObject(root,"Value0")) - end -end --设置前三名背景头像 function this.SetHeadsInfo(data,root,index,name,level) if not this.playerHeadList[root] then @@ -529,31 +200,17 @@ function this.SetHeadsInfo(data,root,index,name,level) end end ---初始化非滚动区信息 -function this.InitNotRollingInfo() - this.firsthead:SetActive(false) - this.firstHeadName.text="" - --this.firstHeadinfoText.text="" - --this.titleName.text="" - --this.titleInfo.text="" - this.info0.text="" - this.info1.text="" - this.rank0.text="" - --this.rank1.text="" -end --设置非滚动区信息 -function this.SetNotRollingInfo(...) - local args={...} - --this.titleName.text=args[1]--顶部信息 - --this.titleInfo.text=args[2] - this.info0.text=args[3]--底部信息 - this.info1.text=args[4] - if not args[5] or args[5]<1 then--排名对比 <0未上榜 - this.rank0.text = args[6] --未上榜 - --this.rank1.text = args[7] --显示内容 +function this.SetNotRollingInfo(myRankData) + -- optional int32 rank = 1; + -- optional int64 param1 = 2; + -- optional int32 param2 = 3; + -- optional int32 param3 = 4; + this.info0.text=Language[10104] + if not myRankData.rank or (myRankData.rank and myRankData.rank < 1) then--排名对比 <0未上榜 + this.rank0.text = Language[10041] --未上榜 else - this.rank0.text = args[8] --上榜 - --this.rank1.text = args[9] --显示内容 + this.rank0.text = myRankData.rank --上榜 end end @@ -561,10 +218,8 @@ end --初始化滚动区信息 function this.InitRollingInfo(_root) local info0= Util.GetGameObject(_root,"Value0"):GetComponent("Text") - --local info1= Util.GetGameObject(_root,"Value1"):GetComponent("Text") info0.text="" - --info1.text="" - return info0--,info1 + return info0 end --玩家信息弹窗 function this.AddPlayerInfoClick(root,uid) @@ -607,11 +262,6 @@ function this.SetHeadInfo(root,head,frame,level) this.playerScrollHead[root]:SetLevel(level) this.playerScrollHead[root]:SetScale(Vector3.one*0.7) end ---设置显示信息 ---function this.SetShowInfo(info1,info2,str1,str2) --- info1.text=""..str1.."" --- info2.text=""..str2.."" ---end -- tab按钮自定义显示设置 @@ -632,13 +282,6 @@ function this.TabAdapter(tab, index, status) txt:GetComponent("Text").color = _tabFontColor[status] end end ---检查是否显示第一页 当切换页签时切换到第一页 当请求下一页时不跳转第一页 -function this.CheckIsTop() - if this.istop then - this.scrollView:SetIndex(1) - this.istop =false - end -end --检查Tab是否解锁 function this.CheckTabCtrlIsLockP(index) local type = RankingManager.GetCurRankingInfo("Id",index) @@ -671,13 +314,15 @@ function this.SetInfoShow(go,data,rankType,Value0) trial:SetActive(false) goldExper:SetActive(false) arenaScore:SetActive(false) + LogGreen("rankType "..rankType) if rankType == RANK_TYPE.FIGHT_LEVEL_RANK then + LogGreen("data.rankInfo.param1 "..data.rankInfo.param1) if data.rankInfo.param1 and data.rankInfo.param1 > 0 then fight:SetActive(true) if Value0 then Value0:GetComponent("Text").text = ""..data.userName.."" end - Util.GetGameObject(go,"fight"):GetComponent("Text").text = RankingManager.mainLevelConfig[data.rankInfo.param1].Name + Util.GetGameObject(go,"fight"):GetComponent("Text").text = ConfigManager.GetConfigData(ConfigName.MainLevelConfig,data.rankInfo.param1).Name end elseif rankType == RANK_TYPE.FORCE_CURR_RANK then if data.rankInfo.param1 and data.rankInfo.param1 >0 then