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

# Conflicts:
#	Assets/Scripts/Scenes/Ride/Scripts/ResultPanelScript.cs

Assets/Scripts/UI/Prefab/MultiTips.cs

@@ -19,7 +19,7 @@ public class MultiTips:PFUIText
         var tiplist = ConfigHelper.mapApi.GetTipsList();
         if (!string.IsNullOrEmpty(tiplist))
         {
-            tips = tiplist.Split(',');
+            tips = tiplist.Split('#');
         }
         var random = new System.Random();
         currentIndex = random.Next(0, tips.Length);