Merge de la branche 'Elouan/master' dans 'Robert/developement'

Version finale, ajout d'un build See merge request !83

Merge de la branche 'Elouan/master' dans 'Robert/developement'
Version finale, ajout d'un build See merge request !83
1df391a8 · HAQUIN ELOUAN · 7db2e183 · 604271b3 · 1df391a8 · 1df391a8
Commit 1df391a8 authored Dec 11, 2020 by HAQUIN ELOUAN 🏄
--- a/Assets/Materials/Rope.mat
+++ b/Assets/Materials/Rope.mat
@@ -84,26 +84,9 @@ Material:
    - _WorkflowMode: 0
    - _ZWrite: 1
    m_Colors:
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-    - _BaseColor: {r: 0.66147363, g: 0.6502565, b: 0.7982968, a: 1}
+    - <noninit>: {r: 0.8395407, g: 0.27497536, b: 0.50082856, a: 1}
+    - _BaseColor: {r: 0.22546327, g: 0.77343595, b: 0.7835753, a: 1}
    - _Color: {r: 1, g: 1, b: 1, a: 1}
-    - _EmissionColor: {r: 0.66147363, g: 0.6502565, b: 0.7982968, a: 1}
-=======
-    - _BaseColor: {r: 0.9132087, g: 0.63143337, b: 0.85007703, a: 1}
-    - _Color: {r: 1, g: 1, b: 1, a: 1}
-    - _EmissionColor: {r: 0.9132087, g: 0.63143337, b: 0.85007703, a: 1}
->>>>>>> 55c8e2c855763198b3457cc14b178706ef6844ae
-=======
-    - _BaseColor: {r: 0.49016207, g: 0.9164957, b: 0.28556198, a: 1}
-    - _Color: {r: 1, g: 1, b: 1, a: 1}
-    - _EmissionColor: {r: 0.49016207, g: 0.9164957, b: 0.28556198, a: 1}
->>>>>>> 8aa38b76150acdcb55d1b21969ab0070719d69d7
-=======
-    - _BaseColor: {r: 0.8395407, g: 0.27497536, b: 0.50082856, a: 1}
-    - _Color: {r: 1, g: 1, b: 1, a: 1}
-    - _EmissionColor: {r: 0.8395407, g: 0.27497536, b: 0.50082856, a: 1}
->>>>>>> 8ed36f1da1fdee76aa560912bd8f51c4241df1ec
+    - _EmissionColor: {r: 0.22546327, g: 0.77343595, b: 0.7835753, a: 1}
    - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
  m_BuildTextureStacks: []
--- a/Assets/Scenes/Endless Level.unity
+++ b/Assets/Scenes/Endless Level.unity
@@ -919,6 +919,7 @@ GameObject:
  - component: {fileID: 816023344}
  - component: {fileID: 816023343}
  - component: {fileID: 816023347}
+  - component: {fileID: 816023348}
  m_Layer: 0
  m_Name: Main Camera
  m_TagString: MainCamera
@@ -1062,6 +1063,102 @@ MonoBehaviour:
  m_RequiresDepthTexture: 0
  m_RequiresColorTexture: 0
  m_Version: 2
+--- !u!82 &816023348
+AudioSource:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 816023341}
+  m_Enabled: 1
+  serializedVersion: 4
+  OutputAudioMixerGroup: {fileID: 24300002, guid: aa2e3317a9a59df48b23539567c564fc, type: 2}
+  m_audioClip: {fileID: 8300000, guid: b017409051ee4414b90c9d82f32151f2, type: 3}
+  m_PlayOnAwake: 1
+  m_Volume: 0.366
+  m_Pitch: 1
+  Loop: 1
+  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 &830565612
 GameObject:
  m_ObjectHideFlags: 0
@@ -1246,6 +1343,11 @@ Transform:
  m_CorrespondingSourceObject: {fileID: 1681481335464841279, guid: 295e06513a3daa449860a89a4ab03676, type: 3}
  m_PrefabInstance: {fileID: 1353875272}
  m_PrefabAsset: {fileID: 0}
+--- !u!1 &968815690 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 8578162909293259192, guid: b05995f6523ef154a9635fad95bb12ba, type: 3}
+  m_PrefabInstance: {fileID: 319958096}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1127390998
 GameObject:
  m_ObjectHideFlags: 0
