diff --git a/Assets/Prefabs/Decor/CaillouAlreadyOnGround.prefab b/Assets/Prefabs/Decor/CaillouAlreadyOnGround.prefab index d96b41e9c658d9218a063a511360b39d75a99883..43e29ce0634240717ee070cd1268b72956f02962 100644 --- a/Assets/Prefabs/Decor/CaillouAlreadyOnGround.prefab +++ b/Assets/Prefabs/Decor/CaillouAlreadyOnGround.prefab @@ -11,9 +11,8 @@ GameObject: - component: {fileID: 8274103944527042891} - component: {fileID: 8274103944527042890} - component: {fileID: 8274103944527042889} - - component: {fileID: 8274103944527042888} m_Layer: 0 - m_Name: Caillou + m_Name: CaillouAlreadyOnGround m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -28,7 +27,7 @@ Transform: m_GameObject: {fileID: 8274103944527042887} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -3.814, y: 0.25, z: -0.5032613} - m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} + m_LocalScale: {x: 2, y: 2, z: 2} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -79,16 +78,3 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 ---- !u!65 &8274103944527042888 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8274103944527042887} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/Prefabs/Decor/VeryTree.prefab b/Assets/Prefabs/Decor/VeryTree.prefab index 0fa03bfb16b27b39256d56b7a04bb85421724bc9..fd7691a3dc4a2c5b16459745c38894cd2e485723 100644 --- a/Assets/Prefabs/Decor/VeryTree.prefab +++ b/Assets/Prefabs/Decor/VeryTree.prefab @@ -212,6 +212,7 @@ GameObject: - component: {fileID: 1289101489244486471} - component: {fileID: 3110289229246008363} - component: {fileID: 3459414719236446010} + - component: {fileID: 8056782429888335884} m_Layer: 0 m_Name: VeryTree m_TagString: Tree @@ -249,6 +250,10 @@ MonoBehaviour: m_EditorClassIdentifier: maxLife: 10 currentLife: 10 + m_deathTime: 3 + dead: 0 + deathAudioSource: {fileID: 0} + deathAudioClip: {fileID: 8300000, guid: 8d51766e0569e864096cfd6c290ef013, type: 3} --- !u!65 &3459414719236446010 BoxCollider: m_ObjectHideFlags: 0 @@ -262,3 +267,99 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 0.3, y: 0.6, z: 0.3} m_Center: {x: 0, y: 0.1, z: 0} +--- !u!82 &8056782429888335884 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1289101489244486468} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 8d51766e0569e864096cfd6c290ef013, type: 3} + 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 diff --git a/Assets/Prefabs/SpawnersAndUnits/AnimalSpawnerAPoserLeVrai.prefab b/Assets/Prefabs/SpawnersAndUnits/AnimalSpawnerAPoserLeVrai.prefab index 8cca66578fd4dcbf8765fe4c65d6b44726368043..6420cd99f64fe58f0f03d4448abc04e3bd22bb45 100644 --- a/Assets/Prefabs/SpawnersAndUnits/AnimalSpawnerAPoserLeVrai.prefab +++ b/Assets/Prefabs/SpawnersAndUnits/AnimalSpawnerAPoserLeVrai.prefab @@ -164,6 +164,102 @@ LineRenderer: generateLightingData: 0 m_UseWorldSpace: 1 m_Loop: 0 +--- !u!82 &4398298486304343163 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3485586581573099226} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 62363ee5f65882b4987d1ea464570e60, type: 3} + m_PlayOnAwake: 1 + 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!208 &8237954710174201318 NavMeshObstacle: m_ObjectHideFlags: 0 @@ -210,6 +306,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: locked: 0 + clipFail: {fileID: 8300000, guid: d041115870f45b94fbe082a394febe96, type: 3} --- !u!1001 &4863508889398085587 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/SpawnersAndUnits/Bucheron Variant.prefab b/Assets/Prefabs/SpawnersAndUnits/Bucheron Variant.prefab index d36f253716908039da736d422967a97d3041cf23..16d89877b90a28888835e07fd58ddfb141b2b899 100644 --- a/Assets/Prefabs/SpawnersAndUnits/Bucheron Variant.prefab +++ b/Assets/Prefabs/SpawnersAndUnits/Bucheron Variant.prefab @@ -13,6 +13,102 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 0.1, y: 0.22, z: 0.1} m_Center: {x: 0, y: 0.105, z: 0} +--- !u!82 &-8320437862591054288 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4943139629279601724} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 5daa6c3424c02344b99081d63fb53ab5, type: 3} + m_PlayOnAwake: 1 + 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!114 &74858927 MonoBehaviour: m_ObjectHideFlags: 0 @@ -29,6 +125,8 @@ MonoBehaviour: currentLife: 5 m_deathTime: 3 dead: 0 + deathAudioSource: {fileID: 0} + deathAudioClip: {fileID: 8300000, guid: 5daa6c3424c02344b99081d63fb53ab5, type: 3} --- !u!114 &74858928 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/SpawnersAndUnits/CaillouAPoser.prefab b/Assets/Prefabs/SpawnersAndUnits/CaillouAPoser.prefab index de703346f6fdc821863c0da0385e7209badec582..aa3f5c966ec628d58f4568531cc5bea51a3d6b72 100644 --- a/Assets/Prefabs/SpawnersAndUnits/CaillouAPoser.prefab +++ b/Assets/Prefabs/SpawnersAndUnits/CaillouAPoser.prefab @@ -18,6 +18,7 @@ GameObject: - component: {fileID: 7669314594426070750} - component: {fileID: 2881216723765597162} - component: {fileID: 3690788147172303302} + - component: {fileID: 7478857694811958498} m_Layer: 0 m_Name: CaillouAPoser m_TagString: Placeable @@ -233,6 +234,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: locked: 0 + clipFail: {fileID: 8300000, guid: d041115870f45b94fbe082a394febe96, type: 3} --- !u!54 &7669314594426070750 Rigidbody: m_ObjectHideFlags: 0 @@ -282,6 +284,102 @@ NavMeshObstacle: m_CarveOnlyStationary: 1 m_Center: {x: 0, y: 0, z: 0} m_TimeToStationary: 0.5 +--- !u!82 &7478857694811958498 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1635955774121567605} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 5e4c9eedfa7b3b64fac601d4cea738e3, type: 3} + m_PlayOnAwake: 1 + 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!1001 &2681253051267372950 PrefabInstance: m_ObjectHideFlags: 0 @@ -349,26 +447,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 8274103944527042891, guid: ebc6115e30f2c4d41a992a5ea5a07a9b, - type: 3} - propertyPath: m_LocalScale.x - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8274103944527042891, guid: ebc6115e30f2c4d41a992a5ea5a07a9b, - type: 3} - propertyPath: m_LocalScale.y - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8274103944527042891, guid: ebc6115e30f2c4d41a992a5ea5a07a9b, - type: 3} - propertyPath: m_LocalScale.z - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8274103944527042888, guid: ebc6115e30f2c4d41a992a5ea5a07a9b, - type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ebc6115e30f2c4d41a992a5ea5a07a9b, type: 3} --- !u!4 &6333816732708769501 stripped diff --git a/Assets/Prefabs/SpawnersAndUnits/CaillouAPoser_1.prefab b/Assets/Prefabs/SpawnersAndUnits/CaillouAPoser_1.prefab new file mode 100644 index 0000000000000000000000000000000000000000..13c95c84eb88212fc23f01dfc26655483d834479 --- /dev/null +++ b/Assets/Prefabs/SpawnersAndUnits/CaillouAPoser_1.prefab @@ -0,0 +1,374 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!54 &1253616072022139223 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9170637679517578948} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 80 + m_CollisionDetection: 1 +--- !u!65 &1848305054101969368 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9170637679517578948} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 0.03, y: 0.018, z: 0.035} + m_Center: {x: 0, y: -0.002, z: 0.0065} +--- !u!208 &-882906569053286648 +NavMeshObstacle: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9170637679517578948} + m_Enabled: 1 + serializedVersion: 3 + m_Shape: 1 + m_Extents: {x: 0.015, y: 0.015, z: 0.015} + m_MoveThreshold: 0.1 + m_Carve: 1 + m_CarveOnlyStationary: 1 + m_Center: {x: -0.002, y: 0, z: 0.005} + m_TimeToStationary: 0.5 +--- !u!82 &-464146812225337924 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9170637679517578948} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 5e4c9eedfa7b3b64fac601d4cea738e3, type: 3} + m_PlayOnAwake: 1 + 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!120 &997167293630739930 +LineRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9170637679517578948} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 0 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 2b785ac165d9520498ece667e6502a27, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Positions: + - {x: 0, y: 0, z: 0} + - {x: 0, y: -50, z: 0} + m_Parameters: + serializedVersion: 3 + widthMultiplier: 0.1 + widthCurve: + 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.5 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + colorGradient: + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 1} + key1: {r: 1, g: 1, b: 1, a: 0} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + numCornerVertices: 0 + numCapVertices: 6 + alignment: 0 + textureMode: 0 + shadowBias: 0.5 + generateLightingData: 0 + m_UseWorldSpace: 1 + m_Loop: 0 +--- !u!114 &-1524627606650707076 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9170637679517578948} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 44b96efd0d0d4cb47ab243cd752cefac, type: 3} + m_Name: + m_EditorClassIdentifier: + m_allowOffhandGrab: 1 + m_snapPosition: 0 + m_snapOrientation: 0 + m_snapOffset: {fileID: 0} + m_grabPoints: [] +--- !u!114 &7782552374194691103 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9170637679517578948} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 33e8c297b5a9ad8458d3470d25b5c749, type: 3} + m_Name: + m_EditorClassIdentifier: + locked: 0 + clipFail: {fileID: 8300000, guid: d041115870f45b94fbe082a394febe96, type: 3} +--- !u!1001 &893203079023456205 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: -927199367670048503, guid: 467583d4ee8d9564bacf5bde7844a76d, + type: 3} + propertyPath: m_Name + value: CaillouAPoser_1 + objectReference: {fileID: 0} + - target: {fileID: -927199367670048503, guid: 467583d4ee8d9564bacf5bde7844a76d, + type: 3} + propertyPath: m_TagString + value: Placeable + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 467583d4ee8d9564bacf5bde7844a76d, + type: 3} + propertyPath: m_LocalPosition.x + value: 3.7387242 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 467583d4ee8d9564bacf5bde7844a76d, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.25630152 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 467583d4ee8d9564bacf5bde7844a76d, + type: 3} + propertyPath: m_LocalPosition.z + value: 0.27650845 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 467583d4ee8d9564bacf5bde7844a76d, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 467583d4ee8d9564bacf5bde7844a76d, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 467583d4ee8d9564bacf5bde7844a76d, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 467583d4ee8d9564bacf5bde7844a76d, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 467583d4ee8d9564bacf5bde7844a76d, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 467583d4ee8d9564bacf5bde7844a76d, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 467583d4ee8d9564bacf5bde7844a76d, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 467583d4ee8d9564bacf5bde7844a76d, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 467583d4ee8d9564bacf5bde7844a76d, + type: 3} + propertyPath: m_LocalScale.x + value: 25 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 467583d4ee8d9564bacf5bde7844a76d, + type: 3} + propertyPath: m_LocalScale.y + value: 25 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 467583d4ee8d9564bacf5bde7844a76d, + type: 3} + propertyPath: m_LocalScale.z + value: 25 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 467583d4ee8d9564bacf5bde7844a76d, type: 3} +--- !u!1 &9170637679517578948 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -927199367670048503, guid: 467583d4ee8d9564bacf5bde7844a76d, + type: 3} + m_PrefabInstance: {fileID: 893203079023456205} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/SpawnersAndUnits/CaillouAPoser_1.prefab.meta b/Assets/Prefabs/SpawnersAndUnits/CaillouAPoser_1.prefab.meta new file mode 100644 index 0000000000000000000000000000000000000000..f4ccfc82327471a6a95982f17baf5406cdb2b9ea --- /dev/null +++ b/Assets/Prefabs/SpawnersAndUnits/CaillouAPoser_1.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: e55a2a935238c364f922d923d3c81938 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/SpawnersAndUnits/CaillouAPoser_2.prefab b/Assets/Prefabs/SpawnersAndUnits/CaillouAPoser_2.prefab new file mode 100644 index 0000000000000000000000000000000000000000..356f1b4350d6b4c90e2d423d89d394271364701c --- /dev/null +++ b/Assets/Prefabs/SpawnersAndUnits/CaillouAPoser_2.prefab @@ -0,0 +1,427 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!54 &1253616072022139223 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9170637679517578948} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 80 + m_CollisionDetection: 1 +--- !u!65 &1848305054101969368 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9170637679517578948} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 0.024778547, y: 0.01543024, z: 0.05251655} + m_Center: {x: -0.0011807715, y: -0.00071512815, z: 0.008656227} +--- !u!208 &-882906569053286648 +NavMeshObstacle: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9170637679517578948} + m_Enabled: 1 + serializedVersion: 3 + m_Shape: 1 + m_Extents: {x: 0.0115, y: 0.015, z: 0.025} + m_MoveThreshold: 0.1 + m_Carve: 1 + m_CarveOnlyStationary: 1 + m_Center: {x: -0.002, y: 0.005, z: 0.009} + m_TimeToStationary: 0.5 +--- !u!82 &-464146812225337924 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9170637679517578948} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 5e4c9eedfa7b3b64fac601d4cea738e3, type: 3} + m_PlayOnAwake: 1 + 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!120 &997167293630739930 +LineRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9170637679517578948} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 0 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 2b785ac165d9520498ece667e6502a27, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Positions: + - {x: 0, y: 0, z: 0} + - {x: 0, y: -50, z: 0} + m_Parameters: + serializedVersion: 3 + widthMultiplier: 0.1 + widthCurve: + 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.5 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + colorGradient: + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 1} + key1: {r: 1, g: 1, b: 1, a: 0} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + numCornerVertices: 0 + numCapVertices: 6 + alignment: 0 + textureMode: 0 + shadowBias: 0.5 + generateLightingData: 0 + m_UseWorldSpace: 1 + m_Loop: 0 +--- !u!33 &6436722732649798270 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9170637679517578948} + m_Mesh: {fileID: -448245740997676312, guid: bb2f2814cef1cbb48838b5133254dcda, type: 3} +--- !u!23 &6989432471115044751 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9170637679517578948} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: -876546973899608171, guid: bb2f2814cef1cbb48838b5133254dcda, type: 3} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!114 &-1524627606650707076 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9170637679517578948} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 44b96efd0d0d4cb47ab243cd752cefac, type: 3} + m_Name: + m_EditorClassIdentifier: + m_allowOffhandGrab: 1 + m_snapPosition: 0 + m_snapOrientation: 0 + m_snapOffset: {fileID: 0} + m_grabPoints: [] +--- !u!114 &7782552374194691103 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9170637679517578948} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 33e8c297b5a9ad8458d3470d25b5c749, type: 3} + m_Name: + m_EditorClassIdentifier: + locked: 0 + clipFail: {fileID: 8300000, guid: d041115870f45b94fbe082a394febe96, type: 3} +--- !u!1001 &893203079023456205 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: -927199367670048503, guid: 467583d4ee8d9564bacf5bde7844a76d, + type: 3} + propertyPath: m_Name + value: CaillouAPoser_2 + objectReference: {fileID: 0} + - target: {fileID: -927199367670048503, guid: 467583d4ee8d9564bacf5bde7844a76d, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -927199367670048503, guid: 467583d4ee8d9564bacf5bde7844a76d, + type: 3} + propertyPath: m_TagString + value: Placeable + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 467583d4ee8d9564bacf5bde7844a76d, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 467583d4ee8d9564bacf5bde7844a76d, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 467583d4ee8d9564bacf5bde7844a76d, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 467583d4ee8d9564bacf5bde7844a76d, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 467583d4ee8d9564bacf5bde7844a76d, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 467583d4ee8d9564bacf5bde7844a76d, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 467583d4ee8d9564bacf5bde7844a76d, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 467583d4ee8d9564bacf5bde7844a76d, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 467583d4ee8d9564bacf5bde7844a76d, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 467583d4ee8d9564bacf5bde7844a76d, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 467583d4ee8d9564bacf5bde7844a76d, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 467583d4ee8d9564bacf5bde7844a76d, + type: 3} + propertyPath: m_LocalScale.x + value: 25 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 467583d4ee8d9564bacf5bde7844a76d, + type: 3} + propertyPath: m_LocalScale.y + value: 25 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 467583d4ee8d9564bacf5bde7844a76d, + type: 3} + propertyPath: m_LocalScale.z + value: 25 + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: -1504981713932161579, guid: 467583d4ee8d9564bacf5bde7844a76d, type: 3} + - {fileID: -5178661895559278292, guid: 467583d4ee8d9564bacf5bde7844a76d, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: 467583d4ee8d9564bacf5bde7844a76d, type: 3} +--- !u!1 &9170637679517578948 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -927199367670048503, guid: 467583d4ee8d9564bacf5bde7844a76d, + type: 3} + m_PrefabInstance: {fileID: 893203079023456205} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/SpawnersAndUnits/CaillouAPoser_2.prefab.meta b/Assets/Prefabs/SpawnersAndUnits/CaillouAPoser_2.prefab.meta new file mode 100644 index 0000000000000000000000000000000000000000..b4ee129f288062523b400d1d84027d1f4bc59121 --- /dev/null +++ b/Assets/Prefabs/SpawnersAndUnits/CaillouAPoser_2.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 3f473ecd8e3f30a4c86e4803b5d45c31 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/SpawnersAndUnits/CaillouAPoser_3.prefab b/Assets/Prefabs/SpawnersAndUnits/CaillouAPoser_3.prefab new file mode 100644 index 0000000000000000000000000000000000000000..99b7aecd959e7eefccf65a44845f2a540ac6bbf8 --- /dev/null +++ b/Assets/Prefabs/SpawnersAndUnits/CaillouAPoser_3.prefab @@ -0,0 +1,427 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!54 &1253616072022139223 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9170637679517578948} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 80 + m_CollisionDetection: 1 +--- !u!65 &1848305054101969368 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9170637679517578948} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 0.021231117, y: 0.019215018, z: 0.022313826} + m_Center: {x: 0.0005929434, y: 0.001177267, z: 0.008485501} +--- !u!23 &-8322484944822133029 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9170637679517578948} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: -876546973899608171, guid: 4e407914474352f4891daebe8ee14418, type: 3} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!208 &-882906569053286648 +NavMeshObstacle: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9170637679517578948} + m_Enabled: 1 + serializedVersion: 3 + m_Shape: 1 + m_Extents: {x: 0.0115, y: 0.015, z: 0.011} + m_MoveThreshold: 0.1 + m_Carve: 1 + m_CarveOnlyStationary: 1 + m_Center: {x: 0, y: 0.005, z: 0.009} + m_TimeToStationary: 0.5 +--- !u!82 &-464146812225337924 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9170637679517578948} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 5e4c9eedfa7b3b64fac601d4cea738e3, type: 3} + m_PlayOnAwake: 1 + 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!120 &997167293630739930 +LineRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9170637679517578948} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 0 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 2b785ac165d9520498ece667e6502a27, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Positions: + - {x: 0, y: 0, z: 0} + - {x: 0, y: -50, z: 0} + m_Parameters: + serializedVersion: 3 + widthMultiplier: 0.1 + widthCurve: + 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.5 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + colorGradient: + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 1} + key1: {r: 1, g: 1, b: 1, a: 0} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + numCornerVertices: 0 + numCapVertices: 6 + alignment: 0 + textureMode: 0 + shadowBias: 0.5 + generateLightingData: 0 + m_UseWorldSpace: 1 + m_Loop: 0 +--- !u!33 &2960132866423535662 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9170637679517578948} + m_Mesh: {fileID: 21906025000962182, guid: 4e407914474352f4891daebe8ee14418, type: 3} +--- !u!114 &-1524627606650707076 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9170637679517578948} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 44b96efd0d0d4cb47ab243cd752cefac, type: 3} + m_Name: + m_EditorClassIdentifier: + m_allowOffhandGrab: 1 + m_snapPosition: 0 + m_snapOrientation: 0 + m_snapOffset: {fileID: 0} + m_grabPoints: [] +--- !u!114 &7782552374194691103 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9170637679517578948} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 33e8c297b5a9ad8458d3470d25b5c749, type: 3} + m_Name: + m_EditorClassIdentifier: + locked: 0 + clipFail: {fileID: 8300000, guid: d041115870f45b94fbe082a394febe96, type: 3} +--- !u!1001 &893203079023456205 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: -927199367670048503, guid: 467583d4ee8d9564bacf5bde7844a76d, + type: 3} + propertyPath: m_Name + value: CaillouAPoser_3 + objectReference: {fileID: 0} + - target: {fileID: -927199367670048503, guid: 467583d4ee8d9564bacf5bde7844a76d, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -927199367670048503, guid: 467583d4ee8d9564bacf5bde7844a76d, + type: 3} + propertyPath: m_TagString + value: Placeable + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 467583d4ee8d9564bacf5bde7844a76d, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 467583d4ee8d9564bacf5bde7844a76d, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 467583d4ee8d9564bacf5bde7844a76d, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 467583d4ee8d9564bacf5bde7844a76d, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 467583d4ee8d9564bacf5bde7844a76d, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 467583d4ee8d9564bacf5bde7844a76d, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 467583d4ee8d9564bacf5bde7844a76d, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 467583d4ee8d9564bacf5bde7844a76d, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 467583d4ee8d9564bacf5bde7844a76d, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 467583d4ee8d9564bacf5bde7844a76d, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 467583d4ee8d9564bacf5bde7844a76d, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 467583d4ee8d9564bacf5bde7844a76d, + type: 3} + propertyPath: m_LocalScale.x + value: 25 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 467583d4ee8d9564bacf5bde7844a76d, + type: 3} + propertyPath: m_LocalScale.y + value: 25 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 467583d4ee8d9564bacf5bde7844a76d, + type: 3} + propertyPath: m_LocalScale.z + value: 25 + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: -1504981713932161579, guid: 467583d4ee8d9564bacf5bde7844a76d, type: 3} + - {fileID: -5178661895559278292, guid: 467583d4ee8d9564bacf5bde7844a76d, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: 467583d4ee8d9564bacf5bde7844a76d, type: 3} +--- !u!1 &9170637679517578948 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -927199367670048503, guid: 467583d4ee8d9564bacf5bde7844a76d, + type: 3} + m_PrefabInstance: {fileID: 893203079023456205} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/SpawnersAndUnits/CaillouAPoser_3.prefab.meta b/Assets/Prefabs/SpawnersAndUnits/CaillouAPoser_3.prefab.meta new file mode 100644 index 0000000000000000000000000000000000000000..7108eee13a86fce587a9f5c3b1f57b7a4afd373e --- /dev/null +++ b/Assets/Prefabs/SpawnersAndUnits/CaillouAPoser_3.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 00bb07c734e570b4aa4bb763e3644188 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/SpawnersAndUnits/humanSpawn Variant.prefab b/Assets/Prefabs/SpawnersAndUnits/humanSpawn Variant.prefab index 358adefa72e904a8cd821f17235ca36919d4f79e..7839d0aeeba35db8cbf19e9aabb8ea64c4b45c80 100644 --- a/Assets/Prefabs/SpawnersAndUnits/humanSpawn Variant.prefab +++ b/Assets/Prefabs/SpawnersAndUnits/humanSpawn Variant.prefab @@ -59,8 +59,8 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: 2b5a54c82ee95914f83c12391f812fce, type: 3} - m_PlayOnAwake: 1 - m_Volume: 1 + m_PlayOnAwake: 0 + m_Volume: 0.3 m_Pitch: 1 Loop: 0 Mute: 0 diff --git a/Assets/Prefabs/SpawnersAndUnits/rock1 Variant.prefab b/Assets/Prefabs/SpawnersAndUnits/rock1 Variant.prefab index cedb1d950db23755b8ef0b84da7c22a62405decc..4b32195ac38d2494d37095f223e84efde196580b 100644 --- a/Assets/Prefabs/SpawnersAndUnits/rock1 Variant.prefab +++ b/Assets/Prefabs/SpawnersAndUnits/rock1 Variant.prefab @@ -1,5 +1,282 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!54 &1253616072022139223 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9170637679517578948} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 80 + m_CollisionDetection: 1 +--- !u!65 &1848305054101969368 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9170637679517578948} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 2, y: 2, z: 2} + m_Center: {x: 0, y: 0, z: 0} +--- !u!208 &-882906569053286648 +NavMeshObstacle: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9170637679517578948} + m_Enabled: 1 + serializedVersion: 3 + m_Shape: 1 + m_Extents: {x: 0.5, y: 0.5, z: 0.5} + m_MoveThreshold: 0.1 + m_Carve: 1 + m_CarveOnlyStationary: 1 + m_Center: {x: 0, y: 0, z: 0} + m_TimeToStationary: 0.5 +--- !u!82 &-464146812225337924 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9170637679517578948} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 5e4c9eedfa7b3b64fac601d4cea738e3, type: 3} + m_PlayOnAwake: 1 + 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!120 &997167293630739930 +LineRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9170637679517578948} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 0 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 2b785ac165d9520498ece667e6502a27, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Positions: + - {x: 0, y: 0, z: 0} + - {x: 0, y: -50, z: 0} + m_Parameters: + serializedVersion: 3 + widthMultiplier: 0.1 + widthCurve: + 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.5 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + colorGradient: + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 1} + key1: {r: 1, g: 1, b: 1, a: 0} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + numCornerVertices: 0 + numCapVertices: 6 + alignment: 0 + textureMode: 0 + shadowBias: 0.5 + generateLightingData: 0 + m_UseWorldSpace: 1 + m_Loop: 0 +--- !u!114 &-1524627606650707076 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9170637679517578948} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 44b96efd0d0d4cb47ab243cd752cefac, type: 3} + m_Name: + m_EditorClassIdentifier: + m_allowOffhandGrab: 1 + m_snapPosition: 0 + m_snapOrientation: 0 + m_snapOffset: {fileID: 0} + m_grabPoints: [] +--- !u!114 &7782552374194691103 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9170637679517578948} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 33e8c297b5a9ad8458d3470d25b5c749, type: 3} + m_Name: + m_EditorClassIdentifier: + locked: 0 + clipFail: {fileID: 8300000, guid: d041115870f45b94fbe082a394febe96, type: 3} --- !u!1001 &893203079023456205 PrefabInstance: m_ObjectHideFlags: 0 @@ -10,27 +287,32 @@ PrefabInstance: - target: {fileID: -927199367670048503, guid: 467583d4ee8d9564bacf5bde7844a76d, type: 3} propertyPath: m_Name - value: rock1 + value: rock1 Variant objectReference: {fileID: 0} - target: {fileID: -927199367670048503, guid: 467583d4ee8d9564bacf5bde7844a76d, type: 3} propertyPath: m_StaticEditorFlags - value: 4294967295 + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -927199367670048503, guid: 467583d4ee8d9564bacf5bde7844a76d, + type: 3} + propertyPath: m_TagString + value: Placeable objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: 467583d4ee8d9564bacf5bde7844a76d, type: 3} propertyPath: m_LocalPosition.x - value: -3.631 + value: 0 objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: 467583d4ee8d9564bacf5bde7844a76d, type: 3} propertyPath: m_LocalPosition.y - value: 0.366 + value: 0 objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: 467583d4ee8d9564bacf5bde7844a76d, type: 3} propertyPath: m_LocalPosition.z - value: -4.2277355 + value: 0 objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: 467583d4ee8d9564bacf5bde7844a76d, type: 3} @@ -89,3 +371,9 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 467583d4ee8d9564bacf5bde7844a76d, type: 3} +--- !u!1 &9170637679517578948 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -927199367670048503, guid: 467583d4ee8d9564bacf5bde7844a76d, + type: 3} + m_PrefabInstance: {fileID: 893203079023456205} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Scenes/Plou/Menu.unity b/Assets/Scenes/Plou/Menu.unity index 55bd6888e3303ac448935387dc1895d2f770c7c4..e0b80891cf7310e438438b290e0d420c59db9083 100644 --- a/Assets/Scenes/Plou/Menu.unity +++ b/Assets/Scenes/Plou/Menu.unity @@ -717,7 +717,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 803767397} m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} - m_LocalPosition: {x: 3.64, y: 3, z: 2.1} + m_LocalPosition: {x: 7.89, y: 7.78, z: -5.28} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} @@ -830,6 +830,11 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 2051765595219415061, guid: 40b53501a36d4d44fb4cd3f334ea9e21, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 40b53501a36d4d44fb4cd3f334ea9e21, type: 3} --- !u!1 &1054689545 @@ -1235,6 +1240,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: nomSceneDeJeu: SceneDeJeu + gm: {fileID: 0} --- !u!4 &1201502690 Transform: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Plou/SceneDeJeu.unity b/Assets/Scenes/Plou/SceneDeJeu.unity index 3d7ff8b83ea13d8322e346d5302b750981e99062..ab1dde0e372b62f51bec00c82c1b715d534bc61e 100644 --- a/Assets/Scenes/Plou/SceneDeJeu.unity +++ b/Assets/Scenes/Plou/SceneDeJeu.unity @@ -325,7 +325,7 @@ PrefabInstance: - target: {fileID: 3720857783025820233, guid: 821300a4df1370d4bb8f1de544cef4d7, type: 3} propertyPath: m_RootOrder - value: 17 + value: 16 objectReference: {fileID: 0} - target: {fileID: 3720857783025820233, guid: 821300a4df1370d4bb8f1de544cef4d7, type: 3} @@ -462,7 +462,7 @@ Transform: - {fileID: 575263968} - {fileID: 1416321939} m_Father: {fileID: 0} - m_RootOrder: 14 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &335640232 PrefabInstance: @@ -519,7 +519,7 @@ PrefabInstance: - target: {fileID: 5273652647191311473, guid: 65025869b4628594985ad0a4d275ed2b, type: 3} propertyPath: m_RootOrder - value: 19 + value: 18 objectReference: {fileID: 0} - target: {fileID: 5273652647191311473, guid: 65025869b4628594985ad0a4d275ed2b, type: 3} @@ -588,7 +588,7 @@ PrefabInstance: - target: {fileID: 3812007012109394173, guid: 33222051824639a43a02341626d542df, type: 3} propertyPath: m_RootOrder - value: 12 + value: 11 objectReference: {fileID: 0} - target: {fileID: 3812007012109394173, guid: 33222051824639a43a02341626d542df, type: 3} @@ -1029,6 +1029,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: nomSceneDeJeu: + gm: {fileID: 0} --- !u!4 &524484149 Transform: m_ObjectHideFlags: 0 @@ -1041,7 +1042,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 18 + m_RootOrder: 17 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &575263968 stripped Transform: @@ -1246,7 +1247,7 @@ PrefabInstance: - target: {fileID: 1901081073596470450, guid: 19f8f72e5dadfc64eaff2141fb7a5428, type: 3} propertyPath: m_RootOrder - value: 15 + value: 14 objectReference: {fileID: 0} - target: {fileID: 1901081073596470450, guid: 19f8f72e5dadfc64eaff2141fb7a5428, type: 3} @@ -1597,7 +1598,7 @@ Transform: m_Children: - {fileID: 1008236115} m_Father: {fileID: 0} - m_RootOrder: 9 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!54 &1295439241 Rigidbody: @@ -1901,7 +1902,7 @@ PrefabInstance: - target: {fileID: 3720857783025820233, guid: 821300a4df1370d4bb8f1de544cef4d7, type: 3} propertyPath: m_RootOrder - value: 16 + value: 15 objectReference: {fileID: 0} - target: {fileID: 3720857783025820233, guid: 821300a4df1370d4bb8f1de544cef4d7, type: 3} @@ -2099,7 +2100,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!1001 &104104573611613964 PrefabInstance: @@ -2332,7 +2333,7 @@ PrefabInstance: - target: {fileID: 3812007012109394173, guid: 33222051824639a43a02341626d542df, type: 3} propertyPath: m_RootOrder - value: 10 + value: 9 objectReference: {fileID: 0} - target: {fileID: 3812007012109394173, guid: 33222051824639a43a02341626d542df, type: 3} @@ -2473,7 +2474,7 @@ PrefabInstance: - target: {fileID: 249423265977640084, guid: c54dfc7de2a849243b0be906721f7d7f, type: 3} propertyPath: m_RootOrder - value: 20 + value: 19 objectReference: {fileID: 0} - target: {fileID: 249423265977640084, guid: c54dfc7de2a849243b0be906721f7d7f, type: 3} @@ -2706,7 +2707,7 @@ PrefabInstance: - target: {fileID: 703763750751559496, guid: 40b53501a36d4d44fb4cd3f334ea9e21, type: 3} propertyPath: m_RootOrder - value: 11 + value: 10 objectReference: {fileID: 0} - target: {fileID: 703763750751559496, guid: 40b53501a36d4d44fb4cd3f334ea9e21, type: 3} @@ -2733,12 +2734,41 @@ PrefabInstance: propertyPath: m_playerBounds value: objectReference: {fileID: 1008236114} + - target: {fileID: 7877475419188864622, guid: 40b53501a36d4d44fb4cd3f334ea9e21, + type: 3} + propertyPath: prefabsToSpawn.Array.size + value: 5 + objectReference: {fileID: 0} - target: {fileID: 7877475419188864622, guid: 40b53501a36d4d44fb4cd3f334ea9e21, type: 3} propertyPath: prefabsToSpawn.Array.data[1] value: + objectReference: {fileID: 9170637679517578948, guid: 3f473ecd8e3f30a4c86e4803b5d45c31, + type: 3} + - target: {fileID: 7877475419188864622, guid: 40b53501a36d4d44fb4cd3f334ea9e21, + type: 3} + propertyPath: prefabsToSpawn.Array.data[0] + value: + objectReference: {fileID: 9170637679517578948, guid: e55a2a935238c364f922d923d3c81938, + type: 3} + - target: {fileID: 7877475419188864622, guid: 40b53501a36d4d44fb4cd3f334ea9e21, + type: 3} + propertyPath: prefabsToSpawn.Array.data[3] + value: objectReference: {fileID: 3485586581573099226, guid: 40da07e2d806d8a4b9734eece14c7f29, type: 3} + - target: {fileID: 7877475419188864622, guid: 40b53501a36d4d44fb4cd3f334ea9e21, + type: 3} + propertyPath: prefabsToSpawn.Array.data[4] + value: + objectReference: {fileID: 1635955774121567605, guid: fb70591c0585bd44aa382e89fe9fe10f, + type: 3} + - target: {fileID: 7877475419188864622, guid: 40b53501a36d4d44fb4cd3f334ea9e21, + type: 3} + propertyPath: prefabsToSpawn.Array.data[2] + value: + objectReference: {fileID: 9170637679517578948, guid: 00bb07c734e570b4aa4bb763e3644188, + type: 3} - target: {fileID: 4636063900629700414, guid: 40b53501a36d4d44fb4cd3f334ea9e21, type: 3} propertyPath: m_Name @@ -2881,7 +2911,7 @@ PrefabInstance: - target: {fileID: 1901081073596470450, guid: 19f8f72e5dadfc64eaff2141fb7a5428, type: 3} propertyPath: m_RootOrder - value: 13 + value: 12 objectReference: {fileID: 0} - target: {fileID: 1901081073596470450, guid: 19f8f72e5dadfc64eaff2141fb7a5428, type: 3} @@ -2975,75 +3005,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 19f8f72e5dadfc64eaff2141fb7a5428, type: 3} ---- !u!1001 &8274103946147553792 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 8274103944527042887, guid: ebc6115e30f2c4d41a992a5ea5a07a9b, - type: 3} - propertyPath: m_Name - value: Caillou - objectReference: {fileID: 0} - - target: {fileID: 8274103944527042891, guid: ebc6115e30f2c4d41a992a5ea5a07a9b, - type: 3} - propertyPath: m_LocalPosition.x - value: -3.814 - objectReference: {fileID: 0} - - target: {fileID: 8274103944527042891, guid: ebc6115e30f2c4d41a992a5ea5a07a9b, - type: 3} - propertyPath: m_LocalPosition.y - value: 0.25 - objectReference: {fileID: 0} - - target: {fileID: 8274103944527042891, guid: ebc6115e30f2c4d41a992a5ea5a07a9b, - type: 3} - propertyPath: m_LocalPosition.z - value: -0.5032613 - objectReference: {fileID: 0} - - target: {fileID: 8274103944527042891, guid: ebc6115e30f2c4d41a992a5ea5a07a9b, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8274103944527042891, guid: ebc6115e30f2c4d41a992a5ea5a07a9b, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8274103944527042891, guid: ebc6115e30f2c4d41a992a5ea5a07a9b, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8274103944527042891, guid: ebc6115e30f2c4d41a992a5ea5a07a9b, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8274103944527042891, guid: ebc6115e30f2c4d41a992a5ea5a07a9b, - type: 3} - propertyPath: m_RootOrder - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 8274103944527042891, guid: ebc6115e30f2c4d41a992a5ea5a07a9b, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8274103944527042891, guid: ebc6115e30f2c4d41a992a5ea5a07a9b, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8274103944527042891, guid: ebc6115e30f2c4d41a992a5ea5a07a9b, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: ebc6115e30f2c4d41a992a5ea5a07a9b, type: 3} --- !u!1001 &8780046436246757025 PrefabInstance: m_ObjectHideFlags: 0 @@ -3203,7 +3164,7 @@ PrefabInstance: - target: {fileID: 8843049163892511642, guid: a4d8a0feae766074e82fe6e3b759c29f, type: 3} propertyPath: m_RootOrder - value: 8 + value: 7 objectReference: {fileID: 0} - target: {fileID: 8843049163892511642, guid: a4d8a0feae766074e82fe6e3b759c29f, type: 3} diff --git a/Assets/Scenes/Plou/SceneDeJeu/NavMesh.asset b/Assets/Scenes/Plou/SceneDeJeu/NavMesh.asset index e7ef8e993b0bf39557b67e84681fb94fb94f996d..51c01a83b6d64057dd1f2236bd89b75ab01481df 100644 Binary files a/Assets/Scenes/Plou/SceneDeJeu/NavMesh.asset and b/Assets/Scenes/Plou/SceneDeJeu/NavMesh.asset differ diff --git a/Assets/Scripts/CustomOVRGrabber.cs b/Assets/Scripts/CustomOVRGrabber.cs index f6071cb18fca5cc483d55d476115c530f33f2664..65a171403448c901e0883c182eb3190c357143aa 100644 --- a/Assets/Scripts/CustomOVRGrabber.cs +++ b/Assets/Scripts/CustomOVRGrabber.cs @@ -337,7 +337,7 @@ public class CustomOVRGrabber : MonoBehaviour if (closestGrabbable.CompareTag("InHandCaillou")) { m_grabbedObj = GameObject.Instantiate( - prefabsToSpawn[0], + prefabsToSpawn[Random.Range(0,3)], closestGrabbable.transform.position, Quaternion.Euler(0f, 0f, 0f)).GetComponent<CustomOVRGrabbable>(); closestGrabbableCollider = closestGrabbable.GetComponent<BoxCollider>(); diff --git a/Assets/Scripts/GameManager.cs b/Assets/Scripts/GameManager.cs index bd6caf31a4aed57a424c131f0de9caa77384f1ef..7e96afe60118bef202b23aa319db8c437cae0bb9 100644 --- a/Assets/Scripts/GameManager.cs +++ b/Assets/Scripts/GameManager.cs @@ -163,6 +163,25 @@ public class GameManager : MonoBehaviour //StartCoroutine(FermetureAppli()); } + public void ResetDecor() + { + for (int i = 0; i < 4; ++i) + { + walls[i].enabled = false; + walls[i].GetComponent<MeshRenderer>().material = matDefaite; + } + + for (int i = 0; i < allHumanSpawners.Length; ++i) + { + Debug.Log("JE SUIS I : " + i); + allHumanSpawners[i].SetGameStarted(false); + } + + boutonsFinDePartie.SetActive(false); + mannette1.SetLaserOff(); + mannette2.SetLaserOff(); + } + private IEnumerator FermetureAppli() { yield return new WaitForSeconds(10f); diff --git a/Assets/Scripts/HumanScript.cs b/Assets/Scripts/HumanScript.cs index 47f2d13b951e016887ba2c40ddc9ac613006745b..f8e07e01799532917140add810a02d0ec708f3c3 100644 --- a/Assets/Scripts/HumanScript.cs +++ b/Assets/Scripts/HumanScript.cs @@ -117,7 +117,8 @@ public class HumanScript : MonoBehaviour } else if(m_modeCut && Time.fixedTime - m_cutStamp > m_cutTime) { - Destroy(closest); + closest.SendMessage("TakeDamage",1000); + //Destroy(closest); closest = null; m_modeReturn = true; m_modeCut = false; diff --git a/Assets/Scripts/Lancable.cs b/Assets/Scripts/Lancable.cs index 79dcd47c65b8571dd574cadd5a79c3135408e695..2bf7ff46927100a31966db654378f8800c43c1af 100644 --- a/Assets/Scripts/Lancable.cs +++ b/Assets/Scripts/Lancable.cs @@ -72,31 +72,38 @@ public class Lancable : MonoBehaviour } else { - myaudiosource.clip = clipFail; + /*myaudiosource.clip = clipFail; myaudiosource.Play(); gameObject.GetComponent<MeshRenderer>().enabled = false; gameObject.GetComponent<BoxCollider>().enabled = false; gameObject.GetComponent<LineRenderer>().enabled = false; gameObject.GetComponent<CustomOVRGrabbable>().enabled = false; //Destroy(gameObject); - DestroyWithDelay(1f); + DestroyWithDelay(1f);*/ + StartCoroutine(DestroyWithDelay(1f)); } } else { - myaudiosource.clip = clipFail; + /*myaudiosource.clip = clipFail; myaudiosource.Play(); gameObject.GetComponent<MeshRenderer>().enabled = false; gameObject.GetComponent<BoxCollider>().enabled = false; gameObject.GetComponent<LineRenderer>().enabled = false; - gameObject.GetComponent<CustomOVRGrabbable>().enabled = false; + gameObject.GetComponent<CustomOVRGrabbable>().enabled = false;*/ //Destroy(gameObject); - DestroyWithDelay(1f); + StartCoroutine(DestroyWithDelay(1f)); } } IEnumerator DestroyWithDelay(float delaySeconds) { + myaudiosource.clip = clipFail; + myaudiosource.Play(); + gameObject.GetComponent<MeshRenderer>().enabled = false; + gameObject.GetComponent<BoxCollider>().enabled = false; + gameObject.GetComponent<LineRenderer>().enabled = false; + gameObject.GetComponent<CustomOVRGrabbable>().enabled = false; yield return new WaitForSeconds(delaySeconds); Destroy(gameObject); } diff --git a/Assets/Scripts/LifeScript.cs b/Assets/Scripts/LifeScript.cs index feb3046936e3d3a0a0de00d32e2a3b2cd6dc5bd2..bf7faffa0f51fc8628acefedd542e1c02a482630 100644 --- a/Assets/Scripts/LifeScript.cs +++ b/Assets/Scripts/LifeScript.cs @@ -2,18 +2,29 @@ using System.Collections.Generic; using UnityEngine; + +// to die with style +[RequireComponent(typeof(AudioSource))] + public class LifeScript : MonoBehaviour { [SerializeField] private float maxLife = 10; [SerializeField] private float currentLife; - [SerializeField] private static int treeCount = 0; + [SerializeField] private static int treeCount = 1; [SerializeField] private float m_deathTime = 3; private float m_deathStamp; public bool dead = false; - public static int TreeCount() => treeCount; + [SerializeField] private AudioSource deathAudioSource; + [SerializeField] private AudioClip deathAudioClip; + + public static int TreeCount() + { + treeCount = GetNumberOfActiveTrees(); + return treeCount; + } public static void LessTree(int c) { treeCount-=c; @@ -21,12 +32,32 @@ public class LifeScript : MonoBehaviour public static void MoreTree(int c) { - treeCount+=c; + //treeCount+=c; + } + + public static int GetNumberOfActiveTrees() + { + GameObject[] at = GameObject.FindGameObjectsWithTag("Tree"); + GameObject[] act = GameObject.FindGameObjectsWithTag("ChoppedTree"); + + var alltrees = new GameObject[at.Length + act.Length]; + at.CopyTo(alltrees, 0); + act.CopyTo(alltrees, at.Length); + + int c = 0; + foreach(GameObject g in alltrees) + { + if(g.activeSelf) + ++c; + } + return c; } // Start is called before the first frame update void Start() { + deathAudioSource = gameObject.GetComponent<AudioSource>(); + if (gameObject.CompareTag("Tree")) { MoreTree(1); @@ -47,18 +78,41 @@ public class LifeScript : MonoBehaviour if(dead && Time.fixedTime - m_deathStamp > m_deathTime) GameObject.Destroy(this.gameObject); } + public IEnumerator DestroyWithSound() + { + Debug.Log("IMDYIING AND IM PROBABLY A TREE"); + + deathAudioSource.clip = deathAudioClip; + deathAudioSource.Play(); + //GetComponent<MeshRenderer>().enabled = false; + GetComponent<BoxCollider>().enabled = false; + MeshRenderer[] mr = GetComponentsInChildren<MeshRenderer>(); + foreach(MeshRenderer m in mr) + { + m.enabled = false; + } + + + yield return new WaitForSeconds(1); + + LessTree(1); + gameObject.SetActive(false); + //GameObject.Destroy(this.gameObject); + } + public void TakeDamage(float d) { currentLife -= d; if(currentLife <= 0) { Animator anim = GetComponent<Animator>(); - if(anim == null) + if(anim == null) // trees { - GameObject.Destroy(this.gameObject); + StartCoroutine(DestroyWithSound()); } - else + else if (anim != null) { + deathAudioSource.Play(); tag = "Dead"; m_deathStamp = Time.fixedTime; dead = true; diff --git a/Assets/Scripts/Posable.cs b/Assets/Scripts/Posable.cs index f4f25a51c49dfc4d6723d41a568e07fb9fbd5f5c..357d43fabe85747194d02f31665bcdb1f10c1b86 100644 --- a/Assets/Scripts/Posable.cs +++ b/Assets/Scripts/Posable.cs @@ -12,15 +12,33 @@ public class Posable : MonoBehaviour private LineRenderer lineRenderPose; + + public AudioClip clipFail; + + private AudioSource myaudiosource; + // Start is called before the first frame update void Start() { + myaudiosource = gameObject.GetComponent<AudioSource>(); layerAvecToutSaufCeluiAIgnorer = ~layerAvecToutSaufCeluiAIgnorer; lineRenderPose = GetComponent<LineRenderer>(); lineRenderPose.useWorldSpace = false; lineRenderPose.enabled = true; } + IEnumerator DestroyWithDelay(float delaySeconds) + { + myaudiosource.clip = clipFail; + myaudiosource.Play(); + gameObject.GetComponent<MeshRenderer>().enabled = false; + gameObject.GetComponent<BoxCollider>().enabled = false; + gameObject.GetComponent<LineRenderer>().enabled = false; + gameObject.GetComponent<CustomOVRGrabbable>().enabled = false; + yield return new WaitForSeconds(delaySeconds); + Destroy(gameObject); + } + public void AfficherLignePose() { lineRenderPose.enabled = true; @@ -49,16 +67,18 @@ public class Posable : MonoBehaviour gameObject.transform.position.z); locked = true; gameObject.GetComponent<CustomOVRGrabbable>().enabled = false; + + myaudiosource.Play(); lineRenderPose.enabled = false; } else { - Destroy(gameObject); + StartCoroutine(DestroyWithDelay(1f)); } } else { - Destroy(gameObject); + StartCoroutine(DestroyWithDelay(1f)); } } diff --git a/Assets/Scripts/SceneManagement.cs b/Assets/Scripts/SceneManagement.cs index cbcac751f7809b83c2bb2261910df99325f2a1a9..f1e89a2f9b715867b2214dd39f835f4c6f238f33 100644 --- a/Assets/Scripts/SceneManagement.cs +++ b/Assets/Scripts/SceneManagement.cs @@ -8,6 +8,8 @@ public class SceneManagement : MonoBehaviour static private string nameGameSceneToLoad; [SerializeField] private string nomSceneDeJeu; + [SerializeField] private GameManager gm; + // Start is called before the first frame update void Start() { diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index da1d2ca308cc327c067673078b779d205d7fdd16..30cebbf91b71985213a7717f4aa77907a8065afc 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -13,7 +13,7 @@ PlayerSettings: useOnDemandResources: 0 accelerometerFrequency: 60 companyName: ENSIIE - productName: Groupe5-IAMGREEN + productName: Groupe5-IAMGREEN-Rendu defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1} @@ -120,7 +120,7 @@ PlayerSettings: 16:10: 1 16:9: 1 Others: 1 - bundleVersion: 0.2 + bundleVersion: 0.7 preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 @@ -162,7 +162,7 @@ PlayerSettings: androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 applicationIdentifier: - Android: com.plou.oculus + Android: com.rendu.oculus buildNumber: {} AndroidBundleVersionCode: 1 AndroidMinSdkVersion: 19