Merge branch 'dev_lishuo' into dev

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

@@ -112,8 +112,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 0, y: -65}
-  m_SizeDelta: {x: 92, y: 50}
+  m_AnchoredPosition: {x: -0.0000038146973, y: -65}
+  m_SizeDelta: {x: 163.5351, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2030232658984377928
 CanvasRenderer:
@@ -155,7 +155,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: Warn
+  m_Text: Warning
 --- !u!1 &2030232659281999545
 GameObject:
   m_ObjectHideFlags: 0

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

@@ -11,9 +11,9 @@ GameObject:
   - component: {fileID: 1148602845821646045}
   - component: {fileID: 1148602845821646048}
   - component: {fileID: 1148602845821646051}
-  - component: {fileID: 1148602845821646050}
+  - component: {fileID: 6957187063806588864}
   m_Layer: 5
-  m_Name: arrow
+  m_Name: MiniArrow
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -65,8 +65,8 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 0}
-  m_Type: 0
+  m_Sprite: {fileID: 21300000, guid: 8a1f5dd0a18144c498c99139fcfa3547, type: 3}
+  m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillMethod: 4
@@ -75,7 +75,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
---- !u!114 &1148602845821646050
+--- !u!114 &6957187063806588864
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -84,7 +84,10 @@ MonoBehaviour:
   m_GameObject: {fileID: 1148602845821646044}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3}
+  m_Script: {fileID: 11500000, guid: 97bc2ebab6563400c95b036136d26ea6, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  radius: 4
+  m_Inverse: 0
+  m_MaskInteraction: 85
+  m_UseStencil: 1
+  m_RaycastFilter: 0

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

@@ -198,7 +198,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: 215, y: 48}
+  m_SizeDelta: {x: 225, y: 48}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8877223148509276859
 CanvasRenderer: