Merge remote-tracking branch 'origin/dev_nonearth' into dev_cyp

Assets/Resources/UI/Prefab/Match/CompetitionResultPanel.prefab

@@ -1790,7 +1790,7 @@ MonoBehaviour:
     m_BestFit: 0
     m_MinSize: 10
     m_MaxSize: 40
-    m_Alignment: 0
+    m_Alignment: 1
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 1
@@ -3591,8 +3591,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: 942.24603, y: -35}
+  m_AnchoredPosition: {x: 935, y: -35}
-  m_SizeDelta: {x: 100.492004, y: 30}
+  m_SizeDelta: {x: 50, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3825925833293410081
 CanvasRenderer:
@@ -3628,7 +3628,7 @@ MonoBehaviour:
     m_BestFit: 0
     m_MinSize: 10
     m_MaxSize: 40
-    m_Alignment: 0
+    m_Alignment: 1
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 1
@@ -3720,7 +3720,7 @@ MonoBehaviour:
     m_BestFit: 0
     m_MinSize: 10
     m_MaxSize: 40
-    m_Alignment: 0
+    m_Alignment: 1
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 1
@@ -3812,7 +3812,7 @@ MonoBehaviour:
     m_BestFit: 0
     m_MinSize: 10
     m_MaxSize: 40
-    m_Alignment: 0
+    m_Alignment: 1
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 1
@@ -4078,7 +4078,7 @@ MonoBehaviour:
     m_BestFit: 0
     m_MinSize: 10
     m_MaxSize: 40
-    m_Alignment: 0
+    m_Alignment: 1
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 1
@@ -4366,7 +4366,7 @@ MonoBehaviour:
     m_BestFit: 0
     m_MinSize: 10
     m_MaxSize: 40
-    m_Alignment: 0
+    m_Alignment: 1
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 1

Assets/Resources/UI/Prefab/Match/CompetitonPanel.prefab

@@ -1907,7 +1907,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   mType: 2
-  Tooltips: RideNow
+  Tooltips: Join
 --- !u!1 &4545746281496939300
 GameObject:
   m_ObjectHideFlags: 0
@@ -4102,7 +4102,7 @@ MonoBehaviour:
     m_BestFit: 0
     m_MinSize: 2
     m_MaxSize: 40
-    m_Alignment: 4
+    m_Alignment: 3
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
@@ -4569,7 +4569,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   mType: 2
-  Tooltips: RideNow
+  Tooltips: Ride Now
 --- !u!1 &6558498178229237427
 GameObject:
   m_ObjectHideFlags: 0
@@ -5636,7 +5636,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   mType: 2
-  Tooltips: 
+  Tooltips: Watch
 --- !u!1 &6558498178766627005
 GameObject:
   m_ObjectHideFlags: 0
@@ -6747,8 +6747,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0}
   m_AnchorMax: {x: 1, y: 0}
-  m_AnchoredPosition: {x: -851.5, y: 644}
+  m_AnchoredPosition: {x: -847.5, y: 644.5}
-  m_SizeDelta: {x: 61, y: 17}
+  m_SizeDelta: {x: 84, y: 17}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &927843223585017441
 CanvasRenderer:
@@ -6787,7 +6787,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: Get Ready

Assets/Resources/UI/Prefab/Match/Mobile/CompetitionResultPanel.prefab

@@ -1776,7 +1776,7 @@ MonoBehaviour:
     m_BestFit: 0
     m_MinSize: 1
     m_MaxSize: 40
-    m_Alignment: 0
+    m_Alignment: 1
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 1
@@ -3577,8 +3577,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: 513.1, y: -36}
+  m_AnchoredPosition: {x: 515, y: -36}
-  m_SizeDelta: {x: 51, y: 22}
+  m_SizeDelta: {x: 25, y: 22}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3825925833293410081
 CanvasRenderer:
@@ -3614,7 +3614,7 @@ MonoBehaviour:
     m_BestFit: 0
     m_MinSize: 1
     m_MaxSize: 40
-    m_Alignment: 0
+    m_Alignment: 1
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 1
@@ -3706,7 +3706,7 @@ MonoBehaviour:
     m_BestFit: 0
     m_MinSize: 1
     m_MaxSize: 40
-    m_Alignment: 0
+    m_Alignment: 1
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 1
@@ -3798,7 +3798,7 @@ MonoBehaviour:
     m_BestFit: 0
     m_MinSize: 1
     m_MaxSize: 40