@@ -1953,6 +2055,17 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: e6914f9abde82d94fbf3379f70fff7e6, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
+  greetingsText: {fileID: 968815690}
+  greetingsList:
+  - Wouuah
+  - Incredible !
+  - OMG !
+  - Do it again !
+  - HOW ?!
+  - 360 Master !
+  - You're the best !
+  timeToPrint: 1
+  sf_Score: {fileID: 1811787165}
 --- !u!114 &1387274000 stripped
 MonoBehaviour:
  m_CorrespondingSourceObject: {fileID: 803512620871034730, guid: 5d0308dd195497c46904b47da7927c60, type: 3}
@@ -2694,6 +2807,17 @@ Transform:
  m_Father: {fileID: 0}
  m_RootOrder: 10
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1811787165 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 803512621702207189, guid: 5d0308dd195497c46904b47da7927c60, type: 3}
+  m_PrefabInstance: {fileID: 1445090423}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: de03b8e75dcb46c185f7d73107d95e3a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &1860402592
 GameObject:
  m_ObjectHideFlags: 0

--- a/Assets/Scenes/Level01.unity
+++ b/Assets/Scenes/Level01.unity
@@ -3505,7 +3505,7 @@ MonoBehaviour:
  m_CorrespondingSourceObject: {fileID: 2294150653364689437, guid: b9dc1e57871a72841b386b4ca1670185, type: 3}
  m_PrefabInstance: {fileID: 2294150654180711725}
  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
+  m_GameObject: {fileID: 2294150654180711726}
  m_Enabled: 1
  m_EditorHideFlags: 0
  m_Script: {fileID: 11500000, guid: 317dbebe378d01441af0fb399fb458df, type: 3}
@@ -7458,6 +7458,10 @@ PrefabInstance:
      propertyPath: m_Camera
      value: 
      objectReference: {fileID: 816023342}
+    - target: {fileID: 6998254347188141164, guid: 4342135b740666a4b9f80c5821561cbe, type: 3}
+      propertyPath: m_SortingOrder
+      value: 50
+      objectReference: {fileID: 0}
    - target: {fileID: 6998254347188141165, guid: 4342135b740666a4b9f80c5821561cbe, type: 3}
      propertyPath: m_LocalPosition.x
      value: 0
@@ -9342,6 +9346,107 @@ PrefabInstance:
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: b9dc1e57871a72841b386b4ca1670185, type: 3}
+--- !u!1 &2294150654180711726 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 2294150653364689408, guid: b9dc1e57871a72841b386b4ca1670185, type: 3}
+  m_PrefabInstance: {fileID: 2294150654180711725}
+  m_PrefabAsset: {fileID: 0}
+--- !u!82 &2294150654180711727
+AudioSource:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2294150654180711726}
+  m_Enabled: 1
+  serializedVersion: 4
+  OutputAudioMixerGroup: {fileID: 24300002, guid: aa2e3317a9a59df48b23539567c564fc, type: 2}
+  m_audioClip: {fileID: 8300000, guid: b017409051ee4414b90c9d82f32151f2, type: 3}
+  m_PlayOnAwake: 1
+  m_Volume: 0.36
+  m_Pitch: 1
+  Loop: 1
+  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!1001 &2367496590578713118
 PrefabInstance:
  m_ObjectHideFlags: 0

--- a/Assets/Scenes/Level02.unity
+++ b/Assets/Scenes/Level02.unity
@@ -1647,6 +1647,10 @@ PrefabInstance:
      propertyPath: m_Camera
      value: 
      objectReference: {fileID: 466091411}
+    - target: {fileID: 6998254347188141164, guid: 4342135b740666a4b9f80c5821561cbe, type: 3}
+      propertyPath: m_SortingOrder
+      value: 50
+      objectReference: {fileID: 0}
    - target: {fileID: 6998254347188141165, guid: 4342135b740666a4b9f80c5821561cbe, type: 3}
      propertyPath: m_LocalPosition.x
      value: 0

--- a/Assets/Scenes/LevelSelection.unity
+++ b/Assets/Scenes/LevelSelection.unity
@@ -2239,6 +2239,10 @@ PrefabInstance:
  m_Modification:
    m_TransformParent: {fileID: 999021562}
    m_Modifications:
