Chargement + Photo Pause + Son GameOver

EPSIProjetWatchIT · Jan 19, 2014 · b6ae58e · b6ae58e
1 parent fdd5105
commit b6ae58e
Show file tree

Hide file tree

Showing 36 changed files with 514 additions and 365 deletions.
diff --git a/Assets/Elements/Grotte/MinionQuitter.jpg.meta b/Assets/Elements/Grotte/MinionQuitter.jpg.meta
diff --git a/Assets/Elements/Grotte/Minion_Indy_Menu_pause.jpg.meta b/Assets/Elements/Grotte/Minion_Indy_Menu_pause.jpg.meta
diff --git a/Assets/Scenes/GameOver.unity b/Assets/Scenes/GameOver.unity
@@ -279,7 +279,7 @@ GameObject:
   - 132: {fileID: 123554714}
   m_Layer: 0
   m_Name: GUI Text GameOver
-  m_TagString: Untagged
+  m_TagString: GuiMenu
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -435,7 +435,7 @@ GameObject:
   - 132: {fileID: 179084983}
   m_Layer: 0
   m_Name: GUI Text DernierScore
-  m_TagString: Untagged
+  m_TagString: GuiMenu
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -485,7 +485,7 @@ GameObject:
   - 132: {fileID: 229748230}
   m_Layer: 0
   m_Name: GUI Text S5
-  m_TagString: Untagged
+  m_TagString: GuiMenu
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -666,7 +666,7 @@ GameObject:
   - 132: {fileID: 629672273}
   m_Layer: 0
   m_Name: GUI Text Score
-  m_TagString: Untagged
+  m_TagString: GuiMenu
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -743,7 +743,7 @@ GameObject:
   - 132: {fileID: 668555647}
   m_Layer: 0
   m_Name: GUI Text S2
-  m_TagString: Untagged
+  m_TagString: GuiMenu
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -926,7 +926,7 @@ GameObject:
   - 132: {fileID: 824630553}
   m_Layer: 0
   m_Name: GUI Text S3
-  m_TagString: Untagged
+  m_TagString: GuiMenu
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -1248,7 +1248,7 @@ GameObject:
   - 132: {fileID: 1124000286}
   m_Layer: 0
   m_Name: GUI Text S4
-  m_TagString: Untagged
+  m_TagString: GuiMenu
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -1519,7 +1519,7 @@ GameObject:
   - 114: {fileID: 1697288071}
   m_Layer: 0
   m_Name: GUI Text Quitter
-  m_TagString: Untagged
+  m_TagString: GuiMenu
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -1850,7 +1850,7 @@ GameObject:
   - 132: {fileID: 1976070344}
   m_Layer: 0
   m_Name: GUI Text S1
-  m_TagString: Untagged
+  m_TagString: GuiMenu
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -2110,7 +2110,6 @@ GameObject:
   - 82: {fileID: 2055215209}
   - 114: {fileID: 2055215211}
   - 82: {fileID: 2055215212}
-  - 114: {fileID: 2055215213}
   m_Layer: 0
   m_Name: Main Camera
   m_TagString: MainCamera
@@ -2329,7 +2328,7 @@ AudioSource:
   m_GameObject: {fileID: 2055215202}
   m_Enabled: 1
   serializedVersion: 3
-  m_audioClip: {fileID: 8300000, guid: c28dde3149f105842a035c5240fd1441, type: 3}
+  m_audioClip: {fileID: 8300000, guid: 00bb6778f7f23cb4682c5283cd3a76da, type: 3}
   m_PlayOnAwake: 1
   m_Volume: 1
   m_Pitch: 1
@@ -2379,17 +2378,6 @@ AudioSource:
       tangentMode: 0
     m_PreInfinity: 2
     m_PostInfinity: 2
---- !u!114 &2055215213
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 2055215202}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 35c7f0c32549807499e96bf8137f19d9, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1 &2109452843
 GameObject:
   m_ObjectHideFlags: 0
