赛事消息通知面板和界面微调

This commit is contained in:
lishuo 2021-07-27 09:18:34 +08:00
parent 7d0128d912
commit 17f2b1cedd
9 changed files with 893 additions and 52 deletions

View File

@ -2690,7 +2690,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 0
--- !u!224 &8648922130929884845 --- !u!224 &8648922130929884845
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

View File

@ -712,10 +712,10 @@ MonoBehaviour:
m_Calls: [] m_Calls: []
m_FontData: m_FontData:
m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3} m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3}
m_FontSize: 14 m_FontSize: 12
m_FontStyle: 0 m_FontStyle: 0
m_BestFit: 0 m_BestFit: 0
m_MinSize: 10 m_MinSize: 1
m_MaxSize: 40 m_MaxSize: 40
m_Alignment: 4 m_Alignment: 4
m_AlignByGeometry: 0 m_AlignByGeometry: 0
@ -887,6 +887,84 @@ MonoBehaviour:
m_FillOrigin: 0 m_FillOrigin: 0
m_UseSpriteMesh: 0 m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1 m_PixelsPerUnitMultiplier: 1
--- !u!1 &3432911802340431511
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8563954619679277008}
- component: {fileID: 6673787635055784084}
- component: {fileID: 1241746537696464621}
m_Layer: 5
m_Name: GetReady
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &8563954619679277008
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3432911802340431511}
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: 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: -360, y: 67}
m_SizeDelta: {x: 84, y: 28}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6673787635055784084
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3432911802340431511}
m_CullTransparentMesh: 0
--- !u!114 &1241746537696464621
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3432911802340431511}
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: 20
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 2
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 00:00:00
--- !u!1 &3522527944848889466 --- !u!1 &3522527944848889466
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -1111,14 +1189,13 @@ GameObject:
- component: {fileID: 5034563014571662167} - component: {fileID: 5034563014571662167}
- component: {fileID: 6791702915386963463} - component: {fileID: 6791702915386963463}
- component: {fileID: 8977229126063107381} - component: {fileID: 8977229126063107381}
- component: {fileID: 9160258268948605046}
m_Layer: 5 m_Layer: 5
m_Name: CancelJoin m_Name: CancelJoin
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 0 m_IsActive: 1
--- !u!224 &3664757228482092608 --- !u!224 &3664757228482092608
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -1133,11 +1210,11 @@ RectTransform:
- {fileID: 9050330319599987492} - {fileID: 9050330319599987492}
- {fileID: 4958187996342670554} - {fileID: 4958187996342670554}
m_Father: {fileID: 6558498177448486125} m_Father: {fileID: 6558498177448486125}
m_RootOrder: 30 m_RootOrder: 32
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0} m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: -352.5, y: 79} m_AnchoredPosition: {x: -752, y: 721.1}
m_SizeDelta: {x: 108, y: 38} m_SizeDelta: {x: 108, y: 38}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &5034563014571662167 --- !u!114 &5034563014571662167
@ -1153,7 +1230,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 0}
m_RaycastTarget: 1 m_RaycastTarget: 1
m_Maskable: 1 m_Maskable: 1
m_OnCullStateChanged: m_OnCullStateChanged:
@ -1220,20 +1297,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4545746281496939300} m_GameObject: {fileID: 4545746281496939300}
m_CullTransparentMesh: 0 m_CullTransparentMesh: 0
--- !u!114 &9160258268948605046
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:
--- !u!1 &4760618918347444675 --- !u!1 &4760618918347444675
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -1267,9 +1330,9 @@ RectTransform:
m_Father: {fileID: 4958187996342670554} m_Father: {fileID: 4958187996342670554}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 20, y: -9} m_AnchoredPosition: {x: 20, y: 0}
m_SizeDelta: {x: 0, y: 16} m_SizeDelta: {x: 0, y: 16}
m_Pivot: {x: 0.5, y: 1} m_Pivot: {x: 0.5, y: 1}
--- !u!222 &471547526591830113 --- !u!222 &471547526591830113
@ -1366,7 +1429,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 1} m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: -50} m_AnchoredPosition: {x: 0, y: -50}
m_SizeDelta: {x: 40, y: 34} m_SizeDelta: {x: 0, y: 34}
m_Pivot: {x: 0.5, y: 1} m_Pivot: {x: 0.5, y: 1}
--- !u!222 &4956907944525320509 --- !u!222 &4956907944525320509
CanvasRenderer: CanvasRenderer:
@ -1568,7 +1631,7 @@ RectTransform:
- {fileID: 6558498177838812408} - {fileID: 6558498177838812408}
- {fileID: 6558498178609268828} - {fileID: 6558498178609268828}
m_Father: {fileID: 6558498177448486125} m_Father: {fileID: 6558498177448486125}
m_RootOrder: 31 m_RootOrder: 33
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0} m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0}
@ -2174,6 +2237,8 @@ RectTransform:
- {fileID: 6558498177932893817} - {fileID: 6558498177932893817}
- {fileID: 6558498177866866937} - {fileID: 6558498177866866937}
- {fileID: 6558498178671643836} - {fileID: 6558498178671643836}
- {fileID: 5987798170253205739}
- {fileID: 8563954619679277008}
- {fileID: 6558498178198826442} - {fileID: 6558498178198826442}
- {fileID: 3664757228482092608} - {fileID: 3664757228482092608}
- {fileID: 6558498177216885471} - {fileID: 6558498177216885471}
@ -3212,7 +3277,7 @@ RectTransform:
- {fileID: 6558498178642912254} - {fileID: 6558498178642912254}
- {fileID: 6558498177739491041} - {fileID: 6558498177739491041}
m_Father: {fileID: 6558498177448486125} m_Father: {fileID: 6558498177448486125}
m_RootOrder: 29 m_RootOrder: 31
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0} m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0}
@ -3833,7 +3898,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0 m_HorizontalOverflow: 0
m_VerticalOverflow: 0 m_VerticalOverflow: 0
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: 2021 - 08-23 14:99:99 m_Text: 0000 - 00-00 00:00:00
--- !u!1 &6558498178539472872 --- !u!1 &6558498178539472872
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -3938,7 +4003,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 6558498177448486125} m_Father: {fileID: 6558498177448486125}
m_RootOrder: 32 m_RootOrder: 34
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
@ -5092,7 +5157,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0 m_HorizontalOverflow: 0
m_VerticalOverflow: 0 m_VerticalOverflow: 0
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: 25552 Players m_Text: 0 Players
--- !u!1 &6558498179321791265 --- !u!1 &6558498179321791265
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -5247,6 +5312,84 @@ MonoBehaviour:
m_ChildControlHeight: 0 m_ChildControlHeight: 0
m_ChildScaleWidth: 0 m_ChildScaleWidth: 0
m_ChildScaleHeight: 0 m_ChildScaleHeight: 0
--- !u!1 &7335431616456065792
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5987798170253205739}
- component: {fileID: 927843223585017441}
- component: {fileID: 7021361582235921813}
m_Layer: 5
m_Name: GetReadyTitle
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &5987798170253205739
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7335431616456065792}
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: 6558498177448486125}
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: -364, y: 90}
m_SizeDelta: {x: 61, y: 17}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &927843223585017441
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7335431616456065792}
m_CullTransparentMesh: 0
--- !u!114 &7021361582235921813
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7335431616456065792}
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.61960787, g: 0.61960787, b: 0.6784314, 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: 12
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: Get Ready
--- !u!1 &7573522942889197828 --- !u!1 &7573522942889197828
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