+    - target: {fileID: 2143400273892736840, guid: 1f7f3fc01daf51e47b6ba01c4846ae40, type: 3}
+      propertyPath: m_Enabled
+      value: 1
+      objectReference: {fileID: 0}
    - target: {fileID: 2143400273892736841, guid: 1f7f3fc01daf51e47b6ba01c4846ae40, type: 3}
      propertyPath: m_Name
      value: SeriousGameManager
@@ -3405,6 +3409,7 @@ GameObject:
  - component: {fileID: 999021561}
  - component: {fileID: 999021560}
  - component: {fileID: 999021559}
+  - component: {fileID: 999021563}
  m_Layer: 0
  m_Name: Canvas
  m_TagString: Untagged
@@ -3495,6 +3500,102 @@ RectTransform:
  m_AnchoredPosition: {x: 0, y: 0}
  m_SizeDelta: {x: 0, y: 0}
  m_Pivot: {x: 0, y: 0}
+--- !u!82 &999021563
+AudioSource:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 999021558}
+  m_Enabled: 1
+  serializedVersion: 4
+  OutputAudioMixerGroup: {fileID: 24300002, guid: aa2e3317a9a59df48b23539567c564fc, type: 2}
+  m_audioClip: {fileID: 8300000, guid: b017409051ee4414b90c9d82f32151f2, type: 3}
+  m_PlayOnAwake: 1
+  m_Volume: 0.363
+  m_Pitch: 1
+  Loop: 1
+  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 &1031082920
 GameObject:
  m_ObjectHideFlags: 0
@@ -5899,6 +6000,7 @@ GameObject:
  - component: {fileID: 1836480742}
  - component: {fileID: 1836480741}
  - component: {fileID: 1836480744}
+  - component: {fileID: 1836480745}
  m_Layer: 0
  m_Name: Main Camera
  m_TagString: MainCamera
@@ -6002,6 +6104,24 @@ MonoBehaviour:
  m_RequiresDepthTexture: 0
  m_RequiresColorTexture: 0
  m_Version: 2
+--- !u!114 &1836480745
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1836480740}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 317dbebe378d01441af0fb399fb458df, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  speedCamera: 0
+  increaseSpeedCamera: 0
+  shouldMove: 0
+  SpeedCameraBuff: 0
+  maxspeed: 0
+  hero: {fileID: 0}
 --- !u!1 &1847234116
 GameObject:
  m_ObjectHideFlags: 0

--- a/Assets/Scenes/MainMenu.unity
+++ b/Assets/Scenes/MainMenu.unity
@@ -865,6 +865,7 @@ GameObject:
  - component: {fileID: 792754726}
  - component: {fileID: 792754725}
  - component: {fileID: 792754724}
+  - component: {fileID: 792754728}
  m_Layer: 5
  m_Name: Canvas
  m_TagString: Untagged
@@ -954,6 +955,102 @@ RectTransform:
  m_AnchoredPosition: {x: 0, y: 0}
  m_SizeDelta: {x: 0, y: 0}
  m_Pivot: {x: 0, y: 0}
+--- !u!82 &792754728
+AudioSource:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 792754723}
+  m_Enabled: 1
+  serializedVersion: 4
+  OutputAudioMixerGroup: {fileID: 24300002, guid: aa2e3317a9a59df48b23539567c564fc, type: 2}
+  m_audioClip: {fileID: 8300000, guid: b017409051ee4414b90c9d82f32151f2, type: 3}
+  m_PlayOnAwake: 1
+  m_Volume: 0.343
+  m_Pitch: 1
+  Loop: 1
+  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 &822418694
 GameObject:
  m_ObjectHideFlags: 0
@@ -1874,7 +1971,7 @@ MonoBehaviour:
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
-  m_text: CLIQUEZ POUR COMMENCER
+  m_text: MODE INFINI
  m_isRightToLeft: 0
  m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
  m_sharedMaterial: {fileID: 2100000, guid: e73a58f6e2794ae7b1b7e50b7fb811b0, type: 2}

--- a/Assets/Scenes/Tutorial.unity
+++ b/Assets/Scenes/Tutorial.unity
@@ -2141,6 +2141,7 @@ GameObject: