From a6de20c18bd2fda60ac9b43f4eb13679808a12bf Mon Sep 17 00:00:00 2001 From: teascade Date: Mon, 19 Aug 2019 23:35:43 +0300 Subject: [PATCH] Add lighting --- Assets/LWRP Stuff.meta | 8 ++ Assets/LWRP Stuff/Asset.asset | 46 ++++++++++ Assets/LWRP Stuff/Asset.asset.meta | 8 ++ Assets/LWRP Stuff/DefaultMat.mat | 35 ++++++++ Assets/LWRP Stuff/DefaultMat.mat.meta | 8 ++ Assets/LWRP Stuff/Renderer.asset | 56 ++++++++++++ Assets/LWRP Stuff/Renderer.asset.meta | 8 ++ Assets/Prefabs/Bodyparts/BigBodyPart-1.prefab | 2 +- Assets/Prefabs/Bodyparts/BigBodyPart-2.prefab | 2 +- Assets/Prefabs/Bodyparts/BigBodyPart-3.prefab | 2 +- .../Prefabs/Bodyparts/BigSteelPart-1.prefab | 2 +- .../Prefabs/Bodyparts/BigSteelPart-2.prefab | 2 +- .../Prefabs/Bodyparts/BigSteelPart-3.prefab | 2 +- .../Prefabs/Bodyparts/ComputerPart-1.prefab | 2 +- .../Prefabs/Bodyparts/ComputerPart-2.prefab | 2 +- .../Prefabs/Bodyparts/ComputerPart-3.prefab | 2 +- .../Prefabs/Bodyparts/ComputerPart-4.prefab | 2 +- .../Prefabs/Bodyparts/MediumBodyPart-1.prefab | 2 +- .../Prefabs/Bodyparts/MediumBodyPart-2.prefab | 2 +- .../Prefabs/Bodyparts/MediumBodyPart-3.prefab | 2 +- .../Bodyparts/MediumSteelPart-1.prefab | 2 +- .../Bodyparts/MediumSteelPart-2.prefab | 2 +- .../Bodyparts/MediumSteelPart-3.prefab | 2 +- .../Bodyparts/MediumSteelPart-4.prefab | 2 +- .../Prefabs/Bodyparts/SmallBodyPart-1.prefab | 2 +- .../Prefabs/Bodyparts/SmallBodyPart-2.prefab | 2 +- .../Prefabs/Bodyparts/SmallBodyPart-3.prefab | 2 +- .../Prefabs/Bodyparts/SmallBodyPart-4.prefab | 2 +- .../Prefabs/Bodyparts/WoodBodyPart-1.prefab | 2 +- .../Prefabs/Bodyparts/WoodBodyPart-2.prefab | 2 +- .../Prefabs/Bodyparts/WoodBodyPart-3.prefab | 2 +- .../Prefabs/Bodyparts/WoodBodyPart-4.prefab | 2 +- Assets/Prefabs/Bullets/Grenade.prefab | 2 +- Assets/Prefabs/Bullets/MobcatBullet.prefab | 2 +- Assets/Prefabs/Bullets/RevolverBullet.prefab | 3 +- Assets/Prefabs/Bullets/Rocket.prefab | 2 +- .../Prefabs/Bullets/ShotgunSubBullet.prefab | 2 +- Assets/Prefabs/Destructibles/Barrel.prefab | 2 +- Assets/Prefabs/Destructibles/Crate.prefab | 2 +- .../Destructible (Computer).prefab | 2 +- .../Destructibles/Destructible (Plant).prefab | 2 +- .../Destructible (Table Wide).prefab | 6 +- .../Destructibles/Destructible (Table).prefab | 4 +- .../Destructibles/Vending Machine.prefab | 2 +- Assets/Prefabs/Enemies/Enemy (Crab).prefab | 2 +- Assets/Prefabs/Enemies/Enemy (MobCat).prefab | 2 +- Assets/Prefabs/Guns/Grenade Launcher.prefab | 2 +- Assets/Prefabs/Guns/Revolver.prefab | 2 +- Assets/Prefabs/Guns/Rocket Launcher.prefab | 2 +- Assets/Prefabs/Guns/Shotgun.prefab | 2 +- .../Particles/BloodParticle (Censored).prefab | 3 +- Assets/Prefabs/Particles/BloodParticle.prefab | 3 +- .../Particles/StructuralDamageParticle.prefab | 2 +- Assets/Prefabs/Particles/WoodParticle.prefab | 2 +- Assets/Prefabs/Player.prefab | 8 +- Assets/Shaders/DefaultSpriteMat.mat | 85 +++++++++++++++++++ Assets/Shaders/DefaultSpriteMat.mat.meta | 8 ++ Packages/manifest.json | 1 + 58 files changed, 320 insertions(+), 54 deletions(-) create mode 100644 Assets/LWRP Stuff.meta create mode 100644 Assets/LWRP Stuff/Asset.asset create mode 100644 Assets/LWRP Stuff/Asset.asset.meta create mode 100644 Assets/LWRP Stuff/DefaultMat.mat create mode 100644 Assets/LWRP Stuff/DefaultMat.mat.meta create mode 100644 Assets/LWRP Stuff/Renderer.asset create mode 100644 Assets/LWRP Stuff/Renderer.asset.meta create mode 100644 Assets/Shaders/DefaultSpriteMat.mat create mode 100644 Assets/Shaders/DefaultSpriteMat.mat.meta diff --git a/Assets/LWRP Stuff.meta b/Assets/LWRP Stuff.meta new file mode 100644 index 0000000..f845771 --- /dev/null +++ b/Assets/LWRP Stuff.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5fe18612ade56904f83f7875051b7f93 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/LWRP Stuff/Asset.asset b/Assets/LWRP Stuff/Asset.asset new file mode 100644 index 0000000..f184831 --- /dev/null +++ b/Assets/LWRP Stuff/Asset.asset @@ -0,0 +1,46 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bf2edee5c58d82540a51f03df9d42094, type: 3} + m_Name: LightweightRenderPipelineAsset + m_EditorClassIdentifier: + k_AssetVersion: 4 + m_RendererType: 1 + m_RendererData: {fileID: 11400000, guid: 618d298269e66c542b306de85db1faea, type: 2} + m_RequireDepthTexture: 0 + m_RequireOpaqueTexture: 0 + m_OpaqueDownsampling: 1 + m_SupportsHDR: 0 + m_MSAA: 1 + m_RenderScale: 1 + m_MainLightRenderingMode: 1 + m_MainLightShadowsSupported: 1 + m_MainLightShadowmapResolution: 2048 + m_AdditionalLightsRenderingMode: 1 + m_AdditionalLightsPerObjectLimit: 4 + m_AdditionalLightShadowsSupported: 0 + m_AdditionalLightsShadowmapResolution: 512 + m_ShadowDistance: 50 + m_ShadowCascades: 0 + m_Cascade2Split: 0.25 + m_Cascade4Split: {x: 0.067, y: 0.2, z: 0.467} + m_ShadowDepthBias: 1 + m_ShadowNormalBias: 1 + m_SoftShadowsSupported: 0 + m_UseSRPBatcher: 1 + m_SupportsDynamicBatching: 0 + m_MixedLightingSupported: 1 + m_ShadowType: 1 + m_LocalShadowsSupported: 0 + m_LocalShadowsAtlasResolution: 256 + m_MaxPixelLights: 0 + m_ShadowAtlasResolution: 256 + m_ShaderVariantLogLevel: 0 diff --git a/Assets/LWRP Stuff/Asset.asset.meta b/Assets/LWRP Stuff/Asset.asset.meta new file mode 100644 index 0000000..b312917 --- /dev/null +++ b/Assets/LWRP Stuff/Asset.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 366832664f824904189f7529d938cdde +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/LWRP Stuff/DefaultMat.mat b/Assets/LWRP Stuff/DefaultMat.mat new file mode 100644 index 0000000..c64fdea --- /dev/null +++ b/Assets/LWRP Stuff/DefaultMat.mat @@ -0,0 +1,35 @@ +%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: New Material + m_Shader: {fileID: 4800000, guid: e260cfa7296ee7642b167f1eb5be5023, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MaskTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _NormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: [] + m_Colors: [] diff --git a/Assets/LWRP Stuff/DefaultMat.mat.meta b/Assets/LWRP Stuff/DefaultMat.mat.meta new file mode 100644 index 0000000..bfa3175 --- /dev/null +++ b/Assets/LWRP Stuff/DefaultMat.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 03e6674a6969c5845b4d97a399c6a451 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/LWRP Stuff/Renderer.asset b/Assets/LWRP Stuff/Renderer.asset new file mode 100644 index 0000000..94f2c63 --- /dev/null +++ b/Assets/LWRP Stuff/Renderer.asset @@ -0,0 +1,56 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 11145981673336645838492a2d98e247, type: 3} + m_Name: New 2D Renderer Data + m_EditorClassIdentifier: + m_RendererFeatures: [] + m_HDREmulationScale: 1 + m_LightBlendStyles: + - enabled: 1 + name: Default + maskTextureChannel: 0 + renderTextureScale: 1 + blendMode: 1 + customBlendFactors: + multiplicative: 0 + additive: 0 + - enabled: 0 + name: Blend Style 1 + maskTextureChannel: 0 + renderTextureScale: 1 + blendMode: 1 + customBlendFactors: + multiplicative: 0 + additive: 0 + - enabled: 0 + name: Blend Style 2 + maskTextureChannel: 0 + renderTextureScale: 1 + blendMode: 1 + customBlendFactors: + multiplicative: 0 + additive: 0 + - enabled: 0 + name: Blend Style 3 + maskTextureChannel: 0 + renderTextureScale: 1 + blendMode: 1 + customBlendFactors: + multiplicative: 0 + additive: 0 + m_ShapeLightShader: {fileID: 4800000, guid: d79e1c784eaf80c4585c0be7391f757a, type: 3} + m_ShapeLightVolumeShader: {fileID: 4800000, guid: 7e60080c8cd24a2468cb08b4bfee5606, + type: 3} + m_PointLightShader: {fileID: 4800000, guid: e35a31e1679aeff489e202f5cc4853d5, type: 3} + m_PointLightVolumeShader: {fileID: 4800000, guid: c7d04ca57e5449d49ad9cee1c604bc26, + type: 3} + m_BlitShader: {fileID: 4800000, guid: c17132b1f77d20942aa75f8429c0f8bc, type: 3} diff --git a/Assets/LWRP Stuff/Renderer.asset.meta b/Assets/LWRP Stuff/Renderer.asset.meta new file mode 100644 index 0000000..6b073c1 --- /dev/null +++ b/Assets/LWRP Stuff/Renderer.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ed942d5de2d8d9141837ed7b128fd548 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Bodyparts/BigBodyPart-1.prefab b/Assets/Prefabs/Bodyparts/BigBodyPart-1.prefab index b5b5e8a..2e19ae9 100644 --- a/Assets/Prefabs/Bodyparts/BigBodyPart-1.prefab +++ b/Assets/Prefabs/Bodyparts/BigBodyPart-1.prefab @@ -118,7 +118,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 03e6674a6969c5845b4d97a399c6a451, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/Prefabs/Bodyparts/BigBodyPart-2.prefab b/Assets/Prefabs/Bodyparts/BigBodyPart-2.prefab index 405d897..d61ffe7 100644 --- a/Assets/Prefabs/Bodyparts/BigBodyPart-2.prefab +++ b/Assets/Prefabs/Bodyparts/BigBodyPart-2.prefab @@ -118,7 +118,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 03e6674a6969c5845b4d97a399c6a451, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/Prefabs/Bodyparts/BigBodyPart-3.prefab b/Assets/Prefabs/Bodyparts/BigBodyPart-3.prefab index 5dc3987..322ffda 100644 --- a/Assets/Prefabs/Bodyparts/BigBodyPart-3.prefab +++ b/Assets/Prefabs/Bodyparts/BigBodyPart-3.prefab @@ -48,7 +48,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 03e6674a6969c5845b4d97a399c6a451, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/Prefabs/Bodyparts/BigSteelPart-1.prefab b/Assets/Prefabs/Bodyparts/BigSteelPart-1.prefab index 36ede58..324a6c7 100644 --- a/Assets/Prefabs/Bodyparts/BigSteelPart-1.prefab +++ b/Assets/Prefabs/Bodyparts/BigSteelPart-1.prefab @@ -118,7 +118,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 03e6674a6969c5845b4d97a399c6a451, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/Prefabs/Bodyparts/BigSteelPart-2.prefab b/Assets/Prefabs/Bodyparts/BigSteelPart-2.prefab index afd218c..1e5c18a 100644 --- a/Assets/Prefabs/Bodyparts/BigSteelPart-2.prefab +++ b/Assets/Prefabs/Bodyparts/BigSteelPart-2.prefab @@ -118,7 +118,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 03e6674a6969c5845b4d97a399c6a451, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/Prefabs/Bodyparts/BigSteelPart-3.prefab b/Assets/Prefabs/Bodyparts/BigSteelPart-3.prefab index 307614d..345bda7 100644 --- a/Assets/Prefabs/Bodyparts/BigSteelPart-3.prefab +++ b/Assets/Prefabs/Bodyparts/BigSteelPart-3.prefab @@ -118,7 +118,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 03e6674a6969c5845b4d97a399c6a451, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/Prefabs/Bodyparts/ComputerPart-1.prefab b/Assets/Prefabs/Bodyparts/ComputerPart-1.prefab index 32a7735..6231853 100644 --- a/Assets/Prefabs/Bodyparts/ComputerPart-1.prefab +++ b/Assets/Prefabs/Bodyparts/ComputerPart-1.prefab @@ -118,7 +118,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 03e6674a6969c5845b4d97a399c6a451, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/Prefabs/Bodyparts/ComputerPart-2.prefab b/Assets/Prefabs/Bodyparts/ComputerPart-2.prefab index a532f86..d1f35a5 100644 --- a/Assets/Prefabs/Bodyparts/ComputerPart-2.prefab +++ b/Assets/Prefabs/Bodyparts/ComputerPart-2.prefab @@ -118,7 +118,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 03e6674a6969c5845b4d97a399c6a451, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/Prefabs/Bodyparts/ComputerPart-3.prefab b/Assets/Prefabs/Bodyparts/ComputerPart-3.prefab index 87a0bb4..ad3e92f 100644 --- a/Assets/Prefabs/Bodyparts/ComputerPart-3.prefab +++ b/Assets/Prefabs/Bodyparts/ComputerPart-3.prefab @@ -118,7 +118,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 03e6674a6969c5845b4d97a399c6a451, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/Prefabs/Bodyparts/ComputerPart-4.prefab b/Assets/Prefabs/Bodyparts/ComputerPart-4.prefab index f3e3c15..f9ed337 100644 --- a/Assets/Prefabs/Bodyparts/ComputerPart-4.prefab +++ b/Assets/Prefabs/Bodyparts/ComputerPart-4.prefab @@ -118,7 +118,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 03e6674a6969c5845b4d97a399c6a451, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/Prefabs/Bodyparts/MediumBodyPart-1.prefab b/Assets/Prefabs/Bodyparts/MediumBodyPart-1.prefab index 051926e..20c07fd 100644 --- a/Assets/Prefabs/Bodyparts/MediumBodyPart-1.prefab +++ b/Assets/Prefabs/Bodyparts/MediumBodyPart-1.prefab @@ -118,7 +118,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 03e6674a6969c5845b4d97a399c6a451, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/Prefabs/Bodyparts/MediumBodyPart-2.prefab b/Assets/Prefabs/Bodyparts/MediumBodyPart-2.prefab index cb4192f..243e872 100644 --- a/Assets/Prefabs/Bodyparts/MediumBodyPart-2.prefab +++ b/Assets/Prefabs/Bodyparts/MediumBodyPart-2.prefab @@ -118,7 +118,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 03e6674a6969c5845b4d97a399c6a451, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/Prefabs/Bodyparts/MediumBodyPart-3.prefab b/Assets/Prefabs/Bodyparts/MediumBodyPart-3.prefab index 0df513b..aeed351 100644 --- a/Assets/Prefabs/Bodyparts/MediumBodyPart-3.prefab +++ b/Assets/Prefabs/Bodyparts/MediumBodyPart-3.prefab @@ -118,7 +118,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 03e6674a6969c5845b4d97a399c6a451, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/Prefabs/Bodyparts/MediumSteelPart-1.prefab b/Assets/Prefabs/Bodyparts/MediumSteelPart-1.prefab index 09ddf16..298addf 100644 --- a/Assets/Prefabs/Bodyparts/MediumSteelPart-1.prefab +++ b/Assets/Prefabs/Bodyparts/MediumSteelPart-1.prefab @@ -118,7 +118,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 03e6674a6969c5845b4d97a399c6a451, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/Prefabs/Bodyparts/MediumSteelPart-2.prefab b/Assets/Prefabs/Bodyparts/MediumSteelPart-2.prefab index 62c4661..c41e7c2 100644 --- a/Assets/Prefabs/Bodyparts/MediumSteelPart-2.prefab +++ b/Assets/Prefabs/Bodyparts/MediumSteelPart-2.prefab @@ -118,7 +118,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 03e6674a6969c5845b4d97a399c6a451, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/Prefabs/Bodyparts/MediumSteelPart-3.prefab b/Assets/Prefabs/Bodyparts/MediumSteelPart-3.prefab index a21f9a8..4cd181c 100644 --- a/Assets/Prefabs/Bodyparts/MediumSteelPart-3.prefab +++ b/Assets/Prefabs/Bodyparts/MediumSteelPart-3.prefab @@ -118,7 +118,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 03e6674a6969c5845b4d97a399c6a451, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/Prefabs/Bodyparts/MediumSteelPart-4.prefab b/Assets/Prefabs/Bodyparts/MediumSteelPart-4.prefab index 66bc195..c4c65e1 100644 --- a/Assets/Prefabs/Bodyparts/MediumSteelPart-4.prefab +++ b/Assets/Prefabs/Bodyparts/MediumSteelPart-4.prefab @@ -118,7 +118,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 03e6674a6969c5845b4d97a399c6a451, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/Prefabs/Bodyparts/SmallBodyPart-1.prefab b/Assets/Prefabs/Bodyparts/SmallBodyPart-1.prefab index 379a614..cac8282 100644 --- a/Assets/Prefabs/Bodyparts/SmallBodyPart-1.prefab +++ b/Assets/Prefabs/Bodyparts/SmallBodyPart-1.prefab @@ -118,7 +118,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 03e6674a6969c5845b4d97a399c6a451, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/Prefabs/Bodyparts/SmallBodyPart-2.prefab b/Assets/Prefabs/Bodyparts/SmallBodyPart-2.prefab index b906745..453d4f6 100644 --- a/Assets/Prefabs/Bodyparts/SmallBodyPart-2.prefab +++ b/Assets/Prefabs/Bodyparts/SmallBodyPart-2.prefab @@ -118,7 +118,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 03e6674a6969c5845b4d97a399c6a451, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/Prefabs/Bodyparts/SmallBodyPart-3.prefab b/Assets/Prefabs/Bodyparts/SmallBodyPart-3.prefab index a843905..08c79b8 100644 --- a/Assets/Prefabs/Bodyparts/SmallBodyPart-3.prefab +++ b/Assets/Prefabs/Bodyparts/SmallBodyPart-3.prefab @@ -118,7 +118,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 03e6674a6969c5845b4d97a399c6a451, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/Prefabs/Bodyparts/SmallBodyPart-4.prefab b/Assets/Prefabs/Bodyparts/SmallBodyPart-4.prefab index f7c21c5..d73e1b6 100644 --- a/Assets/Prefabs/Bodyparts/SmallBodyPart-4.prefab +++ b/Assets/Prefabs/Bodyparts/SmallBodyPart-4.prefab @@ -118,7 +118,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 03e6674a6969c5845b4d97a399c6a451, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/Prefabs/Bodyparts/WoodBodyPart-1.prefab b/Assets/Prefabs/Bodyparts/WoodBodyPart-1.prefab index 618f13d..7d96aa6 100644 --- a/Assets/Prefabs/Bodyparts/WoodBodyPart-1.prefab +++ b/Assets/Prefabs/Bodyparts/WoodBodyPart-1.prefab @@ -118,7 +118,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 03e6674a6969c5845b4d97a399c6a451, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/Prefabs/Bodyparts/WoodBodyPart-2.prefab b/Assets/Prefabs/Bodyparts/WoodBodyPart-2.prefab index 514c8dd..ccdacff 100644 --- a/Assets/Prefabs/Bodyparts/WoodBodyPart-2.prefab +++ b/Assets/Prefabs/Bodyparts/WoodBodyPart-2.prefab @@ -118,7 +118,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 03e6674a6969c5845b4d97a399c6a451, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/Prefabs/Bodyparts/WoodBodyPart-3.prefab b/Assets/Prefabs/Bodyparts/WoodBodyPart-3.prefab index ce94dc6..e457493 100644 --- a/Assets/Prefabs/Bodyparts/WoodBodyPart-3.prefab +++ b/Assets/Prefabs/Bodyparts/WoodBodyPart-3.prefab @@ -118,7 +118,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 03e6674a6969c5845b4d97a399c6a451, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/Prefabs/Bodyparts/WoodBodyPart-4.prefab b/Assets/Prefabs/Bodyparts/WoodBodyPart-4.prefab index 90a5c73..a6f50ac 100644 --- a/Assets/Prefabs/Bodyparts/WoodBodyPart-4.prefab +++ b/Assets/Prefabs/Bodyparts/WoodBodyPart-4.prefab @@ -118,7 +118,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 03e6674a6969c5845b4d97a399c6a451, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/Prefabs/Bullets/Grenade.prefab b/Assets/Prefabs/Bullets/Grenade.prefab index fb8cf42..b51a563 100644 --- a/Assets/Prefabs/Bullets/Grenade.prefab +++ b/Assets/Prefabs/Bullets/Grenade.prefab @@ -155,7 +155,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 03e6674a6969c5845b4d97a399c6a451, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/Prefabs/Bullets/MobcatBullet.prefab b/Assets/Prefabs/Bullets/MobcatBullet.prefab index 3dca038..0cf3438 100644 --- a/Assets/Prefabs/Bullets/MobcatBullet.prefab +++ b/Assets/Prefabs/Bullets/MobcatBullet.prefab @@ -9660,7 +9660,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 03e6674a6969c5845b4d97a399c6a451, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/Prefabs/Bullets/RevolverBullet.prefab b/Assets/Prefabs/Bullets/RevolverBullet.prefab index 579f473..46549e2 100644 --- a/Assets/Prefabs/Bullets/RevolverBullet.prefab +++ b/Assets/Prefabs/Bullets/RevolverBullet.prefab @@ -9611,6 +9611,7 @@ MonoBehaviour: Sprite: {fileID: 5552990435088311320} Trail: {fileID: 4595570391660610945} Explosion: {fileID: 6411602551704027216} + Damage: 12 --- !u!1 &5552990435088311320 GameObject: m_ObjectHideFlags: 0 @@ -9659,7 +9660,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 03e6674a6969c5845b4d97a399c6a451, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/Prefabs/Bullets/Rocket.prefab b/Assets/Prefabs/Bullets/Rocket.prefab index af39787..f7f2c6c 100644 --- a/Assets/Prefabs/Bullets/Rocket.prefab +++ b/Assets/Prefabs/Bullets/Rocket.prefab @@ -9660,7 +9660,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 03e6674a6969c5845b4d97a399c6a451, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/Prefabs/Bullets/ShotgunSubBullet.prefab b/Assets/Prefabs/Bullets/ShotgunSubBullet.prefab index ed70e2e..c6113a8 100644 --- a/Assets/Prefabs/Bullets/ShotgunSubBullet.prefab +++ b/Assets/Prefabs/Bullets/ShotgunSubBullet.prefab @@ -9660,7 +9660,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 03e6674a6969c5845b4d97a399c6a451, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/Prefabs/Destructibles/Barrel.prefab b/Assets/Prefabs/Destructibles/Barrel.prefab index bb22258..01f6f91 100644 --- a/Assets/Prefabs/Destructibles/Barrel.prefab +++ b/Assets/Prefabs/Destructibles/Barrel.prefab @@ -174,7 +174,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 03e6674a6969c5845b4d97a399c6a451, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/Prefabs/Destructibles/Crate.prefab b/Assets/Prefabs/Destructibles/Crate.prefab index e5a6335..3ec0fb3 100644 --- a/Assets/Prefabs/Destructibles/Crate.prefab +++ b/Assets/Prefabs/Destructibles/Crate.prefab @@ -174,7 +174,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 03e6674a6969c5845b4d97a399c6a451, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/Prefabs/Destructibles/Destructible (Computer).prefab b/Assets/Prefabs/Destructibles/Destructible (Computer).prefab index 39fbfe0..b87213b 100644 --- a/Assets/Prefabs/Destructibles/Destructible (Computer).prefab +++ b/Assets/Prefabs/Destructibles/Destructible (Computer).prefab @@ -178,7 +178,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 03e6674a6969c5845b4d97a399c6a451, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/Prefabs/Destructibles/Destructible (Plant).prefab b/Assets/Prefabs/Destructibles/Destructible (Plant).prefab index b3bced6..2a1a68f 100644 --- a/Assets/Prefabs/Destructibles/Destructible (Plant).prefab +++ b/Assets/Prefabs/Destructibles/Destructible (Plant).prefab @@ -48,7 +48,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 03e6674a6969c5845b4d97a399c6a451, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/Prefabs/Destructibles/Destructible (Table Wide).prefab b/Assets/Prefabs/Destructibles/Destructible (Table Wide).prefab index 4a1bad6..ad1b297 100644 --- a/Assets/Prefabs/Destructibles/Destructible (Table Wide).prefab +++ b/Assets/Prefabs/Destructibles/Destructible (Table Wide).prefab @@ -153,7 +153,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 03e6674a6969c5845b4d97a399c6a451, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -234,7 +234,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 03e6674a6969c5845b4d97a399c6a451, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -315,7 +315,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 03e6674a6969c5845b4d97a399c6a451, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/Prefabs/Destructibles/Destructible (Table).prefab b/Assets/Prefabs/Destructibles/Destructible (Table).prefab index 3bb96b7..ef2fa69 100644 --- a/Assets/Prefabs/Destructibles/Destructible (Table).prefab +++ b/Assets/Prefabs/Destructibles/Destructible (Table).prefab @@ -152,7 +152,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 03e6674a6969c5845b4d97a399c6a451, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -233,7 +233,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 03e6674a6969c5845b4d97a399c6a451, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/Prefabs/Destructibles/Vending Machine.prefab b/Assets/Prefabs/Destructibles/Vending Machine.prefab index 4e6e8d7..b17a97a 100644 --- a/Assets/Prefabs/Destructibles/Vending Machine.prefab +++ b/Assets/Prefabs/Destructibles/Vending Machine.prefab @@ -49,7 +49,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 03e6674a6969c5845b4d97a399c6a451, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/Prefabs/Enemies/Enemy (Crab).prefab b/Assets/Prefabs/Enemies/Enemy (Crab).prefab index 7108cf7..f675d1e 100644 --- a/Assets/Prefabs/Enemies/Enemy (Crab).prefab +++ b/Assets/Prefabs/Enemies/Enemy (Crab).prefab @@ -304,7 +304,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 03e6674a6969c5845b4d97a399c6a451, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/Prefabs/Enemies/Enemy (MobCat).prefab b/Assets/Prefabs/Enemies/Enemy (MobCat).prefab index 5d8d317..f92e50b 100644 --- a/Assets/Prefabs/Enemies/Enemy (MobCat).prefab +++ b/Assets/Prefabs/Enemies/Enemy (MobCat).prefab @@ -49,7 +49,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 03e6674a6969c5845b4d97a399c6a451, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/Prefabs/Guns/Grenade Launcher.prefab b/Assets/Prefabs/Guns/Grenade Launcher.prefab index 00d3b49..b8c3bf2 100644 --- a/Assets/Prefabs/Guns/Grenade Launcher.prefab +++ b/Assets/Prefabs/Guns/Grenade Launcher.prefab @@ -198,7 +198,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 03e6674a6969c5845b4d97a399c6a451, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/Prefabs/Guns/Revolver.prefab b/Assets/Prefabs/Guns/Revolver.prefab index 12a6b84..323e792 100644 --- a/Assets/Prefabs/Guns/Revolver.prefab +++ b/Assets/Prefabs/Guns/Revolver.prefab @@ -198,7 +198,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 03e6674a6969c5845b4d97a399c6a451, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/Prefabs/Guns/Rocket Launcher.prefab b/Assets/Prefabs/Guns/Rocket Launcher.prefab index 43dd786..aa040f9 100644 --- a/Assets/Prefabs/Guns/Rocket Launcher.prefab +++ b/Assets/Prefabs/Guns/Rocket Launcher.prefab @@ -198,7 +198,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 03e6674a6969c5845b4d97a399c6a451, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/Prefabs/Guns/Shotgun.prefab b/Assets/Prefabs/Guns/Shotgun.prefab index 649f177..8774b64 100644 --- a/Assets/Prefabs/Guns/Shotgun.prefab +++ b/Assets/Prefabs/Guns/Shotgun.prefab @@ -198,7 +198,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 03e6674a6969c5845b4d97a399c6a451, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/Prefabs/Particles/BloodParticle (Censored).prefab b/Assets/Prefabs/Particles/BloodParticle (Censored).prefab index 938dc1f..1393812 100644 --- a/Assets/Prefabs/Particles/BloodParticle (Censored).prefab +++ b/Assets/Prefabs/Particles/BloodParticle (Censored).prefab @@ -48,7 +48,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 03e6674a6969c5845b4d97a399c6a451, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -127,5 +127,6 @@ MonoBehaviour: Renderer: {fileID: 1882677610630750274} LaunchForce: {x: 0, y: 0} Settled: 0 + GetsStuck: 1 Sprites: - {fileID: 21300000, guid: 1a2ef685debc2114187302af36eac8fb, type: 3} diff --git a/Assets/Prefabs/Particles/BloodParticle.prefab b/Assets/Prefabs/Particles/BloodParticle.prefab index 342b71a..0b0da07 100644 --- a/Assets/Prefabs/Particles/BloodParticle.prefab +++ b/Assets/Prefabs/Particles/BloodParticle.prefab @@ -48,7 +48,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 03e6674a6969c5845b4d97a399c6a451, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -128,6 +128,7 @@ MonoBehaviour: Renderer: {fileID: 5625006176639346186} LaunchForce: {x: 0, y: 0} Settled: 0 + GetsStuck: 1 Sprites: - {fileID: 5684327315910396547, guid: ff1fce077e0aafb45be2c369b110d6e0, type: 3} - {fileID: -1189345562256101844, guid: ff1fce077e0aafb45be2c369b110d6e0, type: 3} diff --git a/Assets/Prefabs/Particles/StructuralDamageParticle.prefab b/Assets/Prefabs/Particles/StructuralDamageParticle.prefab index 4bf8126..002a3ec 100644 --- a/Assets/Prefabs/Particles/StructuralDamageParticle.prefab +++ b/Assets/Prefabs/Particles/StructuralDamageParticle.prefab @@ -48,7 +48,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 03e6674a6969c5845b4d97a399c6a451, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/Prefabs/Particles/WoodParticle.prefab b/Assets/Prefabs/Particles/WoodParticle.prefab index f51a19b..6bba3d5 100644 --- a/Assets/Prefabs/Particles/WoodParticle.prefab +++ b/Assets/Prefabs/Particles/WoodParticle.prefab @@ -48,7 +48,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 03e6674a6969c5845b4d97a399c6a451, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/Prefabs/Player.prefab b/Assets/Prefabs/Player.prefab index c050d5a..532a461 100644 --- a/Assets/Prefabs/Player.prefab +++ b/Assets/Prefabs/Player.prefab @@ -138,7 +138,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 03e6674a6969c5845b4d97a399c6a451, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -359,7 +359,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 03e6674a6969c5845b4d97a399c6a451, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -548,11 +548,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ba61752571d0d70478c63122f73914db, type: 3} m_Name: m_EditorClassIdentifier: - Body: {fileID: 8489029732530782792} Bobbing: {fileID: 5620918083888341557} Direction: {x: 0, y: 0} MaxSpeed: 7 AccelerationSpeed: 70 + DecelerationSpeed: 70 --- !u!114 &5620918083888341557 MonoBehaviour: m_ObjectHideFlags: 0 @@ -620,7 +620,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 03e6674a6969c5845b4d97a399c6a451, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/Shaders/DefaultSpriteMat.mat b/Assets/Shaders/DefaultSpriteMat.mat new file mode 100644 index 0000000..0865a78 --- /dev/null +++ b/Assets/Shaders/DefaultSpriteMat.mat @@ -0,0 +1,85 @@ +%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: DefaultSpriteMat + m_Shader: {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: ETC1_EXTERNAL_ALPHA + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _AlphaTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _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: 0} + 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: + - PixelSnap: 0 + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _EnableExternalAlpha: 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} + - _Flip: {r: 1, g: 1, b: 1, a: 1} + - _RendererColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/Shaders/DefaultSpriteMat.mat.meta b/Assets/Shaders/DefaultSpriteMat.mat.meta new file mode 100644 index 0000000..9c8fccc --- /dev/null +++ b/Assets/Shaders/DefaultSpriteMat.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e0ab93c383682b443a6ec30a382d32f5 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/manifest.json b/Packages/manifest.json index cc11d53..97b1394 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -6,6 +6,7 @@ "com.unity.ext.nunit": "1.0.0", "com.unity.ide.vscode": "1.0.7", "com.unity.package-manager-ui": "2.2.0", + "com.unity.render-pipelines.lightweight": "6.9.1", "com.unity.test-framework": "1.0.13", "com.unity.textmeshpro": "2.0.1", "com.unity.timeline": "1.1.0",