-    m_Alignment: 0
+    m_Alignment: 1
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 1
@@ -4064,7 +4064,7 @@ MonoBehaviour:
     m_BestFit: 0
     m_MinSize: 1
     m_MaxSize: 40
-    m_Alignment: 0
+    m_Alignment: 1
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 1
@@ -4315,8 +4315,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: 452, y: -36}
+  m_AnchoredPosition: {x: 446, y: -36}
-  m_SizeDelta: {x: 36, y: 22}
+  m_SizeDelta: {x: 22, y: 22}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6997647666854245048
 CanvasRenderer:
@@ -4352,7 +4352,7 @@ MonoBehaviour:
     m_BestFit: 0
     m_MinSize: 1
     m_MaxSize: 40
-    m_Alignment: 0
+    m_Alignment: 1
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 1

Assets/Resources/UI/Prefab/Match/Mobile/CompetitonPanel.prefab

@@ -1055,6 +1055,7 @@ GameObject:
   - component: {fileID: 9050330319599987492}
   - component: {fileID: 1189539954558915803}
   - component: {fileID: 8172043082098890144}
+  - component: {fileID: 2379498331486989716}
   m_Layer: 5
   m_Name: Text
   m_TagString: Untagged
@@ -1122,6 +1123,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: Cancel Reservation
+--- !u!114 &2379498331486989716
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2014103318300012421}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  key: 
 --- !u!1 &3158444263648747324
 GameObject:
   m_ObjectHideFlags: 0
@@ -1893,7 +1907,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   mType: 2
-  Tooltips: RideNow
+  Tooltips: Join
 --- !u!1 &4545746281496939300
 GameObject:
   m_ObjectHideFlags: 0
@@ -4336,7 +4350,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   mType: 2
-  Tooltips: RideNow
+  Tooltips: Ride Now
 --- !u!1 &6558498178229237427
 GameObject:
   m_ObjectHideFlags: 0
@@ -6528,8 +6542,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: 393.5, y: -115.4}
+  m_AnchoredPosition: {x: 380.6, y: -115.399994}
-  m_SizeDelta: {x: 51, y: 14}
+  m_SizeDelta: {x: 54.99997, y: 14}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &927843223585017441
 CanvasRenderer:
@@ -6568,7 +6582,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: Get Ready

Assets/Resources/UI/Prefab/Panel/Mobile/EditUserPanel.prefab

@@ -337,10 +337,10 @@ MonoBehaviour:
     m_BestFit: 0
     m_MinSize: 1
     m_MaxSize: 40
-    m_Alignment: 4
+    m_Alignment: 3
     m_AlignByGeometry: 0
     m_RichText: 1
-    m_HorizontalOverflow: 0
+    m_HorizontalOverflow: 1
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: All merchandise prizes will be sent to this address by default
@@ -1512,7 +1512,7 @@ MonoBehaviour:
     m_BestFit: 0
     m_MinSize: 1
     m_MaxSize: 40
-    m_Alignment: 0
+    m_Alignment: 1
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0

Assets/Resources/UI/Prefab/Panel/Mobile/MapListPanel.prefab

@@ -4897,6 +4897,7 @@ GameObject:
   - component: {fileID: 8528332866498371246}
   - component: {fileID: 267367882303563041}
   - component: {fileID: 195975062738487632}
+  - component: {fileID: 4071915485421764287}
   m_Layer: 5
   m_Name: Text
   m_TagString: Untagged
@@ -4964,6 +4965,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: Found Nothing
+--- !u!114 &4071915485421764287
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7187515827089651429}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  key: 
 --- !u!114 &1429559311976359837
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -5853,18 +5867,18 @@ PrefabInstance:
     - {fileID: 7793409217181307314, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3}
     - {fileID: 829206726517620079, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3}
   m_SourcePrefab: {fileID: 100100000, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3}
---- !u!1 &1500710352127235982 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 2638424933752433026, guid: a1999d0576fee6248a9c5a507ae8d10e,
-    type: 3}
-  m_PrefabInstance: {fileID: 3480729881595313676}
-  m_PrefabAsset: {fileID: 0}
 --- !u!224 &1500710352127235983 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e,
     type: 3}
   m_PrefabInstance: {fileID: 3480729881595313676}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &1500710352127235982 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 2638424933752433026, guid: a1999d0576fee6248a9c5a507ae8d10e,
+    type: 3}
+  m_PrefabInstance: {fileID: 3480729881595313676}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &5321188461237024149
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -6024,45 +6038,21 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3}
---- !u!1 &4628129972378993927 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 712346121867735186, guid: 5ee52e0b78bd38244a2b473e2236800c,
-    type: 3}
-  m_PrefabInstance: {fileID: 5321188461237024149}
-  m_PrefabAsset: {fileID: 0}
---- !u!1 &3075247155673026290 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 7166863393051868007, guid: 5ee52e0b78bd38244a2b473e2236800c,
-    type: 3}
-  m_PrefabInstance: {fileID: 5321188461237024149}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &4951052648640690816 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 967434514102783765, guid: 5ee52e0b78bd38244a2b473e2236800c,
     type: 3}
   m_PrefabInstance: {fileID: 5321188461237024149}
   m_PrefabAsset: {fileID: 0}
---- !u!224 &2234182990056195463 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 6258245508770672658, guid: 5ee52e0b78bd38244a2b473e2236800c,
-    type: 3}
-  m_PrefabInstance: {fileID: 5321188461237024149}
-  m_PrefabAsset: {fileID: 0}
---- !u!1 &8149286171844735752 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 4089475371085219485, guid: 5ee52e0b78bd38244a2b473e2236800c,
-    type: 3}
-  m_PrefabInstance: {fileID: 5321188461237024149}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &5779092891361109961 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 1867831574853112412, guid: 5ee52e0b78bd38244a2b473e2236800c,
     type: 3}
   m_PrefabInstance: {fileID: 5321188461237024149}
   m_PrefabAsset: {fileID: 0}
---- !u!1 &6398833330297696636 stripped
+--- !u!1 &8149286171844735752 stripped
 GameObject:
-  m_CorrespondingSourceObject: {fileID: 1231050277644289257, guid: 5ee52e0b78bd38244a2b473e2236800c,
+  m_CorrespondingSourceObject: {fileID: 4089475371085219485, guid: 5ee52e0b78bd38244a2b473e2236800c,
     type: 3}
   m_PrefabInstance: {fileID: 5321188461237024149}
   m_PrefabAsset: {fileID: 0}
@@ -6072,12 +6062,36 @@ GameObject:
     type: 3}
   m_PrefabInstance: {fileID: 5321188461237024149}
   m_PrefabAsset: {fileID: 0}
+--- !u!224 &2234182990056195463 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 6258245508770672658, guid: 5ee52e0b78bd38244a2b473e2236800c,
+    type: 3}
+  m_PrefabInstance: {fileID: 5321188461237024149}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &5464789140640568869 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 148192672769352624, guid: 5ee52e0b78bd38244a2b473e2236800c,
     type: 3}
   m_PrefabInstance: {fileID: 5321188461237024149}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &3075247155673026290 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 7166863393051868007, guid: 5ee52e0b78bd38244a2b473e2236800c,
+    type: 3}
+  m_PrefabInstance: {fileID: 5321188461237024149}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &4628129972378993927 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 712346121867735186, guid: 5ee52e0b78bd38244a2b473e2236800c,
+    type: 3}
+  m_PrefabInstance: {fileID: 5321188461237024149}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &6398833330297696636 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 1231050277644289257, guid: 5ee52e0b78bd38244a2b473e2236800c,
+    type: 3}
+  m_PrefabInstance: {fileID: 5321188461237024149}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &6073211655158443556
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -6227,6 +6241,18 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3}
+--- !u!1 &6749386026079657654 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 712346121867735186, guid: 5ee52e0b78bd38244a2b473e2236800c,
+    type: 3}
+  m_PrefabInstance: {fileID: 6073211655158443556}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &3980532922793874755 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 7166863393051868007, guid: 5ee52e0b78bd38244a2b473e2236800c,
+    type: 3}
+  m_PrefabInstance: {fileID: 6073211655158443556}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &7820744829146851513 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 4089475371085219485, guid: 5ee52e0b78bd38244a2b473e2236800c,
@@ -6239,27 +6265,9 @@ GameObject:
     type: 3}
   m_PrefabInstance: {fileID: 6073211655158443556}
   m_PrefabAsset: {fileID: 0}
---- !u!1 &6216688916544654740 stripped
+--- !u!1 &4998415483215112909 stripped
 GameObject:
