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

# Conflicts:
#	Assets/Resources/UI/language.json

Assets/Scenes/Ride.unity

@@ -1972,7 +1972,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!1 &286379890
 GameObject:
   m_ObjectHideFlags: 0
@@ -4630,6 +4630,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 3622b843b296d2e46ba722beb139f040, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  newNav: {fileID: 0}
 --- !u!222 &878222276
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -4894,12 +4895,14 @@ MonoBehaviour:
   map: {fileID: 159634025}
   player: {fileID: 286379776}
   UIObject: {fileID: 1554806540}
-  preticks: 0
+  minicamera: {fileID: 0}
   isQuit: 0
   isPause: 0
+  RotateLock: 1
   singleUIManager: {fileID: 0}
   map3d: {fileID: 0}
   Is3dView: 0
+  RankingId: 0
 --- !u!1 &1525557491
 GameObject:
   m_ObjectHideFlags: 0
@@ -5220,6 +5223,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 3622b843b296d2e46ba722beb139f040, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  newNav: {fileID: 0}
 --- !u!222 &1900532202
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -5246,7 +5250,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &2145970966
 Transform:
   m_ObjectHideFlags: 0