Merge remote-tracking branch 'origin/dev_mobile_ble' into dev_mobile

# Conflicts:
#	Assets/Scripts/Scenes/MainController.cs

Assets/Resources/UI/Prefab/Common/Mobile/Loading.prefab

@@ -36,7 +36,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 308, y: 222}
+  m_SizeDelta: {x: 360, y: 360}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6067144360479621595
 CanvasRenderer:

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

@@ -669,7 +669,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 25.87, y: -25.5}
-  m_SizeDelta: {x: 31.732483, y: 19}
+  m_SizeDelta: {x: 31.732483, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2602899783160591258
 CanvasRenderer:
@@ -709,6 +709,6 @@ MonoBehaviour:
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
+    m_VerticalOverflow: 1
     m_LineSpacing: 1
   m_Text: 111

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

@@ -1614,7 +1614,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7021295876441927992}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 281c3f68a13a427499876dec554c3223, type: 3}
   m_Name: 

Assets/Resources/UI/Prefab/Match/onlinePlayerNoScript.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 1857b202bf5b0dd41b6f7f76b5c837f8
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/UI/Prefab/ResultList/LocalRouteItem-Mobile.prefab

@@ -742,7 +742,6 @@ GameObject:
   - component: {fileID: 4085630360285719622}
   - component: {fileID: 4085630360285719621}
   - component: {fileID: 4085630360285719623}
-  - component: {fileID: 8165744897097518677}
   - component: {fileID: 6147895834536267412}
   - component: {fileID: 1057269569260839362}
   m_Layer: 5
@@ -825,18 +824,6 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   radius: 10
---- !u!114 &8165744897097518677
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4085630360285719619}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f822eddd7a641a744a198d79e43e3f55, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!114 &6147895834536267412
 MonoBehaviour:
   m_ObjectHideFlags: 0

Assets/Resources/UI/Prefab/Ride/EmptyOnlinePlayer.prefab

@@ -0,0 +1,58 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &6678810120740130779
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7262506377483379747}
+  - component: {fileID: 4261497295736767088}
+  m_Layer: 0
+  m_Name: EmptyOnlinePlayer
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &7262506377483379747
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6678810120740130779}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 212.23204, y: 87.61264, z: -266.70435}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &4261497295736767088
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6678810120740130779}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 281c3f68a13a427499876dec554c3223, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  character: {fileID: 6678810120740130779}
+  characterAnimator: {fileID: 0}
+  nextPos: {x: 0, y: 0, z: 0}
+  ticks: 0
+  stopRecord: 0
+  CurrentIndex: 0
+  CurrentDistance: 0
+  NextSlopeTotalDistance: 0
+  PreElevation: 0
+  PreSlope: 0
+  currentRotation: {x: 0, y: 0, z: 0, w: 0}
+  currentPos: {x: 0, y: 0, z: 0}
+  _playerController: {fileID: 0}

Assets/Resources/UI/Prefab/Ride/EmptyOnlinePlayer.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: a2c204e9244f6304dae6ccedf7f68733
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/UI/Prefab/Ride/OnlinePlayer.prefab

@@ -109,6 +109,7 @@ MonoBehaviour:
   character: {fileID: 1056360222971152080}
   characterAnimator: {fileID: 0}
   nextPos: {x: 0, y: 0, z: 0}
+  ticks: 0
   stopRecord: 0
   CurrentIndex: 0
   CurrentDistance: 0
@@ -118,4 +119,3 @@ MonoBehaviour:
   currentRotation: {x: 0, y: 0, z: 0, w: 0}
   currentPos: {x: 0, y: 0, z: 0}
   _playerController: {fileID: 0}
-  isShowInfo: 0