-  m_CorrespondingSourceObject: {fileID: 148192672769352624, guid: 5ee52e0b78bd38244a2b473e2236800c,
+  m_CorrespondingSourceObject: {fileID: 1231050277644289257, guid: 5ee52e0b78bd38244a2b473e2236800c,
-    type: 3}
-  m_PrefabInstance: {fileID: 6073211655158443556}
-  m_PrefabAsset: {fileID: 0}
---- !u!1 &5594525415673429112 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 1867831574853112412, guid: 5ee52e0b78bd38244a2b473e2236800c,
-    type: 3}
-  m_PrefabInstance: {fileID: 6073211655158443556}
-  m_PrefabAsset: {fileID: 0}
---- !u!1 &6423651778393776433 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 967434514102783765, guid: 5ee52e0b78bd38244a2b473e2236800c,
-    type: 3}
-  m_PrefabInstance: {fileID: 6073211655158443556}
-  m_PrefabAsset: {fileID: 0}
---- !u!1 &3980532922793874755 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 7166863393051868007, guid: 5ee52e0b78bd38244a2b473e2236800c,
     type: 3}
   m_PrefabInstance: {fileID: 6073211655158443556}
   m_PrefabAsset: {fileID: 0}
@@ -6269,15 +6277,21 @@ RectTransform:
     type: 3}
   m_PrefabInstance: {fileID: 6073211655158443556}
   m_PrefabAsset: {fileID: 0}
---- !u!1 &6749386026079657654 stripped
+--- !u!1 &6216688916544654740 stripped
 GameObject:
-  m_CorrespondingSourceObject: {fileID: 712346121867735186, guid: 5ee52e0b78bd38244a2b473e2236800c,
+  m_CorrespondingSourceObject: {fileID: 148192672769352624, guid: 5ee52e0b78bd38244a2b473e2236800c,
     type: 3}
   m_PrefabInstance: {fileID: 6073211655158443556}
   m_PrefabAsset: {fileID: 0}
---- !u!1 &4998415483215112909 stripped
+--- !u!1 &6423651778393776433 stripped
 GameObject:
-  m_CorrespondingSourceObject: {fileID: 1231050277644289257, guid: 5ee52e0b78bd38244a2b473e2236800c,
+  m_CorrespondingSourceObject: {fileID: 967434514102783765, guid: 5ee52e0b78bd38244a2b473e2236800c,
+    type: 3}
+  m_PrefabInstance: {fileID: 6073211655158443556}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &5594525415673429112 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 1867831574853112412, guid: 5ee52e0b78bd38244a2b473e2236800c,
     type: 3}
   m_PrefabInstance: {fileID: 6073211655158443556}
   m_PrefabAsset: {fileID: 0}

Assets/Resources/UI/Prefab/Panel/Mobile/RaceAlertPanel.prefab

@@ -456,7 +456,7 @@ MonoBehaviour:
     m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
-    m_HorizontalOverflow: 0
+    m_HorizontalOverflow: 1
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: Your 13km races about to start !

Assets/Resources/UI/Prefab/Panel/Mobile/RaceListPanel.prefab

@@ -144,6 +144,7 @@ GameObject:
   - component: {fileID: 71653441061169207}
   - component: {fileID: 71653441061169201}
   - component: {fileID: 71653441061169206}
+  - component: {fileID: 248042085895375876}
   m_Layer: 5
   m_Name: Text
   m_TagString: Untagged
@@ -211,6 +212,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: Found Nothing
+--- !u!114 &248042085895375876
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 71653441061169204}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  key: 
 --- !u!1 &71653441858533812
 GameObject:
   m_ObjectHideFlags: 0

Assets/Resources/UI/Prefab/Panel/Mobile/ResultListPanel.prefab

@@ -88,6 +88,7 @@ GameObject:
   - component: {fileID: 1726930185677054155}
   - component: {fileID: 9191359517318385996}
   - component: {fileID: 6142696700458525710}
+  - component: {fileID: 3726733143445342223}
   m_Layer: 5
   m_Name: BtnRower
   m_TagString: Untagged
@@ -198,6 +199,19 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &3726733143445342223
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 567707184756957303}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  key: 
 --- !u!1 &2977388904857115695
 GameObject:
   m_ObjectHideFlags: 0
@@ -746,6 +760,7 @@ GameObject:
   - component: {fileID: 3070817481139605445}
   - component: {fileID: 3070817481139605451}
   - component: {fileID: 3070817481139605450}
+  - component: {fileID: 4966463988604296540}
   m_Layer: 5
   m_Name: Text
   m_TagString: Untagged
@@ -813,6 +828,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: 
+--- !u!114 &4966463988604296540
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3070817481139605444}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  key: 
 --- !u!1 &3070817481364595018
 GameObject:
   m_ObjectHideFlags: 0
@@ -825,6 +853,7 @@ GameObject:
   - component: {fileID: 3070817481364595022}
   - component: {fileID: 3070817481364595017}
   - component: {fileID: 3070817481364595016}
+  - component: {fileID: 6051090552576052468}
   m_Layer: 5
   m_Name: Text
   m_TagString: Untagged
@@ -906,6 +935,19 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_HorizontalFit: 2
   m_VerticalFit: 0
+--- !u!114 &6051090552576052468
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3070817481364595018}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  key: 
 --- !u!1 &3070817481453899750
 GameObject:
   m_ObjectHideFlags: 0
@@ -918,6 +960,7 @@ GameObject:
   - component: {fileID: 3070817481453899754}
   - component: {fileID: 3070817481453899749}
   - component: {fileID: 3070817481453899748}
+  - component: {fileID: 2411583013162116489}
   m_Layer: 5
   m_Name: Text
   m_TagString: Untagged
@@ -999,6 +1042,19 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_HorizontalFit: 2
   m_VerticalFit: 0
+--- !u!114 &2411583013162116489
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3070817481453899750}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  key: 
 --- !u!1 &3070817481813969682
 GameObject:
   m_ObjectHideFlags: 0
@@ -1268,6 +1324,7 @@ GameObject:
   - component: {fileID: 3070817482187742057}
   - component: {fileID: 3070817482187742063}
   - component: {fileID: 3070817482187742062}
+  - component: {fileID: 6076755285331854212}
   m_Layer: 5
   m_Name: Text
   m_TagString: Untagged
@@ -1335,6 +1392,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: 
+--- !u!114 &6076755285331854212
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3070817482187742056}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  key: 
 --- !u!1 &3143990868080801560
 GameObject:
   m_ObjectHideFlags: 0
@@ -2918,6 +2988,7 @@ GameObject:
   - component: {fileID: 6925723137004327147}
   - component: {fileID: 1581401587416902500}
   - component: {fileID: 1513099208614774549}
+  - component: {fileID: 463731895178052400}
   m_Layer: 5
   m_Name: Text
   m_TagString: Untagged
@@ -2985,6 +3056,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: Found Nothing
+--- !u!114 &463731895178052400
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8500696446198708384}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  key: 
 --- !u!1 &8872633363535256335
 GameObject:
   m_ObjectHideFlags: 0
@@ -3193,12 +3277,6 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 07e45aecba1a2d542b043157aa2e9322, type: 3}
---- !u!224 &8950617846780388532 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 3608523562535466787, guid: 07e45aecba1a2d542b043157aa2e9322,
-    type: 3}
-  m_PrefabInstance: {fileID: 5630333573527524247}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &6303326001201218303 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 1827088261433348456, guid: 07e45aecba1a2d542b043157aa2e9322,
@@ -3211,3 +3289,9 @@ GameObject:
     type: 3}
   m_PrefabInstance: {fileID: 5630333573527524247}
   m_PrefabAsset: {fileID: 0}
+--- !u!224 &8950617846780388532 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 3608523562535466787, guid: 07e45aecba1a2d542b043157aa2e9322,
+    type: 3}
+  m_PrefabInstance: {fileID: 5630333573527524247}
+  m_PrefabAsset: {fileID: 0}

Assets/Resources/UI/Prefab/Panel/RaceAlertPanel.prefab

@@ -428,7 +428,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: Your 13km races about to start !

Assets/Resources/UI/Prefab/Panel/RaceListPanel.prefab

@@ -144,6 +144,7 @@ GameObject:
   - component: {fileID: 71653441061169207}
   - component: {fileID: 71653441061169201}
   - component: {fileID: 71653441061169206}
+  - component: {fileID: 3505654211507180141}
   m_Layer: 5
   m_Name: Text
   m_TagString: Untagged
@@ -211,6 +212,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: Found Nothing
+--- !u!114 &3505654211507180141
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 71653441061169204}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  key: 
 --- !u!1 &71653441858533812
 GameObject:
   m_ObjectHideFlags: 0

Assets/Resources/UI/language.json

@@ -14,7 +14,7 @@
     "Current Slope": "当前坡度",
     "join this route !": "加入路线！",
     "New Shadow": "添加",
-    "Name": "名字",
+    "Name": "姓名",
     "No Shadow Here": "无数据",
     "Cancel": "取消",
     "Enter text...": "请输入关键字",
@@ -66,17 +66,17 @@
     "Join Now": "报名",
     "ROUTES": "线路",
     "MATCH": "赛事",
-    "Found Nothing": "wushuju",
+    "Found Nothing": "无数据",
     "Toast": "Toast",
-    "Riders": "骑手",
+    "Riders": "位骑手",
     "Altitude": "海拔",
     "Power": "功率",
     "Cadence": "踏频",
     "Heart Rate": "心率",
     "Speed": "速度",
     "Name/ID": "名称",
-    "No": "否",
+    "No": "取消",
-    "Yes": "是",
+    "Yes": "确认",
     "Enter": "进入",
     "Cancel  Apply": "取消报名",
     "Cancel  Reserve": "取消报名",
@@ -132,7 +132,7 @@
     "Wheel Diameter": "轮径",
     "Please enter your WD": "请输入您的轮径",
     "DELIVERY INFO": "收货信息",
-    "Please enter your name": "请输入您的收货信息",
+    "Please enter your name": "请输入您的姓名",
     "Phone number": "手机号",
     "Please enter your phone number": "请输入您的手机号",
     "Address": "地址",
@@ -163,8 +163,8 @@
     "Route Name": "线路名称",
     "SETTING": "设置",
     "NOTIFICATION": "通知",
-    "GO!": "开始!",
+    "GO!": "进入!",
-    "Go": "开始",
+    "Go": "进入",
     "Stay": "忽略",
     "ALL RACE": "所有赛事",
     "Status": "状态",
@@ -172,12 +172,12 @@
     "Not started": "未开始",
     "In play": "进行中",
     "Done": "结束",
-    "Join In": "报名",
+    "Join In": "已报名",
     "Race Name": "赛事名称",
     "Total Rides": "总计骑行次数",
     "Total Riding Time": "总计骑行时间",
     "times": "次",
-    "hours": "h",
+    "hours": "H",
     "KCAL": "KCAL",
     "M": "M",
     "KM": "KM",
@@ -194,7 +194,7 @@
     "SIGN UP": "注册",
     "Verification Code": "验证码",
     "Verify": "获取验证码",
-    "Repeat Password": "重复输入密码",
+    "Repeat Password": "确认密码",
     "LOGIN": "登录",
     "Forgot password?": "忘记密码？",
     "Previous": "上一步",
@@ -212,7 +212,7 @@
     "Start for Registration": "报名开始时间",
     "Deadline for Registration": "报名截止时间",
     "WATTS": "功率",
-    "Choose Your Account": "选择一个账号",
+    "Choose Your Account": "登录记录",
     "Are you a new to Powerfun?": "新用户?",
     "Account Infomation": "账号信息",
     "You're almost done.": "马上完成",
@@ -274,7 +274,12 @@
     "Upload": "上传",
     "Upload the local record?": "上传本地记录？",
     "Delete the local record?": "删除本地记录？",
-    "Registered": "已报名"
+    "Registered": "已报名",
+    "Cycling Equipment": "骑行设备",
+    "Mileage": "里程",
+    "Times": "骑行次数",
+    "Rank": "排名",
+    "Connecting...": "连接中"
   },
   "en": {
     "HOT ROUTES": "HOT ROUTES",
@@ -542,6 +547,11 @@
     "Upload": "Upload",
     "Upload the local record?": "Upload the local record?",
     "Delete the local record?": "Delete the local record?",
-    "Registered": "Registered"
+    "Registered": "Registered",
+    "Cycling Equipment": "Cycling Equipment",
+    "Mileage": "Mileage",
+    "Times": "Times",
+    "Rank": "Rank",
+    "Connecting...": "Connecting..."
   }
 }

Assets/Scripts/Apis/ApiBase.cs

@@ -295,7 +295,8 @@ namespace Assets.Scripts.Apis
             //}
             var request = (HttpWebRequest)WebRequest.Create(ConfigHelper.Host + url);
             request.UserAgent = httpClient.DefaultRequestHeaders.UserAgent.ToString();
