diff --git a/Assets/Scenes/PlayerPrefabPackage.unitypackage.meta b/Assets/Audio.meta similarity index 67% rename from Assets/Scenes/PlayerPrefabPackage.unitypackage.meta rename to Assets/Audio.meta index a0418a90e83a032b4562fd170a4c0698efc82675..00dcd522e4fa67e0c8a3ff2b324eed994a6f0cc1 100644 --- a/Assets/Scenes/PlayerPrefabPackage.unitypackage.meta +++ b/Assets/Audio.meta @@ -1,5 +1,6 @@ fileFormatVersion: 2 -guid: 56a0506be2d25124dadc8b5d491b3f0a +guid: 6cf165bf9ebf267439af59816bf066df +folderAsset: yes DefaultImporter: externalObjects: {} userData: diff --git a/Assets/Audio/Foudre1.wav b/Assets/Audio/Foudre1.wav new file mode 100644 index 0000000000000000000000000000000000000000..561da24fef183969d5899169a0184b3a84c262f2 Binary files /dev/null and b/Assets/Audio/Foudre1.wav differ diff --git a/Assets/Audio/Foudre1.wav.meta b/Assets/Audio/Foudre1.wav.meta new file mode 100644 index 0000000000000000000000000000000000000000..816b67927a837e86130edfa02a220a7b3fffa0b3 --- /dev/null +++ b/Assets/Audio/Foudre1.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 3dc732068268eae4486cca5b306efa48 +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/Foudre2.wav b/Assets/Audio/Foudre2.wav new file mode 100644 index 0000000000000000000000000000000000000000..14cd76a4cf66af93790d1607d2c7d0223b50c1f4 Binary files /dev/null and b/Assets/Audio/Foudre2.wav differ diff --git a/Assets/Audio/Foudre2.wav.meta b/Assets/Audio/Foudre2.wav.meta new file mode 100644 index 0000000000000000000000000000000000000000..b5c90acab20f7bad6e5a038b4c7c809ad784034e --- /dev/null +++ b/Assets/Audio/Foudre2.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: af71d98977b0bc34fa3f66016c0bfef1 +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/Foudre3.wav b/Assets/Audio/Foudre3.wav new file mode 100644 index 0000000000000000000000000000000000000000..5dde444f8646836f0ecd214afd473eb8dc425455 Binary files /dev/null and b/Assets/Audio/Foudre3.wav differ diff --git a/Assets/Audio/Foudre3.wav.meta b/Assets/Audio/Foudre3.wav.meta new file mode 100644 index 0000000000000000000000000000000000000000..a45182a42a16404447acfa109c1aa0289ccc1808 --- /dev/null +++ b/Assets/Audio/Foudre3.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: cdf7b7f280a5ad040bfb11b7ac7dcf02 +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/PlouThunder.prefab b/Assets/Prefabs/PlouThunder.prefab index 706423a6c6e9593f5de9378d8106c33439c5c241..1897ea75d06ba9d936d39146f0fcf55667f04f58 100644 --- a/Assets/Prefabs/PlouThunder.prefab +++ b/Assets/Prefabs/PlouThunder.prefab @@ -17,6 +17,7 @@ GameObject: - component: {fileID: 7669314594426070750} - component: {fileID: 2881216723765597162} - component: {fileID: 4985059379525975686} + - component: {fileID: -60245208455828847} m_Layer: 0 m_Name: PlouThunder m_TagString: Eclair @@ -255,3 +256,99 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: locked: 0 +--- !u!82 &-60245208455828847 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1635955774121567605} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 3dc732068268eae4486cca5b306efa48, 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 diff --git a/Assets/Resources/OVRBuildConfig.asset b/Assets/Resources/OVRBuildConfig.asset index bd17d709c2307310779d4b50d7c99d27a86debf4..cf5cd6c59a1e1821e567df12f9361feb6a0a78bc 100644 --- a/Assets/Resources/OVRBuildConfig.asset +++ b/Assets/Resources/OVRBuildConfig.asset @@ -12,6 +12,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 20553fac56ec59645857c0732b787431, type: 3} m_Name: OVRBuildConfig m_EditorClassIdentifier: - androidSDKPath: C:\Program Files\Unity\Hub\Editor\2019.2.0f1\Editor\Data\PlaybackEngines\AndroidPlayer\SDK + androidSDKPath: gradlePath: jdkPath: diff --git a/Assets/Scenes/Demo/Demo_1.unity b/Assets/Scenes/Demo/Demo_1.unity index e8c163b8540b05957989069cfc9f2c5b350795bd..5bd4137664e9bdab9e445617f46b2f59fbb518d9 100644 --- a/Assets/Scenes/Demo/Demo_1.unity +++ b/Assets/Scenes/Demo/Demo_1.unity @@ -900,7 +900,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: trucaATuer: {fileID: 0} - manaAmount: 0 manaAmountText: {fileID: 688335511} treesAmountText: {fileID: 1124147798} --- !u!4 &716695862 diff --git a/Assets/Scenes/Haowen.meta b/Assets/Scenes/Haowen.meta new file mode 100644 index 0000000000000000000000000000000000000000..47f2bca98ca733f95a9b98af522d39ca586e0f80 --- /dev/null +++ b/Assets/Scenes/Haowen.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 02a3116d8d100f74eaa8f69f7980a403 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Plou/External.meta b/Assets/Scenes/Plou/External.meta new file mode 100644 index 0000000000000000000000000000000000000000..8a0c9b57339802362d83e6e1da4336c19a7c6c92 --- /dev/null +++ b/Assets/Scenes/Plou/External.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 98e674e46c7f2b2448370c9592076fe5 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Lancable.cs b/Assets/Scripts/Lancable.cs index 87ea85a6a2d1cf42a2102d88ba2ad90142b9ae5b..2988997bb97a382e61ffcaee10a4d062bec81133 100644 --- a/Assets/Scripts/Lancable.cs +++ b/Assets/Scripts/Lancable.cs @@ -62,6 +62,7 @@ public class Lancable : MonoBehaviour lineRenderPose.enabled = false; StartCoroutine(ThunderFall()); ThunderHit(hit.point,0.5f,20f); + gameObject.GetComponent<AudioSource>().Play(); } else { diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index a70b0bd387564149bc7585eceb158b1d3e6e7977..0147887ef4b113c3a3b8da44ef30e3208f1e9120 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -4,29 +4,5 @@ EditorBuildSettings: m_ObjectHideFlags: 0 serializedVersion: 2 - m_Scenes: - - enabled: 0 - path: Assets/_SimplePointer/Main.unity - guid: 9fc0d4010bbf28b4594072e72b8655ab - - enabled: 0 - path: Assets/Scenes/testAltarick.unity - guid: a57cc732e330ff541838221ca57b8c7c - - enabled: 0 - path: Assets/Scenes/Plou/Plou_1.unity - guid: b9e2594fa47377646aa1e263473882cf - - enabled: 0 - path: Assets/Scenes/Demo/Demo_1.unity - guid: d7e3fd51bef470143a9efcc0786c0d7b -<<<<<<< HEAD - - enabled: 1 - path: Assets/Scenes/Altarick/test1.unity - guid: 2ee202d64779835489f3c288bfa15426 -======= - - enabled: 0 - path: Assets/Scenes/Sky/Demo_Sky.unity - guid: a331b5422d349a8499cf3b10a7ce4842 - - enabled: 0 - path: Assets/Scenes/Plou/Demo_Plou_Sky 1.unity - guid: 247caccad46e59a4fb5908d25be2773d ->>>>>>> c2db1555e5fbe940f9b6569cb4e850ace43a163d + m_Scenes: [] m_configObjects: {} diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 2fb8c5b87ca99ec1c9ff51ace79d49e3ce05678e..da1d2ca308cc327c067673078b779d205d7fdd16 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -13,7 +13,7 @@ PlayerSettings: useOnDemandResources: 0 accelerometerFrequency: 60 companyName: ENSIIE - productName: com.oculus.altarick + productName: Groupe5-IAMGREEN defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1} @@ -162,7 +162,7 @@ PlayerSettings: androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 applicationIdentifier: - Android: com.oculus.altarick + Android: com.plou.oculus buildNumber: {} AndroidBundleVersionCode: 1 AndroidMinSdkVersion: 19