Sounds Fixed

LastCoffeeStudio · Sep 4, 2018 · ef8a82c · ef8a82c
1 parent 2749a33
commit ef8a82c
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 47 deletions.
diff --git a/ShowPT/Assets/Scenes/Game.unity b/ShowPT/Assets/Scenes/Game.unity
@@ -3951,7 +3951,7 @@ Prefab:
     - target: {fileID: 224518933033658160, guid: 13999a6b2bbed614eb7eed987d5f40ef,
         type: 2}
       propertyPath: m_RootOrder
-      value: 20
+      value: 19
       objectReference: {fileID: 0}
     - target: {fileID: 224518933033658160, guid: 13999a6b2bbed614eb7eed987d5f40ef,
         type: 2}
@@ -5382,7 +5382,7 @@ Transform:
   - {fileID: 1656855913}
   - {fileID: 89874970}
   m_Father: {fileID: 0}
-  m_RootOrder: 19
+  m_RootOrder: 18
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &106158044
 GameObject:
@@ -10755,7 +10755,7 @@ Transform:
   - {fileID: 1718375450}
   - {fileID: 1265515622}
   m_Father: {fileID: 0}
-  m_RootOrder: 18
+  m_RootOrder: 17
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &168314838
 Prefab:
@@ -19879,48 +19879,6 @@ MeshRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
---- !u!1001 &284719806
-Prefab:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 4689495464855942, guid: 1fd85f70a87b0df4cb92cba6e98e0dc0, type: 2}
-      propertyPath: m_LocalPosition.x
-      value: -11.034362
-      objectReference: {fileID: 0}
-    - target: {fileID: 4689495464855942, guid: 1fd85f70a87b0df4cb92cba6e98e0dc0, type: 2}
-      propertyPath: m_LocalPosition.y
-      value: 3.3548477
-      objectReference: {fileID: 0}
-    - target: {fileID: 4689495464855942, guid: 1fd85f70a87b0df4cb92cba6e98e0dc0, type: 2}
-      propertyPath: m_LocalPosition.z
-      value: -12.43
-      objectReference: {fileID: 0}
-    - target: {fileID: 4689495464855942, guid: 1fd85f70a87b0df4cb92cba6e98e0dc0, type: 2}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4689495464855942, guid: 1fd85f70a87b0df4cb92cba6e98e0dc0, type: 2}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4689495464855942, guid: 1fd85f70a87b0df4cb92cba6e98e0dc0, type: 2}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4689495464855942, guid: 1fd85f70a87b0df4cb92cba6e98e0dc0, type: 2}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4689495464855942, guid: 1fd85f70a87b0df4cb92cba6e98e0dc0, type: 2}
-      propertyPath: m_RootOrder
-      value: 17
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_ParentPrefab: {fileID: 100100000, guid: 1fd85f70a87b0df4cb92cba6e98e0dc0, type: 2}
-  m_IsPrefabParent: 0
 --- !u!1 &287066000
 GameObject:
   m_ObjectHideFlags: 0
@@ -87523,7 +87481,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 21
+  m_RootOrder: 20
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &1167477688
 Prefab:
@@ -140740,6 +140698,48 @@ Prefab:
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: cb76ff9d7d32a4c4ca04a1187306b0a0, type: 3}
   m_IsPrefabParent: 0
+--- !u!1001 &1958630822
+Prefab:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 4689495464855942, guid: 1fd85f70a87b0df4cb92cba6e98e0dc0, type: 2}
+      propertyPath: m_LocalPosition.x
+      value: -11.034362
+      objectReference: {fileID: 0}
+    - target: {fileID: 4689495464855942, guid: 1fd85f70a87b0df4cb92cba6e98e0dc0, type: 2}
+      propertyPath: m_LocalPosition.y
+      value: 3.3548477
+      objectReference: {fileID: 0}
+    - target: {fileID: 4689495464855942, guid: 1fd85f70a87b0df4cb92cba6e98e0dc0, type: 2}
+      propertyPath: m_LocalPosition.z
+      value: -12.43
+      objectReference: {fileID: 0}
+    - target: {fileID: 4689495464855942, guid: 1fd85f70a87b0df4cb92cba6e98e0dc0, type: 2}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4689495464855942, guid: 1fd85f70a87b0df4cb92cba6e98e0dc0, type: 2}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4689495464855942, guid: 1fd85f70a87b0df4cb92cba6e98e0dc0, type: 2}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4689495464855942, guid: 1fd85f70a87b0df4cb92cba6e98e0dc0, type: 2}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4689495464855942, guid: 1fd85f70a87b0df4cb92cba6e98e0dc0, type: 2}
+      propertyPath: m_RootOrder
+      value: 21
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 100100000, guid: 1fd85f70a87b0df4cb92cba6e98e0dc0, type: 2}
+  m_IsPrefabParent: 0
 --- !u!1 &1960071867
 GameObject:
   m_ObjectHideFlags: 0

diff --git a/ShowPT/Assets/Scripts/BGM.cs b/ShowPT/Assets/Scripts/BGM.cs
@@ -44,7 +44,7 @@ public void playMeSomething(int musicId)
 	{
 		stopTheMusic ();
 		ctrlAudio.setTrackVolume ("Music", trackVolume);
-		ctrlAudio.playOneSound("Music", musicList[musicId], Vector3.zero, 0.6f, 0f, 1, true);
+	    idbackgroundMusic = ctrlAudio.playOneSound("Music", musicList[musicId], Vector3.zero, 0.6f, 0f, 1, true);
     }
 
 	public void stopTheMusic()

diff --git a/ShowPT/Assets/Scripts/IntroCinematicController.cs b/ShowPT/Assets/Scripts/IntroCinematicController.cs
@@ -17,6 +17,7 @@ private void Start()
 
     private void playGame(VideoPlayer vp)
     {
+        GameObject.FindGameObjectWithTag("CtrlAudio").GetComponent<BGM>().stopTheMusic();
         ctrlMain.activateSceneGame();
     }
 }