Merge branch 'dev_cyp' into dev

# Conflicts:
#	Assets/Resources/Loading.meta
#	Assets/Scripts/Apis/MapApi.cs
#	Assets/Scripts/UI/Prefab/Panel/MapListController.cs

Assets/Scenes/MainScene.unity

@@ -134,6 +134,7 @@ GameObject:
   - component: {fileID: 273807002}
   - component: {fileID: 273807001}
   - component: {fileID: 273807005}
+  - component: {fileID: 273807007}
   m_Layer: 5
   m_Name: Canvas
   m_TagString: Untagged
@@ -235,6 +236,14 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   root: {fileID: 2038446772}
+--- !u!222 &273807007
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 273807000}
+  m_CullTransparentMesh: 0
 --- !u!1 &584235025
 GameObject:
   m_ObjectHideFlags: 0
@@ -651,7 +660,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: ff5927b9099e57740a8e1c1296251a99, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  alert: {fileID: 0}
+  Root: {fileID: 0}
 --- !u!4 &1962586927
 Transform:
   m_ObjectHideFlags: 0