Initial state machine with soundbites added

RealityVirtually2019 · Feb 9, 2019 · 40d9c25 · 40d9c25
1 parent ef72afc
commit 40d9c25
Show file tree

Hide file tree

Showing 35 changed files with 948 additions and 24 deletions.
diff --git a/UnityProject/Assets/.DS_Store b/UnityProject/Assets/.DS_Store
diff --git a/UnityProject/Assets/Prefabs/GameAudio.prefab b/UnityProject/Assets/Prefabs/GameAudio.prefab
@@ -1,5 +1,132 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &1923425252
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1923425253}
+  - component: {fileID: 2042114575495120406}
+  m_Layer: 0
+  m_Name: SoundBites
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1923425253
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1923425252}
+  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: 1008820298187534462}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!82 &2042114575495120406
+AudioSource:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1923425252}
+  m_Enabled: 1
+  serializedVersion: 4
+  OutputAudioMixerGroup: {fileID: 0}
+  m_audioClip: {fileID: 0}
+  m_PlayOnAwake: 0
+  m_Volume: 1
+  m_Pitch: 1
+  Loop: 0
+  Mute: 0
+  Spatialize: 0
+  SpatializePostEffects: 0
+  Priority: 128
+  DopplerLevel: 1
+  MinDistance: 1
+  MaxDistance: 500
+  Pan2D: 0
+  rolloffMode: 0
+  BypassEffects: 0
+  BypassListenerEffects: 0
+  BypassReverbZones: 0
+  rolloffCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 1
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  panLevelCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  spreadCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  reverbZoneMixCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
 --- !u!1 &1008820297631836204
 GameObject:
   m_ObjectHideFlags: 0
@@ -139,6 +266,7 @@ GameObject:
   - component: {fileID: 1008820298187534461}
   - component: {fileID: 1008820298187534460}
   - component: {fileID: 1008820298187534463}
+  - component: {fileID: 2123648237}
   m_Layer: 0
   m_Name: GameAudio
   m_TagString: music
@@ -158,6 +286,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 1008820297631836205}
+  - {fileID: 1923425253}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -361,3 +490,21 @@ AudioSource:
     m_PreInfinity: 2
     m_PostInfinity: 2
     m_RotationOrder: 4
+--- !u!114 &2123648237
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1008820298187534459}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e423a5a71276f4c5984423150f03107e, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  soundBiteSource: {fileID: 0}
+  cosmicWeb: {fileID: 8300000, guid: daa6c59c2717c4aaaad0689bc2fb4c6f, type: 3}
+  stars: {fileID: 8300000, guid: 87ea2f94b50c044079bf7f6b73d3d071, type: 3}
+  gas: {fileID: 8300000, guid: 4c5ebac3db4f445bb904c13821f50ff4, type: 3}
+  darkMatter: {fileID: 8300000, guid: f2679e2549a194b419f19b11fcfbb179, type: 3}
+  theUniverse: {fileID: 8300000, guid: ee679928fdb9c48bca47da633d68116f, type: 3}
diff --git a/UnityProject/Assets/Prefabs/GameStateManager.prefab b/UnityProject/Assets/Prefabs/GameStateManager.prefab
@@ -0,0 +1,47 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &8712749221715294238
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1497727604867117132}
+  - component: {fileID: 8467476132425917512}
+  m_Layer: 0
+  m_Name: GameStateManager
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1497727604867117132
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8712749221715294238}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -0.000030517578, y: -46.9, z: 389}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &8467476132425917512
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8712749221715294238}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 03b3b5daa65be48cf91ca0f2e2f30026, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  GameState: 0
+  musicManager: {fileID: 0}
diff --git a/UnityProject/Assets/Prefabs/GameStateManager.prefab.meta b/UnityProject/Assets/Prefabs/GameStateManager.prefab.meta
diff --git a/UnityProject/Assets/Scenes/Oculus/cosmosHighRes_Oculus.unity b/UnityProject/Assets/Scenes/Oculus/cosmosHighRes_Oculus.unity
@@ -124,11 +124,6 @@ PrefabInstance:
       propertyPath: m_Name
       value: GameAudio
       objectReference: {fileID: 0}
-    - target: {fileID: 1008820298187534459, guid: 1d24e29a6d53945169e0e5f2247020e1,
-        type: 3}
-      propertyPath: m_TagString
-      value: music
-      objectReference: {fileID: 0}
     - target: {fileID: 1008820298187534462, guid: 1d24e29a6d53945169e0e5f2247020e1,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -3064,21 +3059,3 @@ MeshFilter:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1987553143}
   m_Mesh: {fileID: 632633705}
---- !u!1 &2123648232 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 1008820298187534459, guid: 1d24e29a6d53945169e0e5f2247020e1,
-    type: 3}
-  m_PrefabInstance: {fileID: 983832}
-  m_PrefabAsset: {fileID: 0}
---- !u!114 &2123648237
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2123648232}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: e423a5a71276f4c5984423150f03107e, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: