From 7f8ac10d4708e44b071c9e85611ffe155ce39c9a Mon Sep 17 00:00:00 2001 From: lishuo Date: Fri, 23 Jul 2021 18:07:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=90=8E=E5=BE=AE=E8=B0=83?= =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E8=B5=9B=E4=BA=8B=E6=8F=90=E9=86=92?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/RaceButtonGroupScript.cs | 5 +- .../UI/Prefab/Match/CountDownPanel.prefab | 8 +- .../UI/Prefab/Panel/RaceAlertPanel.prefab | 1313 +++++++++++++++++ .../Prefab/Panel/RaceAlertPanel.prefab.meta | 7 + Assets/Scripts/Apis/MapCompetitionApi.cs | 4 +- Assets/Scripts/App.cs | 3 + Assets/Scripts/Scenes/LoginController.cs | 2 + Assets/Scripts/Scenes/MainController.cs | 16 +- .../Competiton/CompetitionResultFactory.cs | 1 + .../Ride/Competiton/CountDownFactory.cs | 2 +- .../Scripts/AbstratctLoadingController.cs | 2 +- .../Scenes/Ride/Scripts/CyclingController.cs | 4 + .../Scenes/Ride/Scripts/MessagePanelScript.cs | 19 + .../Scripts/UI/Prefab/Panel/HomeController.cs | 13 +- .../UI/Prefab/Panel/RaceAlertController.cs | 62 + .../Prefab/Panel/RaceAlertController.cs.meta | 11 + Assets/Scripts/UIManager.cs | 61 +- 17 files changed, 1508 insertions(+), 25 deletions(-) create mode 100644 Assets/Resources/UI/Prefab/Panel/RaceAlertPanel.prefab create mode 100644 Assets/Resources/UI/Prefab/Panel/RaceAlertPanel.prefab.meta create mode 100644 Assets/Scripts/UI/Prefab/Panel/RaceAlertController.cs create mode 100644 Assets/Scripts/UI/Prefab/Panel/RaceAlertController.cs.meta diff --git a/Assets/RaceButtonGroupScript.cs b/Assets/RaceButtonGroupScript.cs index 6005a6a6..eff18dea 100644 --- a/Assets/RaceButtonGroupScript.cs +++ b/Assets/RaceButtonGroupScript.cs @@ -2,6 +2,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; +using UnityEngine.SceneManagement; public class RaceButtonGroupScript : MonoBehaviour { @@ -28,7 +29,9 @@ public class RaceButtonGroupScript : MonoBehaviour } void GoEnter() { - Debug.Log(map); + App.RouteIdParam = map.RouteId; + App.CompetionId = map.Id; + SceneManager.LoadScene("Ride"); } void GoCancel() { diff --git a/Assets/Resources/UI/Prefab/Match/CountDownPanel.prefab b/Assets/Resources/UI/Prefab/Match/CountDownPanel.prefab index 0ef67920..a1417e8b 100644 --- a/Assets/Resources/UI/Prefab/Match/CountDownPanel.prefab +++ b/Assets/Resources/UI/Prefab/Match/CountDownPanel.prefab @@ -112,8 +112,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 98.5, y: -109} - m_SizeDelta: {x: 82, y: 22} + m_AnchoredPosition: {x: 108.5, y: -109} + m_SizeDelta: {x: 102, y: 22} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4634055342823246341 CanvasRenderer: @@ -149,13 +149,13 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 1 m_MaxSize: 40 - m_Alignment: 4 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Total time + m_Text: Riding Time --- !u!1 &8655198199642205025 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/UI/Prefab/Panel/RaceAlertPanel.prefab b/Assets/Resources/UI/Prefab/Panel/RaceAlertPanel.prefab new file mode 100644 index 00000000..919075b9 --- /dev/null +++ b/Assets/Resources/UI/Prefab/Panel/RaceAlertPanel.prefab @@ -0,0 +1,1313 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &515512715299283613 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 515512715299283612} + - component: {fileID: 515512715299283609} + - component: {fileID: 515512715299283614} + - component: {fileID: 6288220231441535706} + m_Layer: 5 + m_Name: RaceAlertPanel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &515512715299283612 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 515512715299283613} + 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: 8465881818703633525} + m_Father: {fileID: 0} + 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: -246, y: -138} + m_SizeDelta: {x: 492, y: 276} + m_Pivot: {x: 0, y: 0} +--- !u!222 &515512715299283609 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 515512715299283613} + m_CullTransparentMesh: 0 +--- !u!114 &515512715299283614 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 515512715299283613} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.13725491, g: 0.13725491, b: 0.1764706, a: 0} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &6288220231441535706 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 515512715299283613} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1640d8d75dcdfa744896cf9c703dca2b, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &1230026707801033200 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3506856048126981147} + - component: {fileID: 2813564157456745620} + - component: {fileID: 115928300911898581} + - component: {fileID: 8999893943909614482} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3506856048126981147 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1230026707801033200} + 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: 9136923623198768419} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 20, y: 0} + m_SizeDelta: {x: 0, y: 16} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &2813564157456745620 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1230026707801033200} + m_CullTransparentMesh: 0 +--- !u!114 &115928300911898581 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1230026707801033200} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: 8180b991008992c45b6bf1a979c7baca, type: 3} + m_FontSize: 12 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: +--- !u!114 &8999893943909614482 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1230026707801033200} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 +--- !u!1 &2567305951832856606 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6932483080444044186} + - component: {fileID: 7393378197932838761} + - component: {fileID: 3457858673156455474} + m_Layer: 5 + m_Name: Content + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6932483080444044186 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2567305951832856606} + 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: 8465881818703633525} + 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.8, y: -2} + m_SizeDelta: {x: 297.5948, y: 25} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7393378197932838761 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2567305951832856606} + m_CullTransparentMesh: 0 +--- !u!114 &3457858673156455474 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2567305951832856606} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 18 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 40 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Your 13km races about to start ! +--- !u!1 &3032339125248658281 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 846954098232430311} + - component: {fileID: 3099452359807354485} + - component: {fileID: 1971680779031604290} + - component: {fileID: 1427233020469708924} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &846954098232430311 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3032339125248658281} + 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: 7399080629572717286} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 20, y: 0} + m_SizeDelta: {x: 0, y: 16} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &3099452359807354485 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3032339125248658281} + m_CullTransparentMesh: 0 +--- !u!114 &1971680779031604290 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3032339125248658281} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: 8180b991008992c45b6bf1a979c7baca, type: 3} + m_FontSize: 12 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: +--- !u!114 &1427233020469708924 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3032339125248658281} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 +--- !u!1 &3541791538790859144 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1753494560799144753} + - component: {fileID: 4973226376160014371} + - component: {fileID: 8668317922998530290} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1753494560799144753 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3541791538790859144} + 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: 6270767621979142586} + 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: 108, y: 38} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4973226376160014371 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3541791538790859144} + m_CullTransparentMesh: 0 +--- !u!114 &8668317922998530290 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3541791538790859144} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Stay +--- !u!1 &5346531551326013327 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1004341911565228515} + - component: {fileID: 1728928963645037940} + - component: {fileID: 2085723927676439840} + - component: {fileID: 3985994633223231062} + m_Layer: 5 + m_Name: Icon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1004341911565228515 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5346531551326013327} + 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: 8465881818703633525} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 70, y: -66} + m_SizeDelta: {x: 60, y: 68} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1728928963645037940 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5346531551326013327} + m_CullTransparentMesh: 0 +--- !u!114 &2085723927676439840 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5346531551326013327} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: dc72d3ff9bd483642a2f52fb764afa95, 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_PixelsPerUnitMultiplier: 1 +--- !u!114 &3985994633223231062 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5346531551326013327} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3} + m_Name: + m_EditorClassIdentifier: + radius: 4 +--- !u!1 &5939200140502441943 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9136923623198768419} + - component: {fileID: 6855085010038000156} + - component: {fileID: 8559776402832900063} + - component: {fileID: 5288177880786097129} + - component: {fileID: 8406340193025140002} + - component: {fileID: 747799950828283154} + m_Layer: 5 + m_Name: Tooltips + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9136923623198768419 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5939200140502441943} + 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: 3506856048126981147} + m_Father: {fileID: 5973640321553668356} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -50} + m_SizeDelta: {x: 0, y: 34} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &6855085010038000156 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5939200140502441943} + m_CullTransparentMesh: 0 +--- !u!114 &8559776402832900063 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5939200140502441943} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.20784315, g: 0.20784315, b: 0.2627451, a: 0.8} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 96bc99033bf6d1d49b8252599543005d, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &5288177880786097129 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5939200140502441943} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 +--- !u!225 &8406340193025140002 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5939200140502441943} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 +--- !u!114 &747799950828283154 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5939200140502441943} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 20 + m_Right: 20 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 +--- !u!1 &5973640321553668357 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5973640321553668356} + - component: {fileID: 6747403619866285241} + - component: {fileID: 5973640321553668359} + - component: {fileID: 8782807691538073479} + - component: {fileID: 129583337066392197} + m_Layer: 5 + m_Name: Go + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5973640321553668356 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5973640321553668357} + 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: 5973640323423424732} + - {fileID: 9136923623198768419} + m_Father: {fileID: 8465881818703633525} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 194, y: -144} + m_SizeDelta: {x: 108, y: 38} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &6747403619866285241 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5973640321553668357} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &5973640321553668359 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5973640321553668357} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, 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_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, 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_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 6747403619866285241} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!222 &8782807691538073479 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5973640321553668357} + m_CullTransparentMesh: 0 +--- !u!114 &129583337066392197 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5973640321553668357} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cb33d8ce76885d8438909e96ff897bf3, type: 3} + m_Name: + m_EditorClassIdentifier: + mType: 2 + Tooltips: +--- !u!1 &5973640323423424733 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5973640323423424732} + - component: {fileID: 5973640323423424734} + - component: {fileID: 5973640323423424735} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5973640323423424732 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5973640323423424733} + 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: 5973640321553668356} + 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: 108, y: 38} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5973640323423424734 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5973640323423424733} + m_CullTransparentMesh: 0 +--- !u!114 &5973640323423424735 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5973640323423424733} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Go +--- !u!1 &6957816826657366028 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6270767621979142586} + - component: {fileID: 5183312885702501802} + - component: {fileID: 7596829208340201364} + - component: {fileID: 57635511549673527} + - component: {fileID: 4327463521751609135} + m_Layer: 5 + m_Name: Stay + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6270767621979142586 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6957816826657366028} + 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: 1753494560799144753} + - {fileID: 7399080629572717286} + m_Father: {fileID: 8465881818703633525} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 312, y: -144} + m_SizeDelta: {x: 108, y: 38} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &5183312885702501802 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6957816826657366028} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &7596829208340201364 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6957816826657366028} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, 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_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, 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_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 5183312885702501802} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!222 &57635511549673527 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6957816826657366028} + m_CullTransparentMesh: 0 +--- !u!114 &4327463521751609135 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6957816826657366028} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cb33d8ce76885d8438909e96ff897bf3, type: 3} + m_Name: + m_EditorClassIdentifier: + mType: 0 + Tooltips: +--- !u!1 &7998641772980978579 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8032670589440870531} + - component: {fileID: 1027356599886764834} + - component: {fileID: 3992202262333371953} + m_Layer: 5 + m_Name: Timer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8032670589440870531 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7998641772980978579} + 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: 8465881818703633525} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 244.5, y: -53} + m_SizeDelta: {x: 209, y: 66} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1027356599886764834 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7998641772980978579} + m_CullTransparentMesh: 0 +--- !u!114 &3992202262333371953 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7998641772980978579} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.9764706, g: 0.1882353, b: 0.5254902, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3} + m_FontSize: 48 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 4 + m_MaxSize: 48 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 00:02:00 +--- !u!1 &8170178627060722827 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7399080629572717286} + - component: {fileID: 8265713731235955313} + - component: {fileID: 2466552425265475911} + - component: {fileID: 7488801094462864877} + - component: {fileID: 1084309768749070226} + - component: {fileID: 1460808199018542561} + m_Layer: 5 + m_Name: Tooltips + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7399080629572717286 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8170178627060722827} + 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: 846954098232430311} + m_Father: {fileID: 6270767621979142586} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -50} + m_SizeDelta: {x: 0, y: 34} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &8265713731235955313 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8170178627060722827} + m_CullTransparentMesh: 0 +--- !u!114 &2466552425265475911 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8170178627060722827} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.20784315, g: 0.20784315, b: 0.2627451, a: 0.8} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 96bc99033bf6d1d49b8252599543005d, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &7488801094462864877 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8170178627060722827} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 +--- !u!225 &1084309768749070226 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8170178627060722827} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 +--- !u!114 &1460808199018542561 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8170178627060722827} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 20 + m_Right: 20 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 +--- !u!1 &8465881818703633524 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8465881818703633525} + - component: {fileID: 8465881818703633520} + - component: {fileID: 8465881818703633527} + - component: {fileID: 8465881818703633526} + - component: {fileID: 5544456592928434985} + m_Layer: 5 + m_Name: Card + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8465881818703633525 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8465881818703633524} + 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: 1004341911565228515} + - {fileID: 8032670589440870531} + - {fileID: 6932483080444044186} + - {fileID: 5973640321553668356} + - {fileID: 6270767621979142586} + m_Father: {fileID: 515512715299283612} + 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: -235, y: -96.5} + m_SizeDelta: {x: 470, y: 193} + m_Pivot: {x: 0, y: 0} +--- !u!222 &8465881818703633520 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8465881818703633524} + m_CullTransparentMesh: 0 +--- !u!114 &8465881818703633527 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8465881818703633524} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.13725491, g: 0.13725491, b: 0.1764706, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &8465881818703633526 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8465881818703633524} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3} + m_Name: + m_EditorClassIdentifier: + radius: 30 +--- !u!114 &5544456592928434985 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8465881818703633524} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0.9764706, g: 0.1882353, b: 0.5254902, a: 0.5} + m_EffectDistance: {x: 2, y: 2} + m_UseGraphicAlpha: 1 diff --git a/Assets/Resources/UI/Prefab/Panel/RaceAlertPanel.prefab.meta b/Assets/Resources/UI/Prefab/Panel/RaceAlertPanel.prefab.meta new file mode 100644 index 00000000..17c2cdfc --- /dev/null +++ b/Assets/Resources/UI/Prefab/Panel/RaceAlertPanel.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 593994e2f8e5e644796cbad931c5338b +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Apis/MapCompetitionApi.cs b/Assets/Scripts/Apis/MapCompetitionApi.cs index 718f8e73..153ff03a 100644 --- a/Assets/Scripts/Apis/MapCompetitionApi.cs +++ b/Assets/Scripts/Apis/MapCompetitionApi.cs @@ -37,9 +37,9 @@ namespace Assets.Scripts.Apis }; } //查询我参与的比赛列表 - public JsonResult> GetMyCompetitionList(string name) + public JsonResult> GetMyCompetitionList() { - var list = Get>($"/MapCompetition/GetMyList?name={ name }"); + var list = Get>($"/MapCompetition/v0/GetMyList"); return new JsonResult> { diff --git a/Assets/Scripts/App.cs b/Assets/Scripts/App.cs index fa7d900f..9e9c1009 100644 --- a/Assets/Scripts/App.cs +++ b/Assets/Scripts/App.cs @@ -51,6 +51,9 @@ public static class App //public static string AppDownloadUrl { get; internal set; } //public static string AppVersionCode { get; internal set; } + public static List JoinedCompetitionList { get; set; }//我参加的比赛 + public static List CompetitionIdList = new List(); + private static MainDeviceAdapter mainDeviceAdapter; public static MainDeviceAdapter MainDeviceAdapter { diff --git a/Assets/Scripts/Scenes/LoginController.cs b/Assets/Scripts/Scenes/LoginController.cs index 12941e78..e9b23b84 100644 --- a/Assets/Scripts/Scenes/LoginController.cs +++ b/Assets/Scripts/Scenes/LoginController.cs @@ -1056,6 +1056,8 @@ public class LoginController : MonoBehaviour } App.CurrentUser = data; App.RideSetting.Sensitivity = data.Sensitivity; + //查询我参加的比赛 + UIManager.UpdateJoinCompetition(); SceneManager.LoadScene("MainScene"); } /// diff --git a/Assets/Scripts/Scenes/MainController.cs b/Assets/Scripts/Scenes/MainController.cs index d9b5248d..08e01c57 100644 --- a/Assets/Scripts/Scenes/MainController.cs +++ b/Assets/Scripts/Scenes/MainController.cs @@ -53,6 +53,11 @@ public class MainController : BaseScene { UIManager.ShowUserInfoPanel(); } + + if (App.MainSceneParam["Name"] == "RaceHomePanel") + { + UIManager.ShowRaceHomePanel(); + } App.MainSceneParam["Name"] = string.Empty; } else @@ -63,14 +68,21 @@ public class MainController : BaseScene //UIManager.ShowBigMapPanel(); //UIManager.ShowEarthPanel(); } + + UIManager.UpdateJoinCompetition();//查询当前我参加的赛事 } - + float t = 1f; // Update is called once per frame void Update() { - + t -= Time.deltaTime; + while (t <= 0) + { + UIManager.SendCompetitionStartMessage("Main"); + t = 1; + } } private async Task Login() diff --git a/Assets/Scripts/Scenes/Ride/Competiton/CompetitionResultFactory.cs b/Assets/Scripts/Scenes/Ride/Competiton/CompetitionResultFactory.cs index 998f644a..15ecba9a 100644 --- a/Assets/Scripts/Scenes/Ride/Competiton/CompetitionResultFactory.cs +++ b/Assets/Scripts/Scenes/Ride/Competiton/CompetitionResultFactory.cs @@ -193,6 +193,7 @@ namespace Assets.Scenes.Ride.Scripts this.gameObject.SetActive(false); this.Destroy(); SceneManager.LoadScene("MainScene"); + App.MainSceneParam["Name"] = "RaceHomePanel"; } } } diff --git a/Assets/Scripts/Scenes/Ride/Competiton/CountDownFactory.cs b/Assets/Scripts/Scenes/Ride/Competiton/CountDownFactory.cs index 94af6236..ab62db27 100644 --- a/Assets/Scripts/Scenes/Ride/Competiton/CountDownFactory.cs +++ b/Assets/Scripts/Scenes/Ride/Competiton/CountDownFactory.cs @@ -55,7 +55,7 @@ namespace Assets.Scenes.Ride.Scripts { //显示倒计时面板信息 //ShowCountDown(s.Item1, "remaining"); - ShowCountDown(cyclingController.currentPlayer.TotalTicks, "Riding Time"); + ShowCountDown(s.Item1, "Remaining Time"); } //显示当前选手骑行时间 Timer.gameObject.SetActive(true); diff --git a/Assets/Scripts/Scenes/Ride/Scripts/AbstratctLoadingController.cs b/Assets/Scripts/Scenes/Ride/Scripts/AbstratctLoadingController.cs index 3e4c9e5e..c7c2751f 100644 --- a/Assets/Scripts/Scenes/Ride/Scripts/AbstratctLoadingController.cs +++ b/Assets/Scripts/Scenes/Ride/Scripts/AbstratctLoadingController.cs @@ -159,7 +159,7 @@ namespace Assets.Scenes.Ride.Scripts processText.text = $"{(f).ToString("#0")}%"; }); - if (process == 100) + if (process >= 100) { rideNow.interactable = true; rideNow.enabled = true; diff --git a/Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs b/Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs index 4c4d6fe7..42bcc3ac 100644 --- a/Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs +++ b/Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs @@ -148,6 +148,10 @@ public class CyclingController : DeviceServiceMonoBase if (timer <= 0)//定时器 一秒执行一次 { TcpHandler(); + if (competitionId == 0) + { + UIManager.SendCompetitionStartMessage("Ride"); + } timer = 1.0f; } } diff --git a/Assets/Scripts/Scenes/Ride/Scripts/MessagePanelScript.cs b/Assets/Scripts/Scenes/Ride/Scripts/MessagePanelScript.cs index cbb2c9e0..eadc63c7 100644 --- a/Assets/Scripts/Scenes/Ride/Scripts/MessagePanelScript.cs +++ b/Assets/Scripts/Scenes/Ride/Scripts/MessagePanelScript.cs @@ -4,6 +4,8 @@ using System.Collections.Generic; using UnityEngine; using UnityEngine.UI; using DG.Tweening; +using Assets.Scripts.Apis.Models; +using System; namespace Assets.Scenes.Ride.Scripts { @@ -65,4 +67,21 @@ namespace Assets.Scenes.Ride.Scripts this.url = url; } } + //赛事开始事件3 + public class CompetitonStartMessageEvent : GameEvent + { + public string title;//赛事标题 + public int competitionId;//赛事id + public int routeId;//路书id + public DateTime StartTime;//赛事开始时间 + + + public CompetitonStartMessageEvent(string Title, int Id, int RouteId, DateTime StartTime) + { + this.title = Title; + this.competitionId = Id; + this.routeId = RouteId; + this.StartTime = StartTime; + } + } } diff --git a/Assets/Scripts/UI/Prefab/Panel/HomeController.cs b/Assets/Scripts/UI/Prefab/Panel/HomeController.cs index a2194f13..ffa7b22e 100644 --- a/Assets/Scripts/UI/Prefab/Panel/HomeController.cs +++ b/Assets/Scripts/UI/Prefab/Panel/HomeController.cs @@ -1,4 +1,5 @@ -using Assets.Scripts; +using Assets.Scenes.Ride.Scripts; +using Assets.Scripts; using Assets.Scripts.Apis; using Assets.Scripts.Apis.Models; using Assets.Scripts.UI.Control; @@ -74,7 +75,8 @@ public class HomeController : PFUIPanel UIManager.AddEvent(userInfo.Find("BtnMore").gameObject, EventTriggerType.PointerClick, x => { - UIManager.ShowUserInfoPanel(); + // UIManager.ShowUserInfoPanel(); + UIManager.ShowRaceAlertPanel(); //UIManager.ShowConfirm("Quit", "Do you want to quit PowerFun?", null); }); //GetSummary(); @@ -113,14 +115,7 @@ public class HomeController : PFUIPanel //进入比赛 private void GoMatch(BaseEventData e) { - //TODO:进入比赛列表 UIManager.ShowRaceHomePanel(); - return; - #region 测试比赛 - App.CompetionId = 1048; - App.RouteIdParam = 1215; - SceneManager.LoadScene("Ride"); - #endregion } private void OnHover(BaseEventData e) { diff --git a/Assets/Scripts/UI/Prefab/Panel/RaceAlertController.cs b/Assets/Scripts/UI/Prefab/Panel/RaceAlertController.cs new file mode 100644 index 00000000..1a1708a9 --- /dev/null +++ b/Assets/Scripts/UI/Prefab/Panel/RaceAlertController.cs @@ -0,0 +1,62 @@ +using Assets.Scripts; +using UnityEngine; +using UnityEngine.EventSystems; +using UnityEngine.SceneManagement; +using UnityEngine.UI; + +namespace Assets.Scenes.Ride.Scripts +{ + public class RaceAlertController : PFUIPanel + { + public Text Content { get; set; } + public Text Timer { get; set; } + + public GameObject GoBtn { get; set; } + public GameObject StayBtn { get; set; } + + public int ticks = 0; + + public int CompetitionId { get; set; } + public int RouteId { get; set; } + + protected override void Awake() + { + Timer = this.transform.Find("Card/Timer").GetComponent(); + Content = this.transform.Find("Card/Content").GetComponent(); + GoBtn = this.transform.Find("Card/Go").gameObject; + StayBtn = this.transform.Find("Card/Stay").gameObject; + + UIManager.AddEvent(GoBtn, UnityEngine.EventSystems.EventTriggerType.PointerClick, Go); + UIManager.AddEvent(StayBtn, UnityEngine.EventSystems.EventTriggerType.PointerClick, Stay); + } + float t = 1f; + private void Update() + { + t -= Time.deltaTime; + while (t <= 0) + { + if (ticks > 0) + { + ticks--; + Timer.text = Helper.FormatTicks(ticks); + } + t = 1f; + } + } + + //切换到当前用户视角 + public void Go(BaseEventData baseEventData) + { + App.CompetitionIdList.Add(CompetitionId); + App.CompetionId = CompetitionId; + App.RouteIdParam = RouteId; + SceneManager.LoadScene("Ride"); + } + + public void Stay(BaseEventData baseEventData) + { + App.CompetitionIdList.Add(CompetitionId); + this.Close(); + } + } +} diff --git a/Assets/Scripts/UI/Prefab/Panel/RaceAlertController.cs.meta b/Assets/Scripts/UI/Prefab/Panel/RaceAlertController.cs.meta new file mode 100644 index 00000000..09394c27 --- /dev/null +++ b/Assets/Scripts/UI/Prefab/Panel/RaceAlertController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 1640d8d75dcdfa744896cf9c703dca2b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UIManager.cs b/Assets/Scripts/UIManager.cs index 69317695..59e12eed 100644 --- a/Assets/Scripts/UIManager.cs +++ b/Assets/Scripts/UIManager.cs @@ -13,6 +13,7 @@ using Assets.Scripts.Apis.Models; using System.Linq; using Newtonsoft.Json.Linq; using System; +using Assets.Scenes.Ride.Scripts; public class UIManager : MonoBehaviour { @@ -110,12 +111,12 @@ public class UIManager : MonoBehaviour } } - private CyclingController mCyclingController; - public CyclingController CyclingController + private RaceAlertController mRaceAlertPanel; + public RaceAlertController RaceAlertPanel { get { - return this.GetPanelInstance("CyclingController", ref this.mCyclingController); + return this.GetPanelInstance("RaceAlertPanel", ref this.mRaceAlertPanel); } } @@ -207,12 +208,24 @@ public class UIManager : MonoBehaviour Debug.Log(123); InitNow(); } + EventQueueSystem.AddListener(CompetitonStartHandler); + } + //比赛即将开始消息提醒 + private void CompetitonStartHandler(CompetitonStartMessageEvent e) + { + ShowRaceAlertPanel(); + if (mRaceAlertPanel != null) + { + mRaceAlertPanel.ticks = (int)(e.StartTime.ToLocalTime() - Now.GetDateTime()).TotalSeconds; + mRaceAlertPanel.Content.text = $"Your {e.title} race about to start"; + mRaceAlertPanel.CompetitionId = e.competitionId; + mRaceAlertPanel.RouteId = e.routeId; + } } - // Start is called before the first frame update void Start() { - + } // Update is called once per frame @@ -220,6 +233,39 @@ public class UIManager : MonoBehaviour { } + //重新查询已经参赛列表 + public static void UpdateJoinCompetition() + { + try + { + if (App.CurrentUser != null) + { + var api = ConfigHelper.mapCompetitionApi; + var s = api.GetMyCompetitionList(); + App.JoinedCompetitionList = s.data; + } + } + catch (Exception) + { + + } + } + //通知用户当前最近的一场比赛开始 + public static void SendCompetitionStartMessage(string sceneName) + { + if (App.JoinedCompetitionList != null) + { + foreach (var item in App.JoinedCompetitionList) + { + var onStart = (item.StartTime.ToLocalTime() - Now.GetDateTime()).TotalMinutes <= 5 && (item.StartTime.ToLocalTime() - Now.GetDateTime()).TotalMinutes >= 0; + var notify = App.CompetitionIdList.Contains(item.Id); + if (onStart && !notify) + { + EventQueueSystem.QueueEvent(new CompetitonStartMessageEvent(item.Title, item.Id, item.RouteId, item.StartTime.ToLocalTime())); + } + } + } + } private T GetPanelInstance(string prefabName, ref T internalComponent) { @@ -410,6 +456,11 @@ public class UIManager : MonoBehaviour UIManager.Show(UIManager.Instance.EditUserPanel, UIManager.Instance.MainPanel); } + public static void ShowRaceAlertPanel() + { + UIManager.Show(UIManager.Instance.RaceAlertPanel, null, true); + } + //LoadingPf loading; public static void ShowLoadingDialogBox() {