Merge remote-tracking branch 'origin/dev' into dev_lishuo

# Conflicts:
#	Assets/Scripts/Apis/UserApi.cs
#	Assets/Scripts/App.cs
#	Assets/Scripts/ConfigHelper.cs
#	Assets/Scripts/Scenes/LoginController.cs
#	Assets/Scripts/UI/Prefab/Panel/HomeController.cs

Assets/Mapbox/User.meta

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

Assets/Mapbox/User/Modifiers.meta

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