-            request.Headers.Add("Language", "en");
+            request.Headers.Add("Language", App.GetLocalLanguage());
+            
             request.CookieContainer = new CookieContainer();
             foreach (Cookie item in cookies)
             {
@@ -556,7 +557,7 @@ namespace Assets.Scripts.Apis
             request.Method = "POST";
             request.UserAgent = httpClient.DefaultRequestHeaders.UserAgent.ToString();
             request.Accept = "application/json";
-            request.Headers.Add("Language", "en");
+            request.Headers.Add("Language", App.GetLocalLanguage());
             request.CookieContainer = new CookieContainer();
             foreach (Cookie item in cookies)
             {

Assets/Scripts/Scenes/Ride/Scripts/SeletedPlayerScript.cs

@@ -53,10 +53,11 @@ namespace Assets.Scenes.Ride.Scripts
         {
             Close.gameObject.SetActive(false);
             isUsed = false;
-            Name.text = "New Shadow";
+            Name.text = App.GetLocalString("New Shadow");
             var defaultexture = Resources.Load<Sprite>("Images/Ride/head~").texture;
             Head.texture = defaultexture;
             RankingId = string.Empty;
+            Name.color = new Color(0.3607843f, 0.3607843f, 0.4313726f, 1);
         }
         public void SetHead(Texture texture, bool select)
         {

Assets/Scripts/UI/Prefab/Device/DeviceView.cs

@@ -327,7 +327,7 @@ public class DeviceView : MonoBehaviour
             mPairButton.SetActive(true);
             searchState.gameObject.SetActive(true);
 #endif
-            searchState.text = "Connecting...";
+            searchState.text = App.GetLocalString("Connecting...");
 
 
         }

Assets/Scripts/UI/Prefab/Panel/EditUserController.cs

@@ -387,7 +387,7 @@ public class EditUserController : PFUIPanel, INativeOnMobileImageSelect
         user.Nickname = mNickName.Text;
         user.Country = UIManager.Instance.loginRegOptions.GetCountryName(mConutryDropdown.SelectedIndex);
         var errorList = new List<object>();
-        if (string.IsNullOrEmpty(mNickName.Text)) errorList.Add(new { Field = "Nickname", ErrMsg = "请填写昵称" });
+        if (string.IsNullOrEmpty(mNickName.Text)) errorList.Add(new { Field = "NickName", ErrMsg = "请填写昵称" });
         if (string.IsNullOrEmpty(mFTP.Text)) errorList.Add(new { Field = "FTP", ErrMsg = "请填写FTP" });
         if (string.IsNullOrEmpty(mHeight.Text)) errorList.Add(new { Field = "Height", ErrMsg = "请填写身高" });
         if (string.IsNullOrEmpty(mWeight.Text)) errorList.Add(new { Field = "Weight", ErrMsg = "请填写体重" });

Assets/Scripts/UI/Prefab/Panel/RaceAlertController.cs

@@ -54,7 +54,7 @@ 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'>{Helper.SubStr(title,10)}</color> race about to start";
+            var content = App.GetLocalLanguage().Equals("en")? $"Your <color='#F93086'>{Helper.SubStr(title,10)}</color> race about to start": $"你参与的 <color='#F93086'>{Helper.SubStr(title, 10)}</color> 比赛即将开始！";
             Content.text = content;
             CompetitionId = competitionId;
             RouteId = routeId;

Assets/Scripts/UI/Prefab/Race/RaceListScript.cs

@@ -175,6 +175,10 @@ public class RaceListScript : RaceScript
         searchInput = transform.Find("Conditions/SearchInput");
         if (searchInput != null) 
         {
+            searchInput.GetComponent<InputField>().onEndEdit.AddListener((t) =>
+            {
+               raceName = t;
+            });
             UIManager.AddEvent(searchInput.Find("Button").gameObject, EventTriggerType.PointerClick, (b) =>
             {
                 var t = searchInput.GetComponent<InputField>().text;

Assets/Scripts/UI/Prefab/ResultList/LocalRouteItem.cs

@@ -79,9 +79,9 @@ public class LocalRouteItem : MonoBehaviour, IPointerExitHandler, IPointerEnterH
    
                 Name.text = record.RouteName;
                 Time.text = record.StartTime.ToString("HH:mm:ss dd-MM-yyyy");
-                RidingTime.text = $"<color={titleColor}>Riding time:</color>{Helper.FormatTicks(record.Ticks)}";
+                RidingTime.text = $"<color={titleColor}>{App.GetLocalString("Riding time")}:</color>{Helper.FormatTicks(record.Ticks)}";
-                RidingDistance.text = $"<color={titleColor}>Mileage:</color>{record.EndDistance.ToString("#0.00")}KM";
+                RidingDistance.text = $"<color={titleColor}>{App.GetLocalString("Mileage")}:</color>{record.EndDistance.ToString("#0.00")}KM";
-                Device.text = $"<color={titleColor}>Cycling equipment:</color>{record.ManufacturerName}";
+                Device.text = $"<color={titleColor}>{App.GetLocalString("Cycling equipment")}:</color>{record.ManufacturerName}";
             }
             else
             {

Assets/Scripts/UI/Prefab/ResultList/RouteItem.cs

@@ -91,9 +91,9 @@ public class RouteItem : MonoBehaviour
         {
             Utils.DisplayImage(raw, result.Cover, true);
         }
-        row1.Find("Time").GetComponent<Text>().text = $"<color=#5c5c6e>Rowing time:</color>{TimeSpan.FromSeconds(result.TotalTime).ToString()}";
+        row1.Find("Time").GetComponent<Text>().text = $"<color=#5c5c6e>{App.GetLocalString("Rowing time")}:</color>{TimeSpan.FromSeconds(result.TotalTime).ToString()}";
-        row1.Find("Distance").GetComponent<Text>().text = $"<color=#5c5c6e>Distance:</color>{result.TotalDistance}M";
+        row1.Find("Distance").GetComponent<Text>().text = $"<color=#5c5c6e>{App.GetLocalString("Distance")}:</color>{result.TotalDistance}M";
-        row2.Find("Device").GetComponent<Text>().text = $"<color=#5c5c6e>Rowing equipment:</color>{result.ManufacturerName}";
+        row2.Find("Device").GetComponent<Text>().text = $"<color=#5c5c6e>{App.GetLocalString("Rowing equipment")}:</color>{result.ManufacturerName}";
         left.Find("Progress").gameObject.SetActive(false);
         left.Find("Main/Name").GetComponent<Text>().text = $"{result.CreateTime.ToLocalTime().ToString("yyyy-MM-dd HH:mm:ss")} Free Rowing";
         left.Find("Main/Time").GetComponent<Text>().text = $"{result.StartTime.ToLocalTime().ToString("yyyy-MM-dd HH:mm:ss")} ~ {result.CreateTime.ToLocalTime().ToString("yyyy-MM-dd HH:mm:ss")}";
@@ -136,12 +136,12 @@ public class RouteItem : MonoBehaviour
         
         left.Find("Main").Find("Name").GetComponent<Text>().text = result.RouteName;
         left.Find("Main").Find("Time").GetComponent<Text>().text = result.CreateTime.ToString("HH:mm:ss dd-MM-yyyy");
-        row1.Find("Time").GetComponent<Text>().text = $"<color={titleColor}>Riding Time:</color>{result.TrainingTime}";
+        row1.Find("Time").GetComponent<Text>().text = $"<color={titleColor}>{App.GetLocalString("Riding Time")}:</color>{result.TrainingTime}";
-        row1.Find("Distance").GetComponent<Text>().text = $"<color={titleColor}>Mileage:</color>{result.EndDistance.ToString("#0.00")}KM";
+        row1.Find("Distance").GetComponent<Text>().text = $"<color={titleColor}>{App.GetLocalString("Mileage")}:</color>{result.EndDistance.ToString("#0.00")}KM";
-        row1.Find("Times").GetComponent<Text>().text = $"<color={titleColor}>Times:</color>{result.Count}";
+        row1.Find("Times").GetComponent<Text>().text = $"<color={titleColor}>{App.GetLocalString("Times")}:</color>{result.Count}";
         if (index == 0)
         {
-            row1.Find("Rank").GetComponent<Text>().text = $"<color={titleColor}>Rank:</color>{result.Ranking}";
+            row1.Find("Rank").GetComponent<Text>().text = $"<color={titleColor}>{App.GetLocalString("Rank")}:</color>{result.Ranking}";
         }
         else 
         {
@@ -149,7 +149,7 @@ public class RouteItem : MonoBehaviour
         }
         left.Find("Progress").Find("Image").GetComponent<Image>().fillAmount = (float)result.Progress;
         left.Find("Progress").Find("Value").GetComponent<Text>().text = (result.Progress * 100).ToString("#0");
-        row2.Find("Device").GetComponent<Text>().text = $"<color={titleColor}>Cycling Equipment:</color>{result.ManufacturerName}";
+        row2.Find("Device").GetComponent<Text>().text = $"<color={titleColor}>{App.GetLocalString("Cycling Equipment")}:</color>{result.ManufacturerName}";
         if (index == 0)
         {
             right = transform.Find("Right");

Assets/Scripts/UI/Prefab/Rower/RowerDeviceView.cs

@@ -296,7 +296,7 @@ public class RowerDeviceView : MonoBehaviour
             mPairButton.SetActive(true);
             searchState.gameObject.SetActive(true);
 #endif
-            searchState.text = "Connecting...";
+            searchState.text = App.GetLocalString("Connecting...");
 
 
         }