diff --git a/Assets/Prefabs/Decor/arbre1 Variant.prefab b/Assets/Prefabs/Decor/arbre1 Variant.prefab index 6cd68121c5a32119b839b2aea3fc53e0d6373384..8d22376e12da1c3c9b12727a52ed687f966f5dee 100644 --- a/Assets/Prefabs/Decor/arbre1 Variant.prefab +++ b/Assets/Prefabs/Decor/arbre1 Variant.prefab @@ -1,199 +1,18 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!208 &1365770728 -NavMeshObstacle: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4301836109967652267} - m_Enabled: 1 - serializedVersion: 3 - m_Shape: 1 - m_Extents: {x: 0.00015, y: 0.003, z: 0.00015} - m_MoveThreshold: 0.1 - m_Carve: 1 - m_CarveOnlyStationary: 1 - m_Center: {x: 0, y: 0.003, z: 0} - m_TimeToStationary: 0.5 ---- !u!114 &1365770729 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4301836109967652267} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 04cc04c6d4ddf7e479c7005f74e4b3dd, type: 3} - m_Name: - m_EditorClassIdentifier: - maxLife: 10 - currentLife: 10 - m_deathTime: 3 - dead: 0 - deathAudioSource: {fileID: 0} - deathAudioClip: {fileID: 0} - deathParticles: {fileID: 0} ---- !u!82 &4072961914611536041 -AudioSource: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4301836109967652267} - 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 ---- !u!199 &956330631525300119 -ParticleSystemRenderer: - serializedVersion: 6 +--- !u!65 &712916308178644963 +BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4301836109967652267} + m_Material: {fileID: 0} + m_IsTrigger: 0 m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 0 - m_ReflectionProbeUsage: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 661316db284ebd2459f1752148d963da, type: 2} - - {fileID: 0} - 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_RenderMode: 0 - m_SortMode: 0 - m_MinParticleSize: 0.01 - m_MaxParticleSize: 0.03 - m_CameraVelocityScale: 0 - m_VelocityScale: 0 - m_LengthScale: 2 - m_SortingFudge: 0 - m_NormalDirection: 1 - m_ShadowBias: 0 - m_RenderAlignment: 0 - m_Pivot: {x: 0, y: 0, z: 0} - m_Flip: {x: 0, y: 0, z: 0} - m_UseCustomVertexStreams: 0 - m_EnableGPUInstancing: 1 - m_ApplyActiveColorSpace: 1 - m_AllowRoll: 1 - m_VertexStreams: 00010304 - m_Mesh: {fileID: 0} - m_Mesh1: {fileID: 0} - m_Mesh2: {fileID: 0} - m_Mesh3: {fileID: 0} - m_MaskInteraction: 0 + serializedVersion: 2 + m_Size: {x: 0.00350967, y: 0.005517079, z: 0.0040116683} + m_Center: {x: -0.000010088144, y: 0.0027585395, z: -0.000017237733} --- !u!198 &4667697540048570125 ParticleSystem: m_ObjectHideFlags: 0 @@ -4852,19 +4671,200 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 vectorLabel1_3: W ---- !u!65 &712916308178644963 -BoxCollider: +--- !u!208 &1365770728 +NavMeshObstacle: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4301836109967652267} - m_Material: {fileID: 0} - m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 0.00350967, y: 0.005517079, z: 0.0040116683} - m_Center: {x: -0.000010088144, y: 0.0027585395, z: -0.000017237733} + serializedVersion: 3 + m_Shape: 1 + m_Extents: {x: 0.00015, y: 0.003, z: 0.00015} + m_MoveThreshold: 0.1 + m_Carve: 1 + m_CarveOnlyStationary: 1 + m_Center: {x: 0, y: 0.003, z: 0} + m_TimeToStationary: 0.5 +--- !u!199 &956330631525300119 +ParticleSystemRenderer: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4301836109967652267} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 661316db284ebd2459f1752148d963da, type: 2} + - {fileID: 0} + 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_RenderMode: 0 + m_SortMode: 0 + m_MinParticleSize: 0.01 + m_MaxParticleSize: 0.03 + m_CameraVelocityScale: 0 + m_VelocityScale: 0 + m_LengthScale: 2 + m_SortingFudge: 0 + m_NormalDirection: 1 + m_ShadowBias: 0 + m_RenderAlignment: 0 + m_Pivot: {x: 0, y: 0, z: 0} + m_Flip: {x: 0, y: 0, z: 0} + m_UseCustomVertexStreams: 0 + m_EnableGPUInstancing: 1 + m_ApplyActiveColorSpace: 1 + m_AllowRoll: 1 + m_VertexStreams: 00010304 + m_Mesh: {fileID: 0} + m_Mesh1: {fileID: 0} + m_Mesh2: {fileID: 0} + m_Mesh3: {fileID: 0} + m_MaskInteraction: 0 +--- !u!82 &4072961914611536041 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4301836109967652267} + 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 +--- !u!114 &1365770729 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4301836109967652267} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 04cc04c6d4ddf7e479c7005f74e4b3dd, type: 3} + m_Name: + m_EditorClassIdentifier: + maxLife: 10 + currentLife: 10 + m_deathTime: 3 + dead: 0 + deathAudioSource: {fileID: 0} + deathAudioClip: {fileID: 0} + deathParticles: {fileID: 0} --- !u!1001 &5229484216292388002 PrefabInstance: m_ObjectHideFlags: 0 @@ -4887,6 +4887,11 @@ PrefabInstance: propertyPath: m_StaticEditorFlags value: 0 objectReference: {fileID: 0} + - target: {fileID: -927199367670048503, guid: dc4cd1497b71aea49b12a743102091ad, + type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: dc4cd1497b71aea49b12a743102091ad, type: 3} propertyPath: m_LocalPosition.x diff --git a/Assets/Prefabs/Decor/arbre2 Variant.prefab b/Assets/Prefabs/Decor/arbre2 Variant.prefab index df6d21dc3aac667789c69d853063cd71f1d18633..e69342dc3c51dd1faebbe96e4d24f97d0d0510a4 100644 --- a/Assets/Prefabs/Decor/arbre2 Variant.prefab +++ b/Assets/Prefabs/Decor/arbre2 Variant.prefab @@ -1,103 +1,18 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!208 &327439722 -NavMeshObstacle: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7609755936041094382} - m_Enabled: 1 - serializedVersion: 3 - m_Shape: 1 - m_Extents: {x: 0.00015, y: 0.004, z: 0.00015} - m_MoveThreshold: 0.1 - m_Carve: 1 - m_CarveOnlyStationary: 1 - m_Center: {x: 0, y: 0.004, z: 0} - m_TimeToStationary: 0.5 ---- !u!114 &327439723 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7609755936041094382} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 04cc04c6d4ddf7e479c7005f74e4b3dd, type: 3} - m_Name: - m_EditorClassIdentifier: - maxLife: 10 - currentLife: 10 - m_deathTime: 3 - dead: 0 - deathAudioSource: {fileID: 0} - deathAudioClip: {fileID: 0} - deathParticles: {fileID: 0} ---- !u!199 &5078636718867306422 -ParticleSystemRenderer: - serializedVersion: 6 +--- !u!65 &2870294475022582312 +BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7609755936041094382} + m_Material: {fileID: 0} + m_IsTrigger: 0 m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 0 - m_ReflectionProbeUsage: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 661316db284ebd2459f1752148d963da, type: 2} - - {fileID: 0} - 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_RenderMode: 0 - m_SortMode: 0 - m_MinParticleSize: 0.01 - m_MaxParticleSize: 0.03 - m_CameraVelocityScale: 0 - m_VelocityScale: 0 - m_LengthScale: 2 - m_SortingFudge: 0 - m_NormalDirection: 1 - m_ShadowBias: 0 - m_RenderAlignment: 0 - m_Pivot: {x: 0, y: 0, z: 0} - m_Flip: {x: 0, y: 0, z: 0} - m_UseCustomVertexStreams: 0 - m_EnableGPUInstancing: 1 - m_ApplyActiveColorSpace: 1 - m_AllowRoll: 1 - m_VertexStreams: 00010304 - m_Mesh: {fileID: 0} - m_Mesh1: {fileID: 0} - m_Mesh2: {fileID: 0} - m_Mesh3: {fileID: 0} - m_MaskInteraction: 0 + serializedVersion: 2 + m_Size: {x: 0.0018666897, y: 0.007375636, z: 0.0018737682} + m_Center: {x: -0.000013411802, y: 0.003687818, z: -0.00005761566} --- !u!198 &9015614858414286718 ParticleSystem: m_ObjectHideFlags: 0 @@ -4756,19 +4671,85 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 vectorLabel1_3: W ---- !u!65 &2870294475022582312 -BoxCollider: +--- !u!208 &327439722 +NavMeshObstacle: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7609755936041094382} - m_Material: {fileID: 0} - m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 0.0018666897, y: 0.007375636, z: 0.0018737682} - m_Center: {x: -0.000013411802, y: 0.003687818, z: -0.00005761566} + serializedVersion: 3 + m_Shape: 1 + m_Extents: {x: 0.00015, y: 0.004, z: 0.00015} + m_MoveThreshold: 0.1 + m_Carve: 1 + m_CarveOnlyStationary: 1 + m_Center: {x: 0, y: 0.004, z: 0} + m_TimeToStationary: 0.5 +--- !u!199 &5078636718867306422 +ParticleSystemRenderer: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7609755936041094382} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 661316db284ebd2459f1752148d963da, type: 2} + - {fileID: 0} + 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_RenderMode: 0 + m_SortMode: 0 + m_MinParticleSize: 0.01 + m_MaxParticleSize: 0.03 + m_CameraVelocityScale: 0 + m_VelocityScale: 0 + m_LengthScale: 2 + m_SortingFudge: 0 + m_NormalDirection: 1 + m_ShadowBias: 0 + m_RenderAlignment: 0 + m_Pivot: {x: 0, y: 0, z: 0} + m_Flip: {x: 0, y: 0, z: 0} + m_UseCustomVertexStreams: 0 + m_EnableGPUInstancing: 1 + m_ApplyActiveColorSpace: 1 + m_AllowRoll: 1 + m_VertexStreams: 00010304 + m_Mesh: {fileID: 0} + m_Mesh1: {fileID: 0} + m_Mesh2: {fileID: 0} + m_Mesh3: {fileID: 0} + m_MaskInteraction: 0 --- !u!82 &5470282062645312699 AudioSource: m_ObjectHideFlags: 0 @@ -4865,6 +4846,25 @@ AudioSource: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 +--- !u!114 &327439723 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7609755936041094382} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 04cc04c6d4ddf7e479c7005f74e4b3dd, type: 3} + m_Name: + m_EditorClassIdentifier: + maxLife: 10 + currentLife: 10 + m_deathTime: 3 + dead: 0 + deathAudioSource: {fileID: 0} + deathAudioClip: {fileID: 0} + deathParticles: {fileID: 0} --- !u!1001 &1926033909299615207 PrefabInstance: m_ObjectHideFlags: 0 @@ -4887,6 +4887,11 @@ PrefabInstance: propertyPath: m_StaticEditorFlags value: 0 objectReference: {fileID: 0} + - target: {fileID: -927199367670048503, guid: 6ac70164538ca4849863b31985ad95b3, + type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: 6ac70164538ca4849863b31985ad95b3, type: 3} propertyPath: m_LocalPosition.x diff --git a/Assets/Prefabs/Decor/arbre3 Variant.prefab b/Assets/Prefabs/Decor/arbre3 Variant.prefab index 0d08e46b8fb3bfe5424e2e2afaa090e7c1f53b06..b4dd8638f814e87e76682c3729078925e479039d 100644 --- a/Assets/Prefabs/Decor/arbre3 Variant.prefab +++ b/Assets/Prefabs/Decor/arbre3 Variant.prefab @@ -1,40 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!208 &515832393 -NavMeshObstacle: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6591661779199486506} - m_Enabled: 1 - serializedVersion: 3 - m_Shape: 1 - m_Extents: {x: 0.00015, y: 0.002, z: 0.00015} - m_MoveThreshold: 0.1 - m_Carve: 1 - m_CarveOnlyStationary: 1 - m_Center: {x: 0, y: 0.002, z: 0} - m_TimeToStationary: 0.5 ---- !u!114 &515832394 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6591661779199486506} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 04cc04c6d4ddf7e479c7005f74e4b3dd, type: 3} - m_Name: - m_EditorClassIdentifier: - maxLife: 10 - currentLife: 10 - m_deathTime: 3 - dead: 0 - deathAudioSource: {fileID: 0} - deathAudioClip: {fileID: 0} - deathParticles: {fileID: 0} --- !u!65 &6863383634263199800 BoxCollider: m_ObjectHideFlags: 0 @@ -48,69 +13,6 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 0.0026249625, y: 0.0046769963, z: 0.0028987755} m_Center: {x: -0.00026825938, y: 0.0023384981, z: -0.000068821246} ---- !u!199 &898678099319666489 -ParticleSystemRenderer: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6591661779199486506} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 0 - m_ReflectionProbeUsage: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 661316db284ebd2459f1752148d963da, type: 2} - - {fileID: 0} - 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_RenderMode: 0 - m_SortMode: 0 - m_MinParticleSize: 0.01 - m_MaxParticleSize: 0.03 - m_CameraVelocityScale: 0 - m_VelocityScale: 0 - m_LengthScale: 2 - m_SortingFudge: 0 - m_NormalDirection: 1 - m_ShadowBias: 0 - m_RenderAlignment: 0 - m_Pivot: {x: 0, y: 0, z: 0} - m_Flip: {x: 0, y: 0, z: 0} - m_UseCustomVertexStreams: 0 - m_EnableGPUInstancing: 1 - m_ApplyActiveColorSpace: 1 - m_AllowRoll: 1 - m_VertexStreams: 00010304 - m_Mesh: {fileID: 0} - m_Mesh1: {fileID: 0} - m_Mesh2: {fileID: 0} - m_Mesh3: {fileID: 0} - m_MaskInteraction: 0 --- !u!198 &382289742517010062 ParticleSystem: m_ObjectHideFlags: 0 @@ -4769,6 +4671,85 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 vectorLabel1_3: W +--- !u!208 &515832393 +NavMeshObstacle: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6591661779199486506} + m_Enabled: 1 + serializedVersion: 3 + m_Shape: 1 + m_Extents: {x: 0.00015, y: 0.002, z: 0.00015} + m_MoveThreshold: 0.1 + m_Carve: 1 + m_CarveOnlyStationary: 1 + m_Center: {x: 0, y: 0.002, z: 0} + m_TimeToStationary: 0.5 +--- !u!199 &898678099319666489 +ParticleSystemRenderer: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6591661779199486506} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 661316db284ebd2459f1752148d963da, type: 2} + - {fileID: 0} + 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_RenderMode: 0 + m_SortMode: 0 + m_MinParticleSize: 0.01 + m_MaxParticleSize: 0.03 + m_CameraVelocityScale: 0 + m_VelocityScale: 0 + m_LengthScale: 2 + m_SortingFudge: 0 + m_NormalDirection: 1 + m_ShadowBias: 0 + m_RenderAlignment: 0 + m_Pivot: {x: 0, y: 0, z: 0} + m_Flip: {x: 0, y: 0, z: 0} + m_UseCustomVertexStreams: 0 + m_EnableGPUInstancing: 1 + m_ApplyActiveColorSpace: 1 + m_AllowRoll: 1 + m_VertexStreams: 00010304 + m_Mesh: {fileID: 0} + m_Mesh1: {fileID: 0} + m_Mesh2: {fileID: 0} + m_Mesh3: {fileID: 0} + m_MaskInteraction: 0 --- !u!82 &4021910386606773482 AudioSource: m_ObjectHideFlags: 0 @@ -4865,6 +4846,25 @@ AudioSource: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 +--- !u!114 &515832394 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6591661779199486506} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 04cc04c6d4ddf7e479c7005f74e4b3dd, type: 3} + m_Name: + m_EditorClassIdentifier: + maxLife: 10 + currentLife: 10 + m_deathTime: 3 + dead: 0 + deathAudioSource: {fileID: 0} + deathAudioClip: {fileID: 0} + deathParticles: {fileID: 0} --- !u!1001 &2908098719351780131 PrefabInstance: m_ObjectHideFlags: 0 @@ -4887,6 +4887,11 @@ PrefabInstance: propertyPath: m_StaticEditorFlags value: 0 objectReference: {fileID: 0} + - target: {fileID: -927199367670048503, guid: 710676261f5feb44c9ddae8f1f83bf94, + type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: 710676261f5feb44c9ddae8f1f83bf94, type: 3} propertyPath: m_LocalPosition.x diff --git a/Assets/Scenes/Plou/SceneNormal.unity b/Assets/Scenes/Plou/SceneNormal.unity index e14485ceb81fc5c653576343fefa3c545f97a5d9..57301a16a9732afceb1a13e6810db57737a54912 100644 --- a/Assets/Scenes/Plou/SceneNormal.unity +++ b/Assets/Scenes/Plou/SceneNormal.unity @@ -2540,5 +2540,9 @@ PrefabInstance: propertyPath: Loop value: 1 objectReference: {fileID: 0} + - target: {fileID: 1476464315, guid: a4d8a0feae766074e82fe6e3b759c29f, type: 3} + propertyPath: m_Volume + value: 0.05 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a4d8a0feae766074e82fe6e3b759c29f, type: 3} diff --git a/Assets/Scripts/Posable.cs b/Assets/Scripts/Posable.cs index 8a56bcf41a37a7c87217061b62da123a236703f3..f2993e5d28d99e4edd30031a9105ccf0ca1330b6 100644 --- a/Assets/Scripts/Posable.cs +++ b/Assets/Scripts/Posable.cs @@ -123,16 +123,27 @@ public class Posable : MonoBehaviour out hit, 100, layerAvecToutSaufCeluiAIgnorer)) { GameObject trucSurLequelOnPose = hit.collider.gameObject; - if (trucSurLequelOnPose.CompareTag("GameBoard")) + + float coutPosable = 0f; + if (gameObject.CompareTag("PlaceableRock")) { - lineRenderPose.startColor = Color.white; - lineRenderPose.endColor = Color.white; + coutPosable = coutCaillou; } - else + else if (gameObject.CompareTag("PlaceableAnimal")) + { + coutPosable = coutAnimal; + } + + if (!trucSurLequelOnPose.CompareTag("GameBoard") || GameManager.ManaAmount() < coutPosable) { lineRenderPose.startColor = Color.red; lineRenderPose.endColor = Color.red; } + else + { + lineRenderPose.startColor = Color.white; + lineRenderPose.endColor = Color.white; + } } } }