diff --git a/Assets/Audio/Animal.wav b/Assets/Audio/Animal.wav new file mode 100644 index 0000000000000000000000000000000000000000..b58ae94774eee6a361618846e82e585b42c2429c Binary files /dev/null and b/Assets/Audio/Animal.wav differ diff --git a/Assets/Audio/Animal.wav.meta b/Assets/Audio/Animal.wav.meta new file mode 100644 index 0000000000000000000000000000000000000000..dce683a4819e23131cbd77ba8414134b0e13f54e --- /dev/null +++ b/Assets/Audio/Animal.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 62363ee5f65882b4987d1ea464570e60 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Beep.wav b/Assets/Audio/Beep.wav new file mode 100644 index 0000000000000000000000000000000000000000..ef992049d3a93aa06aa8ce6dd2118e3874717a32 Binary files /dev/null and b/Assets/Audio/Beep.wav differ diff --git a/Assets/Audio/Beep.wav.meta b/Assets/Audio/Beep.wav.meta new file mode 100644 index 0000000000000000000000000000000000000000..334421f3a3ce048fdfd1d336889aa0b2970f5e14 --- /dev/null +++ b/Assets/Audio/Beep.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 22fc9efa7552177458a3f286b41a7ce0 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/EnnemiSpawn.wav b/Assets/Audio/EnnemiSpawn.wav new file mode 100644 index 0000000000000000000000000000000000000000..893e0cbc15a160389ab9934484d789ad263df71b Binary files /dev/null and b/Assets/Audio/EnnemiSpawn.wav differ diff --git a/Assets/Audio/EnnemiSpawn.wav.meta b/Assets/Audio/EnnemiSpawn.wav.meta new file mode 100644 index 0000000000000000000000000000000000000000..1790acf3cb6f154fe559ec0e2378873b78fa2f42 --- /dev/null +++ b/Assets/Audio/EnnemiSpawn.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 2b5a54c82ee95914f83c12391f812fce +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/EnnemyDie.wav b/Assets/Audio/EnnemyDie.wav new file mode 100644 index 0000000000000000000000000000000000000000..0285d053fe398fa344cc4b7297a19f6aa75ff2ac Binary files /dev/null and b/Assets/Audio/EnnemyDie.wav differ diff --git a/Assets/Audio/EnnemyDie.wav.meta b/Assets/Audio/EnnemyDie.wav.meta new file mode 100644 index 0000000000000000000000000000000000000000..84a61516885ef0a48e0a61bc66f370a9299c2cc4 --- /dev/null +++ b/Assets/Audio/EnnemyDie.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 5daa6c3424c02344b99081d63fb53ab5 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Fail.wav b/Assets/Audio/Fail.wav new file mode 100644 index 0000000000000000000000000000000000000000..1d9111bde627866dd360f7fbd52594df970da2ad Binary files /dev/null and b/Assets/Audio/Fail.wav differ diff --git a/Assets/Audio/Fail.wav.meta b/Assets/Audio/Fail.wav.meta new file mode 100644 index 0000000000000000000000000000000000000000..4dcc102191309075fcd3867c5f9e8dd49cb58192 --- /dev/null +++ b/Assets/Audio/Fail.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: d041115870f45b94fbe082a394febe96 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Rock.wav b/Assets/Audio/Rock.wav new file mode 100644 index 0000000000000000000000000000000000000000..da0d3255f291db3c777802d39ef14f7d5c17e696 Binary files /dev/null and b/Assets/Audio/Rock.wav differ diff --git a/Assets/Audio/Rock.wav.meta b/Assets/Audio/Rock.wav.meta new file mode 100644 index 0000000000000000000000000000000000000000..e1221801e2220aaee32c81ad5465eaea8854fcef --- /dev/null +++ b/Assets/Audio/Rock.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 5e4c9eedfa7b3b64fac601d4cea738e3 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/TreeDie.wav b/Assets/Audio/TreeDie.wav new file mode 100644 index 0000000000000000000000000000000000000000..6aa54353942870990354a153d75a41c26d21d4eb Binary files /dev/null and b/Assets/Audio/TreeDie.wav differ diff --git a/Assets/Audio/TreeDie.wav.meta b/Assets/Audio/TreeDie.wav.meta new file mode 100644 index 0000000000000000000000000000000000000000..c5525135e2a510e5e3e2abb5373eada9202bfccc --- /dev/null +++ b/Assets/Audio/TreeDie.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 8d51766e0569e864096cfd6c290ef013 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/soundtrack_zapsplat_well_oiled_machine_114.mp3 b/Assets/Audio/soundtrack_zapsplat_well_oiled_machine_114.mp3 new file mode 100644 index 0000000000000000000000000000000000000000..baf3116ce47070681bf1208ecbf9f009c9c561a6 Binary files /dev/null and b/Assets/Audio/soundtrack_zapsplat_well_oiled_machine_114.mp3 differ diff --git a/Assets/Audio/soundtrack_zapsplat_well_oiled_machine_114.mp3.meta b/Assets/Audio/soundtrack_zapsplat_well_oiled_machine_114.mp3.meta new file mode 100644 index 0000000000000000000000000000000000000000..326711b44719dabcb1f0b1cbe5051f9feb372bcb --- /dev/null +++ b/Assets/Audio/soundtrack_zapsplat_well_oiled_machine_114.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 1875d238f0cf2f94890fc872a163f2f8 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/CountdownToStart.prefab b/Assets/Prefabs/CountdownToStart.prefab new file mode 100644 index 0000000000000000000000000000000000000000..7992cc70b75ac36f9d6dafc782c685929c335ba3 --- /dev/null +++ b/Assets/Prefabs/CountdownToStart.prefab @@ -0,0 +1,369 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &249423265977640080 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 249423265977640084} + - component: {fileID: 249423265977640085} + - component: {fileID: 249423265977640082} + - component: {fileID: 249423265977640083} + - component: {fileID: 7180095565804770562} + m_Layer: 5 + m_Name: CountdownToStart + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &249423265977640084 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 249423265977640080} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 2.07} + m_LocalScale: {x: 0.35650623, y: 0.35650623, z: 0.35650623} + m_Children: + - {fileID: 249423267845331610} + - {fileID: 1284575395503233097} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 2.5} + m_SizeDelta: {x: 10, y: 10} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!223 &249423265977640085 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 249423265977640080} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 2 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 25 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!114 &249423265977640082 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 249423265977640080} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 +--- !u!114 &249423265977640083 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 249423265977640080} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &7180095565804770562 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 249423265977640080} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f032452833aaf8a4b8a1830175a11bd4, type: 3} + m_Name: + m_EditorClassIdentifier: + manaAmountText: {fileID: 0} + treesAmountText: {fileID: 0} + timerText: {fileID: 249423267845331613} + gameManager: {fileID: 0} +--- !u!1 &249423267845331611 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 249423267845331610} + - component: {fileID: 249423267845331612} + - component: {fileID: 249423267845331613} + m_Layer: 5 + m_Name: TimerText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &249423267845331610 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 249423267845331611} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 249423265977640084} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &249423267845331612 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 249423267845331611} + m_CullTransparentMesh: 0 +--- !u!114 &249423267845331613 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 249423267845331611} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_text: 0 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_outlineColor: + serializedVersion: 2 + rgba: 4278190080 + m_fontSize: 8.95 + m_fontSizeBase: 1.3 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 4 + m_fontSizeMax: 72 + m_fontStyle: 1 + m_textAlignment: 514 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 50 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_firstOverflowCharacterIndex: -1 + m_linkedTextComponent: {fileID: 0} + m_isLinkedTextComponent: 0 + m_isTextTruncated: 0 + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_ignoreRectMaskCulling: 0 + m_ignoreCulling: 1 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_VertexBufferAutoSizeReduction: 1 + m_firstVisibleCharacter: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_textInfo: + textComponent: {fileID: 249423267845331613} + characterCount: 1 + spriteCount: 0 + spaceCount: 0 + wordCount: 1 + linkCount: 0 + lineCount: 1 + pageCount: 1 + materialCount: 1 + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_spriteAnimator: {fileID: 0} + m_hasFontAssetChanged: 0 + m_subTextObjects: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &2347362731278405822 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1284575395503233097} + - component: {fileID: 2730719339185636108} + - component: {fileID: 6633833567843330955} + - component: {fileID: 4713201302125569269} + m_Layer: 0 + m_Name: Plane + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1284575395503233097 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2347362731278405822} + m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: 0.1} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 249423265977640084} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} +--- !u!33 &2730719339185636108 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2347362731278405822} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &6633833567843330955 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2347362731278405822} + 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: 2100000, guid: 93bf22314b2b7f9459b98d43d95da164, 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 +--- !u!64 &4713201302125569269 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2347362731278405822} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Convex: 0 + m_CookingOptions: 14 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} diff --git a/Assets/Prefabs/CountdownToStart.prefab.meta b/Assets/Prefabs/CountdownToStart.prefab.meta new file mode 100644 index 0000000000000000000000000000000000000000..f15f2c7bbf5e4665801c651e2450f50810e116ce --- /dev/null +++ b/Assets/Prefabs/CountdownToStart.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: c54dfc7de2a849243b0be906721f7d7f +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Decor.meta b/Assets/Prefabs/Decor.meta new file mode 100644 index 0000000000000000000000000000000000000000..24e63f65160442f37726441143103dc7849e5ee7 --- /dev/null +++ b/Assets/Prefabs/Decor.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a066c4f5f6f479b47be3b6602a128347 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/BoutDeForet.prefab b/Assets/Prefabs/Decor/BoutDeForet.prefab similarity index 100% rename from Assets/Prefabs/BoutDeForet.prefab rename to Assets/Prefabs/Decor/BoutDeForet.prefab diff --git a/Assets/Prefabs/BoutDeForet.prefab.meta b/Assets/Prefabs/Decor/BoutDeForet.prefab.meta similarity index 100% rename from Assets/Prefabs/BoutDeForet.prefab.meta rename to Assets/Prefabs/Decor/BoutDeForet.prefab.meta diff --git a/Assets/Prefabs/Caillou.prefab b/Assets/Prefabs/Decor/CaillouAlreadyOnGround.prefab similarity index 100% rename from Assets/Prefabs/Caillou.prefab rename to Assets/Prefabs/Decor/CaillouAlreadyOnGround.prefab diff --git a/Assets/Prefabs/Caillou.prefab.meta b/Assets/Prefabs/Decor/CaillouAlreadyOnGround.prefab.meta similarity index 100% rename from Assets/Prefabs/Caillou.prefab.meta rename to Assets/Prefabs/Decor/CaillouAlreadyOnGround.prefab.meta diff --git a/Assets/Prefabs/VeryTree.prefab b/Assets/Prefabs/Decor/VeryTree.prefab similarity index 100% rename from Assets/Prefabs/VeryTree.prefab rename to Assets/Prefabs/Decor/VeryTree.prefab diff --git a/Assets/Prefabs/VeryTree.prefab.meta b/Assets/Prefabs/Decor/VeryTree.prefab.meta similarity index 100% rename from Assets/Prefabs/VeryTree.prefab.meta rename to Assets/Prefabs/Decor/VeryTree.prefab.meta diff --git a/Assets/Prefabs/arbre1 Variant.prefab b/Assets/Prefabs/Decor/arbre1 Variant.prefab similarity index 100% rename from Assets/Prefabs/arbre1 Variant.prefab rename to Assets/Prefabs/Decor/arbre1 Variant.prefab diff --git a/Assets/Prefabs/arbre1 Variant.prefab.meta b/Assets/Prefabs/Decor/arbre1 Variant.prefab.meta similarity index 100% rename from Assets/Prefabs/arbre1 Variant.prefab.meta rename to Assets/Prefabs/Decor/arbre1 Variant.prefab.meta diff --git a/Assets/Prefabs/arbre2 Variant.prefab b/Assets/Prefabs/Decor/arbre2 Variant.prefab similarity index 100% rename from Assets/Prefabs/arbre2 Variant.prefab rename to Assets/Prefabs/Decor/arbre2 Variant.prefab diff --git a/Assets/Prefabs/arbre2 Variant.prefab.meta b/Assets/Prefabs/Decor/arbre2 Variant.prefab.meta similarity index 100% rename from Assets/Prefabs/arbre2 Variant.prefab.meta rename to Assets/Prefabs/Decor/arbre2 Variant.prefab.meta diff --git a/Assets/Prefabs/arbre3 Variant.prefab b/Assets/Prefabs/Decor/arbre3 Variant.prefab similarity index 100% rename from Assets/Prefabs/arbre3 Variant.prefab rename to Assets/Prefabs/Decor/arbre3 Variant.prefab diff --git a/Assets/Prefabs/arbre3 Variant.prefab.meta b/Assets/Prefabs/Decor/arbre3 Variant.prefab.meta similarity index 100% rename from Assets/Prefabs/arbre3 Variant.prefab.meta rename to Assets/Prefabs/Decor/arbre3 Variant.prefab.meta diff --git a/Assets/Prefabs/GameManager.prefab b/Assets/Prefabs/GameManager.prefab index 6407bc28602bde7d978a9fbd0da4a4b017b4a9b0..90a57f0f0d032f7bcf760b434280fd7d91477aa1 100644 --- a/Assets/Prefabs/GameManager.prefab +++ b/Assets/Prefabs/GameManager.prefab @@ -196,6 +196,7 @@ GameObject: m_Component: - component: {fileID: 8843049163892511642} - component: {fileID: 8843049163892511641} + - component: {fileID: 1476464315} m_Layer: 0 m_Name: GameManager m_TagString: GameManager @@ -234,6 +235,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: trucaATuer: {fileID: 0} + startMana: 30 walls: - {fileID: 8843049164827647817} - {fileID: 8843049163153765051} @@ -241,8 +243,113 @@ MonoBehaviour: - {fileID: 8843049163181613583} matDefaite: {fileID: 2100000, guid: 93bf22314b2b7f9459b98d43d95da164, type: 2} matVictoire: {fileID: 2100000, guid: b991e54001a19cf4fb1500d1dd6205e5, type: 2} - tempsDeJeuRestant: 30 + tempsDeJeuRestant: 80 gameEnded: 0 + nbSecondesAttenteDebut: 2 + boutonsFinDePartie: {fileID: 0} + mannette1: {fileID: 0} + mannette2: {fileID: 0} + allHumanSpawners: + - {fileID: 0} + - {fileID: 0} + canvasCountdownStart: {fileID: 0} + textCountdownStart: {fileID: 0} +--- !u!82 &1476464315 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8843049163892511640} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 1875d238f0cf2f94890fc872a163f2f8, type: 3} + m_PlayOnAwake: 0 + m_Volume: 0.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!1 &8843049164346990865 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Non-used.meta b/Assets/Prefabs/Non-used.meta new file mode 100644 index 0000000000000000000000000000000000000000..c52d56f5f60c085740f6716fe1e0c7f080cd6933 --- /dev/null +++ b/Assets/Prefabs/Non-used.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8090fad36b9e3624290897c6e8a9017a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Animal.prefab b/Assets/Prefabs/Non-used/Animal.prefab similarity index 100% rename from Assets/Prefabs/Animal.prefab rename to Assets/Prefabs/Non-used/Animal.prefab diff --git a/Assets/Prefabs/Animal.prefab.meta b/Assets/Prefabs/Non-used/Animal.prefab.meta similarity index 100% rename from Assets/Prefabs/Animal.prefab.meta rename to Assets/Prefabs/Non-used/Animal.prefab.meta diff --git a/Assets/Prefabs/AnimalSpawner.prefab b/Assets/Prefabs/Non-used/AnimalSpawner.prefab similarity index 100% rename from Assets/Prefabs/AnimalSpawner.prefab rename to Assets/Prefabs/Non-used/AnimalSpawner.prefab diff --git a/Assets/Prefabs/AnimalSpawner.prefab.meta b/Assets/Prefabs/Non-used/AnimalSpawner.prefab.meta similarity index 100% rename from Assets/Prefabs/AnimalSpawner.prefab.meta rename to Assets/Prefabs/Non-used/AnimalSpawner.prefab.meta diff --git a/Assets/Prefabs/AnimalsAPoser.prefab b/Assets/Prefabs/Non-used/AnimalsAPoser.prefab similarity index 100% rename from Assets/Prefabs/AnimalsAPoser.prefab rename to Assets/Prefabs/Non-used/AnimalsAPoser.prefab diff --git a/Assets/Prefabs/AnimalsAPoser.prefab.meta b/Assets/Prefabs/Non-used/AnimalsAPoser.prefab.meta similarity index 100% rename from Assets/Prefabs/AnimalsAPoser.prefab.meta rename to Assets/Prefabs/Non-used/AnimalsAPoser.prefab.meta diff --git a/Assets/Prefabs/Human.prefab b/Assets/Prefabs/Non-used/Human.prefab similarity index 100% rename from Assets/Prefabs/Human.prefab rename to Assets/Prefabs/Non-used/Human.prefab diff --git a/Assets/Prefabs/Human.prefab.meta b/Assets/Prefabs/Non-used/Human.prefab.meta similarity index 100% rename from Assets/Prefabs/Human.prefab.meta rename to Assets/Prefabs/Non-used/Human.prefab.meta diff --git a/Assets/Prefabs/MovementPrefab.prefab b/Assets/Prefabs/Non-used/MovementPrefab.prefab similarity index 100% rename from Assets/Prefabs/MovementPrefab.prefab rename to Assets/Prefabs/Non-used/MovementPrefab.prefab diff --git a/Assets/Prefabs/MovementPrefab.prefab.meta b/Assets/Prefabs/Non-used/MovementPrefab.prefab.meta similarity index 100% rename from Assets/Prefabs/MovementPrefab.prefab.meta rename to Assets/Prefabs/Non-used/MovementPrefab.prefab.meta diff --git a/Assets/Prefabs/PlayerPrefab.prefab b/Assets/Prefabs/Non-used/PlayerPrefab.prefab similarity index 100% rename from Assets/Prefabs/PlayerPrefab.prefab rename to Assets/Prefabs/Non-used/PlayerPrefab.prefab diff --git a/Assets/Prefabs/PlayerPrefab.prefab.meta b/Assets/Prefabs/Non-used/PlayerPrefab.prefab.meta similarity index 100% rename from Assets/Prefabs/PlayerPrefab.prefab.meta rename to Assets/Prefabs/Non-used/PlayerPrefab.prefab.meta diff --git a/Assets/Prefabs/PlayerPrefabDemo.prefab b/Assets/Prefabs/Non-used/PlayerPrefabDemo.prefab similarity index 100% rename from Assets/Prefabs/PlayerPrefabDemo.prefab rename to Assets/Prefabs/Non-used/PlayerPrefabDemo.prefab diff --git a/Assets/Prefabs/PlayerPrefabDemo.prefab.meta b/Assets/Prefabs/Non-used/PlayerPrefabDemo.prefab.meta similarity index 100% rename from Assets/Prefabs/PlayerPrefabDemo.prefab.meta rename to Assets/Prefabs/Non-used/PlayerPrefabDemo.prefab.meta diff --git a/Assets/Prefabs/PlouCube.prefab b/Assets/Prefabs/Non-used/PlouCube.prefab similarity index 100% rename from Assets/Prefabs/PlouCube.prefab rename to Assets/Prefabs/Non-used/PlouCube.prefab diff --git a/Assets/Prefabs/PlouCube.prefab.meta b/Assets/Prefabs/Non-used/PlouCube.prefab.meta similarity index 100% rename from Assets/Prefabs/PlouCube.prefab.meta rename to Assets/Prefabs/Non-used/PlouCube.prefab.meta diff --git a/Assets/Prefabs/PlouCube2.prefab b/Assets/Prefabs/Non-used/PlouCube2.prefab similarity index 100% rename from Assets/Prefabs/PlouCube2.prefab rename to Assets/Prefabs/Non-used/PlouCube2.prefab diff --git a/Assets/Prefabs/PlouCube2.prefab.meta b/Assets/Prefabs/Non-used/PlouCube2.prefab.meta similarity index 100% rename from Assets/Prefabs/PlouCube2.prefab.meta rename to Assets/Prefabs/Non-used/PlouCube2.prefab.meta diff --git a/Assets/Prefabs/PlouOVRPlayerController.prefab b/Assets/Prefabs/Non-used/PlouOVRPlayerController.prefab similarity index 100% rename from Assets/Prefabs/PlouOVRPlayerController.prefab rename to Assets/Prefabs/Non-used/PlouOVRPlayerController.prefab diff --git a/Assets/Prefabs/PlouOVRPlayerController.prefab.meta b/Assets/Prefabs/Non-used/PlouOVRPlayerController.prefab.meta similarity index 100% rename from Assets/Prefabs/PlouOVRPlayerController.prefab.meta rename to Assets/Prefabs/Non-used/PlouOVRPlayerController.prefab.meta diff --git a/Assets/Prefabs/SpawnCube 1.prefab b/Assets/Prefabs/Non-used/SpawnCube 1.prefab similarity index 100% rename from Assets/Prefabs/SpawnCube 1.prefab rename to Assets/Prefabs/Non-used/SpawnCube 1.prefab diff --git a/Assets/Prefabs/SpawnCube 1.prefab.meta b/Assets/Prefabs/Non-used/SpawnCube 1.prefab.meta similarity index 100% rename from Assets/Prefabs/SpawnCube 1.prefab.meta rename to Assets/Prefabs/Non-used/SpawnCube 1.prefab.meta diff --git a/Assets/Prefabs/SpawnCube.prefab b/Assets/Prefabs/Non-used/SpawnCube.prefab similarity index 100% rename from Assets/Prefabs/SpawnCube.prefab rename to Assets/Prefabs/Non-used/SpawnCube.prefab diff --git a/Assets/Prefabs/SpawnCube.prefab.meta b/Assets/Prefabs/Non-used/SpawnCube.prefab.meta similarity index 100% rename from Assets/Prefabs/SpawnCube.prefab.meta rename to Assets/Prefabs/Non-used/SpawnCube.prefab.meta diff --git a/Assets/Prefabs/SpawnCube1_Rotating.prefab b/Assets/Prefabs/Non-used/SpawnCube1_Rotating.prefab similarity index 100% rename from Assets/Prefabs/SpawnCube1_Rotating.prefab rename to Assets/Prefabs/Non-used/SpawnCube1_Rotating.prefab diff --git a/Assets/Prefabs/SpawnCube1_Rotating.prefab.meta b/Assets/Prefabs/Non-used/SpawnCube1_Rotating.prefab.meta similarity index 100% rename from Assets/Prefabs/SpawnCube1_Rotating.prefab.meta rename to Assets/Prefabs/Non-used/SpawnCube1_Rotating.prefab.meta diff --git a/Assets/Prefabs/SpawnCube_Rotating.prefab b/Assets/Prefabs/Non-used/SpawnCube_Rotating.prefab similarity index 100% rename from Assets/Prefabs/SpawnCube_Rotating.prefab rename to Assets/Prefabs/Non-used/SpawnCube_Rotating.prefab diff --git a/Assets/Prefabs/SpawnCube_Rotating.prefab.meta b/Assets/Prefabs/Non-used/SpawnCube_Rotating.prefab.meta similarity index 100% rename from Assets/Prefabs/SpawnCube_Rotating.prefab.meta rename to Assets/Prefabs/Non-used/SpawnCube_Rotating.prefab.meta diff --git a/Assets/Prefabs/Spawner.prefab b/Assets/Prefabs/Non-used/Spawner.prefab similarity index 100% rename from Assets/Prefabs/Spawner.prefab rename to Assets/Prefabs/Non-used/Spawner.prefab diff --git a/Assets/Prefabs/Spawner.prefab.meta b/Assets/Prefabs/Non-used/Spawner.prefab.meta similarity index 100% rename from Assets/Prefabs/Spawner.prefab.meta rename to Assets/Prefabs/Non-used/Spawner.prefab.meta diff --git a/Assets/Prefabs/V2PlouSkypPlayerPrefab.prefab b/Assets/Prefabs/Non-used/V2PlouSkypPlayerPrefab.prefab similarity index 100% rename from Assets/Prefabs/V2PlouSkypPlayerPrefab.prefab rename to Assets/Prefabs/Non-used/V2PlouSkypPlayerPrefab.prefab diff --git a/Assets/Prefabs/V2PlouSkypPlayerPrefab.prefab.meta b/Assets/Prefabs/Non-used/V2PlouSkypPlayerPrefab.prefab.meta similarity index 100% rename from Assets/Prefabs/V2PlouSkypPlayerPrefab.prefab.meta rename to Assets/Prefabs/Non-used/V2PlouSkypPlayerPrefab.prefab.meta diff --git a/Assets/Prefabs/animalSpawner Variant.prefab b/Assets/Prefabs/Non-used/animalSpawner Variant.prefab similarity index 100% rename from Assets/Prefabs/animalSpawner Variant.prefab rename to Assets/Prefabs/Non-used/animalSpawner Variant.prefab diff --git a/Assets/Prefabs/animalSpawner Variant.prefab.meta b/Assets/Prefabs/Non-used/animalSpawner Variant.prefab.meta similarity index 100% rename from Assets/Prefabs/animalSpawner Variant.prefab.meta rename to Assets/Prefabs/Non-used/animalSpawner Variant.prefab.meta diff --git a/Assets/Prefabs/SceneAndUI.meta b/Assets/Prefabs/SceneAndUI.meta new file mode 100644 index 0000000000000000000000000000000000000000..98b1403061d98b9055313b2c701a0368f9cc829d --- /dev/null +++ b/Assets/Prefabs/SceneAndUI.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ea9943d8ed52e8f47a7f6d98dd9c0097 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/AffichageMuralInfos.prefab b/Assets/Prefabs/SceneAndUI/AffichageMuralData.prefab similarity index 100% rename from Assets/Prefabs/AffichageMuralInfos.prefab rename to Assets/Prefabs/SceneAndUI/AffichageMuralData.prefab diff --git a/Assets/Prefabs/AffichageMuralInfos.prefab.meta b/Assets/Prefabs/SceneAndUI/AffichageMuralData.prefab.meta similarity index 100% rename from Assets/Prefabs/AffichageMuralInfos.prefab.meta rename to Assets/Prefabs/SceneAndUI/AffichageMuralData.prefab.meta diff --git a/Assets/Prefabs/Tuto.prefab b/Assets/Prefabs/SceneAndUI/AffichageMuralTuto.prefab similarity index 100% rename from Assets/Prefabs/Tuto.prefab rename to Assets/Prefabs/SceneAndUI/AffichageMuralTuto.prefab diff --git a/Assets/Prefabs/Tuto.prefab.meta b/Assets/Prefabs/SceneAndUI/AffichageMuralTuto.prefab.meta similarity index 100% rename from Assets/Prefabs/Tuto.prefab.meta rename to Assets/Prefabs/SceneAndUI/AffichageMuralTuto.prefab.meta diff --git a/Assets/Prefabs/BoutonsPlayQuit.prefab b/Assets/Prefabs/SceneAndUI/BoutonsPlayQuit.prefab similarity index 100% rename from Assets/Prefabs/BoutonsPlayQuit.prefab rename to Assets/Prefabs/SceneAndUI/BoutonsPlayQuit.prefab diff --git a/Assets/Prefabs/BoutonsPlayQuit.prefab.meta b/Assets/Prefabs/SceneAndUI/BoutonsPlayQuit.prefab.meta similarity index 100% rename from Assets/Prefabs/BoutonsPlayQuit.prefab.meta rename to Assets/Prefabs/SceneAndUI/BoutonsPlayQuit.prefab.meta diff --git a/Assets/Prefabs/GameBoard.prefab b/Assets/Prefabs/SceneAndUI/GameBoard.prefab similarity index 100% rename from Assets/Prefabs/GameBoard.prefab rename to Assets/Prefabs/SceneAndUI/GameBoard.prefab diff --git a/Assets/Prefabs/GameBoard.prefab.meta b/Assets/Prefabs/SceneAndUI/GameBoard.prefab.meta similarity index 100% rename from Assets/Prefabs/GameBoard.prefab.meta rename to Assets/Prefabs/SceneAndUI/GameBoard.prefab.meta diff --git a/Assets/Prefabs/SpawnersAndUnits.meta b/Assets/Prefabs/SpawnersAndUnits.meta new file mode 100644 index 0000000000000000000000000000000000000000..b8b924101f8752e591884e89063a8bd59b037dcc --- /dev/null +++ b/Assets/Prefabs/SpawnersAndUnits.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 358fc41cb7941cb48a0221f49e2e0392 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/AnimalSpawnerAPoserLeVrai.prefab b/Assets/Prefabs/SpawnersAndUnits/AnimalSpawnerAPoserLeVrai.prefab similarity index 100% rename from Assets/Prefabs/AnimalSpawnerAPoserLeVrai.prefab rename to Assets/Prefabs/SpawnersAndUnits/AnimalSpawnerAPoserLeVrai.prefab diff --git a/Assets/Prefabs/AnimalSpawnerAPoserLeVrai.prefab.meta b/Assets/Prefabs/SpawnersAndUnits/AnimalSpawnerAPoserLeVrai.prefab.meta similarity index 100% rename from Assets/Prefabs/AnimalSpawnerAPoserLeVrai.prefab.meta rename to Assets/Prefabs/SpawnersAndUnits/AnimalSpawnerAPoserLeVrai.prefab.meta diff --git a/Assets/Prefabs/Bucheron Variant.prefab b/Assets/Prefabs/SpawnersAndUnits/Bucheron Variant.prefab similarity index 100% rename from Assets/Prefabs/Bucheron Variant.prefab rename to Assets/Prefabs/SpawnersAndUnits/Bucheron Variant.prefab diff --git a/Assets/Prefabs/Bucheron Variant.prefab.meta b/Assets/Prefabs/SpawnersAndUnits/Bucheron Variant.prefab.meta similarity index 100% rename from Assets/Prefabs/Bucheron Variant.prefab.meta rename to Assets/Prefabs/SpawnersAndUnits/Bucheron Variant.prefab.meta diff --git a/Assets/Prefabs/CaillouAPoser.prefab b/Assets/Prefabs/SpawnersAndUnits/CaillouAPoser.prefab similarity index 60% rename from Assets/Prefabs/CaillouAPoser.prefab rename to Assets/Prefabs/SpawnersAndUnits/CaillouAPoser.prefab index 17ee15026f83818af4a9ab5d60b7a3fa2cdf2a4e..de703346f6fdc821863c0da0385e7209badec582 100644 --- a/Assets/Prefabs/CaillouAPoser.prefab +++ b/Assets/Prefabs/SpawnersAndUnits/CaillouAPoser.prefab @@ -36,7 +36,6 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} m_Children: - - {fileID: 8696216932177430657} - {fileID: 6333816732708769501} m_Father: {fileID: 0} m_RootOrder: 0 @@ -112,8 +111,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f4e38e7ef58866a459e4845515cc1ddc, type: 3} m_Name: m_EditorClassIdentifier: - theCanvas: {fileID: 7585250455020012139} - textMeshPro: {fileID: 1025402451874077085} + theCanvas: {fileID: 0} + textMeshPro: {fileID: 0} infoAAfficher: JE SUIS GRAND secsBeforePopupDisappear: 2 --- !u!120 &8848484259265448206 @@ -283,262 +282,6 @@ NavMeshObstacle: m_CarveOnlyStationary: 1 m_Center: {x: 0, y: 0, z: 0} m_TimeToStationary: 0.5 ---- !u!1 &2549913157817142243 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7675461631385868611} - - component: {fileID: 4781017312780879953} - - component: {fileID: 1025402451874077085} - m_Layer: 0 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7675461631385868611 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2549913157817142243} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 8696216932177430657} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 1, y: 0.5} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4781017312780879953 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2549913157817142243} - m_CullTransparentMesh: 0 ---- !u!114 &1025402451874077085 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2549913157817142243} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_text: Je texte - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_outlineColor: - serializedVersion: 2 - rgba: 4278190080 - m_fontSize: 0.1 - m_fontSizeBase: 0.1 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_textAlignment: 514 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_firstOverflowCharacterIndex: -1 - m_linkedTextComponent: {fileID: 0} - m_isLinkedTextComponent: 0 - m_isTextTruncated: 0 - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_ignoreRectMaskCulling: 0 - m_ignoreCulling: 1 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_VertexBufferAutoSizeReduction: 1 - m_firstVisibleCharacter: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_textInfo: - textComponent: {fileID: 1025402451874077085} - characterCount: 8 - spriteCount: 0 - spaceCount: 1 - wordCount: 2 - linkCount: 0 - lineCount: 1 - pageCount: 1 - materialCount: 1 - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_spriteAnimator: {fileID: 0} - m_hasFontAssetChanged: 0 - m_subTextObjects: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &7585250455020012139 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8696216932177430657} - - component: {fileID: 7271097800252597184} - - component: {fileID: 7374973142336212725} - - component: {fileID: 987893908620158483} - m_Layer: 0 - m_Name: Canvas - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &8696216932177430657 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7585250455020012139} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 7675461631385868611} - m_Father: {fileID: 1635955774121567601} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 1} - m_SizeDelta: {x: 1, y: 0.5} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!223 &7271097800252597184 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7585250455020012139} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 2 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_AdditionalShaderChannelsFlag: 25 - m_SortingLayerID: 0 - m_SortingOrder: 0 - m_TargetDisplay: 0 ---- !u!114 &7374973142336212725 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7585250455020012139} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} - m_Name: - m_EditorClassIdentifier: - m_UiScaleMode: 0 - m_ReferencePixelsPerUnit: 100 - m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} - m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 - m_PhysicalUnit: 3 - m_FallbackScreenDPI: 96 - m_DefaultSpriteDPI: 96 - m_DynamicPixelsPerUnit: 1 ---- !u!114 &987893908620158483 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7585250455020012139} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 4294967295 --- !u!1001 &2681253051267372950 PrefabInstance: m_ObjectHideFlags: 0 @@ -546,6 +289,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1635955774121567601} 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 @@ -584,7 +332,7 @@ PrefabInstance: - target: {fileID: 8274103944527042891, guid: ebc6115e30f2c4d41a992a5ea5a07a9b, type: 3} propertyPath: m_RootOrder - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8274103944527042891, guid: ebc6115e30f2c4d41a992a5ea5a07a9b, type: 3} @@ -616,11 +364,6 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 2 objectReference: {fileID: 0} - - target: {fileID: 8274103944527042887, guid: ebc6115e30f2c4d41a992a5ea5a07a9b, - type: 3} - propertyPath: m_Name - value: Caillou - objectReference: {fileID: 0} - target: {fileID: 8274103944527042888, guid: ebc6115e30f2c4d41a992a5ea5a07a9b, type: 3} propertyPath: m_Enabled diff --git a/Assets/Prefabs/CaillouAPoser.prefab.meta b/Assets/Prefabs/SpawnersAndUnits/CaillouAPoser.prefab.meta similarity index 100% rename from Assets/Prefabs/CaillouAPoser.prefab.meta rename to Assets/Prefabs/SpawnersAndUnits/CaillouAPoser.prefab.meta diff --git a/Assets/Prefabs/PlouThunder.prefab b/Assets/Prefabs/SpawnersAndUnits/Eclair.prefab similarity index 99% rename from Assets/Prefabs/PlouThunder.prefab rename to Assets/Prefabs/SpawnersAndUnits/Eclair.prefab index 5c2d644fb36b884b401836cf09311a026f01e342..1f50c6823fda2d333b89b989255fdc32a928cec7 100644 --- a/Assets/Prefabs/PlouThunder.prefab +++ b/Assets/Prefabs/SpawnersAndUnits/Eclair.prefab @@ -21,7 +21,7 @@ GameObject: - component: {fileID: 7142414680544549018} - component: {fileID: 2355496042827591734} m_Layer: 0 - m_Name: PlouThunder + m_Name: Eclair m_TagString: Eclair m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -258,6 +258,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: locked: 0 + clipFail: {fileID: 8300000, guid: d041115870f45b94fbe082a394febe96, type: 3} --- !u!82 &-60245208455828847 AudioSource: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/PlouThunder.prefab.meta b/Assets/Prefabs/SpawnersAndUnits/Eclair.prefab.meta similarity index 100% rename from Assets/Prefabs/PlouThunder.prefab.meta rename to Assets/Prefabs/SpawnersAndUnits/Eclair.prefab.meta diff --git a/Assets/Prefabs/SpawnAnimalSpawnerAPoserLeVrai.prefab b/Assets/Prefabs/SpawnersAndUnits/SpawnAnimalSpawnerAPoserLeVrai.prefab similarity index 99% rename from Assets/Prefabs/SpawnAnimalSpawnerAPoserLeVrai.prefab rename to Assets/Prefabs/SpawnersAndUnits/SpawnAnimalSpawnerAPoserLeVrai.prefab index 0b0a920b2a3ce8c93c184499d7916cbb3df4ba49..8822fa4a3ee93ed21178bf80d1d8e420c8e08780 100644 --- a/Assets/Prefabs/SpawnAnimalSpawnerAPoserLeVrai.prefab +++ b/Assets/Prefabs/SpawnersAndUnits/SpawnAnimalSpawnerAPoserLeVrai.prefab @@ -253,7 +253,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_text: Guardian's Lair + m_text: Guardian's Lair (5) m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -322,10 +322,10 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_textInfo: textComponent: {fileID: 535362866475433497} - characterCount: 15 + characterCount: 19 spriteCount: 0 - spaceCount: 1 - wordCount: 2 + spaceCount: 2 + wordCount: 3 linkCount: 0 lineCount: 2 pageCount: 1 diff --git a/Assets/Prefabs/SpawnAnimalSpawnerAPoserLeVrai.prefab.meta b/Assets/Prefabs/SpawnersAndUnits/SpawnAnimalSpawnerAPoserLeVrai.prefab.meta similarity index 100% rename from Assets/Prefabs/SpawnAnimalSpawnerAPoserLeVrai.prefab.meta rename to Assets/Prefabs/SpawnersAndUnits/SpawnAnimalSpawnerAPoserLeVrai.prefab.meta diff --git a/Assets/Prefabs/SpawnCaillou.prefab b/Assets/Prefabs/SpawnersAndUnits/SpawnCaillou.prefab similarity index 98% rename from Assets/Prefabs/SpawnCaillou.prefab rename to Assets/Prefabs/SpawnersAndUnits/SpawnCaillou.prefab index 8dbc781761b04545fc57d6b0c473523e0577bc10..47fc97e991535bd6232e1962fa2bcc8c26e958ff 100644 --- a/Assets/Prefabs/SpawnCaillou.prefab +++ b/Assets/Prefabs/SpawnersAndUnits/SpawnCaillou.prefab @@ -37,7 +37,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0.75} - m_SizeDelta: {x: 0.1, y: 0.05} + m_SizeDelta: {x: 0.12, y: 0.05} m_Pivot: {x: 0.5, y: 0.5} --- !u!223 &7378692012727154957 Canvas: @@ -116,7 +116,7 @@ GameObject: - component: {fileID: 6072849483488530945} m_Layer: 9 m_Name: SpawnCaillou - m_TagString: JeanSpawner + m_TagString: InHandCaillou m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -277,7 +277,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0.1, y: 0.05} + m_SizeDelta: {x: 0.12, y: 0.05} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4371533939856052040 CanvasRenderer: @@ -307,7 +307,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_text: Rocky Obstacle + m_text: Rocky Obstacle (5) m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -376,10 +376,10 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_textInfo: textComponent: {fileID: 693562887515929191} - characterCount: 14 + characterCount: 18 spriteCount: 0 - spaceCount: 1 - wordCount: 2 + spaceCount: 2 + wordCount: 3 linkCount: 0 lineCount: 2 pageCount: 1 diff --git a/Assets/Prefabs/SpawnCaillou.prefab.meta b/Assets/Prefabs/SpawnersAndUnits/SpawnCaillou.prefab.meta similarity index 100% rename from Assets/Prefabs/SpawnCaillou.prefab.meta rename to Assets/Prefabs/SpawnersAndUnits/SpawnCaillou.prefab.meta diff --git a/Assets/Prefabs/SpawnThunder.prefab b/Assets/Prefabs/SpawnersAndUnits/SpawnThunder.prefab similarity index 98% rename from Assets/Prefabs/SpawnThunder.prefab rename to Assets/Prefabs/SpawnersAndUnits/SpawnThunder.prefab index f8dbd39d424be48742925742c1c1560a3975fb58..2e6b0bc95de11d366120fc88ec5adaa4a11652d9 100644 --- a/Assets/Prefabs/SpawnThunder.prefab +++ b/Assets/Prefabs/SpawnersAndUnits/SpawnThunder.prefab @@ -159,7 +159,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 110d18684c8989749858487c630bec35, type: 2} + - {fileID: 2100000, guid: cc398c799c0a3d9439ced9b560e4cdb4, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -291,7 +291,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_text: Cloud's Wrath + m_text: Cloud's Wrath (30) m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -360,10 +360,10 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_textInfo: textComponent: {fileID: 8091582481608792189} - characterCount: 13 + characterCount: 18 spriteCount: 0 - spaceCount: 1 - wordCount: 2 + spaceCount: 2 + wordCount: 3 linkCount: 0 lineCount: 2 pageCount: 1 @@ -488,7 +488,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 110d18684c8989749858487c630bec35, type: 2} + - {fileID: 2100000, guid: cc398c799c0a3d9439ced9b560e4cdb4, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/Prefabs/SpawnThunder.prefab.meta b/Assets/Prefabs/SpawnersAndUnits/SpawnThunder.prefab.meta similarity index 100% rename from Assets/Prefabs/SpawnThunder.prefab.meta rename to Assets/Prefabs/SpawnersAndUnits/SpawnThunder.prefab.meta diff --git a/Assets/Prefabs/animal Variant.prefab b/Assets/Prefabs/SpawnersAndUnits/animal Variant.prefab similarity index 100% rename from Assets/Prefabs/animal Variant.prefab rename to Assets/Prefabs/SpawnersAndUnits/animal Variant.prefab diff --git a/Assets/Prefabs/animal Variant.prefab.meta b/Assets/Prefabs/SpawnersAndUnits/animal Variant.prefab.meta similarity index 100% rename from Assets/Prefabs/animal Variant.prefab.meta rename to Assets/Prefabs/SpawnersAndUnits/animal Variant.prefab.meta diff --git a/Assets/Prefabs/humanSpawn Variant.prefab b/Assets/Prefabs/SpawnersAndUnits/humanSpawn Variant.prefab similarity index 80% rename from Assets/Prefabs/humanSpawn Variant.prefab rename to Assets/Prefabs/SpawnersAndUnits/humanSpawn Variant.prefab index 752b053c370dec451019516eaba4fab0d1118545..358adefa72e904a8cd821f17235ca36919d4f79e 100644 --- a/Assets/Prefabs/humanSpawn Variant.prefab +++ b/Assets/Prefabs/SpawnersAndUnits/humanSpawn Variant.prefab @@ -10,6 +10,7 @@ GameObject: m_Component: - component: {fileID: 346441978} - component: {fileID: 346441979} + - component: {fileID: 8725566141506292444} m_Layer: 0 m_Name: SpawnPoint m_TagString: Untagged @@ -46,6 +47,103 @@ MonoBehaviour: m_human: {fileID: 3620929232822062864} m_originalDelta: 8 m_floor: 3 + thegamestarted: 0 +--- !u!82 &8725566141506292444 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 346441977} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 2b5a54c82ee95914f83c12391f812fce, 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: 1 + 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 &1518817695 NavMeshObstacle: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/humanSpawn Variant.prefab.meta b/Assets/Prefabs/SpawnersAndUnits/humanSpawn Variant.prefab.meta similarity index 100% rename from Assets/Prefabs/humanSpawn Variant.prefab.meta rename to Assets/Prefabs/SpawnersAndUnits/humanSpawn Variant.prefab.meta diff --git a/Assets/Prefabs/rock1 Variant.prefab b/Assets/Prefabs/SpawnersAndUnits/rock1 Variant.prefab similarity index 100% rename from Assets/Prefabs/rock1 Variant.prefab rename to Assets/Prefabs/SpawnersAndUnits/rock1 Variant.prefab diff --git a/Assets/Prefabs/rock1 Variant.prefab.meta b/Assets/Prefabs/SpawnersAndUnits/rock1 Variant.prefab.meta similarity index 100% rename from Assets/Prefabs/rock1 Variant.prefab.meta rename to Assets/Prefabs/SpawnersAndUnits/rock1 Variant.prefab.meta diff --git a/Assets/Prefabs/rock2 Variant.prefab b/Assets/Prefabs/SpawnersAndUnits/rock2 Variant.prefab similarity index 100% rename from Assets/Prefabs/rock2 Variant.prefab rename to Assets/Prefabs/SpawnersAndUnits/rock2 Variant.prefab diff --git a/Assets/Prefabs/rock2 Variant.prefab.meta b/Assets/Prefabs/SpawnersAndUnits/rock2 Variant.prefab.meta similarity index 100% rename from Assets/Prefabs/rock2 Variant.prefab.meta rename to Assets/Prefabs/SpawnersAndUnits/rock2 Variant.prefab.meta diff --git a/Assets/Prefabs/rock3 Variant.prefab b/Assets/Prefabs/SpawnersAndUnits/rock3 Variant.prefab similarity index 100% rename from Assets/Prefabs/rock3 Variant.prefab rename to Assets/Prefabs/SpawnersAndUnits/rock3 Variant.prefab diff --git a/Assets/Prefabs/rock3 Variant.prefab.meta b/Assets/Prefabs/SpawnersAndUnits/rock3 Variant.prefab.meta similarity index 100% rename from Assets/Prefabs/rock3 Variant.prefab.meta rename to Assets/Prefabs/SpawnersAndUnits/rock3 Variant.prefab.meta diff --git a/Assets/Scenes/Plou/Menu.unity b/Assets/Scenes/Plou/Menu.unity index d94ed561ea546d4a40e636d78ef8127502e2f66f..55bd6888e3303ac448935387dc1895d2f770c7c4 100644 --- a/Assets/Scenes/Plou/Menu.unity +++ b/Assets/Scenes/Plou/Menu.unity @@ -1214,6 +1214,7 @@ GameObject: m_Component: - component: {fileID: 1201502690} - component: {fileID: 1201502689} + - component: {fileID: 1201502691} m_Layer: 0 m_Name: SceneManager m_TagString: Untagged @@ -1248,6 +1249,102 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!82 &1201502691 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1201502688} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 1875d238f0cf2f94890fc872a163f2f8, type: 3} + m_PlayOnAwake: 1 + m_Volume: 0.1 + m_Pitch: 1 + Loop: 1 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 --- !u!1 &1232352620 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Plou/SceneDeJeu.unity b/Assets/Scenes/Plou/SceneDeJeu.unity index d757cc0fe7876f49d1fb86fbe9a3c753bb1f769b..3d7ff8b83ea13d8322e346d5302b750981e99062 100644 --- a/Assets/Scenes/Plou/SceneDeJeu.unity +++ b/Assets/Scenes/Plou/SceneDeJeu.unity @@ -1406,8 +1406,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1008236113} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalPosition: {x: 0, y: 1, z: 0} + m_LocalScale: {x: 1, y: 1.5, z: 1} m_Children: [] m_Father: {fileID: 1295439240} m_RootOrder: 0 @@ -2423,6 +2423,239 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2378845050949971727} m_PrefabAsset: {fileID: 0} +--- !u!1001 &7279517774167845689 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 249423265977640080, guid: c54dfc7de2a849243b0be906721f7d7f, + type: 3} + propertyPath: m_Name + value: CountdownToStart + objectReference: {fileID: 0} + - target: {fileID: 249423265977640084, guid: c54dfc7de2a849243b0be906721f7d7f, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 249423265977640084, guid: c54dfc7de2a849243b0be906721f7d7f, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 249423265977640084, guid: c54dfc7de2a849243b0be906721f7d7f, + type: 3} + propertyPath: m_LocalPosition.z + value: 2.07 + objectReference: {fileID: 0} + - target: {fileID: 249423265977640084, guid: c54dfc7de2a849243b0be906721f7d7f, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 249423265977640084, guid: c54dfc7de2a849243b0be906721f7d7f, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 249423265977640084, guid: c54dfc7de2a849243b0be906721f7d7f, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 249423265977640084, guid: c54dfc7de2a849243b0be906721f7d7f, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 249423265977640084, guid: c54dfc7de2a849243b0be906721f7d7f, + type: 3} + propertyPath: m_RootOrder + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 249423265977640084, guid: c54dfc7de2a849243b0be906721f7d7f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 249423265977640084, guid: c54dfc7de2a849243b0be906721f7d7f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 249423265977640084, guid: c54dfc7de2a849243b0be906721f7d7f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 249423265977640084, guid: c54dfc7de2a849243b0be906721f7d7f, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 249423265977640084, guid: c54dfc7de2a849243b0be906721f7d7f, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 2.5 + objectReference: {fileID: 0} + - target: {fileID: 249423265977640084, guid: c54dfc7de2a849243b0be906721f7d7f, + type: 3} + propertyPath: m_SizeDelta.x + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 249423265977640084, guid: c54dfc7de2a849243b0be906721f7d7f, + type: 3} + propertyPath: m_SizeDelta.y + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 249423265977640084, guid: c54dfc7de2a849243b0be906721f7d7f, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 249423265977640084, guid: c54dfc7de2a849243b0be906721f7d7f, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 249423265977640084, guid: c54dfc7de2a849243b0be906721f7d7f, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 249423265977640084, guid: c54dfc7de2a849243b0be906721f7d7f, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 249423265977640084, guid: c54dfc7de2a849243b0be906721f7d7f, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 249423265977640084, guid: c54dfc7de2a849243b0be906721f7d7f, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c54dfc7de2a849243b0be906721f7d7f, type: 3} +--- !u!114 &7381448146964574628 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 249423267845331613, guid: c54dfc7de2a849243b0be906721f7d7f, + type: 3} + m_PrefabInstance: {fileID: 7279517774167845689} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &7381448147743674281 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 249423265977640080, guid: c54dfc7de2a849243b0be906721f7d7f, + type: 3} + m_PrefabInstance: {fileID: 7279517774167845689} + m_PrefabAsset: {fileID: 0} +--- !u!82 &7381448147743674282 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7381448147743674281} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 22fc9efa7552177458a3f286b41a7ce0, 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: 1 + 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: 1 + 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 &7877475419153254235 PrefabInstance: m_ObjectHideFlags: 0 @@ -2556,6 +2789,16 @@ PrefabInstance: propertyPath: rotateAxisSpeed.x value: 20 objectReference: {fileID: 0} + - target: {fileID: 2051765595219415061, guid: 40b53501a36d4d44fb4cd3f334ea9e21, + type: 3} + propertyPath: m_TagString + value: InHandCaillou + objectReference: {fileID: 0} + - target: {fileID: 7696851736610335028, guid: 40b53501a36d4d44fb4cd3f334ea9e21, + type: 3} + propertyPath: m_Constraints + value: 126 + objectReference: {fileID: 0} - target: {fileID: 3597270653793144617, guid: 40b53501a36d4d44fb4cd3f334ea9e21, type: 3} propertyPath: m_StaticEditorFlags @@ -2884,14 +3127,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8843049163892511641, guid: a4d8a0feae766074e82fe6e3b759c29f, type: 3} - propertyPath: allHumanSpawners.Array.size - value: 2 - objectReference: {fileID: 0} + propertyPath: boutonsFinDePartie + value: + objectReference: {fileID: 942570001} - target: {fileID: 8843049163892511641, guid: a4d8a0feae766074e82fe6e3b759c29f, type: 3} - propertyPath: tempsDeJeuRestant - value: 80 - objectReference: {fileID: 0} + propertyPath: mannette1 + value: + objectReference: {fileID: 953090160} + - target: {fileID: 8843049163892511641, guid: a4d8a0feae766074e82fe6e3b759c29f, + type: 3} + propertyPath: mannette2 + value: + objectReference: {fileID: 695192209} - target: {fileID: 8843049163892511641, guid: a4d8a0feae766074e82fe6e3b759c29f, type: 3} propertyPath: allHumanSpawners.Array.data[0] @@ -2904,24 +3152,19 @@ PrefabInstance: objectReference: {fileID: 816938592} - target: {fileID: 8843049163892511641, guid: a4d8a0feae766074e82fe6e3b759c29f, type: 3} - propertyPath: nbSecondesAttenteDebut - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 8843049163892511641, guid: a4d8a0feae766074e82fe6e3b759c29f, - type: 3} - propertyPath: boutonsFinDePartie + propertyPath: canvasCountdownStart value: - objectReference: {fileID: 942570001} + objectReference: {fileID: 7381448147743674281} - target: {fileID: 8843049163892511641, guid: a4d8a0feae766074e82fe6e3b759c29f, type: 3} - propertyPath: mannette1 + propertyPath: textCountdownStart value: - objectReference: {fileID: 953090160} + objectReference: {fileID: 7381448146964574628} - target: {fileID: 8843049163892511641, guid: a4d8a0feae766074e82fe6e3b759c29f, type: 3} - propertyPath: mannette2 - value: - objectReference: {fileID: 695192209} + propertyPath: nbSecondesAttenteDebut + value: 5 + objectReference: {fileID: 0} - target: {fileID: 8843049163892511642, guid: a4d8a0feae766074e82fe6e3b759c29f, type: 3} propertyPath: m_LocalPosition.x @@ -2977,10 +3220,9 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 8843049163153765051, guid: a4d8a0feae766074e82fe6e3b759c29f, - type: 3} - propertyPath: m_Enabled - value: 0 + - target: {fileID: 1476464315, guid: a4d8a0feae766074e82fe6e3b759c29f, type: 3} + propertyPath: Loop + value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a4d8a0feae766074e82fe6e3b759c29f, type: 3} diff --git a/Assets/Scripts/GameManager.cs b/Assets/Scripts/GameManager.cs index 797b862d42980a04f0cabdcab7ab2ead22423400..bd6caf31a4aed57a424c131f0de9caa77384f1ef 100644 --- a/Assets/Scripts/GameManager.cs +++ b/Assets/Scripts/GameManager.cs @@ -26,7 +26,9 @@ public class GameManager : MonoBehaviour public static float ManaAmount() => manaAmount; [SerializeField] private bool gameEnded = false; - [SerializeField] private float nbSecondesAttenteDebut = 3f; + [SerializeField] private int nbSecondesAttenteDebut = 3; + private int secondsToWait; + [SerializeField] private GameObject boutonsFinDePartie; [SerializeField] private CustomOVRGrabber mannette1; @@ -34,6 +36,12 @@ public class GameManager : MonoBehaviour [SerializeField] private HumanSpawner[] allHumanSpawners; + public GameObject canvasCountdownStart; + public TextMeshProUGUI textCountdownStart; + + private AudioSource audioCountdown; + private AudioSource musicScene; + // true apres X secondes private static bool gameStarted = false; @@ -45,17 +53,20 @@ public class GameManager : MonoBehaviour // Start is called before the first frame update void Start() { + musicScene = gameObject.GetComponent<AudioSource>(); + audioCountdown = canvasCountdownStart.GetComponent<AudioSource>(); + secondsToWait = nbSecondesAttenteDebut; + + textCountdownStart.text = secondsToWait.ToString(); + audioCountdown.Play(); + manaAmount = startMana; - Debug.Log("Euuuuuuuuuuuuuuuh"); for (int i = 0; i< allHumanSpawners.Length; ++i) { - Debug.Log("JE SUIS I : " + i); allHumanSpawners[i].SetGameStarted(false); } - Debug.Log("DONEONEONEOENOEN"); boutonsFinDePartie.SetActive(false); - Debug.Log("JEAN EUDES DAMMIT"); //Time.timeScale = 0f; StartCoroutine(TimerToStart()); //StartCoroutine(GenerateMana()); @@ -65,7 +76,16 @@ public class GameManager : MonoBehaviour IEnumerator TimerToStart() { - yield return new WaitForSeconds(nbSecondesAttenteDebut); + while(secondsToWait > 0) + { + yield return new WaitForSeconds(1); + --secondsToWait; + textCountdownStart.text = secondsToWait.ToString(); + audioCountdown.Play(); + } + + canvasCountdownStart.SetActive(false); + musicScene.Play(); //Time.timeScale = 1f; GameManager.gameStarted = true; @@ -152,7 +172,7 @@ public class GameManager : MonoBehaviour // Update is called once per frame void Update() { - if (!gameEnded) + if ((!gameEnded) && gameStarted) { tempsDeJeuRestant -= Time.deltaTime; TestFinDePartie(); diff --git a/Assets/Scripts/HumanSpawner.cs b/Assets/Scripts/HumanSpawner.cs index d56705cc6e625570238f001d8be637270e08832d..61105a0434e341f8bcdae1ec36a5391ee618146e 100644 --- a/Assets/Scripts/HumanSpawner.cs +++ b/Assets/Scripts/HumanSpawner.cs @@ -16,6 +16,8 @@ public class HumanSpawner : MonoBehaviour [SerializeField] private bool thegamestarted = false; + private AudioSource audioEnemySpawn; + public void SetGameStarted(bool g) { Debug.Log("GAMESTARTED SET TO : " + g); @@ -26,12 +28,14 @@ public class HumanSpawner : MonoBehaviour stamp = Time.fixedTime; Instantiate(m_human, transform.position, Quaternion.identity).SetActive(true); delta = m_originalDelta; + audioEnemySpawn.Play(); } } // Start is called before the first frame update void Start() { + audioEnemySpawn = gameObject.GetComponent<AudioSource>(); /* stamp = Time.fixedTime; Instantiate(m_human, transform.position, Quaternion.identity).SetActive(true); @@ -60,6 +64,7 @@ public class HumanSpawner : MonoBehaviour { stamp = Time.fixedTime; Instantiate(m_human, transform.position, Quaternion.identity).SetActive(true); + audioEnemySpawn.Play(); if (delta > m_floor) delta -= 1; } } diff --git a/Assets/Scripts/Lancable.cs b/Assets/Scripts/Lancable.cs index 28f509601a886cfad44e403385be0cf44b204878..79dcd47c65b8571dd574cadd5a79c3135408e695 100644 --- a/Assets/Scripts/Lancable.cs +++ b/Assets/Scripts/Lancable.cs @@ -16,6 +16,10 @@ public class Lancable : MonoBehaviour [SerializeField] private static float coutEclair = 30f; + public AudioClip clipFail; + + private AudioSource myaudiosource; + public void setLanceurTransform(Transform t) { lanceurTransform = t; @@ -24,6 +28,7 @@ public class Lancable : MonoBehaviour // Start is called before the first frame update void Start() { + myaudiosource = gameObject.GetComponent<AudioSource>(); layerAvecToutSaufCeluiAIgnorer = ~layerAvecToutSaufCeluiAIgnorer; lineRenderPose = GetComponent<LineRenderer>(); lineRenderPose.useWorldSpace = false; @@ -62,20 +67,40 @@ public class Lancable : MonoBehaviour lineRenderPose.enabled = false; StartCoroutine(ThunderFall()); ThunderHit(hit.point,0.5f,20f); - gameObject.GetComponent<AudioSource>().Play(); + myaudiosource.Play(); gameObject.GetComponent<ParticleSystem>().Play(); } else { - Destroy(gameObject); + 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); } } else { - Destroy(gameObject); + 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); } } + IEnumerator DestroyWithDelay(float delaySeconds) + { + yield return new WaitForSeconds(delaySeconds); + Destroy(gameObject); + } + private void ThunderHit(Vector3 centerSphere, float radius, float damage) { Collider[] hitColliders = Physics.OverlapSphere(centerSphere, radius);