赛事loading页面状态实时变化和一些微调
This commit is contained in:
parent
ea79b6cfc5
commit
0eb399be9a
@ -132,13 +132,13 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_Color: {r: 0.20784314, g: 0.20784314, b: 0.2627451, a: 0.8}
|
||||
m_RaycastTarget: 1
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 21300000, guid: 1277fd0f0664a0042a3f23a72f4e0371, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: 5cbb2a1813e35d143a8939fc60814d38, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
@ -1035,7 +1035,7 @@ MonoBehaviour:
|
||||
m_Alignment: 0
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 0
|
||||
m_HorizontalOverflow: 1
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: 00:00:00
|
||||
|
||||
729
Assets/Resources/UI/Prefab/Panel/RaceAlertBandPanel.prefab
Normal file
729
Assets/Resources/UI/Prefab/Panel/RaceAlertBandPanel.prefab
Normal file
@ -0,0 +1,729 @@
|
||||
%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: RaceAlertBandPanel
|
||||
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: 5842261755140000527}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: -536, y: -84}
|
||||
m_SizeDelta: {x: 392, y: 44}
|
||||
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:
|
||||
ticks: 0
|
||||
--- !u!1 &802164553699374885
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 5512156117343105211}
|
||||
- component: {fileID: 4466499155195279828}
|
||||
- component: {fileID: 1896852856402570438}
|
||||
m_Layer: 5
|
||||
m_Name: Text
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &5512156117343105211
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 802164553699374885}
|
||||
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: 45755669647462262}
|
||||
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.000017047, y: -0.5}
|
||||
m_SizeDelta: {x: 28.092041, y: 16}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4466499155195279828
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 802164553699374885}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &1896852856402570438
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 802164553699374885}
|
||||
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: 1db9e217733971041be26b076fda6083, type: 3}
|
||||
m_FontSize: 14
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 1
|
||||
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 &1915655178652630353
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 5842261755140000527}
|
||||
- component: {fileID: 7199237010373622387}
|
||||
- component: {fileID: 4568661341024461208}
|
||||
- component: {fileID: 2624398818856855047}
|
||||
m_Layer: 5
|
||||
m_Name: Card
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &5842261755140000527
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1915655178652630353}
|
||||
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: 4618055002628938678}
|
||||
- {fileID: 4069045253571672239}
|
||||
- {fileID: 45755669647462262}
|
||||
- {fileID: 3983527088756723980}
|
||||
m_Father: {fileID: 515512715299283612}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: -340, y: -62}
|
||||
m_SizeDelta: {x: 392, y: 44}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7199237010373622387
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1915655178652630353}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &4568661341024461208
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1915655178652630353}
|
||||
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.8}
|
||||
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 &2624398818856855047
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1915655178652630353}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
radius: 22
|
||||
--- !u!1 &2861520427159955387
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 2552918015941874495}
|
||||
- component: {fileID: 5621771002718107125}
|
||||
- component: {fileID: 4967781721841961069}
|
||||
m_Layer: 5
|
||||
m_Name: Text
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &2552918015941874495
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2861520427159955387}
|
||||
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: 3983527088756723980}
|
||||
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 &5621771002718107125
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2861520427159955387}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &4967781721841961069
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2861520427159955387}
|
||||
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.19607843, g: 0.19607843, b: 0.19607843, 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: 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:
|
||||
--- !u!1 &3540154109124559502
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 4618055002628938678}
|
||||
- component: {fileID: 633820982323412342}
|
||||
- component: {fileID: 3707790678906830409}
|
||||
m_Layer: 5
|
||||
m_Name: Image
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &4618055002628938678
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3540154109124559502}
|
||||
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: 5842261755140000527}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0.5}
|
||||
m_AnchorMax: {x: 0, y: 0.5}
|
||||
m_AnchoredPosition: {x: 34, y: 0}
|
||||
m_SizeDelta: {x: 28, y: 28}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &633820982323412342
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3540154109124559502}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &3707790678906830409
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3540154109124559502}
|
||||
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!1 &4047981210531422437
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 3983527088756723980}
|
||||
- component: {fileID: 4902683126761565560}
|
||||
- component: {fileID: 9040790131811311082}
|
||||
- component: {fileID: 961960684654131611}
|
||||
m_Layer: 5
|
||||
m_Name: Stay
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &3983527088756723980
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4047981210531422437}
|
||||
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: 2552918015941874495}
|
||||
m_Father: {fileID: 5842261755140000527}
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 0}
|
||||
m_AnchoredPosition: {x: -28, y: 22}
|
||||
m_SizeDelta: {x: 16, y: 16}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4902683126761565560
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4047981210531422437}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &9040790131811311082
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4047981210531422437}
|
||||
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.25490198, g: 0.25882354, b: 0.31764707, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 21300000, guid: 5cbb2a1813e35d143a8939fc60814d38, 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 &961960684654131611
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4047981210531422437}
|
||||
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: 9040790131811311082}
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
--- !u!1 &6094534469248396050
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 45755669647462262}
|
||||
- component: {fileID: 8555668976453305956}
|
||||
- component: {fileID: 4113576028155303025}
|
||||
- component: {fileID: 8281380518608851179}
|
||||
m_Layer: 5
|
||||
m_Name: Go
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &45755669647462262
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6094534469248396050}
|
||||
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: 5512156117343105211}
|
||||
m_Father: {fileID: 5842261755140000527}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: -65.95, y: -22}
|
||||
m_SizeDelta: {x: 28.092041, y: 16}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &8555668976453305956
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6094534469248396050}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &4113576028155303025
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6094534469248396050}
|
||||
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: 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 &8281380518608851179
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6094534469248396050}
|
||||
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: 4113576028155303025}
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
--- !u!1 &7577877535076679788
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 4069045253571672239}
|
||||
- component: {fileID: 5406606897990230713}
|
||||
- component: {fileID: 8312461921480324951}
|
||||
m_Layer: 5
|
||||
m_Name: Content
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &4069045253571672239
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7577877535076679788}
|
||||
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: 5842261755140000527}
|
||||
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: 189.61, y: -25.5}
|
||||
m_SizeDelta: {x: 263.21265, y: 21}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5406606897990230713
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7577877535076679788}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &8312461921480324951
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7577877535076679788}
|
||||
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: 1db9e217733971041be26b076fda6083, type: 3}
|
||||
m_FontSize: 14
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 10
|
||||
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!
|
||||
@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: bf401ac965f3ffa4a8997438693469a4
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -213,7 +213,7 @@ GameObject:
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &1151153123674904992
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -5964,6 +5964,26 @@ PrefabInstance:
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 300
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2158088071931721755, guid: ed226fe096f17a0459f856db5fc494af,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2158088071931721755, guid: ed226fe096f17a0459f856db5fc494af,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2306836787388412542, guid: ed226fe096f17a0459f856db5fc494af,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2306836787388412542, guid: ed226fe096f17a0459f856db5fc494af,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7974311519597661726, guid: ed226fe096f17a0459f856db5fc494af,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -11,7 +11,7 @@ using Assets.Scripts.Devices;
|
||||
|
||||
public static class App
|
||||
{
|
||||
public static string Host = "http://192.168.0.101:5085/";
|
||||
public static string Host = "http://192.168.0.102:5082/";
|
||||
|
||||
public static string AppVersion = Application.version;
|
||||
|
||||
|
||||
@ -63,7 +63,11 @@ namespace Assets.Scenes.Ride.Scripts
|
||||
GetReadyTitle.gameObject.SetActive(false);
|
||||
GetReady.gameObject.SetActive(false);
|
||||
}
|
||||
|
||||
var applyCount = (int)(competition.StartApplyTime.ToLocalTime() - UIManager.Now.GetDateTime()).TotalSeconds;
|
||||
if (count == 0 || applyCount == 0)
|
||||
{
|
||||
UpdateCompetition();
|
||||
}
|
||||
//1.报名按钮
|
||||
Apply.SetActive(_canJoin);
|
||||
//2.观看按钮
|
||||
@ -141,7 +145,7 @@ namespace Assets.Scenes.Ride.Scripts
|
||||
//比赛开始时间
|
||||
StartTime.text = competition.StartTime.ToLongTimeString();
|
||||
//比赛状态
|
||||
CompetitionStatus.text = GetENStatus(competition.StatusVlaue.ToString());
|
||||
CompetitionStatus.text = competition.StatusVlaue.ToString();
|
||||
//参赛选手
|
||||
Contestant.text = competition.UserList.Count.ToString() + "Players";
|
||||
ShowPlayers(competition.UserList);
|
||||
@ -191,17 +195,6 @@ namespace Assets.Scenes.Ride.Scripts
|
||||
}
|
||||
}
|
||||
}
|
||||
private string GetENStatus(string status)
|
||||
{
|
||||
switch (status)
|
||||
{
|
||||
case "已结束": return "DONE";
|
||||
case "未开始": return "APPLIED";
|
||||
case "报名中": return "APPLLYING";
|
||||
case "比赛中": return "RACING";
|
||||
}
|
||||
return "";
|
||||
}
|
||||
#region 事件
|
||||
|
||||
//查看赛事详情
|
||||
@ -221,6 +214,24 @@ namespace Assets.Scenes.Ride.Scripts
|
||||
{
|
||||
Application.OpenURL(App.CurrentUser.WebHost + $"#/Mine/MatchPreview?id={cyclingController.competitionId}&Token={App.CurrentUser.cookie}");
|
||||
}
|
||||
|
||||
private void UpdateCompetition()
|
||||
{
|
||||
MapCompetitionApi s = ConfigHelper.mapCompetitionApi;
|
||||
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;
|
||||
}
|
||||
}
|
||||
protected void ApplyRace(BaseEventData baseEvent)
|
||||
{
|
||||
UIManager.ShowConfirm("Apply", "Are your want to Apply this race?", async () =>
|
||||
@ -229,22 +240,9 @@ namespace Assets.Scenes.Ride.Scripts
|
||||
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);
|
||||
}
|
||||
UpdateCompetition();
|
||||
UIManager.UpdateJoinCompetition();
|
||||
Utils.showToast(gameObject, "success", 2, 1);
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -268,22 +266,9 @@ namespace Assets.Scenes.Ride.Scripts
|
||||
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);
|
||||
}
|
||||
UpdateCompetition();
|
||||
UIManager.UpdateJoinCompetition();
|
||||
Utils.showToast(gameObject, "success", 2, 1);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
@ -23,6 +23,11 @@ namespace Assets.Scenes.Ride.Scripts
|
||||
reviewPanel.SetActive(false);
|
||||
//隐藏单人骑行时间
|
||||
var spilitLineH2 = transform.Find("Panel/ComputerPanel/SpilitLineH2").gameObject;
|
||||
var raceViewBtn = transform.Find("Panel/RaceViewButton").gameObject;
|
||||
raceViewBtn.SetActive(true);
|
||||
viewButton.gameObject.SetActive(false);
|
||||
UIManager.AddEvent(raceViewBtn, UnityEngine.EventSystems.EventTriggerType.PointerClick, ChangeView);
|
||||
|
||||
spilitLineH2.SetActive(false);
|
||||
timerTxt.gameObject.SetActive(false);
|
||||
timerTxtTitle.gameObject.SetActive(false);
|
||||
@ -55,7 +60,6 @@ namespace Assets.Scenes.Ride.Scripts
|
||||
public override void StartRide()
|
||||
{
|
||||
competitionModel = mainController.cyclingController as CompetitionModel;
|
||||
|
||||
countDownPanel = Instantiate(Resources.Load<GameObject>("UI/Prefab/Match/CountDownPanel"), transform.Find("Panel"));
|
||||
title = countDownPanel.transform.Find("Title").GetComponent<Text>();
|
||||
timer = countDownPanel.transform.Find("Timer").GetComponent<Text>();
|
||||
|
||||
@ -61,11 +61,13 @@ namespace Assets.Scenes.Ride.Scripts
|
||||
competitionRankingItem = rankingList.OrderByDescending(c => c.rank).FirstOrDefault();
|
||||
}
|
||||
}
|
||||
competitionRankingItem.setHead(item.Head);
|
||||
competitionRankingItem.setTimer(item.TripTime);
|
||||
competitionRankingItem.SetRank(item.Index);
|
||||
competitionRankingItem.setName(item.Name);
|
||||
competitionRankingItem.setUserId(item.UserId);
|
||||
competitionRankingItem.setCountry(item.Country);
|
||||
var countryTexture = cyclingController.GetCountryImageByName(item.Country);
|
||||
competitionRankingItem.setCountry(countryTexture);
|
||||
competitionRankingItem.transform.SetSiblingIndex(item.Index);
|
||||
}
|
||||
}
|
||||
|
||||
@ -56,12 +56,9 @@ namespace Assets.Scenes.Ride.Scripts
|
||||
}
|
||||
}
|
||||
|
||||
public void setCountry(string url)
|
||||
public void setCountry(Texture texture)
|
||||
{
|
||||
if (!string.IsNullOrEmpty(url))
|
||||
{
|
||||
Utils.DisplayImage(Country, url, true);
|
||||
}
|
||||
Country.texture = texture;
|
||||
}
|
||||
public void setName(string name)
|
||||
{
|
||||
|
||||
@ -94,6 +94,10 @@ namespace Assets.Scenes.Ride.Scripts.Model.CyclingModels
|
||||
{
|
||||
try
|
||||
{
|
||||
if (recorderData.Saved)
|
||||
{
|
||||
return;
|
||||
}
|
||||
if (recorderData.RiderDatas.Any())
|
||||
{
|
||||
var lastData = recorderData.RiderDatas.Last();
|
||||
|
||||
@ -223,7 +223,8 @@ namespace Assets.Scenes.Ride.Scripts.Model.CyclingModels
|
||||
TripTime = item.TripTime,
|
||||
Country = item.Country,
|
||||
Name = item.Name,
|
||||
UserId = item.UserId
|
||||
UserId = item.UserId,
|
||||
Head = item.WxHeadImg,
|
||||
});
|
||||
}
|
||||
|
||||
@ -238,7 +239,8 @@ namespace Assets.Scenes.Ride.Scripts.Model.CyclingModels
|
||||
TripTime = "———",
|
||||
Country = item.CountryImg,
|
||||
Name = item.Name,
|
||||
UserId = item.UserId
|
||||
UserId = item.UserId,
|
||||
Head = item.Headimage,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@ -85,6 +85,8 @@ namespace Assets.Scenes.Ride.Scripts.Model
|
||||
|
||||
public string Country { get; set; }
|
||||
|
||||
public string Head { get; set; }
|
||||
|
||||
public string TripTime { get; set; }
|
||||
}
|
||||
|
||||
|
||||
@ -43,7 +43,7 @@ public class CyclingController : DeviceServiceMonoBase
|
||||
public List<MapRouteRanking> mapRouteRankingList { get; set; }
|
||||
private Vector2d coordiantes;//当前地图中心
|
||||
|
||||
public bool isStart;//当前游戏是否开始
|
||||
public bool isStart { get; set; }//当前游戏是否开始
|
||||
public CyclingModel cyclingModel { get; set; }//当前骑行模式
|
||||
public BaseCycling cyclingController { get; set; }
|
||||
private int routeId;
|
||||
@ -684,7 +684,6 @@ public class CyclingController : DeviceServiceMonoBase
|
||||
|
||||
string imageFileName = path +"/"+ Guid.NewGuid().ToString() + ".png";
|
||||
CaptureCamera(Camera.main, new Rect(Screen.width * 0f, Screen.height * 0f, Screen.width * 0.5f, Screen.height * 0.5f), imageFileName);
|
||||
|
||||
cyclingController.recorderData.StartTime = startTime;
|
||||
cyclingController.recorderData.EndTime = UIManager.Now.GetDateTime();
|
||||
cyclingController.recorderData.IsCompleted = totalDistance == mapData.TotalDistance;
|
||||
|
||||
@ -10,14 +10,10 @@ namespace Assets.Scenes.Ride.Scripts
|
||||
public class RaceAlertController : PFUIPanel
|
||||
{
|
||||
public Text Content { get; set; }
|
||||
public Text BandContent { get; set; }
|
||||
public Text Timer { get; set; }
|
||||
//public Text Timer { get; set; }
|
||||
public GameObject GoBtn { get; set; }
|
||||
public GameObject Card { get; set; }
|
||||
public GameObject Band { get; set; }
|
||||
public GameObject BandGoBtn { get; set; }
|
||||
public GameObject StayBtn { get; set; }
|
||||
public GameObject BandStayBtn { get; set; }
|
||||
|
||||
public int ticks = 0;
|
||||
|
||||
@ -27,54 +23,37 @@ namespace Assets.Scenes.Ride.Scripts
|
||||
protected override void Awake()
|
||||
{
|
||||
//Card
|
||||
Timer = this.transform.Find("Card/Timer").GetComponent<Text>();
|
||||
//Timer = this.transform.Find("Card/Timer").GetComponent<Text>();
|
||||
Content = this.transform.Find("Card/Content").GetComponent<Text>();
|
||||
GoBtn = this.transform.Find("Card/Go").gameObject;
|
||||
StayBtn = this.transform.Find("Card/Stay").gameObject;
|
||||
Card = this.transform.Find("Card").gameObject;
|
||||
|
||||
//band
|
||||
BandContent = this.transform.Find("Band/Content").GetComponent<Text>();
|
||||
BandGoBtn = this.transform.Find("Band/Go").gameObject;
|
||||
BandStayBtn = this.transform.Find("Band/Stay").gameObject;
|
||||
Band = this.transform.Find("Band").gameObject;
|
||||
|
||||
UIManager.AddEvent(GoBtn, UnityEngine.EventSystems.EventTriggerType.PointerClick, Go);
|
||||
UIManager.AddEvent(StayBtn, UnityEngine.EventSystems.EventTriggerType.PointerClick, Stay);
|
||||
|
||||
UIManager.AddEvent(BandGoBtn, UnityEngine.EventSystems.EventTriggerType.PointerClick, Go);
|
||||
UIManager.AddEvent(BandStayBtn, 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;
|
||||
}
|
||||
//t -= Time.deltaTime;
|
||||
//while (t <= 0)
|
||||
//{
|
||||
// if (ticks > 0)
|
||||
// {
|
||||
// ticks--;
|
||||
// Timer.text = Helper.FormatTicks(ticks);
|
||||
// }
|
||||
// t = 1f;
|
||||
//}
|
||||
}
|
||||
|
||||
public void Set(DateTime startTime, DateTime now,string title, string sceneName, int competitionId,int routeId)
|
||||
{
|
||||
ticks = (int)(startTime - now).TotalSeconds;
|
||||
|
||||
var content = $"Your <color='#F93086'>{title}</color> race about to start";
|
||||
Content.text = content;
|
||||
BandContent.text = content;
|
||||
|
||||
CompetitionId = competitionId;
|
||||
RouteId = routeId;
|
||||
|
||||
var ride = sceneName.Equals("Ride");
|
||||
Card.SetActive(ride);
|
||||
Band.SetActive(!ride);
|
||||
}
|
||||
|
||||
//切换到当前用户视角
|
||||
|
||||
@ -61,12 +61,12 @@ public class UIManager : MonoBehaviour
|
||||
}
|
||||
}
|
||||
private SettingContoller mSettingContoller;
|
||||
public SettingContoller SettingModal
|
||||
public SettingContoller SettingModal
|
||||
{
|
||||
get
|
||||
get
|
||||
{
|
||||
return this.GetPanelInstance("SettingModal", ref this.mSettingContoller);
|
||||
}
|
||||
}
|
||||
}
|
||||
private FeedbackController mfeedbackController;
|
||||
public FeedbackController FeedbackModal
|
||||
@ -92,7 +92,7 @@ public class UIManager : MonoBehaviour
|
||||
return this.GetPanelInstance("DownloadModal", ref this.mDownloadModal);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
private MapListController mMapListController;
|
||||
public MapListController MapListPanel
|
||||
{
|
||||
@ -120,6 +120,15 @@ public class UIManager : MonoBehaviour
|
||||
}
|
||||
}
|
||||
|
||||
private RaceAlertController mRaceAlertBandPanel;
|
||||
public RaceAlertController RaceAlertBandPanel
|
||||
{
|
||||
get
|
||||
{
|
||||
return this.GetPanelInstance("RaceAlertBandPanel", ref this.mRaceAlertBandPanel);
|
||||
}
|
||||
}
|
||||
|
||||
private EditUserController mEditUserController;
|
||||
public EditUserController EditUserPanel
|
||||
{
|
||||
@ -139,7 +148,7 @@ public class UIManager : MonoBehaviour
|
||||
}
|
||||
public static void ShowRaceHomePanel(bool fromRaceList = false)
|
||||
{
|
||||
if (fromRaceList)
|
||||
if (fromRaceList)
|
||||
{
|
||||
UIManager.PopStack();
|
||||
}
|
||||
@ -194,7 +203,7 @@ public class UIManager : MonoBehaviour
|
||||
var settingsJson = PlayerPrefs.GetString("Settings");
|
||||
settings = JsonConvert.DeserializeObject<Settings>(settingsJson);
|
||||
if (settings == null) settings = new Settings();
|
||||
|
||||
|
||||
userInfoIndex = PlayerPrefs.GetInt("UserInfoIndex");
|
||||
collectDict = new Dictionary<bool, Sprite> {
|
||||
{ false,Resources.Load<Sprite>("Images/p-4灰")},
|
||||
@ -202,8 +211,8 @@ public class UIManager : MonoBehaviour
|
||||
};
|
||||
var a = Resources.Load<TextAsset>("UI/simpleCountry");
|
||||
var clist = JsonConvert.DeserializeObject<List<CountryInfo>>(a.text);
|
||||
|
||||
if(_now == null)
|
||||
|
||||
if (_now == null)
|
||||
{
|
||||
Debug.Log(123);
|
||||
InitNow();
|
||||
@ -213,11 +222,24 @@ public class UIManager : MonoBehaviour
|
||||
//比赛即将开始消息提醒
|
||||
private void CompetitonStartHandler(CompetitonStartMessageEvent e)
|
||||
{
|
||||
ShowRaceAlertPanel();
|
||||
if (mRaceAlertPanel != null)
|
||||
if (e.SceneName.Equals("Ride"))
|
||||
{
|
||||
mRaceAlertPanel.Set(e.StartTime.ToLocalTime(), Now.GetDateTime(), e.title, e.SceneName, e.competitionId, e.routeId);
|
||||
ShowRaceAlertPanel();
|
||||
if (mRaceAlertPanel != null)
|
||||
{
|
||||
mRaceAlertPanel.Set(e.StartTime.ToLocalTime(), Now.GetDateTime(), e.title, e.SceneName, e.competitionId, e.routeId);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
ShowRaceAlertBanelPanel();
|
||||
if (mRaceAlertBandPanel != null)
|
||||
{
|
||||
mRaceAlertBandPanel.Set(e.StartTime.ToLocalTime(), Now.GetDateTime(), e.title, e.SceneName, e.competitionId, e.routeId);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
// Start is called before the first frame update
|
||||
void Start()
|
||||
@ -458,6 +480,11 @@ public class UIManager : MonoBehaviour
|
||||
UIManager.Show(UIManager.Instance.RaceAlertPanel, null, true);
|
||||
}
|
||||
|
||||
public static void ShowRaceAlertBanelPanel()
|
||||
{
|
||||
UIManager.Show(UIManager.Instance.RaceAlertBandPanel, null, true);
|
||||
}
|
||||
|
||||
//LoadingPf loading;
|
||||
public static void ShowLoadingDialogBox()
|
||||
{
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user