Merge branch 'dev_lishuo' of https://gitlab.com/rhino4biz/powerfun/powerfun-unity into dev_lishuo

# Conflicts:
#	Assets/DOTween.meta
#	Assets/Mapbox/Core/Plugins/Android.meta
#	Assets/Mapbox/Unity/Map/InitializeMapWithLocationProvider.cs
#	Assets/Plugins/Newtonsoft.Json.dll
#	Assets/Prefabs.meta
#	Assets/Resources.meta
#	Assets/Scenes/Ride/Minimap Render Texture.renderTexture
#	Assets/Scenes/Ride/Ride.unity
#	Assets/Scenes/Ride/Scripts/Helper.cs
#	Assets/Scenes/Ride/Scripts/PlayerController.cs
#	Assets/Scenes/Ride/Scripts/RouteController.cs
#	Assets/Scenes/Ride/Scripts/UIManager.cs
#	Packages/manifest.json
#	Packages/packages-lock.json

Assets/Scripts/UI.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 39a2553da07e5664a998dcde082ea86b
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Scripts/Utils.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 6ff97914c4666344b99b4484a6e295c1
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: