Merge branch 'master' of http://gdx-studio.synology.me:23000/gdxadmin/UnityBase

Assets/Scenes/SampleProject.unity

@@ -130,7 +130,6 @@ GameObject:
   - component: {fileID: 88083293}
   - component: {fileID: 88083292}
   - component: {fileID: 88083291}
-  - component: {fileID: 88083294}
   m_Layer: 0
   m_Name: EventSystem
   m_TagString: Untagged
@@ -199,31 +198,6 @@ Transform:
   m_Children: []
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &88083294
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 88083290}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d0b148fe25e99eb48b9724523833bab1, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Delegates:
-  - eventID: 0
-    callback:
-      m_PersistentCalls:
-        m_Calls: []
-  - eventID: 1
-    callback:
-      m_PersistentCalls:
-        m_Calls: []
-  - eventID: 4
-    callback:
-      m_PersistentCalls:
-        m_Calls: []
 --- !u!1 &330585543
 GameObject:
   m_ObjectHideFlags: 0
@@ -2026,7 +2000,8 @@ PrefabInstance:
       propertyPath: m_Name
       value: InfoWindow
       objectReference: {fileID: 0}
-    m_RemovedComponents: []
+    m_RemovedComponents:
+    - {fileID: 9096332282778631911, guid: 036e56b4c097fc8409ffced10ff53562, type: 3}
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
     m_AddedComponents: []