From 42b547ef73ba00f616d2345a320387c3b03d218d Mon Sep 17 00:00:00 2001 From: rezazfn Date: Sat, 15 Feb 2025 21:29:39 +0800 Subject: [PATCH] game: smoke vfx fix + raining sound audio --- Game/Assets/Audio/Raining 1.mp3 | 3 + Game/Assets/Audio/Raining 1.mp3.meta | 23 +++ Game/Assets/Scenes/GoodEnding.unity | 4 +- Game/Assets/Scenes/Town.unity | 157 ++++++++++++++++-- .../Smoke/WFX_SmokeGrenade Additive.prefab | 10 +- 5 files changed, 175 insertions(+), 22 deletions(-) create mode 100644 Game/Assets/Audio/Raining 1.mp3 create mode 100644 Game/Assets/Audio/Raining 1.mp3.meta diff --git a/Game/Assets/Audio/Raining 1.mp3 b/Game/Assets/Audio/Raining 1.mp3 new file mode 100644 index 0000000..1608323 --- /dev/null +++ b/Game/Assets/Audio/Raining 1.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:15ae2c8397d8aa2a934c7973da01c7355e77c36cafeb2783521097b3b6514b57 +size 3824640 diff --git a/Game/Assets/Audio/Raining 1.mp3.meta b/Game/Assets/Audio/Raining 1.mp3.meta new file mode 100644 index 0000000..0921710 --- /dev/null +++ b/Game/Assets/Audio/Raining 1.mp3.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 7f3e3748816e4f243ad0627a9d36e365 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game/Assets/Scenes/GoodEnding.unity b/Game/Assets/Scenes/GoodEnding.unity index 9dd9f43..572ecb2 100644 --- a/Game/Assets/Scenes/GoodEnding.unity +++ b/Game/Assets/Scenes/GoodEnding.unity @@ -148893,7 +148893,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &733186437 MonoBehaviour: m_ObjectHideFlags: 0 @@ -206152,7 +206152,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &931094978 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Game/Assets/Scenes/Town.unity b/Game/Assets/Scenes/Town.unity index 7dc75d9..ddac9c5 100644 --- a/Game/Assets/Scenes/Town.unity +++ b/Game/Assets/Scenes/Town.unity @@ -8796,7 +8796,7 @@ MeshCollider: serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 - m_Mesh: {fileID: 912889608} + m_Mesh: {fileID: 239935539} --- !u!33 &57662720 MeshFilter: m_ObjectHideFlags: 10 @@ -14363,7 +14363,7 @@ MeshCollider: serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 - m_Mesh: {fileID: 0} + m_Mesh: {fileID: 238581542} --- !u!33 &82688249 MeshFilter: m_ObjectHideFlags: 10 @@ -27136,7 +27136,7 @@ MeshCollider: serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 - m_Mesh: {fileID: 73661514} + m_Mesh: {fileID: 961159430} --- !u!33 &153826609 MeshFilter: m_ObjectHideFlags: 10 @@ -38425,7 +38425,7 @@ MeshCollider: serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 - m_Mesh: {fileID: 2072989810} + m_Mesh: {fileID: 1102690100} --- !u!33 &213832082 MeshFilter: m_ObjectHideFlags: 10 @@ -70729,7 +70729,7 @@ MeshCollider: serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 - m_Mesh: {fileID: 239935539} + m_Mesh: {fileID: 1362172324} --- !u!33 &385120483 MeshFilter: m_ObjectHideFlags: 10 @@ -137129,6 +137129,134 @@ Mesh: offset: 0 size: 0 path: +--- !u!1 &684358110 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 684358112} + - component: {fileID: 684358111} + m_Layer: 0 + m_Name: Raining Sound + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!82 &684358111 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 684358110} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 7f3e3748816e4f243ad0627a9d36e365, type: 3} + m_PlayOnAwake: 1 + m_Volume: 0.601 + 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.222 + 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 &684358112 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 684358110} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 39.8, y: 29.41238, z: 1097.4} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &684813519 PrefabInstance: m_ObjectHideFlags: 0 @@ -161887,7 +162015,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6480689750653206557, guid: 3d2cb73c0ae79084db7e6f6426b40419, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6619653675981249492, guid: 3d2cb73c0ae79084db7e6f6426b40419, type: 3} propertyPath: m_LocalScale.x @@ -216999,7 +217127,7 @@ MeshCollider: serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 - m_Mesh: {fileID: 0} + m_Mesh: {fileID: 912889608} --- !u!33 &1100576992 MeshFilter: m_ObjectHideFlags: 10 @@ -234421,7 +234549,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6480689750653206557, guid: 3d2cb73c0ae79084db7e6f6426b40419, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6619653675981249492, guid: 3d2cb73c0ae79084db7e6f6426b40419, type: 3} propertyPath: m_LocalScale.x @@ -248747,7 +248875,7 @@ MeshCollider: serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 - m_Mesh: {fileID: 1362172324} + m_Mesh: {fileID: 636215235} --- !u!33 &1257921385 MeshFilter: m_ObjectHideFlags: 10 @@ -260051,7 +260179,7 @@ MeshCollider: serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 - m_Mesh: {fileID: 1350935723} + m_Mesh: {fileID: 2125815365} --- !u!33 &1322038718 MeshFilter: m_ObjectHideFlags: 10 @@ -334703,7 +334831,7 @@ MeshCollider: serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 - m_Mesh: {fileID: 2125815365} + m_Mesh: {fileID: 73661514} --- !u!33 &1705996057 MeshFilter: m_ObjectHideFlags: 10 @@ -348965,7 +349093,7 @@ MeshCollider: serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 - m_Mesh: {fileID: 1102690100} + m_Mesh: {fileID: 1350935723} --- !u!33 &1785964207 MeshFilter: m_ObjectHideFlags: 10 @@ -356471,7 +356599,7 @@ MeshCollider: serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 - m_Mesh: {fileID: 380562813} + m_Mesh: {fileID: 2072989810} --- !u!33 &1818651610 MeshFilter: m_ObjectHideFlags: 10 @@ -413837,7 +413965,7 @@ MeshCollider: serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 - m_Mesh: {fileID: 636215235} + m_Mesh: {fileID: 380562813} --- !u!33 &2047617929 MeshFilter: m_ObjectHideFlags: 10 @@ -475685,3 +475813,4 @@ SceneRoots: - {fileID: 1387741392} - {fileID: 1385490376} - {fileID: 617280415} + - {fileID: 684358112} diff --git a/Game/Assets/VFX/Isaac/isaacvfxhehe/WarFX/_Effects/Smoke/WFX_SmokeGrenade Additive.prefab b/Game/Assets/VFX/Isaac/isaacvfxhehe/WarFX/_Effects/Smoke/WFX_SmokeGrenade Additive.prefab index 7125663..ac45bcd 100644 --- a/Game/Assets/VFX/Isaac/isaacvfxhehe/WarFX/_Effects/Smoke/WFX_SmokeGrenade Additive.prefab +++ b/Game/Assets/VFX/Isaac/isaacvfxhehe/WarFX/_Effects/Smoke/WFX_SmokeGrenade Additive.prefab @@ -50,7 +50,7 @@ ParticleSystem: ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} emitterVelocityMode: 0 - looping: 0 + looping: 1 prewarm: 0 playOnAwake: 1 useUnscaledTime: 0 @@ -4657,7 +4657,6 @@ ParticleSystemRenderer: m_RendererPriority: 0 m_Materials: - {fileID: 2100000, guid: 08860f5a2ea791b418ad49e30b240d79, type: 2} - - {fileID: 0} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -4771,7 +4770,7 @@ ParticleSystem: ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} emitterVelocityMode: 0 - looping: 0 + looping: 1 prewarm: 0 playOnAwake: 1 useUnscaledTime: 0 @@ -5114,7 +5113,7 @@ ParticleSystem: m_RotationOrder: 4 startRotationX: serializedVersion: 2 - minMaxState: 0 + minMaxState: 3 scalar: 0 minScalar: 0 maxCurve: @@ -5167,7 +5166,7 @@ ParticleSystem: m_RotationOrder: 4 startRotationY: serializedVersion: 2 - minMaxState: 0 + minMaxState: 3 scalar: 0 minScalar: 0 maxCurve: @@ -9351,7 +9350,6 @@ ParticleSystemRenderer: m_RendererPriority: 0 m_Materials: - {fileID: 2100000, guid: 08860f5a2ea791b418ad49e30b240d79, type: 2} - - {fileID: 0} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0