From 1e5adb41496d2d81233e795adc46be7d69efddbb Mon Sep 17 00:00:00 2001 From: GamerClassN7 Date: Sun, 31 Jan 2021 13:50:44 +0100 Subject: [PATCH] Minor Tweeks --- Assets/Materials/AnkInCanvas.mat | 2 +- Assets/Materials/Gold.mat | 77 +++++++++++++ Assets/Materials/Gold.mat.meta | 8 ++ Assets/Materials/New Material.mat | 77 +++++++++++++ Assets/Materials/New Material.mat.meta | 8 ++ Assets/Materials/wood.mat | 77 +++++++++++++ Assets/Materials/wood.mat.meta | 8 ++ Assets/Prefabs/Artifac.prefab | 2 +- Assets/Prefabs/HideSpikes.prefab | 98 ++++++++++------ Assets/Prefabs/Saw.prefab | 7 +- Assets/Prefabs/SawRiding.prefab | 5 + Assets/Prefabs/ShowSpikes.prefab | 109 +++++++++++------- Assets/Prefabs/Sign.prefab | 6 +- Assets/Scenes/{Testing => Levels}/Filip.unity | 0 .../{Testing => Levels}/Filip.unity.meta | 0 Assets/Scenes/Menu/MainMenu.unity | 6 +- .../{ => SampleScene_Profiles}/Filip.unity | 0 .../Filip.unity.meta | 0 ProjectSettings/EditorBuildSettings.asset | 8 +- 19 files changed, 406 insertions(+), 92 deletions(-) create mode 100644 Assets/Materials/Gold.mat create mode 100644 Assets/Materials/Gold.mat.meta create mode 100644 Assets/Materials/New Material.mat create mode 100644 Assets/Materials/New Material.mat.meta create mode 100644 Assets/Materials/wood.mat create mode 100644 Assets/Materials/wood.mat.meta rename Assets/Scenes/{Testing => Levels}/Filip.unity (100%) rename Assets/Scenes/{Testing => Levels}/Filip.unity.meta (100%) rename Assets/Scenes/{ => SampleScene_Profiles}/Filip.unity (100%) rename Assets/Scenes/{ => SampleScene_Profiles}/Filip.unity.meta (100%) diff --git a/Assets/Materials/AnkInCanvas.mat b/Assets/Materials/AnkInCanvas.mat index 079d836..55eb75a 100644 --- a/Assets/Materials/AnkInCanvas.mat +++ b/Assets/Materials/AnkInCanvas.mat @@ -73,5 +73,5 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.9245283, g: 0.7041555, b: 0.49279103, a: 1} + - _Color: {r: 0.8396226, g: 0.482747, b: 0.13861692, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Assets/Materials/Gold.mat b/Assets/Materials/Gold.mat new file mode 100644 index 0000000..08a6d17 --- /dev/null +++ b/Assets/Materials/Gold.mat @@ -0,0 +1,77 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Gold + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0.866 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 0.8867924, g: 0.72383523, b: 0.054378804, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Assets/Materials/Gold.mat.meta b/Assets/Materials/Gold.mat.meta new file mode 100644 index 0000000..5694df2 --- /dev/null +++ b/Assets/Materials/Gold.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1794d360318012046bcba6a1c92570d9 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/New Material.mat b/Assets/Materials/New Material.mat new file mode 100644 index 0000000..f2fd325 --- /dev/null +++ b/Assets/Materials/New Material.mat @@ -0,0 +1,77 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: New Material + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 0.40445888, g: 0.40445888, b: 0.5754717, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Assets/Materials/New Material.mat.meta b/Assets/Materials/New Material.mat.meta new file mode 100644 index 0000000..c68e47e --- /dev/null +++ b/Assets/Materials/New Material.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 362210ecf78b8454bb2af1c2fe3321de +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/wood.mat b/Assets/Materials/wood.mat new file mode 100644 index 0000000..49a7790 --- /dev/null +++ b/Assets/Materials/wood.mat @@ -0,0 +1,77 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: wood + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 0.49056602, g: 0.31212953, b: 0.08098966, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Assets/Materials/wood.mat.meta b/Assets/Materials/wood.mat.meta new file mode 100644 index 0000000..f15e800 --- /dev/null +++ b/Assets/Materials/wood.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2b6e18fafb9bde1458eb2d103eb7aab6 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Artifac.prefab b/Assets/Prefabs/Artifac.prefab index 0ff74a1..ccb3be0 100644 --- a/Assets/Prefabs/Artifac.prefab +++ b/Assets/Prefabs/Artifac.prefab @@ -164,7 +164,7 @@ PrefabInstance: type: 3} propertyPath: m_Materials.Array.data[1] value: - objectReference: {fileID: 2100000, guid: 49025a60961b95a43986697748175308, type: 2} + objectReference: {fileID: 2100000, guid: 1794d360318012046bcba6a1c92570d9, type: 2} - target: {fileID: 919132149155446097, guid: dbb67ade1acacb046b14f8c82b3d1495, type: 3} propertyPath: m_Name diff --git a/Assets/Prefabs/HideSpikes.prefab b/Assets/Prefabs/HideSpikes.prefab index 43c4330..cbb5915 100644 --- a/Assets/Prefabs/HideSpikes.prefab +++ b/Assets/Prefabs/HideSpikes.prefab @@ -79,18 +79,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 ---- !u!114 &1998731762 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1388626848845330808} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: eccc7532abe12e840833011dd7aad947, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!136 &6421470552571676874 CapsuleCollider: m_ObjectHideFlags: 0 @@ -105,13 +93,13 @@ CapsuleCollider: m_Height: 5 m_Direction: 1 m_Center: {x: 0, y: 3.425582, z: 0} ---- !u!114 &1998731763 +--- !u!114 &1998731762 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2156174483670564380} + m_GameObject: {fileID: 1388626848845330808} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: eccc7532abe12e840833011dd7aad947, type: 3} @@ -131,6 +119,18 @@ CapsuleCollider: m_Height: 6 m_Direction: 1 m_Center: {x: 2.1933563, y: 3.5384803, z: 0} +--- !u!114 &1998731763 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2156174483670564380} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: eccc7532abe12e840833011dd7aad947, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &2445808756126767684 GameObject: m_ObjectHideFlags: 0 @@ -163,18 +163,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1998731783 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5196525844608827118} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: eccc7532abe12e840833011dd7aad947, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!136 &543006812352869409 CapsuleCollider: m_ObjectHideFlags: 0 @@ -189,6 +177,18 @@ CapsuleCollider: m_Height: 6 m_Direction: 1 m_Center: {x: -0.07755566, y: 3.5041447, z: -0.069414735} +--- !u!114 &1998731783 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5196525844608827118} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: eccc7532abe12e840833011dd7aad947, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!65 &6731158098948586105 BoxCollider: m_ObjectHideFlags: 0 @@ -234,18 +234,8 @@ MonoBehaviour: instaKill: 0 damage: 10 damageRate: 1 ---- !u!114 &1998731782 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8125980356071770695} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: eccc7532abe12e840833011dd7aad947, type: 3} - m_Name: - m_EditorClassIdentifier: + fromPosition: {fileID: 0} + toPosition: {fileID: 0} --- !u!136 &7854312960757732773 CapsuleCollider: m_ObjectHideFlags: 0 @@ -260,6 +250,18 @@ CapsuleCollider: m_Height: 5 m_Direction: 1 m_Center: {x: 2.2515378, y: 3.3230143, z: 0} +--- !u!114 &1998731782 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8125980356071770695} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: eccc7532abe12e840833011dd7aad947, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &6731158098948586093 PrefabInstance: m_ObjectHideFlags: 0 @@ -337,6 +339,21 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: -6877481245417288963, guid: 330aaef30835dc6428fa0611d8636c28, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 2b6e18fafb9bde1458eb2d103eb7aab6, type: 2} + - target: {fileID: -6034480803058315714, guid: 330aaef30835dc6428fa0611d8636c28, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 2b6e18fafb9bde1458eb2d103eb7aab6, type: 2} + - target: {fileID: -4856746350265117782, guid: 330aaef30835dc6428fa0611d8636c28, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 2b6e18fafb9bde1458eb2d103eb7aab6, type: 2} - target: {fileID: 919132149155446097, guid: 330aaef30835dc6428fa0611d8636c28, type: 3} propertyPath: m_Name @@ -347,6 +364,11 @@ PrefabInstance: propertyPath: m_TagString value: EnemyObjects objectReference: {fileID: 0} + - target: {fileID: 1541998606474349963, guid: 330aaef30835dc6428fa0611d8636c28, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 2b6e18fafb9bde1458eb2d103eb7aab6, type: 2} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 330aaef30835dc6428fa0611d8636c28, type: 3} --- !u!1 &5884104032974260028 stripped diff --git a/Assets/Prefabs/Saw.prefab b/Assets/Prefabs/Saw.prefab index 9f0a987..60445cb 100644 --- a/Assets/Prefabs/Saw.prefab +++ b/Assets/Prefabs/Saw.prefab @@ -42,7 +42,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: objectType: 3 - instaKill: 0 + instaKill: 1 damage: 25 damageRate: 0.5 fromPosition: {fileID: 0} @@ -294,6 +294,11 @@ PrefabInstance: propertyPath: m_Name value: Saw objectReference: {fileID: 0} + - target: {fileID: 7202271454713460447, guid: 8e76ebdc23b6a7c48b338f18330c3d6e, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 362210ecf78b8454bb2af1c2fe3321de, type: 2} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8e76ebdc23b6a7c48b338f18330c3d6e, type: 3} --- !u!1 &1677231193731325872 stripped diff --git a/Assets/Prefabs/SawRiding.prefab b/Assets/Prefabs/SawRiding.prefab index a9a8081..29cb235 100644 --- a/Assets/Prefabs/SawRiding.prefab +++ b/Assets/Prefabs/SawRiding.prefab @@ -272,6 +272,11 @@ PrefabInstance: propertyPath: m_Name value: Saw objectReference: {fileID: 0} + - target: {fileID: 7202271454713460447, guid: 8e76ebdc23b6a7c48b338f18330c3d6e, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 362210ecf78b8454bb2af1c2fe3321de, type: 2} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8e76ebdc23b6a7c48b338f18330c3d6e, type: 3} --- !u!1 &2243115294033145012 stripped diff --git a/Assets/Prefabs/ShowSpikes.prefab b/Assets/Prefabs/ShowSpikes.prefab index 8500594..459004d 100644 --- a/Assets/Prefabs/ShowSpikes.prefab +++ b/Assets/Prefabs/ShowSpikes.prefab @@ -1,5 +1,47 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!64 &6364420393879567125 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1620859099576797736} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: -4746165098021687754, guid: 330aaef30835dc6428fa0611d8636c28, type: 3} +--- !u!64 &6364420394372686582 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1789990931432410444} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 2504345457074934838, guid: 330aaef30835dc6428fa0611d8636c28, type: 3} +--- !u!64 &6364420394340331402 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5559362483217059262} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: -6195245291975648998, guid: 330aaef30835dc6428fa0611d8636c28, type: 3} --- !u!65 &6364420393197139716 BoxCollider: m_ObjectHideFlags: 0 @@ -42,20 +84,11 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: objectType: 2 ---- !u!64 &6364420393879567125 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1620859099576797736} - m_Material: {fileID: 0} - m_IsTrigger: 1 - m_Enabled: 1 - serializedVersion: 4 - m_Convex: 1 - m_CookingOptions: 30 - m_Mesh: {fileID: -4746165098021687754, guid: 330aaef30835dc6428fa0611d8636c28, type: 3} + instaKill: 0 + damage: 10 + damageRate: 5 + fromPosition: {fileID: 0} + toPosition: {fileID: 0} --- !u!1 &6364420394033728395 GameObject: m_ObjectHideFlags: 0 @@ -87,34 +120,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!64 &6364420394340331402 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5559362483217059262} - m_Material: {fileID: 0} - m_IsTrigger: 1 - m_Enabled: 1 - serializedVersion: 4 - m_Convex: 1 - m_CookingOptions: 30 - m_Mesh: {fileID: -6195245291975648998, guid: 330aaef30835dc6428fa0611d8636c28, type: 3} ---- !u!64 &6364420394372686582 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1789990931432410444} - m_Material: {fileID: 0} - m_IsTrigger: 1 - m_Enabled: 1 - serializedVersion: 4 - m_Convex: 1 - m_CookingOptions: 30 - m_Mesh: {fileID: 2504345457074934838, guid: 330aaef30835dc6428fa0611d8636c28, type: 3} --- !u!64 &6364420394726793011 MeshCollider: m_ObjectHideFlags: 0 @@ -206,6 +211,21 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: -6877481245417288963, guid: 330aaef30835dc6428fa0611d8636c28, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 2b6e18fafb9bde1458eb2d103eb7aab6, type: 2} + - target: {fileID: -6034480803058315714, guid: 330aaef30835dc6428fa0611d8636c28, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 2b6e18fafb9bde1458eb2d103eb7aab6, type: 2} + - target: {fileID: -4856746350265117782, guid: 330aaef30835dc6428fa0611d8636c28, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 2b6e18fafb9bde1458eb2d103eb7aab6, type: 2} - target: {fileID: 919132149155446097, guid: 330aaef30835dc6428fa0611d8636c28, type: 3} propertyPath: m_Name @@ -216,6 +236,11 @@ PrefabInstance: propertyPath: m_TagString value: EnemyObjects objectReference: {fileID: 0} + - target: {fileID: 1541998606474349963, guid: 330aaef30835dc6428fa0611d8636c28, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 2b6e18fafb9bde1458eb2d103eb7aab6, type: 2} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 330aaef30835dc6428fa0611d8636c28, type: 3} --- !u!1 &6094390029467858028 stripped diff --git a/Assets/Prefabs/Sign.prefab b/Assets/Prefabs/Sign.prefab index cb583ed..a38dd46 100644 --- a/Assets/Prefabs/Sign.prefab +++ b/Assets/Prefabs/Sign.prefab @@ -58,7 +58,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 670224309865224971, guid: 2784c771a437b7e4cb23176a2e7c3ee3, type: 3} + - {fileID: 2100000, guid: 2b6e18fafb9bde1458eb2d103eb7aab6, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -199,8 +199,8 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 670224309865224971, guid: 2784c771a437b7e4cb23176a2e7c3ee3, type: 3} - - {fileID: 2100000, guid: 49025a60961b95a43986697748175308, type: 2} + - {fileID: 2100000, guid: 2b6e18fafb9bde1458eb2d103eb7aab6, type: 2} + - {fileID: 2100000, guid: 2b6e18fafb9bde1458eb2d103eb7aab6, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/Scenes/Testing/Filip.unity b/Assets/Scenes/Levels/Filip.unity similarity index 100% rename from Assets/Scenes/Testing/Filip.unity rename to Assets/Scenes/Levels/Filip.unity diff --git a/Assets/Scenes/Testing/Filip.unity.meta b/Assets/Scenes/Levels/Filip.unity.meta similarity index 100% rename from Assets/Scenes/Testing/Filip.unity.meta rename to Assets/Scenes/Levels/Filip.unity.meta diff --git a/Assets/Scenes/Menu/MainMenu.unity b/Assets/Scenes/Menu/MainMenu.unity index 526e0c6..be38af7 100644 --- a/Assets/Scenes/Menu/MainMenu.unity +++ b/Assets/Scenes/Menu/MainMenu.unity @@ -2063,8 +2063,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: ScoreText: {fileID: 748254063} + ScoreOneLineText: {fileID: 0} name: {fileID: 0} - score: {fileID: 0} --- !u!114 &989324638 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3698,7 +3698,9 @@ MonoBehaviour: SHIFT - for Sprint - SPACE - for Jump' + SPACE - for Jump + + ESC - Menu' m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} diff --git a/Assets/Scenes/Filip.unity b/Assets/Scenes/SampleScene_Profiles/Filip.unity similarity index 100% rename from Assets/Scenes/Filip.unity rename to Assets/Scenes/SampleScene_Profiles/Filip.unity diff --git a/Assets/Scenes/Filip.unity.meta b/Assets/Scenes/SampleScene_Profiles/Filip.unity.meta similarity index 100% rename from Assets/Scenes/Filip.unity.meta rename to Assets/Scenes/SampleScene_Profiles/Filip.unity.meta diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 2fdbcd0..5553c31 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -9,8 +9,8 @@ EditorBuildSettings: path: Assets/Scenes/Menu/MainMenu.unity guid: 33d54f39f74b30b4dbb8d638a1d5c9b4 - enabled: 1 - path: Assets/Scenes/Levels/Level 1 _ vs.unity - guid: 127deaeaf7712824f83ee4cba639e023 + path: Assets/Scenes/Levels/Level 1.unity + guid: e677daabf0db5f14e841a1d5f3937e59 - enabled: 1 path: Assets/Scenes/Levels/Level 2.unity guid: 3ff2402a6d1a5b1459781b37d0f8e1c7 @@ -18,8 +18,8 @@ EditorBuildSettings: path: Assets/Scenes/Levels/Level 3.unity guid: 7d7146aedfcd48445bb0d44a485249b2 - enabled: 1 - path: Assets/Scenes/Testing/Filip.unity - guid: 326dea585e0ea574389529eaae8a0ab4 + path: Assets/Scenes/Levels/Level 4.unity + guid: 4566ab90c1f6b3a47b49e46c12caf02e - enabled: 1 path: Assets/Scenes/Menu/FinalMenu.unity guid: e728960f94bcba84089c530dec85aa8d