From 2b7f81fa6e4d878e1ab0a6712537b102987bb731 Mon Sep 17 00:00:00 2001 From: liskiran Date: Thu, 5 May 2022 23:48:35 +0700 Subject: [PATCH] weapon changed --- Assets/MentalDreamsAssets.meta | 8 + .../MentalDreamsAssets/SoldierSoundsPack.meta | 8 + .../SoldierSoundsPack/ReadMe!.txt | 5 + .../SoldierSoundsPack/ReadMe!.txt.meta | 7 + .../SoldierSoundsPack/bulletshells01.mp3 | 3 + .../SoldierSoundsPack/bulletshells01.mp3.meta | 22 + .../SoldierSoundsPack/bulletshells02.mp3 | 3 + .../SoldierSoundsPack/bulletshells02.mp3.meta | 22 + .../SoldierSoundsPack/bulletshells03.mp3 | 3 + .../SoldierSoundsPack/bulletshells03.mp3.meta | 22 + .../SoldierSoundsPack/bulletshells04.mp3 | 3 + .../SoldierSoundsPack/bulletshells04.mp3.meta | 22 + .../SoldierSoundsPack/fall.wav | 3 + .../SoldierSoundsPack/fall.wav.meta | 22 + .../SoldierSoundsPack/fire.mp3 | 3 + .../SoldierSoundsPack/fire.mp3.meta | 22 + .../SoldierSoundsPack/jump.wav | 3 + .../SoldierSoundsPack/jump.wav.meta | 22 + .../SoldierSoundsPack/kick.wav | 3 + .../SoldierSoundsPack/kick.wav.meta | 22 + .../SoldierSoundsPack/reload.mp3 | 3 + .../SoldierSoundsPack/reload.mp3.meta | 22 + Assets/Scenes/dont touch me plz.unity | 483 ++++++++++++++---- .../Character/scr_CharacterController.cs | 39 +- .../ParticleSystems/Prefabs/Flare.prefab | 184 ++++++- .../Prefabs/FlareMobile.prefab | 184 ++++++- 26 files changed, 1014 insertions(+), 129 deletions(-) create mode 100644 Assets/MentalDreamsAssets.meta create mode 100644 Assets/MentalDreamsAssets/SoldierSoundsPack.meta create mode 100644 Assets/MentalDreamsAssets/SoldierSoundsPack/ReadMe!.txt create mode 100644 Assets/MentalDreamsAssets/SoldierSoundsPack/ReadMe!.txt.meta create mode 100644 Assets/MentalDreamsAssets/SoldierSoundsPack/bulletshells01.mp3 create mode 100644 Assets/MentalDreamsAssets/SoldierSoundsPack/bulletshells01.mp3.meta create mode 100644 Assets/MentalDreamsAssets/SoldierSoundsPack/bulletshells02.mp3 create mode 100644 Assets/MentalDreamsAssets/SoldierSoundsPack/bulletshells02.mp3.meta create mode 100644 Assets/MentalDreamsAssets/SoldierSoundsPack/bulletshells03.mp3 create mode 100644 Assets/MentalDreamsAssets/SoldierSoundsPack/bulletshells03.mp3.meta create mode 100644 Assets/MentalDreamsAssets/SoldierSoundsPack/bulletshells04.mp3 create mode 100644 Assets/MentalDreamsAssets/SoldierSoundsPack/bulletshells04.mp3.meta create mode 100644 Assets/MentalDreamsAssets/SoldierSoundsPack/fall.wav create mode 100644 Assets/MentalDreamsAssets/SoldierSoundsPack/fall.wav.meta create mode 100644 Assets/MentalDreamsAssets/SoldierSoundsPack/fire.mp3 create mode 100644 Assets/MentalDreamsAssets/SoldierSoundsPack/fire.mp3.meta create mode 100644 Assets/MentalDreamsAssets/SoldierSoundsPack/jump.wav create mode 100644 Assets/MentalDreamsAssets/SoldierSoundsPack/jump.wav.meta create mode 100644 Assets/MentalDreamsAssets/SoldierSoundsPack/kick.wav create mode 100644 Assets/MentalDreamsAssets/SoldierSoundsPack/kick.wav.meta create mode 100644 Assets/MentalDreamsAssets/SoldierSoundsPack/reload.mp3 create mode 100644 Assets/MentalDreamsAssets/SoldierSoundsPack/reload.mp3.meta diff --git a/Assets/MentalDreamsAssets.meta b/Assets/MentalDreamsAssets.meta new file mode 100644 index 0000000..6a6f97a --- /dev/null +++ b/Assets/MentalDreamsAssets.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 999827c92df14e74f8ccae2224a1574b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MentalDreamsAssets/SoldierSoundsPack.meta b/Assets/MentalDreamsAssets/SoldierSoundsPack.meta new file mode 100644 index 0000000..7dec033 --- /dev/null +++ b/Assets/MentalDreamsAssets/SoldierSoundsPack.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1a79c6a65079a5549a081b1830304095 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MentalDreamsAssets/SoldierSoundsPack/ReadMe!.txt b/Assets/MentalDreamsAssets/SoldierSoundsPack/ReadMe!.txt new file mode 100644 index 0000000..cf89f98 --- /dev/null +++ b/Assets/MentalDreamsAssets/SoldierSoundsPack/ReadMe!.txt @@ -0,0 +1,5 @@ +This package is prepared by Mentaldreams.All copyrights belong to mentaldreams. + +Contact : +http://mentaldreams.weebly.com +mentalasset@gmail.com \ No newline at end of file diff --git a/Assets/MentalDreamsAssets/SoldierSoundsPack/ReadMe!.txt.meta b/Assets/MentalDreamsAssets/SoldierSoundsPack/ReadMe!.txt.meta new file mode 100644 index 0000000..07c3d6b --- /dev/null +++ b/Assets/MentalDreamsAssets/SoldierSoundsPack/ReadMe!.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d98e5a5914a302a48892bc347aef5227 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MentalDreamsAssets/SoldierSoundsPack/bulletshells01.mp3 b/Assets/MentalDreamsAssets/SoldierSoundsPack/bulletshells01.mp3 new file mode 100644 index 0000000..1f89187 --- /dev/null +++ b/Assets/MentalDreamsAssets/SoldierSoundsPack/bulletshells01.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:72e675c6f3c48f265b7a47d5619e758e950684f20c3cd89e9547fd0c6d485956 +size 7676 diff --git a/Assets/MentalDreamsAssets/SoldierSoundsPack/bulletshells01.mp3.meta b/Assets/MentalDreamsAssets/SoldierSoundsPack/bulletshells01.mp3.meta new file mode 100644 index 0000000..eea27c6 --- /dev/null +++ b/Assets/MentalDreamsAssets/SoldierSoundsPack/bulletshells01.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 06df58efa12d0b04a8e5bb2fc2dd7ace +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 1 + sampleRateSetting: 0 + sampleRateOverride: 0 + 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/MentalDreamsAssets/SoldierSoundsPack/bulletshells02.mp3 b/Assets/MentalDreamsAssets/SoldierSoundsPack/bulletshells02.mp3 new file mode 100644 index 0000000..735d96c --- /dev/null +++ b/Assets/MentalDreamsAssets/SoldierSoundsPack/bulletshells02.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:84b1dd0b8821515435561846b9dd58c4351fe0724d290b18d1a5c647de451c5d +size 16325 diff --git a/Assets/MentalDreamsAssets/SoldierSoundsPack/bulletshells02.mp3.meta b/Assets/MentalDreamsAssets/SoldierSoundsPack/bulletshells02.mp3.meta new file mode 100644 index 0000000..514ea8b --- /dev/null +++ b/Assets/MentalDreamsAssets/SoldierSoundsPack/bulletshells02.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 01d5f944020259248b89cdad55173949 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 1 + sampleRateSetting: 0 + sampleRateOverride: 0 + 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/MentalDreamsAssets/SoldierSoundsPack/bulletshells03.mp3 b/Assets/MentalDreamsAssets/SoldierSoundsPack/bulletshells03.mp3 new file mode 100644 index 0000000..a4568fa --- /dev/null +++ b/Assets/MentalDreamsAssets/SoldierSoundsPack/bulletshells03.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:76869e687c2d31aebb53a947ec4e89d8671dd535d5773251bbb1016307ee348a +size 13400 diff --git a/Assets/MentalDreamsAssets/SoldierSoundsPack/bulletshells03.mp3.meta b/Assets/MentalDreamsAssets/SoldierSoundsPack/bulletshells03.mp3.meta new file mode 100644 index 0000000..332eb38 --- /dev/null +++ b/Assets/MentalDreamsAssets/SoldierSoundsPack/bulletshells03.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 22279186d6da3f1498affd2c9ecb7dfb +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 1 + sampleRateSetting: 0 + sampleRateOverride: 0 + 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/MentalDreamsAssets/SoldierSoundsPack/bulletshells04.mp3 b/Assets/MentalDreamsAssets/SoldierSoundsPack/bulletshells04.mp3 new file mode 100644 index 0000000..d9c0a5c --- /dev/null +++ b/Assets/MentalDreamsAssets/SoldierSoundsPack/bulletshells04.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:443e11809bdceb927bc5b25c55579f02ab26d1d9bb2adc2ded3c5d05f0826c6f +size 15489 diff --git a/Assets/MentalDreamsAssets/SoldierSoundsPack/bulletshells04.mp3.meta b/Assets/MentalDreamsAssets/SoldierSoundsPack/bulletshells04.mp3.meta new file mode 100644 index 0000000..f29d7ed --- /dev/null +++ b/Assets/MentalDreamsAssets/SoldierSoundsPack/bulletshells04.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 51fcf928d40b7f943ba156c18dfe3280 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 1 + sampleRateSetting: 0 + sampleRateOverride: 0 + 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/MentalDreamsAssets/SoldierSoundsPack/fall.wav b/Assets/MentalDreamsAssets/SoldierSoundsPack/fall.wav new file mode 100644 index 0000000..9313576 --- /dev/null +++ b/Assets/MentalDreamsAssets/SoldierSoundsPack/fall.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:772f169b2184ed40f05dbf5757b2b882c8ca865fda5dfae54743bad0518629ab +size 345788 diff --git a/Assets/MentalDreamsAssets/SoldierSoundsPack/fall.wav.meta b/Assets/MentalDreamsAssets/SoldierSoundsPack/fall.wav.meta new file mode 100644 index 0000000..6ae0ff1 --- /dev/null +++ b/Assets/MentalDreamsAssets/SoldierSoundsPack/fall.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 756c4e23e8553954fa91b4cc2936afa0 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 1 + sampleRateSetting: 0 + sampleRateOverride: 0 + compressionFormat: 0 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MentalDreamsAssets/SoldierSoundsPack/fire.mp3 b/Assets/MentalDreamsAssets/SoldierSoundsPack/fire.mp3 new file mode 100644 index 0000000..1e23638 --- /dev/null +++ b/Assets/MentalDreamsAssets/SoldierSoundsPack/fire.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3e965a304f0b13487e8da3bde57ebe6eb37728736cbe36339046d2482de7290b +size 11937 diff --git a/Assets/MentalDreamsAssets/SoldierSoundsPack/fire.mp3.meta b/Assets/MentalDreamsAssets/SoldierSoundsPack/fire.mp3.meta new file mode 100644 index 0000000..d3063d2 --- /dev/null +++ b/Assets/MentalDreamsAssets/SoldierSoundsPack/fire.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 8602b7d5cd15c1943a50aa53f171c8cf +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 1 + sampleRateSetting: 0 + sampleRateOverride: 0 + 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/MentalDreamsAssets/SoldierSoundsPack/jump.wav b/Assets/MentalDreamsAssets/SoldierSoundsPack/jump.wav new file mode 100644 index 0000000..04e1380 --- /dev/null +++ b/Assets/MentalDreamsAssets/SoldierSoundsPack/jump.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:34e6d5d4941543dce65367ac5958989cf8818c05c8b207eb6c94c9de285204f5 +size 345788 diff --git a/Assets/MentalDreamsAssets/SoldierSoundsPack/jump.wav.meta b/Assets/MentalDreamsAssets/SoldierSoundsPack/jump.wav.meta new file mode 100644 index 0000000..bb47c10 --- /dev/null +++ b/Assets/MentalDreamsAssets/SoldierSoundsPack/jump.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 5a618c007fe353c459f6916c3860e274 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 1 + sampleRateSetting: 0 + sampleRateOverride: 0 + compressionFormat: 0 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MentalDreamsAssets/SoldierSoundsPack/kick.wav b/Assets/MentalDreamsAssets/SoldierSoundsPack/kick.wav new file mode 100644 index 0000000..236d6e1 --- /dev/null +++ b/Assets/MentalDreamsAssets/SoldierSoundsPack/kick.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:74bc4eaa8d14becc337e8e05274a2ecf0684d9d108ad80476d16f2b43ad25202 +size 54878 diff --git a/Assets/MentalDreamsAssets/SoldierSoundsPack/kick.wav.meta b/Assets/MentalDreamsAssets/SoldierSoundsPack/kick.wav.meta new file mode 100644 index 0000000..78b669a --- /dev/null +++ b/Assets/MentalDreamsAssets/SoldierSoundsPack/kick.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: a9646a6173bb6ad4b951ea60adaaa407 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 1 + sampleRateSetting: 0 + sampleRateOverride: 0 + compressionFormat: 0 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MentalDreamsAssets/SoldierSoundsPack/reload.mp3 b/Assets/MentalDreamsAssets/SoldierSoundsPack/reload.mp3 new file mode 100644 index 0000000..feded16 --- /dev/null +++ b/Assets/MentalDreamsAssets/SoldierSoundsPack/reload.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5e10058abaa1b0f5dc32dc24c1cdf769b90eeb001971cf065ace83a9286f3f6d +size 47672 diff --git a/Assets/MentalDreamsAssets/SoldierSoundsPack/reload.mp3.meta b/Assets/MentalDreamsAssets/SoldierSoundsPack/reload.mp3.meta new file mode 100644 index 0000000..eb6c0e6 --- /dev/null +++ b/Assets/MentalDreamsAssets/SoldierSoundsPack/reload.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 3c5c1d4d7b9307c458890a4beb12e4ae +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 1 + sampleRateSetting: 0 + sampleRateOverride: 0 + 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/Scenes/dont touch me plz.unity b/Assets/Scenes/dont touch me plz.unity index f0f39b8..c119ee3 100755 --- a/Assets/Scenes/dont touch me plz.unity +++ b/Assets/Scenes/dont touch me plz.unity @@ -241,6 +241,7 @@ GameObject: - component: {fileID: 254804100} - component: {fileID: 254804099} - component: {fileID: 254804103} + - component: {fileID: 254804104} m_Layer: 0 m_Name: Cube m_TagString: Untagged @@ -341,12 +342,193 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!82 &254804104 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 254804098} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 8602b7d5cd15c1943a50aa53f171c8cf, type: 3} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 --- !u!20 &459940408 stripped Camera: m_CorrespondingSourceObject: {fileID: 5245491128202443529, guid: 80f6c1c85e5daed4c96c70205ed5503d, type: 3} m_PrefabInstance: {fileID: 1642807971} m_PrefabAsset: {fileID: 0} +--- !u!1001 &586361676 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 2110857926} + m_Modifications: + - target: {fileID: 100006, guid: 0438351a6e6422d43a09930e9be00ee9, type: 3} + propertyPath: m_Name + value: Flare + objectReference: {fileID: 0} + - target: {fileID: 400006, guid: 0438351a6e6422d43a09930e9be00ee9, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400006, guid: 0438351a6e6422d43a09930e9be00ee9, type: 3} + propertyPath: m_LocalPosition.x + value: 14.592 + objectReference: {fileID: 0} + - target: {fileID: 400006, guid: 0438351a6e6422d43a09930e9be00ee9, type: 3} + propertyPath: m_LocalPosition.y + value: 6.515 + objectReference: {fileID: 0} + - target: {fileID: 400006, guid: 0438351a6e6422d43a09930e9be00ee9, type: 3} + propertyPath: m_LocalPosition.z + value: 6.801 + objectReference: {fileID: 0} + - target: {fileID: 400006, guid: 0438351a6e6422d43a09930e9be00ee9, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400006, guid: 0438351a6e6422d43a09930e9be00ee9, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400006, guid: 0438351a6e6422d43a09930e9be00ee9, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400006, guid: 0438351a6e6422d43a09930e9be00ee9, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400006, guid: 0438351a6e6422d43a09930e9be00ee9, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400006, guid: 0438351a6e6422d43a09930e9be00ee9, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400006, guid: 0438351a6e6422d43a09930e9be00ee9, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 19800004, guid: 0438351a6e6422d43a09930e9be00ee9, type: 3} + propertyPath: looping + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 19800004, guid: 0438351a6e6422d43a09930e9be00ee9, type: 3} + propertyPath: lengthInSec + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 19800004, guid: 0438351a6e6422d43a09930e9be00ee9, type: 3} + propertyPath: ShapeModule.angle + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 19800004, guid: 0438351a6e6422d43a09930e9be00ee9, type: 3} + propertyPath: InitialModule.maxNumParticles + value: 10000 + objectReference: {fileID: 0} + - target: {fileID: 19900000, guid: 0438351a6e6422d43a09930e9be00ee9, type: 3} + propertyPath: m_Materials.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 19900002, guid: 0438351a6e6422d43a09930e9be00ee9, type: 3} + propertyPath: m_Materials.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 19900004, guid: 0438351a6e6422d43a09930e9be00ee9, type: 3} + propertyPath: m_Materials.Array.size + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 0438351a6e6422d43a09930e9be00ee9, type: 3} --- !u!1 &676942498 GameObject: m_ObjectHideFlags: 0 @@ -439,77 +621,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} ---- !u!1001 &697796853 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 2110857926} - m_Modifications: - - target: {fileID: 100004, guid: d8c41be67f41aa545ae053b0b927f821, type: 3} - propertyPath: m_Name - value: Afterburner - objectReference: {fileID: 0} - - target: {fileID: 400004, guid: d8c41be67f41aa545ae053b0b927f821, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400004, guid: d8c41be67f41aa545ae053b0b927f821, type: 3} - propertyPath: m_LocalPosition.x - value: 14.604 - objectReference: {fileID: 0} - - target: {fileID: 400004, guid: d8c41be67f41aa545ae053b0b927f821, type: 3} - propertyPath: m_LocalPosition.y - value: 6.56 - objectReference: {fileID: 0} - - target: {fileID: 400004, guid: d8c41be67f41aa545ae053b0b927f821, type: 3} - propertyPath: m_LocalPosition.z - value: 6.8067 - objectReference: {fileID: 0} - - target: {fileID: 400004, guid: d8c41be67f41aa545ae053b0b927f821, type: 3} - propertyPath: m_LocalRotation.w - value: 0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 400004, guid: d8c41be67f41aa545ae053b0b927f821, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 400004, guid: d8c41be67f41aa545ae053b0b927f821, type: 3} - propertyPath: m_LocalRotation.y - value: 0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 400004, guid: d8c41be67f41aa545ae053b0b927f821, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 400004, guid: d8c41be67f41aa545ae053b0b927f821, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400004, guid: d8c41be67f41aa545ae053b0b927f821, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 90 - objectReference: {fileID: 0} - - target: {fileID: 400004, guid: d8c41be67f41aa545ae053b0b927f821, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 19900000, guid: d8c41be67f41aa545ae053b0b927f821, type: 3} - propertyPath: m_Materials.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 19900002, guid: d8c41be67f41aa545ae053b0b927f821, type: 3} - propertyPath: m_Materials.Array.size - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: d8c41be67f41aa545ae053b0b927f821, type: 3} ---- !u!4 &697796854 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 400004, guid: d8c41be67f41aa545ae053b0b927f821, - type: 3} - m_PrefabInstance: {fileID: 697796853} - m_PrefabAsset: {fileID: 0} --- !u!1 &1002225300 GameObject: m_ObjectHideFlags: 0 @@ -636,7 +747,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &1260474436 stripped Transform: @@ -644,6 +755,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1642807971} m_PrefabAsset: {fileID: 0} +--- !u!4 &1511953383 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400006, guid: 0438351a6e6422d43a09930e9be00ee9, + type: 3} + m_PrefabInstance: {fileID: 586361676} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1642807971 PrefabInstance: m_ObjectHideFlags: 0 @@ -716,6 +833,11 @@ PrefabInstance: propertyPath: fpsCam value: objectReference: {fileID: 459940408} + - target: {fileID: 5245491127989480122, guid: 80f6c1c85e5daed4c96c70205ed5503d, + type: 3} + propertyPath: gunSound + value: + objectReference: {fileID: 1830168238} - target: {fileID: 5245491127989480122, guid: 80f6c1c85e5daed4c96c70205ed5503d, type: 3} propertyPath: flashPoof @@ -732,6 +854,16 @@ PrefabInstance: propertyPath: impactEffect value: objectReference: {fileID: 2110857925} + - target: {fileID: 5245491127989480122, guid: 80f6c1c85e5daed4c96c70205ed5503d, + type: 3} + propertyPath: aftergunSound + value: + objectReference: {fileID: 8300000, guid: 06df58efa12d0b04a8e5bb2fc2dd7ace, type: 3} + - target: {fileID: 5245491127989480122, guid: 80f6c1c85e5daed4c96c70205ed5503d, + type: 3} + propertyPath: m_GunShotSounds.Array.size + value: 4 + objectReference: {fileID: 0} - target: {fileID: 5245491127989480125, guid: 80f6c1c85e5daed4c96c70205ed5503d, type: 3} propertyPath: m_Name @@ -770,7 +902,7 @@ ParticleSystem: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1712255273} serializedVersion: 6 - lengthInSec: 0.2 + lengthInSec: 1 simulationSpeed: 1 stopAction: 0 cullingMode: 0 @@ -844,8 +976,8 @@ ParticleSystem: enabled: 1 startLifetime: serializedVersion: 2 - minMaxState: 3 - scalar: 0.06 + minMaxState: 0 + scalar: 0.03 minScalar: 0.04 maxCurve: serializedVersion: 2 @@ -897,8 +1029,8 @@ ParticleSystem: m_RotationOrder: 4 startSpeed: serializedVersion: 2 - minMaxState: 3 - scalar: 5 + minMaxState: 0 + scalar: 100 minScalar: 0 maxCurve: serializedVersion: 2 @@ -1014,7 +1146,7 @@ ParticleSystem: startSize: serializedVersion: 2 minMaxState: 0 - scalar: 0.16 + scalar: 0.1 minScalar: 1 maxCurve: serializedVersion: 2 @@ -1390,7 +1522,7 @@ ParticleSystem: serializedVersion: 6 enabled: 1 type: 4 - angle: 25 + angle: 0 length: 5 boxThickness: {x: 0, y: 0, z: 0} radiusThickness: 1 @@ -1476,7 +1608,7 @@ ParticleSystem: sphericalDirectionAmount: 0 randomPositionAmount: 0 radius: - value: 1 + value: 0.03 mode: 0 spread: 0 speed: @@ -1704,7 +1836,7 @@ ParticleSystem: time: 0 countCurve: serializedVersion: 2 - minMaxState: 0 + minMaxState: 3 scalar: 30 minScalar: 30 maxCurve: @@ -2083,7 +2215,7 @@ ParticleSystem: m_RotationOrder: 4 separateAxes: 0 ColorModule: - enabled: 0 + enabled: 1 gradient: serializedVersion: 2 minMaxState: 1 @@ -2091,33 +2223,33 @@ ParticleSystem: maxColor: {r: 1, g: 1, b: 1, a: 1} maxGradient: serializedVersion: 2 - key0: {r: 1, g: 1, b: 1, a: 1} - key1: {r: 1, g: 1, b: 1, a: 1} - key2: {r: 0, g: 0, b: 0, a: 0} - key3: {r: 0, g: 0, b: 0, a: 0} - key4: {r: 0, g: 0, b: 0, a: 0} + key0: {r: 0.8584906, g: 0.044544328, b: 0.07546273, a: 1} + key1: {r: 0.7924528, g: 0.048593827, b: 0.32427666, a: 0.36078432} + key2: {r: 0.88308495, g: 0.9056604, b: 0.32039872, a: 0.61960787} + key3: {r: 0, g: 0, b: 0, a: 0.67058825} + key4: {r: 0, g: 0, b: 0, a: 0.5176471} key5: {r: 0, g: 0, b: 0, a: 0} key6: {r: 0, g: 0, b: 0, a: 0} key7: {r: 0, g: 0, b: 0, a: 0} - ctime0: 0 - ctime1: 65535 - ctime2: 0 + ctime0: 386 + ctime1: 26600 + ctime2: 65150 ctime3: 0 ctime4: 0 ctime5: 0 ctime6: 0 ctime7: 0 - atime0: 0 - atime1: 65535 - atime2: 0 - atime3: 0 - atime4: 0 + atime0: 193 + atime1: 4433 + atime2: 26214 + atime3: 59945 + atime4: 65535 atime5: 0 atime6: 0 atime7: 0 m_Mode: 0 - m_NumColorKeys: 2 - m_NumAlphaKeys: 2 + m_NumColorKeys: 3 + m_NumAlphaKeys: 5 minGradient: serializedVersion: 2 key0: {r: 1, g: 1, b: 1, a: 1} @@ -4342,9 +4474,9 @@ ParticleSystem: m_NumAlphaKeys: 2 range: {x: 0, y: 1} CollisionModule: - enabled: 0 + enabled: 1 serializedVersion: 3 - type: 0 + type: 1 collisionMode: 0 colliderForce: 0 multiplyColliderForceByParticleSize: 0 @@ -4551,12 +4683,12 @@ ParticleSystem: emitProbability: 1 LightsModule: enabled: 1 - ratio: 0 - light: {fileID: 0} + ratio: 0.1 + light: {fileID: 676942499} randomDistribution: 1 - color: 1 - range: 1 - intensity: 1 + color: 0 + range: 0 + intensity: 0 rangeCurve: serializedVersion: 2 minMaxState: 0 @@ -5497,7 +5629,7 @@ ParticleSystemRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10308, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 5a595d561ddb2ac4aad808dc54e08e6a, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -5549,7 +5681,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1712255273} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.099, y: -0.0589, z: 2.0828} + m_LocalPosition: {x: 0.0943, y: -0.0589, z: 2.0828} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1260474436} @@ -5654,6 +5786,133 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} +--- !u!1 &1830168237 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1830168239} + - component: {fileID: 1830168238} + m_Layer: 0 + m_Name: fire + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!82 &1830168238 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1830168237} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 8602b7d5cd15c1943a50aa53f171c8cf, type: 3} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!4 &1830168239 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1830168237} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 30.129, y: 11.694, z: 40.236} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2018793729 stripped GameObject: m_CorrespondingSourceObject: {fileID: 5245491127989480125, guid: 80f6c1c85e5daed4c96c70205ed5503d, @@ -5772,13 +6031,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2110857925} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 15.609156, y: 5.1766596, z: 33.4517} + m_LocalRotation: {x: -0, y: -0.7071068, z: -0, w: 0.7071068} + m_LocalPosition: {x: 6.880993, y: -6.5713406, z: -12.507372} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 697796854} - m_Father: {fileID: 0} - m_RootOrder: 5 + - {fileID: 1511953383} + m_Father: {fileID: 1260474436} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &3813978155778551933 PrefabInstance: @@ -5795,7 +6054,7 @@ PrefabInstance: - target: {fileID: 5088209617264965581, guid: 46663c9de0d7b54418d63b50d2ae3a72, type: 3} propertyPath: m_RootOrder - value: 7 + value: 6 objectReference: {fileID: 0} - target: {fileID: 5088209617264965581, guid: 46663c9de0d7b54418d63b50d2ae3a72, type: 3} diff --git a/Assets/Scripts/Character/scr_CharacterController.cs b/Assets/Scripts/Character/scr_CharacterController.cs index 4956bbe..6d98dd3 100755 --- a/Assets/Scripts/Character/scr_CharacterController.cs +++ b/Assets/Scripts/Character/scr_CharacterController.cs @@ -1,6 +1,7 @@ using System; using System.Collections; using System.Collections.Generic; +using System.Media; using Unity.Barracuda; using UnityEngine; using UnityEngine.InputSystem; @@ -68,6 +69,13 @@ public class scr_CharacterController : MonoBehaviour public Camera fpsCam; public ParticleSystem muzzleFlash; public GameObject impactEffect; + + public AudioClip aftergunSound; + public AudioSource gunSound; + + public int count_of_bullets = 120; + public int count_of_bullets_gun = 30; + private int current_count_of_bullets_gun = 30; private void Awake() { defaultInput = new DefaultInput(); @@ -97,11 +105,40 @@ public class scr_CharacterController : MonoBehaviour } + void PlayShootingSound() + { + gunSound.PlayOneShot(gunSound.clip); + gunSound.PlayOneShot(aftergunSound); + } private void Update() { - if (Input.GetButtonDown("Fire1")) + if (Input.GetKeyDown("r")) { + Debug.Log("Reload"); + int difference = 0; + if (count_of_bullets_gun == current_count_of_bullets_gun) + return; + if (current_count_of_bullets_gun < count_of_bullets_gun) + { + difference = count_of_bullets_gun - current_count_of_bullets_gun; + if (count_of_bullets > difference) + { + current_count_of_bullets_gun = count_of_bullets_gun; + count_of_bullets -= count_of_bullets_gun; + } + else + { + current_count_of_bullets_gun = count_of_bullets; + count_of_bullets = 0; + } + } + } + if (Input.GetButtonDown("Fire1") && current_count_of_bullets_gun > 0) + { + PlayShootingSound(); Shoot(); + Debug.Log(current_count_of_bullets_gun); + current_count_of_bullets_gun -= 5; } CalculateView(); CalculateMovement(); diff --git a/Assets/Standard Assets/ParticleSystems/Prefabs/Flare.prefab b/Assets/Standard Assets/ParticleSystems/Prefabs/Flare.prefab index 8025f3d..2b3fb1b 100644 --- a/Assets/Standard Assets/ParticleSystems/Prefabs/Flare.prefab +++ b/Assets/Standard Assets/ParticleSystems/Prefabs/Flare.prefab @@ -1288,6 +1288,7 @@ ParticleSystem: m_NumColorKeys: 2 m_NumAlphaKeys: 2 UVModule: + serializedVersion: 2 enabled: 0 mode: 0 timeMode: 0 @@ -1405,7 +1406,7 @@ ParticleSystem: rowIndex: 0 cycles: 1 uvChannelMask: -1 - randomRow: 1 + rowMode: 1 sprites: - sprite: {fileID: 0} flipU: 0 @@ -2216,8 +2217,61 @@ ParticleSystem: inWorldSpace: 0 randomizePerFrame: 0 ExternalForcesModule: + serializedVersion: 2 enabled: 0 - multiplier: 1 + multiplierCurve: + serializedVersion: 2 + minMaxState: 0 + scalar: 1 + minScalar: 1 + maxCurve: + 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: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + 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: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 influenceFilter: 0 influenceMask: serializedVersion: 2 @@ -4579,6 +4633,7 @@ ParticleSystemRenderer: m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 + m_RayTracingMode: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4591,6 +4646,7 @@ ParticleSystemRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -6115,6 +6171,7 @@ ParticleSystem: m_NumColorKeys: 2 m_NumAlphaKeys: 2 UVModule: + serializedVersion: 2 enabled: 0 mode: 0 timeMode: 0 @@ -6232,7 +6289,7 @@ ParticleSystem: rowIndex: 0 cycles: 1 uvChannelMask: -1 - randomRow: 1 + rowMode: 1 sprites: - sprite: {fileID: 0} flipU: 0 @@ -6989,8 +7046,61 @@ ParticleSystem: inWorldSpace: 0 randomizePerFrame: 0 ExternalForcesModule: + serializedVersion: 2 enabled: 0 - multiplier: 1 + multiplierCurve: + serializedVersion: 2 + minMaxState: 0 + scalar: 1 + minScalar: 1 + maxCurve: + 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: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + 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: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 influenceFilter: 0 influenceMask: serializedVersion: 2 @@ -9352,6 +9462,7 @@ ParticleSystemRenderer: m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 + m_RayTracingMode: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9364,6 +9475,7 @@ ParticleSystemRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -9719,7 +9831,7 @@ ParticleSystem: m_RotationOrder: 4 startSizeY: serializedVersion: 2 - minMaxState: 0 + minMaxState: 3 scalar: 1 minScalar: 1 maxCurve: @@ -9772,7 +9884,7 @@ ParticleSystem: m_RotationOrder: 4 startSizeZ: serializedVersion: 2 - minMaxState: 0 + minMaxState: 3 scalar: 1 minScalar: 1 maxCurve: @@ -10707,6 +10819,7 @@ ParticleSystem: m_NumColorKeys: 2 m_NumAlphaKeys: 2 UVModule: + serializedVersion: 2 enabled: 0 mode: 0 timeMode: 0 @@ -10806,7 +10919,7 @@ ParticleSystem: rowIndex: 0 cycles: 33 uvChannelMask: -1 - randomRow: 1 + rowMode: 1 sprites: - sprite: {fileID: 0} flipU: 0 @@ -11617,8 +11730,61 @@ ParticleSystem: inWorldSpace: 0 randomizePerFrame: 0 ExternalForcesModule: + serializedVersion: 2 enabled: 0 - multiplier: 1 + multiplierCurve: + serializedVersion: 2 + minMaxState: 0 + scalar: 1 + minScalar: 1 + maxCurve: + 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: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + 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: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 influenceFilter: 0 influenceMask: serializedVersion: 2 @@ -13980,6 +14146,7 @@ ParticleSystemRenderer: m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 + m_RayTracingMode: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -13992,6 +14159,7 @@ ParticleSystemRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 diff --git a/Assets/Standard Assets/ParticleSystems/Prefabs/FlareMobile.prefab b/Assets/Standard Assets/ParticleSystems/Prefabs/FlareMobile.prefab index b6dd7cd..1650a44 100644 --- a/Assets/Standard Assets/ParticleSystems/Prefabs/FlareMobile.prefab +++ b/Assets/Standard Assets/ParticleSystems/Prefabs/FlareMobile.prefab @@ -1288,6 +1288,7 @@ ParticleSystem: m_NumColorKeys: 2 m_NumAlphaKeys: 2 UVModule: + serializedVersion: 2 enabled: 0 mode: 0 timeMode: 0 @@ -1405,7 +1406,7 @@ ParticleSystem: rowIndex: 0 cycles: 1 uvChannelMask: -1 - randomRow: 1 + rowMode: 1 sprites: - sprite: {fileID: 0} flipU: 0 @@ -2216,8 +2217,61 @@ ParticleSystem: inWorldSpace: 0 randomizePerFrame: 0 ExternalForcesModule: + serializedVersion: 2 enabled: 0 - multiplier: 1 + multiplierCurve: + serializedVersion: 2 + minMaxState: 0 + scalar: 1 + minScalar: 1 + maxCurve: + 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: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + 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: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 influenceFilter: 0 influenceMask: serializedVersion: 2 @@ -4579,6 +4633,7 @@ ParticleSystemRenderer: m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 + m_RayTracingMode: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4591,6 +4646,7 @@ ParticleSystemRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -6115,6 +6171,7 @@ ParticleSystem: m_NumColorKeys: 2 m_NumAlphaKeys: 2 UVModule: + serializedVersion: 2 enabled: 0 mode: 0 timeMode: 0 @@ -6232,7 +6289,7 @@ ParticleSystem: rowIndex: 0 cycles: 1 uvChannelMask: -1 - randomRow: 1 + rowMode: 1 sprites: - sprite: {fileID: 0} flipU: 0 @@ -6989,8 +7046,61 @@ ParticleSystem: inWorldSpace: 0 randomizePerFrame: 0 ExternalForcesModule: + serializedVersion: 2 enabled: 0 - multiplier: 1 + multiplierCurve: + serializedVersion: 2 + minMaxState: 0 + scalar: 1 + minScalar: 1 + maxCurve: + 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: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + 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: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 influenceFilter: 0 influenceMask: serializedVersion: 2 @@ -9352,6 +9462,7 @@ ParticleSystemRenderer: m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 + m_RayTracingMode: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9364,6 +9475,7 @@ ParticleSystemRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -9719,7 +9831,7 @@ ParticleSystem: m_RotationOrder: 4 startSizeY: serializedVersion: 2 - minMaxState: 0 + minMaxState: 3 scalar: 1 minScalar: 1 maxCurve: @@ -9772,7 +9884,7 @@ ParticleSystem: m_RotationOrder: 4 startSizeZ: serializedVersion: 2 - minMaxState: 0 + minMaxState: 3 scalar: 1 minScalar: 1 maxCurve: @@ -10707,6 +10819,7 @@ ParticleSystem: m_NumColorKeys: 2 m_NumAlphaKeys: 2 UVModule: + serializedVersion: 2 enabled: 0 mode: 0 timeMode: 0 @@ -10806,7 +10919,7 @@ ParticleSystem: rowIndex: 0 cycles: 33 uvChannelMask: -1 - randomRow: 1 + rowMode: 1 sprites: - sprite: {fileID: 0} flipU: 0 @@ -11617,8 +11730,61 @@ ParticleSystem: inWorldSpace: 0 randomizePerFrame: 0 ExternalForcesModule: + serializedVersion: 2 enabled: 0 - multiplier: 1 + multiplierCurve: + serializedVersion: 2 + minMaxState: 0 + scalar: 1 + minScalar: 1 + maxCurve: + 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: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + 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: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 influenceFilter: 0 influenceMask: serializedVersion: 2 @@ -13980,6 +14146,7 @@ ParticleSystemRenderer: m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 + m_RayTracingMode: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -13992,6 +14159,7 @@ ParticleSystemRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0