diff --git a/Assets/Arts/BigRookGames/_AssetPacks/Stylized Weapon Pack/M4 Scoped Assault Rifle/Prefabs/VFX_M4 Muzzle Flash.prefab b/Assets/Arts/BigRookGames/_AssetPacks/Stylized Weapon Pack/M4 Scoped Assault Rifle/Prefabs/VFX_M4 Muzzle Flash.prefab index 3b7a5fe..348cea2 100644 --- a/Assets/Arts/BigRookGames/_AssetPacks/Stylized Weapon Pack/M4 Scoped Assault Rifle/Prefabs/VFX_M4 Muzzle Flash.prefab +++ b/Assets/Arts/BigRookGames/_AssetPacks/Stylized Weapon Pack/M4 Scoped Assault Rifle/Prefabs/VFX_M4 Muzzle Flash.prefab @@ -25,13 +25,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1116040971840050} - m_LocalRotation: {x: -0.66030705, y: -0, z: -0, w: 0.75099576} + m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} m_LocalPosition: {x: 0.031, y: 0, z: 0.025} m_LocalScale: {x: 1, y: 1.0000005, z: 1.0000005} m_Children: [] m_Father: {fileID: 4639870034382688} m_RootOrder: 5 - m_LocalEulerAnglesHint: {x: -82.647, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!198 &198121254391941232 ParticleSystem: m_ObjectHideFlags: 0 @@ -2183,62 +2183,6 @@ ParticleSystem: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - LifetimeByEmitterSpeedModule: - enabled: 0 - m_Curve: - serializedVersion: 2 - minMaxState: 1 - scalar: 1 - minScalar: 1 - maxCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: -0.8 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0.2 - inSlope: -0.8 - 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 - m_Range: {x: 0, y: 1} ForceModule: enabled: 0 x: @@ -4820,7 +4764,6 @@ ParticleSystemRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 0 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -4862,8 +4805,6 @@ ParticleSystemRenderer: m_EnableGPUInstancing: 1 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 - m_FreeformStretching: 0 - m_RotateWithStretchDirection: 1 m_VertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} @@ -4895,13 +4836,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1222506973823736} - m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} m_LocalPosition: {x: 0.019, y: 0, z: 0} m_LocalScale: {x: 1, y: 1.0000005, z: 1.0000005} m_Children: [] m_Father: {fileID: 4639870034382688} m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!198 &198323450087234306 ParticleSystem: m_ObjectHideFlags: 0 @@ -7062,62 +7003,6 @@ ParticleSystem: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - LifetimeByEmitterSpeedModule: - enabled: 0 - m_Curve: - serializedVersion: 2 - minMaxState: 1 - scalar: 1 - minScalar: 1 - maxCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: -0.8 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0.2 - inSlope: -0.8 - 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 - m_Range: {x: 0, y: 1} ForceModule: enabled: 0 x: @@ -9699,7 +9584,6 @@ ParticleSystemRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 0 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -9741,8 +9625,6 @@ ParticleSystemRenderer: m_EnableGPUInstancing: 1 m_ApplyActiveColorSpace: 0 m_AllowRoll: 1 - m_FreeformStretching: 0 - m_RotateWithStretchDirection: 1 m_VertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} @@ -11932,62 +11814,6 @@ ParticleSystem: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - LifetimeByEmitterSpeedModule: - enabled: 0 - m_Curve: - serializedVersion: 2 - minMaxState: 1 - scalar: 1 - minScalar: 1 - maxCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: -0.8 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0.2 - inSlope: -0.8 - 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 - m_Range: {x: 0, y: 1} ForceModule: enabled: 1 x: @@ -14569,7 +14395,6 @@ ParticleSystemRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 0 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -14611,8 +14436,6 @@ ParticleSystemRenderer: m_EnableGPUInstancing: 1 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 - m_FreeformStretching: 0 - m_RotateWithStretchDirection: 1 m_VertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} @@ -14644,13 +14467,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1306587544184404} - m_LocalRotation: {x: 1, y: 0, z: 0, w: 0} + m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} m_LocalPosition: {x: 0.030999988, y: 0, z: 0.0250001} m_LocalScale: {x: 1, y: 1.0000012, z: 1.0000012} m_Children: [] m_Father: {fileID: 4639870034382688} m_RootOrder: 6 - m_LocalEulerAnglesHint: {x: 180, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!198 &198034242751518514 ParticleSystem: m_ObjectHideFlags: 0 @@ -16802,62 +16625,6 @@ ParticleSystem: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - LifetimeByEmitterSpeedModule: - enabled: 0 - m_Curve: - serializedVersion: 2 - minMaxState: 1 - scalar: 1 - minScalar: 1 - maxCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: -0.8 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0.2 - inSlope: -0.8 - 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 - m_Range: {x: 0, y: 1} ForceModule: enabled: 0 x: @@ -19439,7 +19206,6 @@ ParticleSystemRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 0 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -19481,8 +19247,6 @@ ParticleSystemRenderer: m_EnableGPUInstancing: 1 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 - m_FreeformStretching: 0 - m_RotateWithStretchDirection: 1 m_VertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} @@ -19514,7 +19278,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1336949550903370} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: 0.70710677, y: 0, z: 0, w: 0.70710677} m_LocalPosition: {x: 0, y: 0, z: -0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: @@ -19527,7 +19291,7 @@ Transform: - {fileID: 4400566815978586} m_Father: {fileID: 0} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 90, y: 90, z: 90} --- !u!198 &198792769130808804 ParticleSystem: m_ObjectHideFlags: 0 @@ -21679,62 +21443,6 @@ ParticleSystem: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - LifetimeByEmitterSpeedModule: - enabled: 0 - m_Curve: - serializedVersion: 2 - minMaxState: 1 - scalar: 1 - minScalar: 1 - maxCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: -0.8 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0.2 - inSlope: -0.8 - 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 - m_Range: {x: 0, y: 1} ForceModule: enabled: 0 x: @@ -24316,7 +24024,6 @@ ParticleSystemRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 0 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -24358,8 +24065,6 @@ ParticleSystemRenderer: m_EnableGPUInstancing: 1 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 - m_FreeformStretching: 0 - m_RotateWithStretchDirection: 1 m_VertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} @@ -24391,13 +24096,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1404526102996912} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} m_LocalPosition: {x: -0.016, y: -0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4639870034382688} m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!198 &198712883296449046 ParticleSystem: m_ObjectHideFlags: 0 @@ -26558,62 +26263,6 @@ ParticleSystem: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - LifetimeByEmitterSpeedModule: - enabled: 0 - m_Curve: - serializedVersion: 2 - minMaxState: 1 - scalar: 1 - minScalar: 1 - maxCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: -0.8 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0.2 - inSlope: -0.8 - 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 - m_Range: {x: 0, y: 1} ForceModule: enabled: 0 x: @@ -29195,7 +28844,6 @@ ParticleSystemRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 0 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -29237,8 +28885,6 @@ ParticleSystemRenderer: m_EnableGPUInstancing: 1 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 - m_FreeformStretching: 0 - m_RotateWithStretchDirection: 1 m_VertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} @@ -29270,13 +28916,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1462184510508918} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} m_LocalPosition: {x: 0.44, y: -0, z: 0.068} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4639870034382688} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!198 &198096151810611572 ParticleSystem: m_ObjectHideFlags: 0 @@ -31428,62 +31074,6 @@ ParticleSystem: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - LifetimeByEmitterSpeedModule: - enabled: 0 - m_Curve: - serializedVersion: 2 - minMaxState: 1 - scalar: 1 - minScalar: 1 - maxCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: -0.8 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0.2 - inSlope: -0.8 - 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 - m_Range: {x: 0, y: 1} ForceModule: enabled: 0 x: @@ -34065,7 +33655,6 @@ ParticleSystemRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 0 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -34107,8 +33696,6 @@ ParticleSystemRenderer: m_EnableGPUInstancing: 1 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 - m_FreeformStretching: 0 - m_RotateWithStretchDirection: 1 m_VertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} @@ -36298,62 +35885,6 @@ ParticleSystem: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - LifetimeByEmitterSpeedModule: - enabled: 0 - m_Curve: - serializedVersion: 2 - minMaxState: 1 - scalar: 1 - minScalar: 1 - maxCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: -0.8 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0.2 - inSlope: -0.8 - 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 - m_Range: {x: 0, y: 1} ForceModule: enabled: 1 x: @@ -38935,7 +38466,6 @@ ParticleSystemRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 0 - m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -38977,8 +38507,6 @@ ParticleSystemRenderer: m_EnableGPUInstancing: 1 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 - m_FreeformStretching: 0 - m_RotateWithStretchDirection: 1 m_VertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} diff --git a/Assets/Arts/SciFiWarriorPBRHPPolyart/Materials/promotion.mat b/Assets/Arts/SciFiWarriorPBRHPPolyart/Materials/promotion.mat new file mode 100644 index 0000000..e42a250 --- /dev/null +++ b/Assets/Arts/SciFiWarriorPBRHPPolyart/Materials/promotion.mat @@ -0,0 +1,77 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: promotion + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: e8a466c997566b84c895066dbd56e130, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Assets/Arts/SciFiWarriorPBRHPPolyart/Materials/promotion.mat.meta b/Assets/Arts/SciFiWarriorPBRHPPolyart/Materials/promotion.mat.meta new file mode 100644 index 0000000..f4d665a --- /dev/null +++ b/Assets/Arts/SciFiWarriorPBRHPPolyart/Materials/promotion.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 706efd9e869f990469a54d85f228f388 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/PlayerPrefab/Player.prefab b/Assets/Prefabs/PlayerPrefab/Player.prefab index 0e04e77..c157be0 100644 --- a/Assets/Prefabs/PlayerPrefab/Player.prefab +++ b/Assets/Prefabs/PlayerPrefab/Player.prefab @@ -1560,10 +1560,10 @@ MonoBehaviour: m_EditorClassIdentifier: raycast: {fileID: 9178730298827149128} firePoint: {fileID: 6083229256174510991} - projectilePrefab: {fileID: 1336949550903370, guid: 4543ab5e3d405ec40a8d4e9aa5165030, + projectilePrefab: {fileID: 198792769130808804, guid: 4543ab5e3d405ec40a8d4e9aa5165030, type: 3} - gun: {fileID: 6083229256174510991} - audio: {fileID: 5688969300207199068} + gun: {fileID: 6504527156986595194} + audioSource: {fileID: 5688969300207199068} --- !u!114 &5519976521156458274 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3244,7 +3244,7 @@ MonoBehaviour: ModeOverride: 0 LensShift: {x: 0, y: 0} GateFit: 2 - m_SensorSize: {x: 1.599741, y: 1} + m_SensorSize: {x: 1.6007463, y: 1} m_Transitions: m_BlendHint: 0 m_InheritPosition: 0 @@ -3383,13 +3383,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6504527156986595194} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8684673709126177962} m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} --- !u!82 &5688969300207199068 AudioSource: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/kirill.unity b/Assets/Scenes/kirill.unity index 274ae16..820064c 100644 --- a/Assets/Scenes/kirill.unity +++ b/Assets/Scenes/kirill.unity @@ -353,6 +353,46 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: -4820536401884566159, guid: b5b04f22586a72c438dddf26e4474a4b, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 706efd9e869f990469a54d85f228f388, type: 2} + - target: {fileID: 295784659895838445, guid: b5b04f22586a72c438dddf26e4474a4b, + type: 3} + propertyPath: m_Lens.m_SensorSize.x + value: 1.6006826 + objectReference: {fileID: 0} + - target: {fileID: 332262046114401060, guid: b5b04f22586a72c438dddf26e4474a4b, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 332262046114401060, guid: b5b04f22586a72c438dddf26e4474a4b, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 332262046114401060, guid: b5b04f22586a72c438dddf26e4474a4b, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 332262046114401060, guid: b5b04f22586a72c438dddf26e4474a4b, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 332262046114401060, guid: b5b04f22586a72c438dddf26e4474a4b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 454394644281622944, guid: b5b04f22586a72c438dddf26e4474a4b, + type: 3} + propertyPath: lengthInSec + value: 0.2 + objectReference: {fileID: 0} - target: {fileID: 916820916668423615, guid: b5b04f22586a72c438dddf26e4474a4b, type: 3} propertyPath: m_LocalRotation.w @@ -478,6 +518,26 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.x value: 0.39 objectReference: {fileID: 0} + - target: {fileID: 3826586624661553856, guid: b5b04f22586a72c438dddf26e4474a4b, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.099999994 + objectReference: {fileID: 0} + - target: {fileID: 3826586624661553856, guid: b5b04f22586a72c438dddf26e4474a4b, + type: 3} + propertyPath: m_LocalPosition.z + value: -1.8900003 + objectReference: {fileID: 0} + - target: {fileID: 3826586624661553856, guid: b5b04f22586a72c438dddf26e4474a4b, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3826586624661553856, guid: b5b04f22586a72c438dddf26e4474a4b, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} - target: {fileID: 4209587867545793288, guid: b5b04f22586a72c438dddf26e4474a4b, type: 3} propertyPath: m_RenderMode @@ -502,7 +562,7 @@ PrefabInstance: type: 3} propertyPath: projectilePrefab value: - objectReference: {fileID: 1336949550903370, guid: 4543ab5e3d405ec40a8d4e9aa5165030, + objectReference: {fileID: 198792769130808804, guid: 4543ab5e3d405ec40a8d4e9aa5165030, type: 3} - target: {fileID: 5170482295850327424, guid: b5b04f22586a72c438dddf26e4474a4b, type: 3} @@ -592,6 +652,21 @@ PrefabInstance: propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} + - target: {fileID: 5681361825237611711, guid: b5b04f22586a72c438dddf26e4474a4b, + type: 3} + propertyPath: looping + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5681361825237611711, guid: b5b04f22586a72c438dddf26e4474a4b, + type: 3} + propertyPath: lengthInSec + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5688969300207199068, guid: b5b04f22586a72c438dddf26e4474a4b, + type: 3} + propertyPath: m_Volume + value: 0.518 + objectReference: {fileID: 0} - target: {fileID: 6900876834040779050, guid: b5b04f22586a72c438dddf26e4474a4b, type: 3} propertyPath: LookSpeed @@ -770,7 +845,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 5bfc78f05f6d4c24f9b3af77b64086a9, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/Scripts/Weapons/Shooting.cs b/Assets/Scripts/Weapons/Shooting.cs index fe17ecf..f37e5f9 100644 --- a/Assets/Scripts/Weapons/Shooting.cs +++ b/Assets/Scripts/Weapons/Shooting.cs @@ -8,7 +8,8 @@ public class Shooting : MonoBehaviour public GameObject raycast; public GameObject firePoint; - [SerializeField] private GameObject projectilePrefab; + //[SerializeField] private ParticleSystem projectilePrefab; + public ParticleSystem projectilePrefab; private float hSliderValue = 0.1f; private float _fireCountdown = 1f; @@ -28,6 +29,7 @@ public class Shooting : MonoBehaviour _fireCountdown = 0; _fireCountdown += hSliderValue; audioSource.Play(); + Instantiate(projectilePrefab, gun.transform.position, gun.transform.rotation); Shoot(); } _fireCountdown -= Time.deltaTime; @@ -41,7 +43,6 @@ public class Shooting : MonoBehaviour { if (hit.transform.TryGetComponent(out var target)) { - Instantiate(projectilePrefab, firePoint.transform.position, firePoint.transform.rotation); target.GetDamage(SettingsReader.Instance.GetSettings.RifleDamage); } }