From 783222adeab797e5407fb79b32cf719833452abc Mon Sep 17 00:00:00 2001 From: vanessrw <vanessarebecca29@gmail.com> Date: Sun, 28 Apr 2024 13:11:36 +0700 Subject: [PATCH] add: sword, logic riffle --- .vscode/settings.json | 3 +- .vsconfig | 6 + .../Materials/Bridges/Bridge.mat | 14 +- .../Materials/Bridges/Broken bridge.mat | 14 +- .../Materials/Camp fire/Camp fire.mat | 14 +- .../Materials/Cliffs/Cliff 001.mat | 14 +- .../Materials/Cliffs/Cliff 002.mat | 14 +- .../Materials/Dead trees/Dead tree 001.mat | 14 +- .../Materials/Dead trees/Dead tree 002.mat | 14 +- .../Materials/Dead trees/Dead tree 003.mat | 14 +- .../Materials/Dead trees/Dead tree 004.mat | 14 +- .../Materials/Fences/Broken fence.mat | 14 +- .../Lowpoly nature/Materials/Fences/Fence.mat | 14 +- .../Materials/Flowers/Flower 001.mat | 14 +- .../Materials/Flowers/Flower 002.mat | 14 +- .../Materials/Flowers/Flower 003.mat | 14 +- .../Materials/Grass/Grass 001.mat | 14 +- .../Materials/Grass/Grass 002.mat | 14 +- .../Materials/Grass/Grass 003.mat | 14 +- .../Materials/Grass/Grass 004.mat | 14 +- .../Materials/Mashrooms/Mashroom 001.mat | 14 +- .../Materials/Mashrooms/Mashroom 002.mat | 14 +- .../Materials/Mashrooms/Mashroom 003.mat | 14 +- .../Materials/Mashrooms/Mashroom 004.mat | 14 +- .../Materials/Pine trees/Pine tree 001.mat | 14 +- .../Materials/Pine trees/Pine tree 002.mat | 14 +- .../Materials/Pine trees/Pine tree 003.mat | 14 +- .../Materials/Pine trees/Pine tree 004.mat | 14 +- .../Materials/Pine trees/Pine tree 005.mat | 14 +- .../Materials/Rocks/Rock 001.mat | 14 +- .../Materials/Rocks/Rock 002.mat | 14 +- .../Materials/Rocks/Rock 003.mat | 14 +- .../Materials/Rocks/Rock 004.mat | 14 +- .../Materials/Rocks/Rock 005.mat | 14 +- .../Materials/Rocks/Rock 006.mat | 14 +- .../Materials/Rocks/Rock 007.mat | 14 +- .../Materials/Rocks/Rock 008.mat | 14 +- .../Materials/Rocks/Rock 009.mat | 14 +- .../Materials/Rocks/Rock 010.mat | 14 +- .../Materials/Terrain/Terrain.mat | 16 +- .../Materials/Trees/Tree 002.mat | 14 +- .../Materials/Trees/Tree 003.mat | 14 +- .../Materials/Trunks/Trunk 002.mat | 14 +- .../Water shader/WaterMaterial.mat | 12 +- .../Collectibles}/TestWeapon.meta | 0 .../Collectibles/TestWeapon/SwordData.asset | 20 + .../TestWeapon/SwordData.asset.meta | 8 + .../TestWeapon/TestWeaponData.asset | 0 .../TestWeapon/TestWeaponData.asset.meta | 0 .../TestWeapon/TestWeaponProjectileData.asset | 0 .../TestWeaponProjectileData.asset.meta | 0 .../Environment/Materials/BatMaterial.mat | 5 +- .../Weapons/TestWeapon/TestWeaponModel.prefab | 2 +- .../TestWeapon/TestProjectile.prefab.meta | 2 +- Assets/Scenes/DevRoom.unity | 690 ++++++++++++------ .../Core/Objects/Weapons/TestWeapon/Sword.cs | 53 ++ .../Objects/Weapons/TestWeapon/Sword.cs.meta | 2 + .../Weapons/TestWeapon/SwordController.cs | 18 + .../TestWeapon/SwordController.cs.meta | 2 + CaseSensitiveTest | 0 60 files changed, 1088 insertions(+), 311 deletions(-) create mode 100644 .vsconfig rename Assets/Resources/{Data/WeaponData => Models/Collectibles}/TestWeapon.meta (100%) create mode 100644 Assets/Resources/Models/Collectibles/TestWeapon/SwordData.asset create mode 100644 Assets/Resources/Models/Collectibles/TestWeapon/SwordData.asset.meta rename Assets/Resources/{Data/WeaponData => Models/Collectibles}/TestWeapon/TestWeaponData.asset (100%) rename Assets/Resources/{Data/WeaponData => Models/Collectibles}/TestWeapon/TestWeaponData.asset.meta (100%) rename Assets/Resources/{Data/WeaponData => Models/Collectibles}/TestWeapon/TestWeaponProjectileData.asset (100%) rename Assets/Resources/{Data/WeaponData => Models/Collectibles}/TestWeapon/TestWeaponProjectileData.asset.meta (100%) create mode 100644 Assets/_Scripts/Core/Objects/Weapons/TestWeapon/Sword.cs create mode 100644 Assets/_Scripts/Core/Objects/Weapons/TestWeapon/Sword.cs.meta create mode 100644 Assets/_Scripts/Core/Objects/Weapons/TestWeapon/SwordController.cs create mode 100644 Assets/_Scripts/Core/Objects/Weapons/TestWeapon/SwordController.cs.meta create mode 100644 CaseSensitiveTest diff --git a/.vscode/settings.json b/.vscode/settings.json index 27886b0f..5f566561 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -51,5 +51,6 @@ "temp/": true, "Temp/": true }, - "dotnet.defaultSolution": "IF3210-2024-Unity-PIP.sln" + "dotnet.defaultSolution": "IF3210-2024-Unity-PIP.sln", + "dotnet.preferCSharpExtension": true } \ No newline at end of file diff --git a/.vsconfig b/.vsconfig new file mode 100644 index 00000000..f019fd0a --- /dev/null +++ b/.vsconfig @@ -0,0 +1,6 @@ +{ + "version": "1.0", + "components": [ + "Microsoft.VisualStudio.Workload.ManagedGame" + ] +} diff --git a/Assets/Oode studios/Lowpoly nature/Materials/Bridges/Bridge.mat b/Assets/Oode studios/Lowpoly nature/Materials/Bridges/Bridge.mat index 6168aef2..2f6bc4de 100644 --- a/Assets/Oode studios/Lowpoly nature/Materials/Bridges/Bridge.mat +++ b/Assets/Oode studios/Lowpoly nature/Materials/Bridges/Bridge.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 9 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -22,6 +22,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Bridge m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -30,7 +32,9 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -92,8 +96,11 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - _AddPrecomputedVelocity: 0 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -102,6 +109,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -115,6 +123,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 @@ -124,3 +133,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Oode studios/Lowpoly nature/Materials/Bridges/Broken bridge.mat b/Assets/Oode studios/Lowpoly nature/Materials/Bridges/Broken bridge.mat index 9531c5c0..428bf664 100644 --- a/Assets/Oode studios/Lowpoly nature/Materials/Bridges/Broken bridge.mat +++ b/Assets/Oode studios/Lowpoly nature/Materials/Bridges/Broken bridge.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 9 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -22,6 +22,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Broken bridge m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -30,7 +32,9 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -92,8 +96,11 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - _AddPrecomputedVelocity: 0 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -102,6 +109,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -115,6 +123,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 @@ -124,3 +133,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Oode studios/Lowpoly nature/Materials/Camp fire/Camp fire.mat b/Assets/Oode studios/Lowpoly nature/Materials/Camp fire/Camp fire.mat index f13491e8..083cabeb 100644 --- a/Assets/Oode studios/Lowpoly nature/Materials/Camp fire/Camp fire.mat +++ b/Assets/Oode studios/Lowpoly nature/Materials/Camp fire/Camp fire.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 9 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -22,6 +22,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Camp fire m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -30,7 +32,9 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -92,8 +96,11 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - _AddPrecomputedVelocity: 0 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -102,6 +109,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -115,6 +123,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 @@ -124,3 +133,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Oode studios/Lowpoly nature/Materials/Cliffs/Cliff 001.mat b/Assets/Oode studios/Lowpoly nature/Materials/Cliffs/Cliff 001.mat index 22d69775..7afaa9e6 100644 --- a/Assets/Oode studios/Lowpoly nature/Materials/Cliffs/Cliff 001.mat +++ b/Assets/Oode studios/Lowpoly nature/Materials/Cliffs/Cliff 001.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Cliff 001 m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -17,7 +19,9 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -79,8 +83,11 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - _AddPrecomputedVelocity: 0 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -89,6 +96,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -102,6 +110,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 @@ -111,6 +120,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &3221616307045910671 MonoBehaviour: m_ObjectHideFlags: 11 @@ -123,4 +133,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 9 diff --git a/Assets/Oode studios/Lowpoly nature/Materials/Cliffs/Cliff 002.mat b/Assets/Oode studios/Lowpoly nature/Materials/Cliffs/Cliff 002.mat index d46634bc..a97f4ee6 100644 --- a/Assets/Oode studios/Lowpoly nature/Materials/Cliffs/Cliff 002.mat +++ b/Assets/Oode studios/Lowpoly nature/Materials/Cliffs/Cliff 002.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Cliff 002 m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -17,7 +19,9 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -79,8 +83,11 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - _AddPrecomputedVelocity: 0 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -89,6 +96,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -102,6 +110,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 @@ -111,6 +120,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &998659588351285303 MonoBehaviour: m_ObjectHideFlags: 11 @@ -123,4 +133,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 9 diff --git a/Assets/Oode studios/Lowpoly nature/Materials/Dead trees/Dead tree 001.mat b/Assets/Oode studios/Lowpoly nature/Materials/Dead trees/Dead tree 001.mat index ffa958a7..f54d99d5 100644 --- a/Assets/Oode studios/Lowpoly nature/Materials/Dead trees/Dead tree 001.mat +++ b/Assets/Oode studios/Lowpoly nature/Materials/Dead trees/Dead tree 001.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 9 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -22,6 +22,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Dead tree 001 m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -30,7 +32,9 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -92,8 +96,11 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - _AddPrecomputedVelocity: 0 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -102,6 +109,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -115,6 +123,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 @@ -124,3 +133,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Oode studios/Lowpoly nature/Materials/Dead trees/Dead tree 002.mat b/Assets/Oode studios/Lowpoly nature/Materials/Dead trees/Dead tree 002.mat index e60b4cf8..c6450070 100644 --- a/Assets/Oode studios/Lowpoly nature/Materials/Dead trees/Dead tree 002.mat +++ b/Assets/Oode studios/Lowpoly nature/Materials/Dead trees/Dead tree 002.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Dead tree 002 m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -17,7 +19,9 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -79,8 +83,11 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - _AddPrecomputedVelocity: 0 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -89,6 +96,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -102,6 +110,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 @@ -111,6 +120,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &1425320053327312673 MonoBehaviour: m_ObjectHideFlags: 11 @@ -123,4 +133,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 9 diff --git a/Assets/Oode studios/Lowpoly nature/Materials/Dead trees/Dead tree 003.mat b/Assets/Oode studios/Lowpoly nature/Materials/Dead trees/Dead tree 003.mat index fd823869..892ce021 100644 --- a/Assets/Oode studios/Lowpoly nature/Materials/Dead trees/Dead tree 003.mat +++ b/Assets/Oode studios/Lowpoly nature/Materials/Dead trees/Dead tree 003.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Dead tree 003 m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -17,7 +19,9 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -79,8 +83,11 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - _AddPrecomputedVelocity: 0 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -89,6 +96,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -102,6 +110,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 @@ -111,6 +120,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &53383011537323537 MonoBehaviour: m_ObjectHideFlags: 11 @@ -123,4 +133,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 9 diff --git a/Assets/Oode studios/Lowpoly nature/Materials/Dead trees/Dead tree 004.mat b/Assets/Oode studios/Lowpoly nature/Materials/Dead trees/Dead tree 004.mat index 29885e97..d3405410 100644 --- a/Assets/Oode studios/Lowpoly nature/Materials/Dead trees/Dead tree 004.mat +++ b/Assets/Oode studios/Lowpoly nature/Materials/Dead trees/Dead tree 004.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Dead tree 004 m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -17,7 +19,9 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -79,8 +83,11 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - _AddPrecomputedVelocity: 0 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -89,6 +96,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -102,6 +110,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 @@ -111,6 +120,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &4879667552500530611 MonoBehaviour: m_ObjectHideFlags: 11 @@ -123,4 +133,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 9 diff --git a/Assets/Oode studios/Lowpoly nature/Materials/Fences/Broken fence.mat b/Assets/Oode studios/Lowpoly nature/Materials/Fences/Broken fence.mat index 39b09e20..19ae3ecf 100644 --- a/Assets/Oode studios/Lowpoly nature/Materials/Fences/Broken fence.mat +++ b/Assets/Oode studios/Lowpoly nature/Materials/Fences/Broken fence.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Broken fence m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -17,7 +19,9 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -79,8 +83,11 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - _AddPrecomputedVelocity: 0 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -89,6 +96,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -102,6 +110,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 @@ -111,6 +120,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &4435367329173693529 MonoBehaviour: m_ObjectHideFlags: 11 @@ -123,4 +133,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 9 diff --git a/Assets/Oode studios/Lowpoly nature/Materials/Fences/Fence.mat b/Assets/Oode studios/Lowpoly nature/Materials/Fences/Fence.mat index 8380db9f..bdd47775 100644 --- a/Assets/Oode studios/Lowpoly nature/Materials/Fences/Fence.mat +++ b/Assets/Oode studios/Lowpoly nature/Materials/Fences/Fence.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Fence m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -17,7 +19,9 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -79,8 +83,11 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - _AddPrecomputedVelocity: 0 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -89,6 +96,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -102,6 +110,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 @@ -111,6 +120,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &2295182576320327223 MonoBehaviour: m_ObjectHideFlags: 11 @@ -123,4 +133,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 9 diff --git a/Assets/Oode studios/Lowpoly nature/Materials/Flowers/Flower 001.mat b/Assets/Oode studios/Lowpoly nature/Materials/Flowers/Flower 001.mat index c2cb996f..a687266a 100644 --- a/Assets/Oode studios/Lowpoly nature/Materials/Flowers/Flower 001.mat +++ b/Assets/Oode studios/Lowpoly nature/Materials/Flowers/Flower 001.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Flower 001 m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -17,7 +19,9 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -79,8 +83,11 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - _AddPrecomputedVelocity: 0 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -89,6 +96,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -102,6 +110,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 @@ -111,6 +120,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &9184424897031150651 MonoBehaviour: m_ObjectHideFlags: 11 @@ -123,4 +133,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 9 diff --git a/Assets/Oode studios/Lowpoly nature/Materials/Flowers/Flower 002.mat b/Assets/Oode studios/Lowpoly nature/Materials/Flowers/Flower 002.mat index 562165ad..dc364157 100644 --- a/Assets/Oode studios/Lowpoly nature/Materials/Flowers/Flower 002.mat +++ b/Assets/Oode studios/Lowpoly nature/Materials/Flowers/Flower 002.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 9 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -22,6 +22,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Flower 002 m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -30,7 +32,9 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -92,8 +96,11 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - _AddPrecomputedVelocity: 0 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -102,6 +109,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -115,6 +123,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 @@ -124,3 +133,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Oode studios/Lowpoly nature/Materials/Flowers/Flower 003.mat b/Assets/Oode studios/Lowpoly nature/Materials/Flowers/Flower 003.mat index d35f534a..6cfe5317 100644 --- a/Assets/Oode studios/Lowpoly nature/Materials/Flowers/Flower 003.mat +++ b/Assets/Oode studios/Lowpoly nature/Materials/Flowers/Flower 003.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 9 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -22,6 +22,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Flower 003 m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -30,7 +32,9 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -92,8 +96,11 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - _AddPrecomputedVelocity: 0 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -102,6 +109,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -115,6 +123,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 @@ -124,3 +133,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Oode studios/Lowpoly nature/Materials/Grass/Grass 001.mat b/Assets/Oode studios/Lowpoly nature/Materials/Grass/Grass 001.mat index 66cb840e..62f874ae 100644 --- a/Assets/Oode studios/Lowpoly nature/Materials/Grass/Grass 001.mat +++ b/Assets/Oode studios/Lowpoly nature/Materials/Grass/Grass 001.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 9 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -22,6 +22,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Grass 001 m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -30,7 +32,9 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -92,8 +96,11 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - _AddPrecomputedVelocity: 0 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -102,6 +109,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -115,6 +123,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 @@ -124,3 +133,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Oode studios/Lowpoly nature/Materials/Grass/Grass 002.mat b/Assets/Oode studios/Lowpoly nature/Materials/Grass/Grass 002.mat index b283fe81..ca0ad5ea 100644 --- a/Assets/Oode studios/Lowpoly nature/Materials/Grass/Grass 002.mat +++ b/Assets/Oode studios/Lowpoly nature/Materials/Grass/Grass 002.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 9 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -22,6 +22,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Grass 002 m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -30,7 +32,9 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -92,8 +96,11 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - _AddPrecomputedVelocity: 0 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -102,6 +109,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -115,6 +123,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 @@ -124,3 +133,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Oode studios/Lowpoly nature/Materials/Grass/Grass 003.mat b/Assets/Oode studios/Lowpoly nature/Materials/Grass/Grass 003.mat index 1c9b7c09..9fd02476 100644 --- a/Assets/Oode studios/Lowpoly nature/Materials/Grass/Grass 003.mat +++ b/Assets/Oode studios/Lowpoly nature/Materials/Grass/Grass 003.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Grass 003 m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -17,7 +19,9 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -79,8 +83,11 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - _AddPrecomputedVelocity: 0 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -89,6 +96,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -102,6 +110,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 @@ -111,6 +120,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &3380154760433463397 MonoBehaviour: m_ObjectHideFlags: 11 @@ -123,4 +133,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 9 diff --git a/Assets/Oode studios/Lowpoly nature/Materials/Grass/Grass 004.mat b/Assets/Oode studios/Lowpoly nature/Materials/Grass/Grass 004.mat index 6cd55f86..995a98b2 100644 --- a/Assets/Oode studios/Lowpoly nature/Materials/Grass/Grass 004.mat +++ b/Assets/Oode studios/Lowpoly nature/Materials/Grass/Grass 004.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Grass 004 m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -17,7 +19,9 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -79,8 +83,11 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - _AddPrecomputedVelocity: 0 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -89,6 +96,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -102,6 +110,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 @@ -111,6 +120,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &6984329388320377590 MonoBehaviour: m_ObjectHideFlags: 11 @@ -123,4 +133,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 9 diff --git a/Assets/Oode studios/Lowpoly nature/Materials/Mashrooms/Mashroom 001.mat b/Assets/Oode studios/Lowpoly nature/Materials/Mashrooms/Mashroom 001.mat index 38395cc9..803ae4cb 100644 --- a/Assets/Oode studios/Lowpoly nature/Materials/Mashrooms/Mashroom 001.mat +++ b/Assets/Oode studios/Lowpoly nature/Materials/Mashrooms/Mashroom 001.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Mashroom 001 m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -17,7 +19,9 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -79,8 +83,11 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - _AddPrecomputedVelocity: 0 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -89,6 +96,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -102,6 +110,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 @@ -111,6 +120,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &80278213656083389 MonoBehaviour: m_ObjectHideFlags: 11 @@ -123,4 +133,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 9 diff --git a/Assets/Oode studios/Lowpoly nature/Materials/Mashrooms/Mashroom 002.mat b/Assets/Oode studios/Lowpoly nature/Materials/Mashrooms/Mashroom 002.mat index 5fc5f4b9..7772858e 100644 --- a/Assets/Oode studios/Lowpoly nature/Materials/Mashrooms/Mashroom 002.mat +++ b/Assets/Oode studios/Lowpoly nature/Materials/Mashrooms/Mashroom 002.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 9 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -22,6 +22,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Mashroom 002 m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -30,7 +32,9 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -92,8 +96,11 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - _AddPrecomputedVelocity: 0 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -102,6 +109,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -115,6 +123,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 @@ -124,3 +133,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Oode studios/Lowpoly nature/Materials/Mashrooms/Mashroom 003.mat b/Assets/Oode studios/Lowpoly nature/Materials/Mashrooms/Mashroom 003.mat index 818472f7..a54ff267 100644 --- a/Assets/Oode studios/Lowpoly nature/Materials/Mashrooms/Mashroom 003.mat +++ b/Assets/Oode studios/Lowpoly nature/Materials/Mashrooms/Mashroom 003.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Mashroom 003 m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -17,7 +19,9 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -79,8 +83,11 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - _AddPrecomputedVelocity: 0 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -89,6 +96,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -102,6 +110,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 @@ -111,6 +120,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &2022512284485908855 MonoBehaviour: m_ObjectHideFlags: 11 @@ -123,4 +133,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 9 diff --git a/Assets/Oode studios/Lowpoly nature/Materials/Mashrooms/Mashroom 004.mat b/Assets/Oode studios/Lowpoly nature/Materials/Mashrooms/Mashroom 004.mat index 615fa4d1..e93db681 100644 --- a/Assets/Oode studios/Lowpoly nature/Materials/Mashrooms/Mashroom 004.mat +++ b/Assets/Oode studios/Lowpoly nature/Materials/Mashrooms/Mashroom 004.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Mashroom 004 m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -17,7 +19,9 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -79,8 +83,11 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - _AddPrecomputedVelocity: 0 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -89,6 +96,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -102,6 +110,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 @@ -111,6 +120,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &5600676850529982078 MonoBehaviour: m_ObjectHideFlags: 11 @@ -123,4 +133,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 9 diff --git a/Assets/Oode studios/Lowpoly nature/Materials/Pine trees/Pine tree 001.mat b/Assets/Oode studios/Lowpoly nature/Materials/Pine trees/Pine tree 001.mat index 398635dd..726576af 100644 --- a/Assets/Oode studios/Lowpoly nature/Materials/Pine trees/Pine tree 001.mat +++ b/Assets/Oode studios/Lowpoly nature/Materials/Pine trees/Pine tree 001.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Pine tree 001 m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -17,7 +19,9 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -79,8 +83,11 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - _AddPrecomputedVelocity: 0 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -89,6 +96,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -102,6 +110,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 @@ -111,6 +120,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &7152698966215066573 MonoBehaviour: m_ObjectHideFlags: 11 @@ -123,4 +133,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 9 diff --git a/Assets/Oode studios/Lowpoly nature/Materials/Pine trees/Pine tree 002.mat b/Assets/Oode studios/Lowpoly nature/Materials/Pine trees/Pine tree 002.mat index f9d3617a..5e64f83a 100644 --- a/Assets/Oode studios/Lowpoly nature/Materials/Pine trees/Pine tree 002.mat +++ b/Assets/Oode studios/Lowpoly nature/Materials/Pine trees/Pine tree 002.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Pine tree 002 m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -17,7 +19,9 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -79,8 +83,11 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - _AddPrecomputedVelocity: 0 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -89,6 +96,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -102,6 +110,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 @@ -111,6 +120,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &2170280408452891999 MonoBehaviour: m_ObjectHideFlags: 11 @@ -123,4 +133,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 9 diff --git a/Assets/Oode studios/Lowpoly nature/Materials/Pine trees/Pine tree 003.mat b/Assets/Oode studios/Lowpoly nature/Materials/Pine trees/Pine tree 003.mat index 2f4dc6bb..b87f6398 100644 --- a/Assets/Oode studios/Lowpoly nature/Materials/Pine trees/Pine tree 003.mat +++ b/Assets/Oode studios/Lowpoly nature/Materials/Pine trees/Pine tree 003.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 9 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -22,6 +22,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Pine tree 003 m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -30,7 +32,9 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -92,8 +96,11 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - _AddPrecomputedVelocity: 0 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -102,6 +109,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -115,6 +123,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 @@ -124,3 +133,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Oode studios/Lowpoly nature/Materials/Pine trees/Pine tree 004.mat b/Assets/Oode studios/Lowpoly nature/Materials/Pine trees/Pine tree 004.mat index 22b04773..5281af10 100644 --- a/Assets/Oode studios/Lowpoly nature/Materials/Pine trees/Pine tree 004.mat +++ b/Assets/Oode studios/Lowpoly nature/Materials/Pine trees/Pine tree 004.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Pine tree 004 m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -17,7 +19,9 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -79,8 +83,11 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - _AddPrecomputedVelocity: 0 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -89,6 +96,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -102,6 +110,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 @@ -111,6 +120,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &2382471188016652946 MonoBehaviour: m_ObjectHideFlags: 11 @@ -123,4 +133,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 9 diff --git a/Assets/Oode studios/Lowpoly nature/Materials/Pine trees/Pine tree 005.mat b/Assets/Oode studios/Lowpoly nature/Materials/Pine trees/Pine tree 005.mat index cb252b6a..41350263 100644 --- a/Assets/Oode studios/Lowpoly nature/Materials/Pine trees/Pine tree 005.mat +++ b/Assets/Oode studios/Lowpoly nature/Materials/Pine trees/Pine tree 005.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 9 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -22,6 +22,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Pine tree 005 m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -30,7 +32,9 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -92,8 +96,11 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - _AddPrecomputedVelocity: 0 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -102,6 +109,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -115,6 +123,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 @@ -124,3 +133,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Oode studios/Lowpoly nature/Materials/Rocks/Rock 001.mat b/Assets/Oode studios/Lowpoly nature/Materials/Rocks/Rock 001.mat index 3141725b..659cfe49 100644 --- a/Assets/Oode studios/Lowpoly nature/Materials/Rocks/Rock 001.mat +++ b/Assets/Oode studios/Lowpoly nature/Materials/Rocks/Rock 001.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Rock 001 m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -17,7 +19,9 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -79,8 +83,11 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - _AddPrecomputedVelocity: 0 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -89,6 +96,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -102,6 +110,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 @@ -111,6 +120,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &1406542285907193976 MonoBehaviour: m_ObjectHideFlags: 11 @@ -123,4 +133,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 9 diff --git a/Assets/Oode studios/Lowpoly nature/Materials/Rocks/Rock 002.mat b/Assets/Oode studios/Lowpoly nature/Materials/Rocks/Rock 002.mat index aca64a76..91e0580d 100644 --- a/Assets/Oode studios/Lowpoly nature/Materials/Rocks/Rock 002.mat +++ b/Assets/Oode studios/Lowpoly nature/Materials/Rocks/Rock 002.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Rock 002 m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -17,7 +19,9 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -79,8 +83,11 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - _AddPrecomputedVelocity: 0 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -89,6 +96,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -102,6 +110,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 @@ -111,6 +120,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &5554180211495096267 MonoBehaviour: m_ObjectHideFlags: 11 @@ -123,4 +133,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 9 diff --git a/Assets/Oode studios/Lowpoly nature/Materials/Rocks/Rock 003.mat b/Assets/Oode studios/Lowpoly nature/Materials/Rocks/Rock 003.mat index ba4f58e7..014451b0 100644 --- a/Assets/Oode studios/Lowpoly nature/Materials/Rocks/Rock 003.mat +++ b/Assets/Oode studios/Lowpoly nature/Materials/Rocks/Rock 003.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Rock 003 m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -17,7 +19,9 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -79,8 +83,11 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - _AddPrecomputedVelocity: 0 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -89,6 +96,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -102,6 +110,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 @@ -111,6 +120,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &7800936238651632838 MonoBehaviour: m_ObjectHideFlags: 11 @@ -123,4 +133,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 9 diff --git a/Assets/Oode studios/Lowpoly nature/Materials/Rocks/Rock 004.mat b/Assets/Oode studios/Lowpoly nature/Materials/Rocks/Rock 004.mat index f796222d..bba47205 100644 --- a/Assets/Oode studios/Lowpoly nature/Materials/Rocks/Rock 004.mat +++ b/Assets/Oode studios/Lowpoly nature/Materials/Rocks/Rock 004.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Rock 004 m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -17,7 +19,9 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -79,8 +83,11 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - _AddPrecomputedVelocity: 0 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -89,6 +96,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -102,6 +110,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 @@ -111,6 +120,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &5391594577027263136 MonoBehaviour: m_ObjectHideFlags: 11 @@ -123,4 +133,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 9 diff --git a/Assets/Oode studios/Lowpoly nature/Materials/Rocks/Rock 005.mat b/Assets/Oode studios/Lowpoly nature/Materials/Rocks/Rock 005.mat index 1ede06d1..97b345b2 100644 --- a/Assets/Oode studios/Lowpoly nature/Materials/Rocks/Rock 005.mat +++ b/Assets/Oode studios/Lowpoly nature/Materials/Rocks/Rock 005.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Rock 005 m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -17,7 +19,9 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -79,8 +83,11 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - _AddPrecomputedVelocity: 0 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -89,6 +96,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -102,6 +110,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 @@ -111,6 +120,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &3361770759129923033 MonoBehaviour: m_ObjectHideFlags: 11 @@ -123,4 +133,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 9 diff --git a/Assets/Oode studios/Lowpoly nature/Materials/Rocks/Rock 006.mat b/Assets/Oode studios/Lowpoly nature/Materials/Rocks/Rock 006.mat index 23092180..7a93bf22 100644 --- a/Assets/Oode studios/Lowpoly nature/Materials/Rocks/Rock 006.mat +++ b/Assets/Oode studios/Lowpoly nature/Materials/Rocks/Rock 006.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Rock 006 m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -17,7 +19,9 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -79,8 +83,11 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - _AddPrecomputedVelocity: 0 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -89,6 +96,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -102,6 +110,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 @@ -111,6 +120,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &8384652201680976968 MonoBehaviour: m_ObjectHideFlags: 11 @@ -123,4 +133,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 9 diff --git a/Assets/Oode studios/Lowpoly nature/Materials/Rocks/Rock 007.mat b/Assets/Oode studios/Lowpoly nature/Materials/Rocks/Rock 007.mat index 82084215..20900f97 100644 --- a/Assets/Oode studios/Lowpoly nature/Materials/Rocks/Rock 007.mat +++ b/Assets/Oode studios/Lowpoly nature/Materials/Rocks/Rock 007.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Rock 007 m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -17,7 +19,9 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -79,8 +83,11 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - _AddPrecomputedVelocity: 0 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -89,6 +96,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -102,6 +110,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 @@ -111,6 +120,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &7444737744386037201 MonoBehaviour: m_ObjectHideFlags: 11 @@ -123,4 +133,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 9 diff --git a/Assets/Oode studios/Lowpoly nature/Materials/Rocks/Rock 008.mat b/Assets/Oode studios/Lowpoly nature/Materials/Rocks/Rock 008.mat index b9452cb6..81ecbf32 100644 --- a/Assets/Oode studios/Lowpoly nature/Materials/Rocks/Rock 008.mat +++ b/Assets/Oode studios/Lowpoly nature/Materials/Rocks/Rock 008.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Rock 008 m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -17,7 +19,9 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -79,8 +83,11 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - _AddPrecomputedVelocity: 0 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -89,6 +96,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -102,6 +110,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 @@ -111,6 +120,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &6319001167566928709 MonoBehaviour: m_ObjectHideFlags: 11 @@ -123,4 +133,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 9 diff --git a/Assets/Oode studios/Lowpoly nature/Materials/Rocks/Rock 009.mat b/Assets/Oode studios/Lowpoly nature/Materials/Rocks/Rock 009.mat index 2a2432a5..10d7defe 100644 --- a/Assets/Oode studios/Lowpoly nature/Materials/Rocks/Rock 009.mat +++ b/Assets/Oode studios/Lowpoly nature/Materials/Rocks/Rock 009.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Rock 009 m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -17,7 +19,9 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -79,8 +83,11 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - _AddPrecomputedVelocity: 0 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -89,6 +96,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -102,6 +110,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 @@ -111,6 +120,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &8168665753606831118 MonoBehaviour: m_ObjectHideFlags: 11 @@ -123,4 +133,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 9 diff --git a/Assets/Oode studios/Lowpoly nature/Materials/Rocks/Rock 010.mat b/Assets/Oode studios/Lowpoly nature/Materials/Rocks/Rock 010.mat index 4fbf0b8c..550d9d81 100644 --- a/Assets/Oode studios/Lowpoly nature/Materials/Rocks/Rock 010.mat +++ b/Assets/Oode studios/Lowpoly nature/Materials/Rocks/Rock 010.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Rock 010 m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -17,7 +19,9 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -79,8 +83,11 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - _AddPrecomputedVelocity: 0 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -89,6 +96,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -102,6 +110,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 @@ -111,6 +120,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &5398329016404229975 MonoBehaviour: m_ObjectHideFlags: 11 @@ -123,4 +133,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 9 diff --git a/Assets/Oode studios/Lowpoly nature/Materials/Terrain/Terrain.mat b/Assets/Oode studios/Lowpoly nature/Materials/Terrain/Terrain.mat index 89643d46..7f0fc5da 100644 --- a/Assets/Oode studios/Lowpoly nature/Materials/Terrain/Terrain.mat +++ b/Assets/Oode studios/Lowpoly nature/Materials/Terrain/Terrain.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 9 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -22,6 +22,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Terrain m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -30,7 +32,9 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -92,8 +96,11 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - _AddPrecomputedVelocity: 0 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -102,6 +109,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -115,12 +123,14 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.7135097, g: 0.745283, b: 0.48865256, a: 1} - - _Color: {r: 0.7135097, g: 0.745283, b: 0.48865253, a: 1} + - _Color: {r: 0.7135097, g: 0.745283, b: 0.48865256, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Oode studios/Lowpoly nature/Materials/Trees/Tree 002.mat b/Assets/Oode studios/Lowpoly nature/Materials/Trees/Tree 002.mat index 536c79ad..426802de 100644 --- a/Assets/Oode studios/Lowpoly nature/Materials/Trees/Tree 002.mat +++ b/Assets/Oode studios/Lowpoly nature/Materials/Trees/Tree 002.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Tree 002 m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -17,7 +19,9 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -79,8 +83,11 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - _AddPrecomputedVelocity: 0 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -89,6 +96,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -102,6 +110,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 @@ -111,6 +120,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &3029156144346626471 MonoBehaviour: m_ObjectHideFlags: 11 @@ -123,4 +133,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 9 diff --git a/Assets/Oode studios/Lowpoly nature/Materials/Trees/Tree 003.mat b/Assets/Oode studios/Lowpoly nature/Materials/Trees/Tree 003.mat index 864e0ca9..c4cc9197 100644 --- a/Assets/Oode studios/Lowpoly nature/Materials/Trees/Tree 003.mat +++ b/Assets/Oode studios/Lowpoly nature/Materials/Trees/Tree 003.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Tree 003 m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -17,7 +19,9 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -79,8 +83,11 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - _AddPrecomputedVelocity: 0 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -89,6 +96,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -102,6 +110,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 @@ -111,6 +120,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &1904478781387157910 MonoBehaviour: m_ObjectHideFlags: 11 @@ -123,4 +133,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 9 diff --git a/Assets/Oode studios/Lowpoly nature/Materials/Trunks/Trunk 002.mat b/Assets/Oode studios/Lowpoly nature/Materials/Trunks/Trunk 002.mat index 3c57421d..110cddcc 100644 --- a/Assets/Oode studios/Lowpoly nature/Materials/Trunks/Trunk 002.mat +++ b/Assets/Oode studios/Lowpoly nature/Materials/Trunks/Trunk 002.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 9 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -22,6 +22,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Trunk 002 m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -30,7 +32,9 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -92,8 +96,11 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - _AddPrecomputedVelocity: 0 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -102,6 +109,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -115,6 +123,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 @@ -124,3 +133,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Oode studios/Lowpoly nature/Water shader/WaterMaterial.mat b/Assets/Oode studios/Lowpoly nature/Water shader/WaterMaterial.mat index 84ce420f..d655c88d 100644 --- a/Assets/Oode studios/Lowpoly nature/Water shader/WaterMaterial.mat +++ b/Assets/Oode studios/Lowpoly nature/Water shader/WaterMaterial.mat @@ -8,8 +8,9 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: WaterMaterial - m_Shader: {fileID: -6465566751694194690, guid: 6f2c4f5ff85d4224695bf2b28c00f6ea, - type: 3} + m_Shader: {fileID: -6465566751694194690, guid: 6f2c4f5ff85d4224695bf2b28c00f6ea, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -17,7 +18,9 @@ Material: m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -131,6 +134,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &2039129046854816734 MonoBehaviour: m_ObjectHideFlags: 11 @@ -143,4 +147,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 9 diff --git a/Assets/Resources/Data/WeaponData/TestWeapon.meta b/Assets/Resources/Models/Collectibles/TestWeapon.meta similarity index 100% rename from Assets/Resources/Data/WeaponData/TestWeapon.meta rename to Assets/Resources/Models/Collectibles/TestWeapon.meta diff --git a/Assets/Resources/Models/Collectibles/TestWeapon/SwordData.asset b/Assets/Resources/Models/Collectibles/TestWeapon/SwordData.asset new file mode 100644 index 00000000..5959e6f2 --- /dev/null +++ b/Assets/Resources/Models/Collectibles/TestWeapon/SwordData.asset @@ -0,0 +1,20 @@ +%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: abc4ca3f3ac6a5646addd6dfbe0b996b, type: 3} + m_Name: SwordData + m_EditorClassIdentifier: + prefabPath: Prefabs/Weapons/TestWeapon/Sword + model: {fileID: 919132149155446097, guid: 3a57f57ae2418ac4d955ac7b76504ccf, type: 3} + baseDamage: 50 + knockbackPower: 1 + attackInterval: 0.2 + alternateAttackInterval: 0.2 diff --git a/Assets/Resources/Models/Collectibles/TestWeapon/SwordData.asset.meta b/Assets/Resources/Models/Collectibles/TestWeapon/SwordData.asset.meta new file mode 100644 index 00000000..d640aaef --- /dev/null +++ b/Assets/Resources/Models/Collectibles/TestWeapon/SwordData.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 56779d045bfaf414ea1e992d489a2763 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Data/WeaponData/TestWeapon/TestWeaponData.asset b/Assets/Resources/Models/Collectibles/TestWeapon/TestWeaponData.asset similarity index 100% rename from Assets/Resources/Data/WeaponData/TestWeapon/TestWeaponData.asset rename to Assets/Resources/Models/Collectibles/TestWeapon/TestWeaponData.asset diff --git a/Assets/Resources/Data/WeaponData/TestWeapon/TestWeaponData.asset.meta b/Assets/Resources/Models/Collectibles/TestWeapon/TestWeaponData.asset.meta similarity index 100% rename from Assets/Resources/Data/WeaponData/TestWeapon/TestWeaponData.asset.meta rename to Assets/Resources/Models/Collectibles/TestWeapon/TestWeaponData.asset.meta diff --git a/Assets/Resources/Data/WeaponData/TestWeapon/TestWeaponProjectileData.asset b/Assets/Resources/Models/Collectibles/TestWeapon/TestWeaponProjectileData.asset similarity index 100% rename from Assets/Resources/Data/WeaponData/TestWeapon/TestWeaponProjectileData.asset rename to Assets/Resources/Models/Collectibles/TestWeapon/TestWeaponProjectileData.asset diff --git a/Assets/Resources/Data/WeaponData/TestWeapon/TestWeaponProjectileData.asset.meta b/Assets/Resources/Models/Collectibles/TestWeapon/TestWeaponProjectileData.asset.meta similarity index 100% rename from Assets/Resources/Data/WeaponData/TestWeapon/TestWeaponProjectileData.asset.meta rename to Assets/Resources/Models/Collectibles/TestWeapon/TestWeaponProjectileData.asset.meta diff --git a/Assets/Resources/Models/Imported Models/Environment/Materials/BatMaterial.mat b/Assets/Resources/Models/Imported Models/Environment/Materials/BatMaterial.mat index 20be8360..9c0dc603 100644 --- a/Assets/Resources/Models/Imported Models/Environment/Materials/BatMaterial.mat +++ b/Assets/Resources/Models/Imported Models/Environment/Materials/BatMaterial.mat @@ -11,8 +11,7 @@ Material: m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _NORMALMAP + m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 @@ -79,7 +78,7 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.588, g: 0.588, b: 0.588, a: 1} + - _Color: {r: 0.43086502, g: 0.9245283, b: 0.91627526, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] m_AllowLocking: 1 diff --git a/Assets/Resources/Models/Weapons/TestWeapon/TestWeaponModel.prefab b/Assets/Resources/Models/Weapons/TestWeapon/TestWeaponModel.prefab index aed14d9e..9620a7e2 100644 --- a/Assets/Resources/Models/Weapons/TestWeapon/TestWeaponModel.prefab +++ b/Assets/Resources/Models/Weapons/TestWeapon/TestWeaponModel.prefab @@ -29,7 +29,7 @@ Transform: m_GameObject: {fileID: 6146631199650576833} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 1, z: 0} m_LocalScale: {x: 0.1, y: 0.1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] diff --git a/Assets/Resources/Prefabs/Weapons/TestWeapon/TestProjectile.prefab.meta b/Assets/Resources/Prefabs/Weapons/TestWeapon/TestProjectile.prefab.meta index fdcf4faf..8722dae9 100644 --- a/Assets/Resources/Prefabs/Weapons/TestWeapon/TestProjectile.prefab.meta +++ b/Assets/Resources/Prefabs/Weapons/TestWeapon/TestProjectile.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 70a197083e3d99246b1d381922eb03bf +guid: 16b37e9a995eca4459e7dc0026b63b88 PrefabImporter: externalObjects: {} userData: diff --git a/Assets/Scenes/DevRoom.unity b/Assets/Scenes/DevRoom.unity index add22b09..34cdf528 100644 --- a/Assets/Scenes/DevRoom.unity +++ b/Assets/Scenes/DevRoom.unity @@ -391,7 +391,7 @@ MonoBehaviour: meshQuery: layers: 16777223 maskAndChannels: 234881031 - surfaceParameter: 102610 + surfaceParameter: 48404 meshQueryIndex: 6 subMeshQueryIndex: 0 geometryHashValue: 3240074839323548863 @@ -662,6 +662,53 @@ MonoBehaviour: - EdgeIndices: 14000000150000001600000017000000 TexGenIndex: 5 Generation: 33 +--- !u!1 &104999907 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 104999908} + - component: {fileID: 104999909} + m_Layer: 0 + m_Name: '[generated-meshes]' + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &104999908 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 104999907} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2144232461} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &104999909 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 104999907} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5c3643d4978096d4880d7edbf4f65a50, type: 3} + m_Name: + m_EditorClassIdentifier: + Version: 1 + owner: {fileID: 2144232460} + helperSurfaces: [] --- !u!43 &124604733 Mesh: m_ObjectHideFlags: 0 @@ -934,7 +981,7 @@ MonoBehaviour: meshQuery: layers: 16777223 maskAndChannels: 234881031 - surfaceParameter: 102430 + surfaceParameter: 48300 meshQueryIndex: 7 subMeshQueryIndex: 0 geometryHashValue: 3008546525906852216 @@ -2745,6 +2792,118 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &432692064 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1193742994} + m_Modifications: + - target: {fileID: -8776705942540922179, guid: 421abe34365b9464b8f92fbbb911a1ff, type: 3} + propertyPath: m_Mesh + value: + objectReference: {fileID: 2956990802375617159, guid: 28a96b17682d64949b4cdf780c240f88, type: 3} + - target: {fileID: -8679921383154817045, guid: 421abe34365b9464b8f92fbbb911a1ff, type: 3} + propertyPath: m_LocalPosition.x + value: 0.2 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 421abe34365b9464b8f92fbbb911a1ff, type: 3} + propertyPath: m_LocalPosition.y + value: 0.8 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 421abe34365b9464b8f92fbbb911a1ff, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 421abe34365b9464b8f92fbbb911a1ff, type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 421abe34365b9464b8f92fbbb911a1ff, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 421abe34365b9464b8f92fbbb911a1ff, type: 3} + propertyPath: m_LocalRotation.y + value: -1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 421abe34365b9464b8f92fbbb911a1ff, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 421abe34365b9464b8f92fbbb911a1ff, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 180 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 421abe34365b9464b8f92fbbb911a1ff, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 421abe34365b9464b8f92fbbb911a1ff, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 180 + objectReference: {fileID: 0} + - target: {fileID: -7548318688979081689, guid: 421abe34365b9464b8f92fbbb911a1ff, type: 3} + propertyPath: m_Mesh + value: + objectReference: {fileID: -4664245761176819981, guid: 28a96b17682d64949b4cdf780c240f88, type: 3} + - target: {fileID: -6136783793582088459, guid: 421abe34365b9464b8f92fbbb911a1ff, type: 3} + propertyPath: m_Mesh + value: + objectReference: {fileID: 6628907312925966407, guid: 28a96b17682d64949b4cdf780c240f88, type: 3} + - target: {fileID: -4998774783193801964, guid: 421abe34365b9464b8f92fbbb911a1ff, type: 3} + propertyPath: m_Mesh + value: + objectReference: {fileID: -5518553633264409321, guid: 28a96b17682d64949b4cdf780c240f88, type: 3} + - target: {fileID: -2390004728327683838, guid: 421abe34365b9464b8f92fbbb911a1ff, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: -1226145213405777949, guid: 28a96b17682d64949b4cdf780c240f88, type: 3} + - target: {fileID: -438153499552440914, guid: 421abe34365b9464b8f92fbbb911a1ff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 421abe34365b9464b8f92fbbb911a1ff, type: 3} + propertyPath: m_Name + value: steampunk_rifle + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 421abe34365b9464b8f92fbbb911a1ff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 3483068211074573027, guid: 421abe34365b9464b8f92fbbb911a1ff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 5084491480846491575, guid: 421abe34365b9464b8f92fbbb911a1ff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 5642479587328125397, guid: 421abe34365b9464b8f92fbbb911a1ff, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: -1226145213405777949, guid: 28a96b17682d64949b4cdf780c240f88, type: 3} + - target: {fileID: 6303199759862661031, guid: 421abe34365b9464b8f92fbbb911a1ff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 7095597588704281647, guid: 421abe34365b9464b8f92fbbb911a1ff, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: -1226145213405777949, guid: 28a96b17682d64949b4cdf780c240f88, type: 3} + - target: {fileID: 8967936297961072905, guid: 421abe34365b9464b8f92fbbb911a1ff, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: -1226145213405777949, guid: 28a96b17682d64949b4cdf780c240f88, type: 3} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 421abe34365b9464b8f92fbbb911a1ff, type: 3} + insertIndex: -1 + addedObject: {fileID: 919132148954593521} + m_SourcePrefab: {fileID: 100100000, guid: 421abe34365b9464b8f92fbbb911a1ff, type: 3} --- !u!1 &437116564 GameObject: m_ObjectHideFlags: 0 @@ -4048,7 +4207,7 @@ MonoBehaviour: meshQuery: layers: 33554440 maskAndChannels: 8 - surfaceParameter: 101040 + surfaceParameter: 48272 meshQueryIndex: 2 subMeshQueryIndex: 0 geometryHashValue: -1365392548276624071 @@ -4580,6 +4739,54 @@ MonoBehaviour: - EdgeIndices: 07000000060000000500000004000000 TexGenIndex: 5 Generation: 2 +--- !u!1 &684930103 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 684930105} + - component: {fileID: 684930104} + m_Layer: 6 + m_Name: ModelSword + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &684930104 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 684930103} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5be6243682755944f96e35acb8e628a9, type: 3} + m_Name: + m_EditorClassIdentifier: + data: {fileID: 11400000, guid: 56779d045bfaf414ea1e992d489a2763, type: 2} + canAttack: 1 + attackRange: 2.5 + attackDamage: 25 +--- !u!4 &684930105 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 684930103} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 543450651951467715} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!43 &688319987 Mesh: m_ObjectHideFlags: 16 @@ -5082,7 +5289,7 @@ MonoBehaviour: meshQuery: layers: 33554440 maskAndChannels: 8 - surfaceParameter: 101040 + surfaceParameter: 48272 meshQueryIndex: 2 subMeshQueryIndex: 0 geometryHashValue: -1365392548276624071 @@ -6149,110 +6356,6 @@ MonoBehaviour: - EdgeIndices: 14000000150000001600000017000000 TexGenIndex: 5 Generation: 33 ---- !u!1 &992814223 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 992814224} - - component: {fileID: 992814225} - m_Layer: 0 - m_Name: '[generated-meshes]' - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &992814224 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 992814223} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1940283710} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &992814225 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 992814223} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5c3643d4978096d4880d7edbf4f65a50, type: 3} - m_Name: - m_EditorClassIdentifier: - Version: 1 - owner: {fileID: 1940283709} - helperSurfaces: [] ---- !u!1001 &1008289185 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1501595418} - m_Modifications: - - target: {fileID: -8679921383154817045, guid: 28a96b17682d64949b4cdf780c240f88, type: 3} - propertyPath: m_LocalPosition.x - value: 0.258 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 28a96b17682d64949b4cdf780c240f88, type: 3} - propertyPath: m_LocalPosition.y - value: 0.793 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 28a96b17682d64949b4cdf780c240f88, type: 3} - propertyPath: m_LocalPosition.z - value: 0.133 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 28a96b17682d64949b4cdf780c240f88, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 28a96b17682d64949b4cdf780c240f88, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 28a96b17682d64949b4cdf780c240f88, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 28a96b17682d64949b4cdf780c240f88, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 28a96b17682d64949b4cdf780c240f88, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 28a96b17682d64949b4cdf780c240f88, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 28a96b17682d64949b4cdf780c240f88, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: 28a96b17682d64949b4cdf780c240f88, type: 3} - propertyPath: m_Name - value: steampunk_rifle - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 28a96b17682d64949b4cdf780c240f88, type: 3} --- !u!43 &1040530778 Mesh: m_ObjectHideFlags: 16 @@ -7278,7 +7381,7 @@ MonoBehaviour: meshQuery: layers: 16777223 maskAndChannels: 234881031 - surfaceParameter: 101022 + surfaceParameter: 48322 meshQueryIndex: 0 subMeshQueryIndex: 0 geometryHashValue: -2436489981782101099 @@ -7549,6 +7652,131 @@ MonoBehaviour: - EdgeIndices: 14000000150000001600000017000000 TexGenIndex: 5 Generation: 33 +--- !u!1001 &1190659014 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1193742994} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 3a57f57ae2418ac4d955ac7b76504ccf, type: 3} + propertyPath: m_LocalScale.x + value: 0.2 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 3a57f57ae2418ac4d955ac7b76504ccf, type: 3} + propertyPath: m_LocalScale.y + value: 0.2 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 3a57f57ae2418ac4d955ac7b76504ccf, type: 3} + propertyPath: m_LocalScale.z + value: 0.2 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 3a57f57ae2418ac4d955ac7b76504ccf, type: 3} + propertyPath: m_LocalPosition.x + value: -0.101 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 3a57f57ae2418ac4d955ac7b76504ccf, type: 3} + propertyPath: m_LocalPosition.y + value: 0.573 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 3a57f57ae2418ac4d955ac7b76504ccf, type: 3} + propertyPath: m_LocalPosition.z + value: 0.2 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 3a57f57ae2418ac4d955ac7b76504ccf, type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 3a57f57ae2418ac4d955ac7b76504ccf, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 3a57f57ae2418ac4d955ac7b76504ccf, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 3a57f57ae2418ac4d955ac7b76504ccf, type: 3} + propertyPath: m_LocalRotation.z + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 3a57f57ae2418ac4d955ac7b76504ccf, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 90 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 3a57f57ae2418ac4d955ac7b76504ccf, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 180 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 3a57f57ae2418ac4d955ac7b76504ccf, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8062973100352779476, guid: 3a57f57ae2418ac4d955ac7b76504ccf, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: -5297899159003180957, guid: 3a57f57ae2418ac4d955ac7b76504ccf, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 3a57f57ae2418ac4d955ac7b76504ccf, type: 3} + propertyPath: m_Name + value: Sword + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 3a57f57ae2418ac4d955ac7b76504ccf, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 2410175765596638660, guid: 3a57f57ae2418ac4d955ac7b76504ccf, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 4880359386960711014, guid: 3a57f57ae2418ac4d955ac7b76504ccf, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 3a57f57ae2418ac4d955ac7b76504ccf, type: 3} + insertIndex: -1 + addedObject: {fileID: 684930105} + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 3a57f57ae2418ac4d955ac7b76504ccf, type: 3} +--- !u!1 &1193742993 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1193742994} + m_Layer: 6 + m_Name: Weapon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1193742994 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1193742993} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 543450652691669578} + - {fileID: 543450651951467715} + m_Father: {fileID: 1501595418} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1198138126 PrefabInstance: m_ObjectHideFlags: 0 @@ -9233,7 +9461,7 @@ MonoBehaviour: damagedDelay: 1 baseDamage: 10 weaponList: - - {fileID: 5029868015402955001, guid: 1a7698227caac3d429dceb8aa5056502, type: 3} + - {fileID: 919132148954593521} companionList: [] companionActive: --- !u!54 &1501595417 @@ -9272,12 +9500,12 @@ Transform: m_GameObject: {fileID: 1501595415} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0.17, y: 0, z: -0.05} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1134916567} - - {fileID: 1676748253} + - {fileID: 1193742994} m_Father: {fileID: 1835324898} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1504602805 @@ -9387,7 +9615,7 @@ MonoBehaviour: meshQuery: layers: 16777223 maskAndChannels: 234881031 - surfaceParameter: 102382 + surfaceParameter: 48038 meshQueryIndex: 8 subMeshQueryIndex: 0 geometryHashValue: 6467234982613496563 @@ -9580,7 +9808,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1838854055268103909, guid: 71b1260932d07054caf2d52890e46704, type: 3} propertyPath: m_LocalPosition.y - value: 0.69 + value: 0.7 objectReference: {fileID: 0} - target: {fileID: 1838854055268103909, guid: 71b1260932d07054caf2d52890e46704, type: 3} propertyPath: m_LocalPosition.z @@ -10208,7 +10436,7 @@ MonoBehaviour: meshQuery: layers: 16777223 maskAndChannels: 234881031 - surfaceParameter: 101034 + surfaceParameter: 47792 meshQueryIndex: 1 subMeshQueryIndex: 0 geometryHashValue: 8624144165243009415 @@ -10531,11 +10759,6 @@ MonoBehaviour: - EdgeIndices: 07000000060000000500000004000000 TexGenIndex: 5 Generation: 2 ---- !u!4 &1676748253 stripped -Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 28a96b17682d64949b4cdf780c240f88, type: 3} - m_PrefabInstance: {fileID: 1008289185} - m_PrefabAsset: {fileID: 0} --- !u!1 &1687945511 GameObject: m_ObjectHideFlags: 0 @@ -11969,7 +12192,7 @@ MonoBehaviour: meshQuery: layers: 16777223 maskAndChannels: 234881031 - surfaceParameter: 102418 + surfaceParameter: 47916 meshQueryIndex: 9 subMeshQueryIndex: 0 geometryHashValue: -2774585206094123893 @@ -12023,102 +12246,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1940283707 -GameObject: - m_ObjectHideFlags: 17 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1940283710} - - component: {fileID: 1940283709} - - component: {fileID: 1940283708} - m_Layer: 0 - m_Name: '[default-CSGModel]' - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 124 - m_IsActive: 1 ---- !u!54 &1940283708 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1940283707} - serializedVersion: 4 - m_Mass: 1 - m_Drag: 0 - m_AngularDrag: 0.05 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_InertiaTensor: {x: 1, y: 1, z: 1} - m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ImplicitCom: 1 - m_ImplicitTensor: 1 - m_UseGravity: 0 - m_IsKinematic: 1 - m_Interpolate: 0 - m_Constraints: 126 - m_CollisionDetection: 0 ---- !u!114 &1940283709 -MonoBehaviour: - m_ObjectHideFlags: 17 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1940283707} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8672dcc90e16b0a489a41edf56e016f8, type: 3} - m_Name: - m_EditorClassIdentifier: - PrefabBehaviour: 0 - PrefabSourceAlignment: 4 - PrefabDestinationAlignment: 0 - Version: 1.1 - infiniteBrush: {fileID: 0} - Settings: 1025 - VertexChannels: 14 - ReceiveGI: 2 - MeshColliderCookingOptions: 14 - ShowGeneratedMeshes: 0 - DefaultPhysicsMaterial: {fileID: 13400000, guid: 0c5fdfb44d6f19646a41a0720fbf751a, type: 2} - exportType: 0 - originType: 0 - exportColliders: 0 - exportPath: - angleError: 1 - areaError: 1 - hardAngle: 60 - packMargin: 20 - scaleInLightmap: 1 - autoUVMaxDistance: 0.5 - autoUVMaxAngle: 89 - minimumChartSize: 4 ---- !u!4 &1940283710 -Transform: - m_ObjectHideFlags: 17 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1940283707} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 992814224} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1993262141 GameObject: m_ObjectHideFlags: 0 @@ -13025,6 +13152,102 @@ MonoBehaviour: - EdgeIndices: 14000000150000001600000017000000 TexGenIndex: 5 Generation: 33 +--- !u!1 &2144232458 +GameObject: + m_ObjectHideFlags: 17 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2144232461} + - component: {fileID: 2144232460} + - component: {fileID: 2144232459} + m_Layer: 0 + m_Name: '[default-CSGModel]' + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 124 + m_IsActive: 1 +--- !u!54 &2144232459 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2144232458} + serializedVersion: 4 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 + m_UseGravity: 0 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 126 + m_CollisionDetection: 0 +--- !u!114 &2144232460 +MonoBehaviour: + m_ObjectHideFlags: 17 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2144232458} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8672dcc90e16b0a489a41edf56e016f8, type: 3} + m_Name: + m_EditorClassIdentifier: + PrefabBehaviour: 0 + PrefabSourceAlignment: 4 + PrefabDestinationAlignment: 0 + Version: 1.1 + infiniteBrush: {fileID: 0} + Settings: 1025 + VertexChannels: 14 + ReceiveGI: 2 + MeshColliderCookingOptions: 14 + ShowGeneratedMeshes: 0 + DefaultPhysicsMaterial: {fileID: 13400000, guid: 0c5fdfb44d6f19646a41a0720fbf751a, type: 2} + exportType: 0 + originType: 0 + exportColliders: 0 + exportPath: + angleError: 1 + areaError: 1 + hardAngle: 60 + packMargin: 20 + scaleInLightmap: 1 + autoUVMaxDistance: 0.5 + autoUVMaxAngle: 89 + minimumChartSize: 4 +--- !u!4 &2144232461 +Transform: + m_ObjectHideFlags: 17 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2144232458} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 104999908} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2147359534 GameObject: m_ObjectHideFlags: 0 @@ -13286,6 +13509,37 @@ MonoBehaviour: - EdgeIndices: 14000000150000001600000017000000 TexGenIndex: 5 Generation: 33 +--- !u!4 &543450651951467715 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 3a57f57ae2418ac4d955ac7b76504ccf, type: 3} + m_PrefabInstance: {fileID: 1190659014} + m_PrefabAsset: {fileID: 0} +--- !u!4 &543450652691669578 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 421abe34365b9464b8f92fbbb911a1ff, type: 3} + m_PrefabInstance: {fileID: 432692064} + m_PrefabAsset: {fileID: 0} +--- !u!1 &919132148954593520 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 421abe34365b9464b8f92fbbb911a1ff, type: 3} + m_PrefabInstance: {fileID: 432692064} + m_PrefabAsset: {fileID: 0} +--- !u!114 &919132148954593521 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 919132148954593520} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 68705b8ed948aae4d98ef6e87b6f6961, type: 3} + m_Name: + m_EditorClassIdentifier: + data: {fileID: 11400000, guid: 875c881f7a9ed2347a9d28ca2c18c4b5, type: 2} + canAttack: 1 + fireRange: 100 + projectileSpeed: 100 --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 @@ -13294,4 +13548,4 @@ SceneRoots: - {fileID: 354420149} - {fileID: 1899092101} - {fileID: 1298502551} - - {fileID: 1940283710} + - {fileID: 2144232461} diff --git a/Assets/_Scripts/Core/Objects/Weapons/TestWeapon/Sword.cs b/Assets/_Scripts/Core/Objects/Weapons/TestWeapon/Sword.cs new file mode 100644 index 00000000..b5bb4f30 --- /dev/null +++ b/Assets/_Scripts/Core/Objects/Weapons/TestWeapon/Sword.cs @@ -0,0 +1,53 @@ +using UnityEngine; + +public class Sword : WeaponObject +{ + public const string weaponPrefab = "Prefabs/Weapons/TestWeapon/Sword"; + private const string hitboxPrefab = "Prefabs/Weapons/TestWeapon/WeaponHitbox"; + + public float attackRange = 2.5f; + public float attackDamage = 25f; + public SwordAnimationController animationController; + + protected new void Start() + { + base.Start(); + animationController = new SwordAnimationController(this); + } + + protected override void OnAttack() + { + // Spawn hitbox + AttackObject hitboxObject = ObjectFactory.CreateAttackObject( + prefabPath: hitboxPrefab, + damage: MathUtils.CalculateDamage(bearer.BaseDamage, data.baseDamage), + knockbackPower: data.knockbackPower, + attackLayerCode: bearer.AttackLayerCode, + damageModifier: bearer.AttackMultiplier, + knockbackOrigin: transform.position, + parent: transform, // Attach hitbox to the sword + objectName: "Sword Hitbox" + ); + ObjectFactory.DestroyObject(hitboxObject, 1f); + } + + + protected override void OnAlternateAttack() + { + animationController.AnimateAlternateAttack(); + + AttackObject attackHitbox = ObjectFactory.CreateAttackObject( + prefabPath: hitboxPrefab, + damage: MathUtils.CalculateDamage(bearer.BaseDamage, data.baseDamage), + knockbackPower: data.knockbackPower, + attackLayerCode: bearer.AttackLayerCode, + damageModifier: bearer.AttackMultiplier, + knockbackOrigin: transform.position, + parent: animationController.model.transform, + objectName: "Sword Hitbox" + ); + + ObjectFactory.DestroyObject(attackHitbox, 0.5f); + } + +} diff --git a/Assets/_Scripts/Core/Objects/Weapons/TestWeapon/Sword.cs.meta b/Assets/_Scripts/Core/Objects/Weapons/TestWeapon/Sword.cs.meta new file mode 100644 index 00000000..152759e9 --- /dev/null +++ b/Assets/_Scripts/Core/Objects/Weapons/TestWeapon/Sword.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 5be6243682755944f96e35acb8e628a9 \ No newline at end of file diff --git a/Assets/_Scripts/Core/Objects/Weapons/TestWeapon/SwordController.cs b/Assets/_Scripts/Core/Objects/Weapons/TestWeapon/SwordController.cs new file mode 100644 index 00000000..2668ad70 --- /dev/null +++ b/Assets/_Scripts/Core/Objects/Weapons/TestWeapon/SwordController.cs @@ -0,0 +1,18 @@ +using UnityEngine; + +public class SwordAnimationController : AnimationController +{ + private const string ALTERNATE_ATTACK_TRIGGER = "AlternateAttack_param"; + + private readonly Sword sword; + + public SwordAnimationController(Sword sword) : base(sword) + { + this.sword = sword; + } + + public void AnimateAlternateAttack() + { + animator.SetTrigger(ALTERNATE_ATTACK_TRIGGER); + } +} diff --git a/Assets/_Scripts/Core/Objects/Weapons/TestWeapon/SwordController.cs.meta b/Assets/_Scripts/Core/Objects/Weapons/TestWeapon/SwordController.cs.meta new file mode 100644 index 00000000..0edea85c --- /dev/null +++ b/Assets/_Scripts/Core/Objects/Weapons/TestWeapon/SwordController.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: a0ce9342a209e2049bc556c0aa8d0227 \ No newline at end of file diff --git a/CaseSensitiveTest b/CaseSensitiveTest new file mode 100644 index 00000000..e69de29b -- GitLab