From cf3758d19bcf27ec3c4e35d356684dbfaf098997 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Wed, 21 Apr 2021 15:47:21 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=B8=89=E7=95=8C=E9=99=8D=E9=AD=94?= =?UTF-8?q?=E3=80=91=E6=B4=BB=E5=8A=A8=E7=BB=93=E6=9D=9F=E5=90=8E=E7=9A=84?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E6=96=87=E5=AD=97=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/DemonSlayer/DemonSlayerPanel.prefab | 907 ++++++++---------- .../Modules/DemonSlayer/DemonSlayerPanel.lua | 25 +- 2 files changed, 427 insertions(+), 505 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/DemonSlayer/DemonSlayerPanel.prefab b/Assets/ManagedResources/Prefabs/UI/DemonSlayer/DemonSlayerPanel.prefab index 5a3061fb8f..fa26d56ff6 100644 --- a/Assets/ManagedResources/Prefabs/UI/DemonSlayer/DemonSlayerPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/DemonSlayer/DemonSlayerPanel.prefab @@ -74,6 +74,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &262509417919736553 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1999804488253290332} + - component: {fileID: 8322015048267843790} + - component: {fileID: 5435697114731437997} + m_Layer: 5 + m_Name: bg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1999804488253290332 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 262509417919736553} + 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: 5619546233300333146} + 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: 900, y: 72} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8322015048267843790 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 262509417919736553} + m_CullTransparentMesh: 0 +--- !u!114 &5435697114731437997 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 262509417919736553} + 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: 5eb7fbeffdba3c448a555d0a7da444cf, 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 &482684183697153720 GameObject: m_ObjectHideFlags: 0 @@ -179,7 +253,7 @@ MonoBehaviour: m_EditorClassIdentifier: bgList: - {fileID: 3892089496709810548} ---- !u!1 &509383581301386546 +--- !u!1 &1157825304609506803 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -187,129 +261,50 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 8336963311421306270} - - component: {fileID: 6930298257145526145} - - component: {fileID: 667263500156292077} - m_Layer: 5 - m_Name: num + - component: {fileID: 1619609929515669323} + - component: {fileID: 4230932159690918251} + - component: {fileID: 4834236102444641291} + m_Layer: 0 + m_Name: ren m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &8336963311421306270 +--- !u!224 &1619609929515669323 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 509383581301386546} + m_GameObject: {fileID: 1157825304609506803} 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: 3060736757162950048} + m_Father: {fileID: 8864219496463196435} 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: 187.3, y: 87.1} + m_AnchoredPosition: {x: 4, y: 121.3} + m_SizeDelta: {x: 186.9, y: 306.6} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6930298257145526145 +--- !u!222 &4230932159690918251 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 509383581301386546} + m_GameObject: {fileID: 1157825304609506803} m_CullTransparentMesh: 0 ---- !u!114 &667263500156292077 +--- !u!114 &4834236102444641291 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 509383581301386546} - 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: 48 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 0 - m_MaxSize: 58 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: 4-10 ---- !u!1 &858299788320127266 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1408903645927335063} - - component: {fileID: 8876710764092857093} - - component: {fileID: 4837618381345459302} - m_Layer: 5 - m_Name: bg - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1408903645927335063 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 858299788320127266} - 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: 5619546233300333146} - 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: 900, y: 72} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8876710764092857093 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 858299788320127266} - m_CullTransparentMesh: 0 ---- !u!114 &4837618381345459302 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 858299788320127266} + m_GameObject: {fileID: 1157825304609506803} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} @@ -323,7 +318,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: 5eb7fbeffdba3c448a555d0a7da444cf, type: 3} + m_Sprite: {fileID: 21300000, guid: 55e398dcbb89e0440a21f67a06a293e1, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -474,13 +469,13 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 8864219496463196435} + m_Father: {fileID: 1474097152188896630} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 4, y: 121.3} - m_SizeDelta: {x: 186.9, y: 306.6} + m_AnchoredPosition: {x: 3, y: 122} + m_SizeDelta: {x: 185.2, y: 304} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3673423893004458656 CanvasRenderer: @@ -744,8 +739,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 6646358559121358598} - - {fileID: 595553904858347416} + - {fileID: 6084730427189226701} + - {fileID: 3941673679479891} m_Father: {fileID: 7862053694005184299} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -791,7 +786,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &2453851668873272622 +--- !u!1 &3044434344172130021 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -799,9 +794,9 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 6646358559121358598} - - component: {fileID: 731834619246549618} - - component: {fileID: 5394543197917340710} + - component: {fileID: 6084730427189226701} + - component: {fileID: 173998015312808377} + - component: {fileID: 4796493601042151405} m_Layer: 0 m_Name: ren m_TagString: Untagged @@ -809,13 +804,13 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &6646358559121358598 +--- !u!224 &6084730427189226701 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2453851668873272622} + m_GameObject: {fileID: 3044434344172130021} 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} @@ -828,21 +823,21 @@ RectTransform: m_AnchoredPosition: {x: 4, y: 120} m_SizeDelta: {x: 185.2, y: 304} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &731834619246549618 +--- !u!222 &173998015312808377 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2453851668873272622} + m_GameObject: {fileID: 3044434344172130021} m_CullTransparentMesh: 0 ---- !u!114 &5394543197917340710 +--- !u!114 &4796493601042151405 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2453851668873272622} + m_GameObject: {fileID: 3044434344172130021} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} @@ -1013,86 +1008,6 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &4335512922403386859 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6441063970620955863} - - component: {fileID: 8222960785702385537} - - component: {fileID: 2692519420765511453} - m_Layer: 0 - m_Name: name - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6441063970620955863 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4335512922403386859} - 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: 1474097152188896630} - 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: -186.41} - m_SizeDelta: {x: 260, y: 43.58} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8222960785702385537 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4335512922403386859} - m_CullTransparentMesh: 0 ---- !u!114 &2692519420765511453 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4335512922403386859} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 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: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 40 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 0 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: "\u6700\u591A\u516D\u4E2A\u5B57" - LanguageIndex: 0 --- !u!1 &4370774905561244738 GameObject: m_ObjectHideFlags: 0 @@ -1136,8 +1051,8 @@ GameObject: m_Component: - component: {fileID: 5255383206710153854} - component: {fileID: 5207616627496183838} - - component: {fileID: 8573263338284824022} - m_Layer: 0 + - component: {fileID: 76364856461596710} + m_Layer: 5 m_Name: num m_TagString: Untagged m_Icon: {fileID: 0} @@ -1151,17 +1066,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4730011186495571169} - 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: [] - m_Father: {fileID: 6215457918852905839} + m_Father: {fileID: 5175128031705849308} 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: 133, y: 0} - m_SizeDelta: {x: 59.05, y: 50} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 187.3, y: 87.1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5207616627496183838 CanvasRenderer: @@ -1171,7 +1086,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4730011186495571169} m_CullTransparentMesh: 0 ---- !u!114 &8573263338284824022 +--- !u!114 &76364856461596710 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1180,11 +1095,11 @@ MonoBehaviour: m_GameObject: {fileID: 4730011186495571169} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.7568628, b: 0.30588236, a: 1} + m_Color: {r: 0.9882353, g: 0.92156863, b: 0.7921569, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1193,93 +1108,18 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 50 + m_FontSize: 48 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 50 - m_Alignment: 3 + m_MinSize: 0 + m_MaxSize: 58 + m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 2 - LanguageIndex: 0 ---- !u!1 &5010477071449866921 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2488213213733390228} - - component: {fileID: 1863043904829440535} - - component: {fileID: 1805688540427879227} - m_Layer: 0 - m_Name: ren - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2488213213733390228 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5010477071449866921} - 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: 1474097152188896630} - 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: 3, y: 122} - m_SizeDelta: {x: 185.2, y: 304} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1863043904829440535 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5010477071449866921} - m_CullTransparentMesh: 0 ---- !u!114 &1805688540427879227 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5010477071449866921} - 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: 55e398dcbb89e0440a21f67a06a293e1, 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: 4-10 --- !u!1 &5091389988436336956 GameObject: m_ObjectHideFlags: 0 @@ -1346,86 +1186,6 @@ MonoBehaviour: isPlayAudio: 1 isHaveCloseBtn: 0 isPlayOnOpen: 0 ---- !u!1 &5212723190387840636 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6756146572866993527} - - component: {fileID: 6670049880329292574} - - component: {fileID: 5107289919260987595} - m_Layer: 0 - m_Name: num - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6756146572866993527 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5212723190387840636} - 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: 2421292600168105873} - 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: 210, y: 0} - m_SizeDelta: {x: 215.13, y: 50} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6670049880329292574 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5212723190387840636} - m_CullTransparentMesh: 0 ---- !u!114 &5107289919260987595 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5212723190387840636} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.882353, b: 0.59607846, 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: 32 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 40 - m_Alignment: 3 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: "2\u592923\u5C0F\u65F62\u5206" - LanguageIndex: 0 --- !u!1 &5290366278905977660 GameObject: m_ObjectHideFlags: 0 @@ -1563,6 +1323,86 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &5325988066511329066 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4657578389275853237} + - component: {fileID: 4614217420016597973} + - component: {fileID: 9130921138435221021} + m_Layer: 0 + m_Name: num + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4657578389275853237 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5325988066511329066} + 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: 6215457918852905839} + 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: 133, y: 0} + m_SizeDelta: {x: 59.05, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4614217420016597973 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5325988066511329066} + m_CullTransparentMesh: 0 +--- !u!114 &9130921138435221021 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5325988066511329066} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 0.7568628, b: 0.30588236, 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: 3 + m_MaxSize: 50 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: 2 + LanguageIndex: 0 --- !u!1 &5806908432142361533 GameObject: m_ObjectHideFlags: 0 @@ -1692,7 +1532,7 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!1 &6218345583101931762 +--- !u!1 &6296785207243665967 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1700,9 +1540,9 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1571677694258074259} - - component: {fileID: 2148491190585750898} - - component: {fileID: 5753991895624818328} + - component: {fileID: 3941673679479891} + - component: {fileID: 6026416757680423231} + - component: {fileID: 6983934873029049990} m_Layer: 0 m_Name: name m_TagString: Untagged @@ -1710,40 +1550,40 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1571677694258074259 +--- !u!224 &3941673679479891 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6218345583101931762} + m_GameObject: {fileID: 6296785207243665967} 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: 8864219496463196435} + m_Father: {fileID: 1224392982071390565} 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: -148.6} + m_AnchoredPosition: {x: 0, y: -148.5} m_SizeDelta: {x: 260, y: 43.58} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2148491190585750898 +--- !u!222 &6026416757680423231 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6218345583101931762} + m_GameObject: {fileID: 6296785207243665967} m_CullTransparentMesh: 0 ---- !u!114 &5753991895624818328 +--- !u!114 &6983934873029049990 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6218345583101931762} + m_GameObject: {fileID: 6296785207243665967} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} @@ -1800,14 +1640,13 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 6756146572866993527} + m_Children: [] m_Father: {fileID: 4321201285116647711} 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: -99.2, y: 566.7} + m_AnchoredPosition: {x: 5.6, y: 566.7} m_SizeDelta: {x: 178.71, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &799473622179338672 @@ -1845,7 +1684,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 3 m_MaxSize: 40 - m_Alignment: 5 + m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 @@ -1853,6 +1692,86 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u8DDD\u6392\u540D\u7ED3\u7B97:" LanguageIndex: 0 +--- !u!1 &6773930249382601529 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2126382343743177048} + - component: {fileID: 1557450156360246969} + - component: {fileID: 5158764333460639059} + m_Layer: 0 + m_Name: name + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2126382343743177048 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6773930249382601529} + 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: 8864219496463196435} + 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: -148.6} + m_SizeDelta: {x: 260, y: 43.58} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1557450156360246969 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6773930249382601529} + m_CullTransparentMesh: 0 +--- !u!114 &5158764333460639059 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6773930249382601529} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 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: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 36 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u6700\u591A\u516D\u4E2A\u5B57" + LanguageIndex: 0 --- !u!1 &6789013595780659101 GameObject: m_ObjectHideFlags: 0 @@ -1882,7 +1801,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 5255383206710153854} + - {fileID: 4657578389275853237} m_Father: {fileID: 4321201285116647711} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1963,12 +1882,12 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 1224392982071390565} + m_Father: {fileID: 1474097152188896630} 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: -148.5} + m_AnchoredPosition: {x: 0, y: -186.41} m_SizeDelta: {x: 260, y: 43.58} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6624786170051105524 @@ -2001,7 +1920,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 36 + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 @@ -2043,8 +1962,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 5175128031705849308} - - {fileID: 3288589982305288234} + - {fileID: 5736577080539188759} + - {fileID: 2733331871129064417} m_Father: {fileID: 4321201285116647711} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2096,6 +2015,86 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u6D3B\u52A8\u89C4\u5219\uFF1A\u5F00\u670D7\u5929\u540E\u6839\u636E\u5FC3\u9B54\u8BD5\u70BC\u6392\u540D\u53D1\u653E\u5956\u52B1" LanguageIndex: 0 +--- !u!1 &6946581036100780320 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5736577080539188759} + - component: {fileID: 3115612077971795481} + - component: {fileID: 2508292747557330646} + m_Layer: 0 + m_Name: rank + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5736577080539188759 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6946581036100780320} + 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: 6972460681134904509} + 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: -392.9, y: 1091.7} + m_SizeDelta: {x: 59.05, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3115612077971795481 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6946581036100780320} + m_CullTransparentMesh: 0 +--- !u!114 &2508292747557330646 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6946581036100780320} + 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.97647065, g: 0.8862746, b: 0.654902, 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: 35 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 50 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u6392\u540D" + LanguageIndex: 0 --- !u!1 &6973814931222460968 GameObject: m_ObjectHideFlags: 0 @@ -2172,7 +2171,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &7506061684261343979 +--- !u!1 &7470634587438161598 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2180,50 +2179,50 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 5175128031705849308} - - component: {fileID: 2553881141165506002} - - component: {fileID: 3063269109547797789} + - component: {fileID: 2733331871129064417} + - component: {fileID: 3091839980275359467} + - component: {fileID: 4302838189678035521} m_Layer: 0 - m_Name: rank + m_Name: reward m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &5175128031705849308 +--- !u!224 &2733331871129064417 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7506061684261343979} + m_GameObject: {fileID: 7470634587438161598} 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: 6972460681134904509} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -392.9, y: 1091.7} + m_AnchoredPosition: {x: 35.5, y: 1090.5} m_SizeDelta: {x: 59.05, y: 50} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2553881141165506002 +--- !u!222 &3091839980275359467 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7506061684261343979} + m_GameObject: {fileID: 7470634587438161598} m_CullTransparentMesh: 0 ---- !u!114 &3063269109547797789 +--- !u!114 &4302838189678035521 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7506061684261343979} + m_GameObject: {fileID: 7470634587438161598} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} @@ -2250,9 +2249,9 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\u6392\u540D" + m_Text: "\u5956\u52B1\u9053\u5177" LanguageIndex: 0 ---- !u!1 &7523994844745126034 +--- !u!1 &7506061684261343979 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2260,9 +2259,9 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 3060736757162950048} - - component: {fileID: 373819585501442330} - - component: {fileID: 6208075437687665761} + - component: {fileID: 5175128031705849308} + - component: {fileID: 2553881141165506002} + - component: {fileID: 6803345056865626026} m_Layer: 5 m_Name: rank m_TagString: Untagged @@ -2270,18 +2269,18 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 0 ---- !u!224 &3060736757162950048 +--- !u!224 &5175128031705849308 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7523994844745126034} + m_GameObject: {fileID: 7506061684261343979} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 100} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 8336963311421306270} + - {fileID: 5255383206710153854} m_Father: {fileID: 5619546233300333146} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2290,21 +2289,21 @@ RectTransform: m_AnchoredPosition: {x: -340, y: 0.000061035156} m_SizeDelta: {x: 200, y: 100} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &373819585501442330 +--- !u!222 &2553881141165506002 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7523994844745126034} + m_GameObject: {fileID: 7506061684261343979} m_CullTransparentMesh: 0 ---- !u!114 &6208075437687665761 +--- !u!114 &6803345056865626026 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7523994844745126034} + m_GameObject: {fileID: 7506061684261343979} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} @@ -2356,8 +2355,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 2177445712708224128} - - {fileID: 1571677694258074259} + - {fileID: 1619609929515669323} + - {fileID: 2126382343743177048} m_Father: {fileID: 7862053694005184299} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2403,86 +2402,6 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &8061675759077313909 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3288589982305288234} - - component: {fileID: 2496605958331436320} - - component: {fileID: 3745611127366570378} - m_Layer: 0 - m_Name: reward - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3288589982305288234 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8061675759077313909} - 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: 6972460681134904509} - 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: 35.5, y: 1090.5} - m_SizeDelta: {x: 59.05, y: 50} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2496605958331436320 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8061675759077313909} - m_CullTransparentMesh: 0 ---- !u!114 &3745611127366570378 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8061675759077313909} - 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.97647065, g: 0.8862746, b: 0.654902, 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: 35 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 50 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: "\u5956\u52B1\u9053\u5177" - LanguageIndex: 0 --- !u!1 &8397359907404652214 GameObject: m_ObjectHideFlags: 0 @@ -2510,8 +2429,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 1408903645927335063} - - {fileID: 3060736757162950048} + - {fileID: 1999804488253290332} + - {fileID: 5175128031705849308} - {fileID: 1441245498250559665} - {fileID: 3637171683400772941} m_Father: {fileID: 405232597685944583} @@ -2551,8 +2470,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 2488213213733390228} - - {fileID: 6441063970620955863} + - {fileID: 2177445712708224128} + - {fileID: 595553904858347416} m_Father: {fileID: 7862053694005184299} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/ManagedResources/~Lua/Modules/DemonSlayer/DemonSlayerPanel.lua b/Assets/ManagedResources/~Lua/Modules/DemonSlayer/DemonSlayerPanel.lua index 31464f9d63..f5800ba8c1 100644 --- a/Assets/ManagedResources/~Lua/Modules/DemonSlayer/DemonSlayerPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DemonSlayer/DemonSlayerPanel.lua @@ -26,8 +26,7 @@ function DemonSlayerPanel:InitComponent() this.helpBtn = Util.GetGameObject(self.gameObject,"HelpBtn") this.btnRank = Util.GetGameObject(self.gameObject,"RankList") - this.time = Util.GetGameObject(self.gameObject, "rewardContent/time") - this.leftTime = Util.GetGameObject(self.gameObject, "rewardContent/time/num"):GetComponent("Text") + this.timeText = Util.GetGameObject(self.gameObject, "rewardContent/time"):GetComponent("Text") this.myRank = Util.GetGameObject(self.gameObject, "rewardContent/myRank/num"):GetComponent("Text") this.pos = Util.GetGameObject(self.gameObject, "pos") @@ -171,7 +170,6 @@ function DemonSlayerPanel:SetState(ActInfo) state = 0--7天内 else state = 1--2天内 - this.time:GetComponent("Text").text = Language[10424] end -- else -- self:ClosePanel() @@ -256,12 +254,17 @@ end function DemonSlayerPanel:SetTime(ActInfo) local extraTime = ConfigManager.GetConfigData(ConfigName.GlobalActivity,ActInfo.activityId).GapTime*86400 --设置一进去的时间,不设置的话一进去会不对 - -- this.time:SetActive(state == 0) local time = ActInfo.endTime - GetTimeStamp() - extraTime - if time > 3600 then - this.leftTime.text = TimeToDHM(time) + local timeStr = "距排名结算:%s" + if time > 0 then + timeStr = "距排名结算:%s" else - this.leftTime.text = TimeToMS(time) + timeStr = "活动已结束" + end + if time > 3600 then + this.timeText.text = string.format(timeStr,TimeToDHM(time)) + else + this.timeText.text = string.format(timeStr,TimeToMS(time)) end if self.timer then @@ -273,9 +276,9 @@ function DemonSlayerPanel:SetTime(ActInfo) if state == 0 then local time = ActInfo.endTime - GetTimeStamp() - extraTime if time > 3600 then - this.leftTime.text = TimeToDHM(time) + this.timeText.text = string.format(timeStr,TimeToDHM(time)) else - this.leftTime.text = TimeToMS(time) + this.timeText.text = string.format(timeStr,TimeToMS(time)) end time = time -1 if time <= 0 then @@ -284,9 +287,9 @@ function DemonSlayerPanel:SetTime(ActInfo) elseif state == 1 then local time = ActInfo.endTime - GetTimeStamp() if time > 3600 then - this.leftTime.text = TimeToDHM(time) + this.timeText.text = string.format(timeStr,TimeToDHM(time)) else - this.leftTime.text = TimeToMS(time) + this.timeText.text = string.format(timeStr,TimeToMS(time)) end time = time -1 if time <= 0 then