@@ -2404,7 +2392,7 @@ GameObject:
   - 114: {fileID: 2109452844}
   m_Layer: 0
   m_Name: GUI Text Recommencer
-  m_TagString: Untagged
+  m_TagString: GuiMenu
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0

diff --git a/Assets/Scenes/GameOverChateau.unity b/Assets/Scenes/GameOverChateau.unity
@@ -121,7 +121,7 @@ GameObject:
   - 132: {fileID: 62735793}
   m_Layer: 0
   m_Name: GUI Text S2
-  m_TagString: Untagged
+  m_TagString: GuiMenu
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -746,7 +746,7 @@ GameObject:
   - 114: {fileID: 582734134}
   m_Layer: 0
   m_Name: GUI Text Recommencer
-  m_TagString: Untagged
+  m_TagString: GuiMenu
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -1343,7 +1343,7 @@ GameObject:
   - 132: {fileID: 1102064774}
   m_Layer: 0
   m_Name: GUI Text S5
-  m_TagString: Untagged
+  m_TagString: GuiMenu
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -1553,7 +1553,7 @@ GameObject:
   - 132: {fileID: 1352290193}
   m_Layer: 0
   m_Name: GUI Text S3
-  m_TagString: Untagged
+  m_TagString: GuiMenu
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -1603,7 +1603,7 @@ GameObject:
   - 132: {fileID: 1360813988}
   m_Layer: 0
   m_Name: GUI Text Score
-  m_TagString: Untagged
+  m_TagString: GuiMenu
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -1737,7 +1737,7 @@ GameObject:
   - 132: {fileID: 1662047606}
   m_Layer: 0
   m_Name: GUI Text DernierScore
-  m_TagString: Untagged
+  m_TagString: GuiMenu
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -1787,7 +1787,7 @@ GameObject:
   - 132: {fileID: 1740888933}
   m_Layer: 0
   m_Name: GUI Text S1
-  m_TagString: Untagged
+  m_TagString: GuiMenu
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -1837,7 +1837,7 @@ GameObject:
   - 132: {fileID: 1895573759}
   m_Layer: 0
   m_Name: GUI Text S4
-  m_TagString: Untagged
+  m_TagString: GuiMenu
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -1890,7 +1890,7 @@ GameObject:
   - 114: {fileID: 1961676355}
   m_Layer: 0
   m_Name: GUI Text Quitter
-  m_TagString: Untagged
+  m_TagString: GuiMenu
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -2100,6 +2100,7 @@ GameObject:
   - 82: {fileID: 2055215210}
   - 82: {fileID: 2055215209}
   - 114: {fileID: 2055215211}
+  - 82: {fileID: 2055215212}
   m_Layer: 0
   m_Name: Main Camera
   m_TagString: MainCamera
@@ -2310,6 +2311,64 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   niveau: 2
+--- !u!82 &2055215212
+AudioSource:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 2055215202}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_audioClip: {fileID: 8300000, guid: 00bb6778f7f23cb4682c5283cd3a76da, type: 3}
+  m_PlayOnAwake: 1
+  m_Volume: 1
+  m_Pitch: 1
+  Loop: 0
+  Mute: 0
+  Priority: 128
+  DopplerLevel: 1
+  MinDistance: 1
+  MaxDistance: 500
+  Pan2D: 0
+  rolloffMode: 0
+  BypassEffects: 0
+  BypassListenerEffects: 0
+  BypassReverbZones: 0
+  rolloffCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - time: 0
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+    - time: 1
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+  panLevelCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - time: 0
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+  spreadCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - time: 0
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+    m_PreInfinity: 2
+    m_PostInfinity: 2
 --- !u!1 &2056326810
 GameObject:
   m_ObjectHideFlags: 0
@@ -2419,7 +2478,7 @@ GameObject:
   - 132: {fileID: 2131155208}
   m_Layer: 0
   m_Name: GUI Text GameOver
-  m_TagString: Untagged
+  m_TagString: GuiMenu
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0