Changes on Main Menu and Scenes Loader after updates

4 年前 · cbc6933e
--- a/UOP1_Project/Assets/Scenes/MainMenu.unity
+++ b/UOP1_Project/Assets/Scenes/MainMenu.unity
  m_OnClick:
    m_PersistentCalls:
      m_Calls:
-      - m_Target: {fileID: 11400000, guid: 95eb00b1852501648b8f37799fcd78f7, type: 2}
+      - m_Target: {fileID: 11400000, guid: c499d87f35465124f8fb2751b150430d, type: 2}
-          m_IntArgument: 0
+          m_IntArgument: 555
          m_FloatArgument: 0
          m_StringArgument: 
          m_BoolArgument: 0
  - component: {fileID: 1967191114}
  - component: {fileID: 1967191113}
  - component: {fileID: 1967191112}
+  - component: {fileID: 1967191115}
  m_Layer: 5
  m_Name: Start
  m_TagString: Untagged
  m_OnClick:
    m_PersistentCalls:
      m_Calls:
-      - m_Target: {fileID: 11400000, guid: 31d49a74dcfce42488af012acaf74bdb, type: 2}
-        m_MethodName: Raise
+      - m_Target: {fileID: 1967191115}
+        m_MethodName: OnPlayButtonPress
        m_Mode: 1
        m_Arguments:
          m_ObjectArgument: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1967191110}
  m_CullTransparentMesh: 0
+--- !u!114 &1967191115
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1967191110}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 45ecefb9fe27f1f4b8cf3ecc3fad707c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  onPlayButtonPress: {fileID: 11400000, guid: 00e3063edc5902e40832ea618644c597, type: 2}
+  locationsToLoad:
+  - {fileID: 11400000, guid: 2f386bbc670c05145834a0f9c7d55798, type: 2}
+  showLoadScreen: 1
 --- !u!1 &2140469179
 GameObject:
  m_ObjectHideFlags: 0
--- a/UOP1_Project/Assets/Scenes/ScenesLoader.unity
+++ b/UOP1_Project/Assets/Scenes/ScenesLoader.unity
  - component: {fileID: 363619425}
  - component: {fileID: 363619427}
  - component: {fileID: 363619426}
-  - component: {fileID: 363619428}
  m_Layer: 5
  m_Name: LoadingInterface
  m_TagString: Untagged
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 363619424}
  m_CullTransparentMesh: 0
--- !u!114 &363619428
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 363619424}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: e72f0bf25bcf9874bbeb271ccae55dde, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  loadingInterface: {fileID: 363619424}
-  loadingProgressBar: {fileID: 841012435}
-  scenesData: {fileID: 11400000, guid: 3cbb90f50a82e01409b7c5fc69f1d429, type: 2}
 --- !u!1 &447650313
 GameObject:
  m_ObjectHideFlags: 0
  - component: {fileID: 447650316}
  - component: {fileID: 447650314}
  m_Layer: 0
-  m_Name: GameExit
+  m_Name: GameExitListener
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_GameObject: {fileID: 447650313}
  m_Enabled: 1
  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 8cb8658de1ad97b4eb747df35933650f, type: 3}
+  m_Script: {fileID: 11500000, guid: 0ba826e9d52310a43b98dffc289c71b2, type: 3}
-  Event: {fileID: 11400000, guid: 95eb00b1852501648b8f37799fcd78f7, type: 2}
-  Response:
+  voidGameEvent: {fileID: 11400000, guid: c499d87f35465124f8fb2751b150430d, type: 2}
+  OnEventRaised:
-      - m_Target: {fileID: 1904845807}
+      - m_Target: {fileID: 1242953036}
        m_MethodName: ExitGame
        m_Mode: 1
        m_Arguments:
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 5
+  m_RootOrder: 3
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &841012433
 GameObject:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 841012433}
  m_CullTransparentMesh: 0
--- !u!1 &938380541
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 938380544}
-  - component: {fileID: 938380545}
-  m_Layer: 0
-  m_Name: LoadNextLevelWithProgress
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!4 &938380544
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 938380541}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 3
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &938380545
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 938380541}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 8cb8658de1ad97b4eb747df35933650f, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  Event: {fileID: 11400000, guid: 31d49a74dcfce42488af012acaf74bdb, type: 2}
-  Response:
-    m_PersistentCalls:
-      m_Calls:
-      - m_Target: {fileID: 363619424}
-        m_MethodName: SetActive
-        m_Mode: 6
-        m_Arguments:
-          m_ObjectArgument: {fileID: 0}
-          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
-          m_IntArgument: 0
-          m_FloatArgument: 0
-          m_StringArgument: 
-          m_BoolArgument: 1
-        m_CallState: 2
-      - m_Target: {fileID: 363619428}
-        m_MethodName: UpdateProgress
-        m_Mode: 1
-        m_Arguments:
-          m_ObjectArgument: {fileID: 0}
-          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
-          m_IntArgument: 0
-          m_FloatArgument: 0
-          m_StringArgument: 
-          m_BoolArgument: 1
-        m_CallState: 2
-      - m_Target: {fileID: 11400000, guid: 3cbb90f50a82e01409b7c5fc69f1d429, type: 2}
-        m_MethodName: NextLevel
-        m_Mode: 1
-        m_Arguments:
-          m_ObjectArgument: {fileID: 0}
-          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
-          m_IntArgument: 0
-          m_FloatArgument: 0
-          m_StringArgument: 
-          m_BoolArgument: 1
-        m_CallState: 2
--- !u!1 &1277026523
+--- !u!1 &1242953035
 GameObject:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_Component:
-  - component: {fileID: 1277026525}
-  - component: {fileID: 1277026524}
+  - component: {fileID: 1242953037}
+  - component: {fileID: 1242953036}
-  m_Name: ClearLists
+  m_Name: Location Loader
--- !u!114 &1277026524
+--- !u!114 &1242953036
-  m_GameObject: {fileID: 1277026523}
+  m_GameObject: {fileID: 1242953035}
-  m_Script: {fileID: 11500000, guid: 74ddcd50a4953a24a83702bb14e0a801, type: 3}
+  m_Script: {fileID: 11500000, guid: b6b928d1d6f59854499ed82bdeef2305, type: 3}
-  scenesData: {fileID: 11400000, guid: 3cbb90f50a82e01409b7c5fc69f1d429, type: 2}
-  ClearOnStart: 1
--- !u!4 &1277026525
+  mainMenuScenes:
+  - {fileID: 11400000, guid: 431ff81b74b48fb4d9301fb76ca633dd, type: 2}
+  loadingInterface: {fileID: 363619424}
+  loadingProgressBar: {fileID: 841012435}
+  _loadEvent: {fileID: 11400000, guid: 00e3063edc5902e40832ea618644c597, type: 2}
+--- !u!4 &1242953037
-  m_GameObject: {fileID: 1277026523}
+  m_GameObject: {fileID: 1242953035}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalPosition: {x: 10.11, y: 5.3500004, z: 29.12}
-  m_RootOrder: 6
+  m_RootOrder: 2
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1387982339
 GameObject:
  m_AnchoredPosition: {x: 0, y: 0}
  m_SizeDelta: {x: 0, y: 0}
  m_Pivot: {x: 0, y: 0}
--- !u!1 &1694358576
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1694358579}
-  - component: {fileID: 1694358577}
-  m_Layer: 0
-  m_Name: LoadNextLevel
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!114 &1694358577
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1694358576}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 8cb8658de1ad97b4eb747df35933650f, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  Event: {fileID: 11400000, guid: d166670d1b4b0af4b969be97d28317e4, type: 2}
-  Response:
-    m_PersistentCalls:
-      m_Calls:
-      - m_Target: {fileID: 11400000, guid: 3cbb90f50a82e01409b7c5fc69f1d429, type: 2}
-        m_MethodName: NextLevel
-        m_Mode: 1
-        m_Arguments:
-          m_ObjectArgument: {fileID: 0}
-          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
-          m_IntArgument: 0
-          m_FloatArgument: 0
-          m_StringArgument: 
-          m_BoolArgument: 0
-        m_CallState: 2
--- !u!4 &1694358579
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1694358576}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 4
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1904845806
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1904845808}
-  - component: {fileID: 1904845807}
-  - component: {fileID: 1904845809}
-  m_Layer: 0
-  m_Name: MainMenuLoader
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!114 &1904845807
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1904845806}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 8ade5a748610bf348a549932627f98d1, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  LoadOnStart: 1
-  onGameStart: {fileID: 11400000, guid: 652ff0e2a34af0246b658aed07ec44a3, type: 2}
--- !u!4 &1904845808
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1904845806}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 2
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1904845809
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1904845806}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 8cb8658de1ad97b4eb747df35933650f, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  Event: {fileID: 11400000, guid: 652ff0e2a34af0246b658aed07ec44a3, type: 2}
-  Response:
-    m_PersistentCalls:
-      m_Calls:
-      - m_Target: {fileID: 11400000, guid: 3cbb90f50a82e01409b7c5fc69f1d429, type: 2}
-        m_MethodName: LoadMainMenu
-        m_Mode: 1
-        m_Arguments:
-          m_ObjectArgument: {fileID: 0}
-          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
-          m_IntArgument: 0
-          m_FloatArgument: 0
-          m_StringArgument: 
-          m_BoolArgument: 0
-        m_CallState: 2