View File

@ -31,6 +31,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children:
- {fileID: 8465881818703633525} - {fileID: 8465881818703633525}
- {fileID: 5842261755140000527}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -88,6 +89,85 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 1640d8d75dcdfa744896cf9c703dca2b, type: 3} m_Script: {fileID: 11500000, guid: 1640d8d75dcdfa744896cf9c703dca2b, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: 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 &1230026707801033200 --- !u!1 &1230026707801033200
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -181,6 +261,98 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_HorizontalFit: 2 m_HorizontalFit: 2
m_VerticalFit: 0 m_VerticalFit: 0
--- !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: Band
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: 1
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 &2567305951832856606 --- !u!1 &2567305951832856606
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -259,6 +431,84 @@ MonoBehaviour:
m_VerticalOverflow: 0 m_VerticalOverflow: 0
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: Your 13km races about to start ! m_Text: Your 13km races about to start !
--- !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 &3032339125248658281 --- !u!1 &3032339125248658281
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -352,6 +602,80 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_HorizontalFit: 2 m_HorizontalFit: 2
m_VerticalFit: 0 m_VerticalFit: 0
--- !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 &3541791538790859144 --- !u!1 &3541791538790859144
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -430,6 +754,125 @@ MonoBehaviour:
m_VerticalOverflow: 0 m_VerticalOverflow: 0
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: Stay m_Text: Stay
--- !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 &5346531551326013327 --- !u!1 &5346531551326013327
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -860,6 +1303,125 @@ MonoBehaviour:
m_VerticalOverflow: 0 m_VerticalOverflow: 0
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: Go m_Text: Go
--- !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 &6957816826657366028 --- !u!1 &6957816826657366028
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -995,6 +1557,84 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
mType: 0 mType: 0
Tooltips: Tooltips:
--- !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!
--- !u!1 &7998641772980978579 --- !u!1 &7998641772980978579
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

View File

@ -72,7 +72,7 @@ namespace Assets.Scripts.Apis
user.LastUpdateBicycleWeightTime = ret.data.LastUpdateBicycleWeightTime; user.LastUpdateBicycleWeightTime = ret.data.LastUpdateBicycleWeightTime;
user.Height = ret.data.Height; user.Height = ret.data.Height;
//todo: check local database, insert new user //todo: check local database, insert new user
user.WebHost = ret.data.WebHost;
//PubCommData.CurrentUser = user; //PubCommData.CurrentUser = user;
user.cookie = cookies[0].Value; user.cookie = cookies[0].Value;
return new JsonResult<UserResultModel>() { result = true, data = user }; return new JsonResult<UserResultModel>() { result = true, data = user };

View File

@ -1,7 +1,6 @@
using Assets.Scripts; using Assets.Scripts;
using Assets.Scripts.Apis; using Assets.Scripts.Apis;
using Assets.Scripts.Apis.Models; using Assets.Scripts.Apis.Models;
using DG.Tweening;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using UnityEngine; using UnityEngine;
@ -21,6 +20,8 @@ namespace Assets.Scenes.Ride.Scripts
private Text StartTime { get; set; } private Text StartTime { get; set; }
private Text Contestant { get; set; } private Text Contestant { get; set; }
private Text CompetitionStatus { get; set; } private Text CompetitionStatus { get; set; }
private Text GetReady { get; set; }
private Text GetReadyTitle { get; set; }
private Transform PlayersPanel {get;set;} private Transform PlayersPanel {get;set;}
private GameObject LeftBack { get; set; } private GameObject LeftBack { get; set; }
private GameObject MiddleBack { get; set; } private GameObject MiddleBack { get; set; }
@ -42,6 +43,28 @@ namespace Assets.Scenes.Ride.Scripts
{ {
base.Start(); base.Start();
} }
MapCompetition competition { get; set; }
protected override void Update()
{
base.Update();
#region
if (competition != null)
{
var count = (int)(competition.StartTime.ToLocalTime() - UIManager.Now.GetDateTime()).TotalSeconds;
if (count > 0)
{
GetReady.text = Helper.FormatTicks(count);
GetReadyTitle.gameObject.SetActive(true);
GetReady.gameObject.SetActive(true);
}
else
{
GetReadyTitle.gameObject.SetActive(false);
GetReady.gameObject.SetActive(false);
}
}
#endregion
}
protected override void ShowLoading() protected override void ShowLoading()
{ {
loadingPanel = panel.transform.Find("LoadingPanel").gameObject; loadingPanel = panel.transform.Find("LoadingPanel").gameObject;
@ -67,6 +90,8 @@ namespace Assets.Scenes.Ride.Scripts
MiddleBack = panel.transform.Find("MiddleBack").gameObject; MiddleBack = panel.transform.Find("MiddleBack").gameObject;
CompetitionStatus = panel.transform.Find("CompetitionStatus").GetComponent<Text>(); CompetitionStatus = panel.transform.Find("CompetitionStatus").GetComponent<Text>();
ReadMore = panel.transform.Find("ReadMore").gameObject; ReadMore = panel.transform.Find("ReadMore").gameObject;
GetReady = panel.transform.Find("GetReady").GetComponent<Text>();
GetReadyTitle = panel.transform.Find("GetReadyTitle").GetComponent<Text>();
UIManager.AddEvent(ReadMore, EventTriggerType.PointerClick, ReadCompetitionPreview); UIManager.AddEvent(ReadMore, EventTriggerType.PointerClick, ReadCompetitionPreview);
UIManager.AddEvent(Watch, EventTriggerType.PointerClick, StartWatch); UIManager.AddEvent(Watch, EventTriggerType.PointerClick, StartWatch);
@ -78,7 +103,7 @@ namespace Assets.Scenes.Ride.Scripts
protected override void InitGameObjectData() protected override void InitGameObjectData()
{ {
var route = cyclingController.mapRoute; var route = cyclingController.mapRoute;
var competition = cyclingController.competition; competition = cyclingController.competition;
//赛事状态按钮控制 //赛事状态按钮控制
_canJoin = competition.CanJoin; _canJoin = competition.CanJoin;
_canStart = competition.CanStart; _canStart = competition.CanStart;
@ -119,16 +144,17 @@ namespace Assets.Scenes.Ride.Scripts
mapDescText.text = route.Dec; mapDescText.text = route.Dec;
//主办方logo //主办方logo
Utils.DisplayImage(SponsorLogoImage, competition.SponsorCoverage, true); Utils.DisplayImage(SponsorLogoImage, competition.SponsorCoverage, true);
//赛事详情 //赛事详情
if (!string.IsNullOrEmpty(competition.ShortPreview)) //if (!string.IsNullOrEmpty(competition.ShortPreview))
{ //{
LeftBack.SetActive(false); // LeftBack.SetActive(false);
MiddleBack.SetActive(false); // MiddleBack.SetActive(false);
Utils.DisplayImage(CompetitionDesc, competition.ShortPreview, true); // Utils.DisplayImage(CompetitionDesc, competition.ShortPreview, true);
var canvasGroup = CompetitionDesc.GetComponent<CanvasGroup>(); // var canvasGroup = CompetitionDesc.GetComponent<CanvasGroup>();
canvasGroup.DOFade(1, 1); // canvasGroup.DOFade(1, 1);
} //}
else //else
{ {
//异步请求mapbox画出当前路书路线图 //异步请求mapbox画出当前路书路线图
DrawMapRouteAsync(route.Id, 1); DrawMapRouteAsync(route.Id, 1);

View File

@ -50,7 +50,7 @@ namespace Assets.Scenes.Ride.Scripts
ShowLoading(); ShowLoading();
} }
void Update() protected virtual void Update()
{ {
if (canvasGroup == null) if (canvasGroup == null)
{ {

View File

@ -71,17 +71,19 @@ namespace Assets.Scenes.Ride.Scripts
public class CompetitonStartMessageEvent : GameEvent public class CompetitonStartMessageEvent : GameEvent
{ {
public string title;//赛事标题 public string title;//赛事标题
public string SceneName;//场景名称
public int competitionId;//赛事id public int competitionId;//赛事id
public int routeId;//路书id public int routeId;//路书id
public DateTime StartTime;//赛事开始时间 public DateTime StartTime;//赛事开始时间
public CompetitonStartMessageEvent(string Title, int Id, int RouteId, DateTime StartTime) public CompetitonStartMessageEvent(string Title, int Id, int RouteId, DateTime StartTime,string SceneName)
{ {
this.title = Title; this.title = Title;
this.competitionId = Id; this.competitionId = Id;
this.routeId = RouteId; this.routeId = RouteId;
this.StartTime = StartTime; this.StartTime = StartTime;
this.SceneName = SceneName;
} }
} }
} }

View File

@ -1,4 +1,5 @@
using Assets.Scripts; using Assets.Scripts;
using System;
using UnityEngine; using UnityEngine;
using UnityEngine.EventSystems; using UnityEngine.EventSystems;
using UnityEngine.SceneManagement; using UnityEngine.SceneManagement;
@ -9,10 +10,14 @@ namespace Assets.Scenes.Ride.Scripts
public class RaceAlertController : PFUIPanel public class RaceAlertController : PFUIPanel
{ {
public Text Content { get; set; } 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 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 StayBtn { get; set; }
public GameObject BandStayBtn { get; set; }
public int ticks = 0; public int ticks = 0;
@ -21,13 +26,25 @@ namespace Assets.Scenes.Ride.Scripts
protected override void Awake() 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>(); Content = this.transform.Find("Card/Content").GetComponent<Text>();
GoBtn = this.transform.Find("Card/Go").gameObject; GoBtn = this.transform.Find("Card/Go").gameObject;
StayBtn = this.transform.Find("Card/Stay").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(GoBtn, UnityEngine.EventSystems.EventTriggerType.PointerClick, Go);
UIManager.AddEvent(StayBtn, UnityEngine.EventSystems.EventTriggerType.PointerClick, Stay); 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; float t = 1f;
private void Update() private void Update()
@ -44,6 +61,22 @@ namespace Assets.Scenes.Ride.Scripts
} }
} }
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);
}
//切换到当前用户视角 //切换到当前用户视角
public void Go(BaseEventData baseEventData) public void Go(BaseEventData baseEventData)
{ {

View File

@ -216,10 +216,7 @@ public class UIManager : MonoBehaviour
ShowRaceAlertPanel(); ShowRaceAlertPanel();
if (mRaceAlertPanel != null) if (mRaceAlertPanel != null)
{ {
mRaceAlertPanel.ticks = (int)(e.StartTime.ToLocalTime() - Now.GetDateTime()).TotalSeconds; mRaceAlertPanel.Set(e.StartTime.ToLocalTime(), Now.GetDateTime(), e.title, e.SceneName, e.competitionId, e.routeId);
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 // Start is called before the first frame update
@ -261,7 +258,7 @@ public class UIManager : MonoBehaviour
var notify = App.CompetitionIdList.Contains(item.Id); var notify = App.CompetitionIdList.Contains(item.Id);
if (onStart && !notify) if (onStart && !notify)
{ {
EventQueueSystem.QueueEvent(new CompetitonStartMessageEvent(item.Title, item.Id, item.RouteId, item.StartTime.ToLocalTime())); EventQueueSystem.QueueEvent(new CompetitonStartMessageEvent(item.Title, item.Id, item.RouteId, item.StartTime.ToLocalTime(), sceneName));
} }
} }
} }