diff --git a/Assets/Resources/UI/Prefab/Match/CompetitonPanel.prefab b/Assets/Resources/UI/Prefab/Match/CompetitonPanel.prefab index bf5fdfbe..0af880ce 100644 --- a/Assets/Resources/UI/Prefab/Match/CompetitonPanel.prefab +++ b/Assets/Resources/UI/Prefab/Match/CompetitonPanel.prefab @@ -312,6 +312,99 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: -20, y: -20} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1574085681054204948 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7866427236923531973} + - component: {fileID: 284819883630785826} + - component: {fileID: 6960175061233437258} + - component: {fileID: 8044665401950462652} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7866427236923531973 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1574085681054204948} + 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: 7832561499842500791} + 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: 20, y: -9} + m_SizeDelta: {x: 0, y: 16} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &284819883630785826 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1574085681054204948} + m_CullTransparentMesh: 0 +--- !u!114 &6960175061233437258 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1574085681054204948} + 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 &8044665401950462652 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1574085681054204948} + 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 &1754763021846574611 GameObject: m_ObjectHideFlags: 0 @@ -646,6 +739,141 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: radius: 30 +--- !u!1 &1998935168941117794 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5123053819850429709} + - component: {fileID: 3389012490513623589} + - component: {fileID: 433786098334052120} + - component: {fileID: 1573347819342039836} + - component: {fileID: 6259491567254898502} + m_Layer: 5 + m_Name: Detail + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &5123053819850429709 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1998935168941117794} + 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: 5698108039784919937} + - {fileID: 7832561499842500791} + m_Father: {fileID: 6558498177448486125} + m_RootOrder: 30 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -232, y: 79} + m_SizeDelta: {x: 108, y: 38} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &3389012490513623589 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1998935168941117794} + 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 &433786098334052120 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1998935168941117794} + 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: 3389012490513623589} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!222 &1573347819342039836 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1998935168941117794} + m_CullTransparentMesh: 0 +--- !u!114 &6259491567254898502 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1998935168941117794} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cb33d8ce76885d8438909e96ff897bf3, type: 3} + m_Name: + m_EditorClassIdentifier: + mType: 0 + Tooltips: Detail --- !u!1 &2014103318300012421 GameObject: m_ObjectHideFlags: 0 @@ -917,11 +1145,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6558498177448486125} - m_RootOrder: 30 + m_RootOrder: 29 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -360, y: 67} + m_AnchoredPosition: {x: -1209, y: 621} m_SizeDelta: {x: 84, y: 28} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6673787635055784084 @@ -1043,6 +1271,162 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: +--- !u!1 &3754120764301340933 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5698108039784919937} + - component: {fileID: 9064943191098126888} + - component: {fileID: 884444794978297512} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5698108039784919937 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3754120764301340933} + 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: 5123053819850429709} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &9064943191098126888 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3754120764301340933} + m_CullTransparentMesh: 0 +--- !u!114 &884444794978297512 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3754120764301340933} + 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: Detail +--- !u!1 &3990000441120744574 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7508488585840996723} + - component: {fileID: 184649310691725609} + - component: {fileID: 3395186303627663437} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7508488585840996723 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3990000441120744574} + 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: 4233764473327857169} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &184649310691725609 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3990000441120744574} + m_CullTransparentMesh: 0 +--- !u!114 &3395186303627663437 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3990000441120744574} + 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: Apply --- !u!1 &4080099147826733645 GameObject: m_ObjectHideFlags: 0 @@ -1177,6 +1561,141 @@ CanvasGroup: m_Interactable: 1 m_BlocksRaycasts: 1 m_IgnoreParentGroups: 0 +--- !u!1 &4163866851374220562 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4233764473327857169} + - component: {fileID: 1652367602553172878} + - component: {fileID: 4911224625286775540} + - component: {fileID: 5172850265895168860} + - component: {fileID: 7727091022062371561} + m_Layer: 5 + m_Name: Apply + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &4233764473327857169 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4163866851374220562} + 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: 7508488585840996723} + - {fileID: 804126381881165943} + m_Father: {fileID: 6558498177448486125} + m_RootOrder: 33 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -232, y: 79} + m_SizeDelta: {x: 108, y: 38} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1652367602553172878 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4163866851374220562} + 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 &4911224625286775540 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4163866851374220562} + 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: 1652367602553172878} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!222 &5172850265895168860 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4163866851374220562} + m_CullTransparentMesh: 0 +--- !u!114 &7727091022062371561 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4163866851374220562} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cb33d8ce76885d8438909e96ff897bf3, type: 3} + m_Name: + m_EditorClassIdentifier: + mType: 2 + Tooltips: RideNow --- !u!1 &4545746281496939300 GameObject: m_ObjectHideFlags: 0 @@ -1189,13 +1708,14 @@ GameObject: - component: {fileID: 5034563014571662167} - component: {fileID: 6791702915386963463} - component: {fileID: 8977229126063107381} + - component: {fileID: 8678333449202276543} m_Layer: 5 m_Name: CancelJoin m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3664757228482092608 RectTransform: m_ObjectHideFlags: 0 @@ -1210,11 +1730,11 @@ RectTransform: - {fileID: 9050330319599987492} - {fileID: 4958187996342670554} m_Father: {fileID: 6558498177448486125} - m_RootOrder: 32 + m_RootOrder: 34 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -752, y: 721.1} + m_AnchoredPosition: {x: -350, y: 79} m_SizeDelta: {x: 108, y: 38} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5034563014571662167 @@ -1230,7 +1750,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_Maskable: 1 m_OnCullStateChanged: @@ -1297,6 +1817,20 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4545746281496939300} m_CullTransparentMesh: 0 +--- !u!114 &8678333449202276543 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4545746281496939300} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cb33d8ce76885d8438909e96ff897bf3, type: 3} + m_Name: + m_EditorClassIdentifier: + mType: 0 + Tooltips: Cancel Apply --- !u!1 &4760618918347444675 GameObject: m_ObjectHideFlags: 0 @@ -1330,9 +1864,9 @@ RectTransform: m_Father: {fileID: 4958187996342670554} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 20, y: -9} m_SizeDelta: {x: 0, y: 16} m_Pivot: {x: 0.5, y: 1} --- !u!222 &471547526591830113 @@ -1429,7 +1963,7 @@ RectTransform: 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_SizeDelta: {x: 40, y: 34} m_Pivot: {x: 0.5, y: 1} --- !u!222 &4956907944525320509 CanvasRenderer: @@ -1519,6 +2053,99 @@ MonoBehaviour: m_ChildControlHeight: 0 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 +--- !u!1 &5674121455785206675 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4747926702531039024} + - component: {fileID: 1246222347643347550} + - component: {fileID: 4025034767926792143} + - component: {fileID: 8366165334940083780} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4747926702531039024 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5674121455785206675} + 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: 804126381881165943} + 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: 20, y: -9} + m_SizeDelta: {x: 0, y: 16} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &1246222347643347550 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5674121455785206675} + m_CullTransparentMesh: 0 +--- !u!114 &4025034767926792143 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5674121455785206675} + 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 &8366165334940083780 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5674121455785206675} + 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 &6404214130608481227 GameObject: m_ObjectHideFlags: 0 @@ -1631,7 +2258,7 @@ RectTransform: - {fileID: 6558498177838812408} - {fileID: 6558498178609268828} m_Father: {fileID: 6558498177448486125} - m_RootOrder: 33 + m_RootOrder: 35 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -1767,8 +2394,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: 420, y: -482} - m_SizeDelta: {x: 360, y: 0} + m_AnchoredPosition: {x: 744, y: -482} + m_SizeDelta: {x: 685, y: 0} m_Pivot: {x: 1, y: 1} --- !u!222 &6558498177234723984 CanvasRenderer: @@ -1936,9 +2563,9 @@ RectTransform: m_Father: {fileID: 6558498178957397887} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 20, y: -9} m_SizeDelta: {x: 0, y: 16} m_Pivot: {x: 0.5, y: 1} --- !u!222 &6558498177402843724 @@ -2117,9 +2744,9 @@ RectTransform: m_Father: {fileID: 6558498177739491041} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 20, y: -9} m_SizeDelta: {x: 0, y: 16} m_Pivot: {x: 0.5, y: 1} --- !u!222 &6558498177429669335 @@ -2236,10 +2863,12 @@ RectTransform: - {fileID: 6558498177906922480} - {fileID: 6558498177932893817} - {fileID: 6558498177866866937} - - {fileID: 6558498178671643836} - {fileID: 5987798170253205739} - {fileID: 8563954619679277008} + - {fileID: 5123053819850429709} + - {fileID: 6558498178671643836} - {fileID: 6558498178198826442} + - {fileID: 4233764473327857169} - {fileID: 3664757228482092608} - {fileID: 6558498177216885471} - {fileID: 6558498178561756610} @@ -2605,7 +3234,7 @@ RectTransform: 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_SizeDelta: {x: 40, y: 34} m_Pivot: {x: 0.5, y: 1} --- !u!222 &6558498177739491052 CanvasRenderer: @@ -3262,7 +3891,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &6558498178198826442 RectTransform: m_ObjectHideFlags: 0 @@ -3277,7 +3906,7 @@ RectTransform: - {fileID: 6558498178642912254} - {fileID: 6558498177739491041} m_Father: {fileID: 6558498177448486125} - m_RootOrder: 31 + m_RootOrder: 32 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -3377,7 +4006,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: mType: 2 - Tooltips: + Tooltips: RideNow --- !u!1 &6558498178229237427 GameObject: m_ObjectHideFlags: 0 @@ -4003,7 +4632,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6558498177448486125} - m_RootOrder: 34 + m_RootOrder: 36 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -4273,7 +4902,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &6558498178671643836 RectTransform: m_ObjectHideFlags: 0 @@ -4288,7 +4917,7 @@ RectTransform: - {fileID: 6558498178369272025} - {fileID: 6558498178957397887} m_Father: {fileID: 6558498177448486125} - m_RootOrder: 28 + m_RootOrder: 31 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -4601,7 +5230,7 @@ RectTransform: 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_SizeDelta: {x: 40, y: 34} m_Pivot: {x: 0.5, y: 1} --- !u!222 &6558498178957397882 CanvasRenderer: @@ -5342,11 +5971,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6558498177448486125} - m_RootOrder: 29 + m_RootOrder: 28 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -364, y: 90} + m_AnchoredPosition: {x: -1213, y: 644} m_SizeDelta: {x: 61, y: 17} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &927843223585017441 @@ -5390,6 +6019,135 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: Get Ready +--- !u!1 &7485406899099566182 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 804126381881165943} + - component: {fileID: 8757589349496557562} + - component: {fileID: 6069917535216715926} + - component: {fileID: 1589806432317767393} + - component: {fileID: 6524920189230811880} + - component: {fileID: 7305823906154345241} + m_Layer: 5 + m_Name: Tooltips + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &804126381881165943 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7485406899099566182} + 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: 4747926702531039024} + m_Father: {fileID: 4233764473327857169} + 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: 40, y: 34} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &8757589349496557562 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7485406899099566182} + m_CullTransparentMesh: 0 +--- !u!114 &6069917535216715926 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7485406899099566182} + 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 &1589806432317767393 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7485406899099566182} + 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 &6524920189230811880 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7485406899099566182} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 +--- !u!114 &7305823906154345241 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7485406899099566182} + 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 &7573522942889197828 GameObject: m_ObjectHideFlags: 0 @@ -5646,6 +6404,135 @@ CanvasGroup: m_Interactable: 1 m_BlocksRaycasts: 1 m_IgnoreParentGroups: 0 +--- !u!1 &8099817024611878460 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7832561499842500791} + - component: {fileID: 5007043874804461461} + - component: {fileID: 6197569413913873436} + - component: {fileID: 1894835727972660373} + - component: {fileID: 7982242512984647662} + - component: {fileID: 6705622833008925848} + m_Layer: 5 + m_Name: Tooltips + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7832561499842500791 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8099817024611878460} + 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: 7866427236923531973} + m_Father: {fileID: 5123053819850429709} + 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: 40, y: 34} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &5007043874804461461 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8099817024611878460} + m_CullTransparentMesh: 0 +--- !u!114 &6197569413913873436 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8099817024611878460} + 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 &1894835727972660373 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8099817024611878460} + 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 &7982242512984647662 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8099817024611878460} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 +--- !u!114 &6705622833008925848 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8099817024611878460} + 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 &8457773700689350405 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Scenes/Ride/Competiton/CompetitionLoadingController.cs b/Assets/Scripts/Scenes/Ride/Competiton/CompetitionLoadingController.cs index 60177c3a..d90d6b94 100644 --- a/Assets/Scripts/Scenes/Ride/Competiton/CompetitionLoadingController.cs +++ b/Assets/Scripts/Scenes/Ride/Competiton/CompetitionLoadingController.cs @@ -33,6 +33,7 @@ namespace Assets.Scenes.Ride.Scripts cyclingController = controller; //渲染比赛界面 panel = Instantiate(Resources.Load("UI/Prefab/Match/CompetitonPanel"), transform); + panel.transform.SetAsFirstSibling(); PFUIPanel mainPanel = panel.GetComponent(); PFUIPanel modelPanel = transform.Find("ModalPanel").GetComponent(); CompetitionDesc = panel.transform.Find("CompetitionDesc").GetComponent(); @@ -62,6 +63,18 @@ namespace Assets.Scenes.Ride.Scripts GetReadyTitle.gameObject.SetActive(false); GetReady.gameObject.SetActive(false); } + + //1.报名按钮 + Apply.SetActive(_canJoin); + //2.观看按钮 + var showWatch = !_canJoin && !_canStart && !_canCancelApply && _raceStart; + Watch.SetActive(showWatch); + //3.开始按钮 + rideNow.gameObject.SetActive(_canStart); + //4.详情按钮 + Detail.SetActive(!_canStart); + //5.取消报名按钮 (比赛开始前可以取消报名) + CancelJoin.SetActive(_canCancelApply && count > 0); } #endregion } @@ -76,6 +89,8 @@ namespace Assets.Scenes.Ride.Scripts InitGameObject(); InitGameObjectData(); } + GameObject Detail { get; set; } + GameObject Apply { get; set; } //构建赛事界面 protected override void InitGameObject() { @@ -85,6 +100,8 @@ namespace Assets.Scenes.Ride.Scripts Contestant = panel.transform.Find("Contestant").GetComponent(); Watch = panel.transform.Find("Watch").gameObject; CancelJoin = panel.transform.Find("CancelJoin").gameObject; + Detail = panel.transform.Find("Detail").gameObject; + Apply = panel.transform.Find("Apply").gameObject; PlayersPanel = panel.transform.Find("PlayersPanel/List/Viewport/Content"); LeftBack = panel.transform.Find("LeftBack").gameObject; MiddleBack = panel.transform.Find("MiddleBack").gameObject; @@ -95,10 +112,13 @@ namespace Assets.Scenes.Ride.Scripts UIManager.AddEvent(ReadMore, EventTriggerType.PointerClick, ReadCompetitionPreview); UIManager.AddEvent(Watch, EventTriggerType.PointerClick, StartWatch); + UIManager.AddEvent(Apply, EventTriggerType.PointerClick, ApplyRace); UIManager.AddEvent(CancelJoin, EventTriggerType.PointerClick, CancelReserve); + UIManager.AddEvent(Detail, EventTriggerType.PointerClick, GoDetail); } - private bool _canCancelApply = false; + private bool _canCancelApply = false; + private bool _raceStart = false; //查询赛事相关数据 protected override void InitGameObjectData() { @@ -108,22 +128,7 @@ namespace Assets.Scenes.Ride.Scripts _canJoin = competition.CanJoin; _canStart = competition.CanStart; _canCancelApply = competition.applyed;//可以取消预约 - //报名或者开始比赛 - rideNowText.text = _canJoin ? "Apply" : "RideNow"; - //观战 - var showWatch = !_canJoin && !_canStart && !_canCancelApply; - Watch.SetActive(showWatch); - rideNow.gameObject.SetActive(!showWatch); - //取消预约 - CancelJoin.SetActive(_canCancelApply); - //比赛结束 - if (competition.Status == 4) - { - rideNow.gameObject.SetActive(false); - Watch.SetActive(false); - CancelJoin.SetActive(false); - } - + _raceStart = competition.Status == 3; #region 赛事基本信息 //赛事名称 mapName.text = competition.Title; @@ -186,12 +191,6 @@ namespace Assets.Scenes.Ride.Scripts } } } - //显示比赛详情图片：如果没有比赛详情图则显示地图 - private void ShowCompetitionDescImage() - { - - } - private string GetENStatus(string status) { switch (status) @@ -204,40 +203,6 @@ namespace Assets.Scenes.Ride.Scripts return ""; } #region 事件 - //先报名后开始 - protected override void StartRide(BaseEventData baseEvent) - { - try - { - //先报名 - if (_canJoin) - { - MapCompetitionApi s = new MapCompetitionApi(); - var rrr = s.ApplyMapCompetition(cyclingController.competitionId); - if (rrr.result) - { - //var competition = s.GetById(cyclingController.competitionId).data; - //_canStart = competition.CanStart; - _canJoin = false; - //取消预约 - CancelJoin.SetActive(true); - } - //if (_canStart) - { - rideNowText.text = "RideNow"; - } - } - else - { - base.StartRide(baseEvent); - } - } - catch (Exception e) - { - Debug.LogError(e); - } - - } //查看赛事详情 protected void ReadCompetitionPreview(BaseEventData baseEvent) @@ -252,32 +217,100 @@ namespace Assets.Scenes.Ride.Scripts cyclingController.player.SetActive(false); base.StartRide(baseEvent); } + protected void GoDetail(BaseEventData baseEvent) + { + Application.OpenURL(App.CurrentUser.WebHost + $"#/Mine/MatchPreview?id={cyclingController.competitionId}&Token={App.CurrentUser.cookie}"); + } + protected void ApplyRace(BaseEventData baseEvent) + { + UIManager.ShowConfirm("Apply", "Are your want to Apply this race?", async () => + { + MapCompetitionApi s = ConfigHelper.mapCompetitionApi; + var rrr = s.ApplyMapCompetition(cyclingController.competitionId); + if (rrr.result) + { + var result = s.GetById(cyclingController.competitionId); + if (result.result == false || result.data == null) + { + Utils.showToast(gameObject, "error when get competition information"); + return; + } + else + { + competition = result.data; + _canStart = competition.CanStart; + _canJoin = competition.CanJoin; + _canCancelApply = competition.applyed; + + UIManager.UpdateJoinCompetition(); + Utils.showToast(gameObject, "success", 2, 1); + } + } + else + { + Utils.showToast(gameObject, rrr.errMsg); + } + rideNow.gameObject.SetActive(_canStart); + Detail.SetActive(!_canStart); + UIManager.CloseConfirm(); + + }); + + } //取消预约 protected void CancelReserve(BaseEventData baseEvent) { try { - MapCompetitionApi api = new MapCompetitionApi(); - var result = api.CancelMapCompetition(cyclingController.competition.Id); - if (result.result) + UIManager.ShowConfirm("Canel Application", "Are you want to cancel this application?", async () => { - rideNowText.text = "Apply"; - CancelJoin.SetActive(false); - _canJoin = true; - Debug.Log(result); - //SHOW Alert - } - else - { - Debug.Log(result); - //SHOW Alert - } + MapCompetitionApi api = ConfigHelper.mapCompetitionApi; + var data = api.CancelMapCompetition(cyclingController.competition.Id); + if (data.result) + { + var result = api.GetById(cyclingController.competitionId); + if (result.result == false || result.data == null) + { + Utils.showToast(gameObject, "error when get competition information"); + return; + } + else + { + competition = result.data; + _canStart = competition.CanStart; + _canJoin = competition.CanJoin; + _canCancelApply = competition.applyed; + + UIManager.UpdateJoinCompetition(); + Utils.showToast(gameObject, "success", 2, 1); + } + } + else + { + Utils.showToast(gameObject, data.errMsg); + } + UIManager.CloseConfirm(); + + }); } catch (Exception ex) { Debug.Log(ex); } } + + protected override void Cancel(BaseEventData baseEvent) + { + if (App.MainSceneParam.ContainsKey("Name")) + { + App.MainSceneParam["Name"] = "RaceHomePanel"; + } + else + { + App.MainSceneParam.Add("Name", "RaceHomePanel"); + } + base.Cancel(baseEvent); + } #endregion } } diff --git a/Assets/Scripts/Scenes/Ride/Competiton/CompetitionRankingFactory.cs b/Assets/Scripts/Scenes/Ride/Competiton/CompetitionRankingFactory.cs index 71a67b02..81022870 100644 --- a/Assets/Scripts/Scenes/Ride/Competiton/CompetitionRankingFactory.cs +++ b/Assets/Scripts/Scenes/Ride/Competiton/CompetitionRankingFactory.cs @@ -129,7 +129,8 @@ namespace Assets.Scenes.Ride.Scripts competitionRankingItem.setRatio(item.KGWeight + "W/KG"); competitionRankingItem.setSpeed(item.Speed.ToString() + "KM/H"); competitionRankingItem.setHead(item.Headimage); - competitionRankingItem.setCountry(item.CountryImg); + var countryTexture = cyclingController.GetCountryImageByName(item.CountryImg); + competitionRankingItem.setCountry(countryTexture); competitionRankingItem.setDistance(currentPlayer.UserId == item.UserId?"0KM": item.Near.ToString() + "KM"); competitionRankingItem.transform.SetSiblingIndex(item.Index); } diff --git a/Assets/Scripts/Scenes/Ride/Competiton/CompetitionRankingItem.cs b/Assets/Scripts/Scenes/Ride/Competiton/CompetitionRankingItem.cs index 80e62b05..bfdd35a1 100644 --- a/Assets/Scripts/Scenes/Ride/Competiton/CompetitionRankingItem.cs +++ b/Assets/Scripts/Scenes/Ride/Competiton/CompetitionRankingItem.cs @@ -96,9 +96,9 @@ namespace Assets.Scenes.Ride.Scripts } } - public void setCountry(string url) + public void setCountry(Texture texture) { - Utils.DisplayImage(Country, url, true); + Country.texture = texture; } public void setName(string name) { diff --git a/Assets/Scripts/Scenes/Ride/Competiton/CompetitionUIManager.cs b/Assets/Scripts/Scenes/Ride/Competiton/CompetitionUIManager.cs index fa3fe330..ab4a20bf 100644 --- a/Assets/Scripts/Scenes/Ride/Competiton/CompetitionUIManager.cs +++ b/Assets/Scripts/Scenes/Ride/Competiton/CompetitionUIManager.cs @@ -164,19 +164,26 @@ namespace Assets.Scenes.Ride.Scripts protected override void StopRide(BaseEventData baseEventData) { - //观察者 + if (!App.MainSceneParam.ContainsKey("Name")) + { + App.MainSceneParam.Add("Name", "RaceHomePanel"); + } + else + { + App.MainSceneParam["Name"] = "RaceHomePanel"; + } if (mainController.isWatch) { - quitPanel.SetActive(true); - var content=quitPanel.transform.Find("Content").GetComponent(); - content.text = "Do you want to quit?"; - quitPanel.transform.Find("AbandonButton").gameObject.SetActive(false); - quitPanel.transform.Find("SaveButton/Text").GetComponent().text = "OK"; + UIManager.ShowConfirm("Quit", "Are you want to quit?", async () => + { + SceneManager.LoadScene("MainScene"); + UIManager.CloseConfirm(); + }); } //参赛者：提醒是否退出并保存赛事结果 else { - quitPanel.SetActive(true); + base.StopRide(baseEventData); } } } diff --git a/Assets/Scripts/Scenes/Ride/Model/CyclingModels/CompetitionModel.cs b/Assets/Scripts/Scenes/Ride/Model/CyclingModels/CompetitionModel.cs index 7f50a01e..a4751765 100644 --- a/Assets/Scripts/Scenes/Ride/Model/CyclingModels/CompetitionModel.cs +++ b/Assets/Scripts/Scenes/Ride/Model/CyclingModels/CompetitionModel.cs @@ -153,7 +153,7 @@ namespace Assets.Scenes.Ride.Scripts.Model.CyclingModels Near = near, KGWeight = Math.Round(item.WeightKg, 2).ToString(), Speed = Math.Round(item.Speed, 1), - CountryImg = ConfigHelper.Host + $"User/GetCountryImg?userid={ item.Id }", + CountryImg = item.Country,//ConfigHelper.Host + $"User/GetCountryImg?userid={ item.Id }", UserId = item.Id, IsSelf = item.IsSelf, Headimage =item.HeadImage diff --git a/Assets/Scripts/Scenes/Ride/Scripts/AbstratctLoadingController.cs b/Assets/Scripts/Scenes/Ride/Scripts/AbstratctLoadingController.cs index 43ca7ae6..03d7c4dd 100644 --- a/Assets/Scripts/Scenes/Ride/Scripts/AbstratctLoadingController.cs +++ b/Assets/Scripts/Scenes/Ride/Scripts/AbstratctLoadingController.cs @@ -187,7 +187,7 @@ namespace Assets.Scenes.Ride.Scripts depressFlag = true; } } - protected void Cancel(BaseEventData baseEvent) + protected virtual void Cancel(BaseEventData baseEvent) { SceneManager.LoadScene("MainScene"); } diff --git a/Assets/Scripts/UI/Prefab/Race/RaceButtonGroupScript.cs b/Assets/Scripts/UI/Prefab/Race/RaceButtonGroupScript.cs index a4d9b56b..c91ca30c 100644 --- a/Assets/Scripts/UI/Prefab/Race/RaceButtonGroupScript.cs +++ b/Assets/Scripts/UI/Prefab/Race/RaceButtonGroupScript.cs @@ -42,6 +42,7 @@ public class RaceButtonGroupScript : MonoBehaviour parent.GetComponent().Join(); } App.RouteIdParam = map.RouteId; + UIManager.UpdateJoinCompetition(); UIManager.CloseConfirm(); }); } @@ -58,6 +59,7 @@ public class RaceButtonGroupScript : MonoBehaviour if (map.HasJoin) { parent.GetComponent().CancelJoin(); + UIManager.UpdateJoinCompetition(); } UIManager.CloseConfirm(); });