diff --git a/Assets/Models/PlainsTerrain1.asset b/Assets/Models/PlainsTerrain1.asset index def9b5f..e99e6fb 100644 Binary files a/Assets/Models/PlainsTerrain1.asset and b/Assets/Models/PlainsTerrain1.asset differ diff --git a/Assets/Models/PlainsTerrain2.asset b/Assets/Models/PlainsTerrain2.asset index 9d576ca..cca2b47 100644 Binary files a/Assets/Models/PlainsTerrain2.asset and b/Assets/Models/PlainsTerrain2.asset differ diff --git a/Assets/Models/Valley.asset b/Assets/Models/Valley.asset index 63394d6..c532b23 100644 Binary files a/Assets/Models/Valley.asset and b/Assets/Models/Valley.asset differ diff --git a/Assets/Scenes/Game-Mountain.unity b/Assets/Scenes/Game-Mountain.unity index c1337fa..8699299 100644 --- a/Assets/Scenes/Game-Mountain.unity +++ b/Assets/Scenes/Game-Mountain.unity @@ -4839,7 +4839,7 @@ Transform: m_LocalScale: {x: 0.7111871, y: 0.039395437, z: 0.7532221} m_Children: [] m_Father: {fileID: 1282091942} - m_RootOrder: 11 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &205996089 BoxCollider: @@ -5568,6 +5568,102 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 226736304} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &227541513 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 227541514} + - component: {fileID: 227541517} + - component: {fileID: 227541516} + - component: {fileID: 227541515} + m_Layer: 0 + m_Name: Wall (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &227541514 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 227541513} + m_LocalRotation: {x: -0.7660445, y: 0, z: 0, w: 0.64278764} + m_LocalPosition: {x: -1137, y: 59, z: 952} + m_LocalScale: {x: 175, y: 1, z: 30} + m_Children: [] + m_Father: {fileID: 256312161} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: -100, y: 0, z: 0} +--- !u!64 &227541515 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 227541513} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &227541516 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 227541513} + m_Enabled: 0 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 471b6e54861f8bd41a48f36c077d5426, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &227541517 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 227541513} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &241047918 GameObject: m_ObjectHideFlags: 0 @@ -5790,6 +5886,40 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 254626365} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &256312160 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 256312161} + m_Layer: 0 + m_Name: Invisible Walls + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &256312161 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 256312160} + 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_Children: + - {fileID: 832352202} + - {fileID: 227541514} + - {fileID: 502838092} + - {fileID: 1323629283} + m_Father: {fileID: 959752957} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &257019914 GameObject: m_ObjectHideFlags: 0 @@ -8212,6 +8342,39 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} +--- !u!1 &362537536 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 362537537} + m_Layer: 0 + m_Name: SlowDownZones + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &362537537 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 362537536} + 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_Children: + - {fileID: 1937045933} + - {fileID: 455578032} + - {fileID: 1963989100} + m_Father: {fileID: 959752957} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &366027500 GameObject: m_ObjectHideFlags: 0 @@ -8522,7 +8685,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 384194923} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -483, y: 212, z: 915} + m_LocalPosition: {x: -483, y: 212, z: 814} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1106733121} @@ -10086,6 +10249,63 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 450954574} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &455578031 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 455578032} + - component: {fileID: 455578034} + - component: {fileID: 455578033} + m_Layer: 0 + m_Name: Zone 2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &455578032 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 455578031} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -255.5, y: 53.9, z: 368.3} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 362537537} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &455578033 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 455578031} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 61af63cea62ce8a4eb42a60e813f75e9, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!65 &455578034 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 455578031} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 115, y: 50, z: 130} + m_Center: {x: 0, y: 0, z: 0} --- !u!1 &465752002 GameObject: m_ObjectHideFlags: 0 @@ -10865,6 +11085,102 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 499423962} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &502838091 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 502838092} + - component: {fileID: 502838095} + - component: {fileID: 502838094} + - component: {fileID: 502838093} + m_Layer: 0 + m_Name: Wall (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &502838092 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 502838091} + m_LocalRotation: {x: 0.71461076, y: -0.30534714, z: 0.27093565, w: 0.5680568} + m_LocalPosition: {x: -140.1, y: 56, z: 202.6} + m_LocalScale: {x: 42, y: 1, z: 30} + m_Children: [] + m_Father: {fileID: 256312161} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 102.22101, y: -10.97998, z: 37.408005} +--- !u!64 &502838093 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 502838091} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &502838094 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 502838091} + m_Enabled: 0 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 65c36ca7b1bcd1146983d55e65af47c9, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &502838095 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 502838091} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &508680237 GameObject: m_ObjectHideFlags: 0 @@ -10892,7 +11208,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 508680237} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 8.280065, y: -0.50506616, z: 0.6265371} + m_LocalPosition: {x: 8.7, y: -0.50506616, z: 0.094} m_LocalScale: {x: 1.2565, y: 0.18419, z: 0.29692} m_Children: [] m_Father: {fileID: 1620175749} @@ -15225,101 +15541,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 719544727} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1 &729717692 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 729717693} - - component: {fileID: 729717696} - - component: {fileID: 729717695} - - component: {fileID: 729717694} - m_Layer: 0 - m_Name: platform 1 (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &729717693 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 729717692} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 14.04, y: -0.426, z: -1.42} - m_LocalScale: {x: 0.7111871, y: 0.039395437, z: 0.7532221} - m_Children: [] - m_Father: {fileID: 1282091942} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!65 &729717694 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 729717692} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!23 &729717695 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 729717692} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: cce4d03b83d5bb44682271d375de60ff, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &729717696 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 729717692} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &731306060 GameObject: m_ObjectHideFlags: 0 @@ -16044,7 +16265,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 745779054} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -490, y: 287, z: 784} + m_LocalPosition: {x: -490, y: 287, z: 663} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1579685678} @@ -16121,7 +16342,7 @@ Transform: m_LocalScale: {x: 0.7111871, y: 0.039395437, z: 0.7532221} m_Children: [] m_Father: {fileID: 1282091942} - m_RootOrder: 13 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &749673949 BoxCollider: @@ -17309,7 +17530,7 @@ Transform: m_LocalScale: {x: 0.7111871, y: 0.039395437, z: 0.7532221} m_Children: [] m_Father: {fileID: 1282091942} - m_RootOrder: 12 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &805315925 BoxCollider: @@ -17894,6 +18115,102 @@ Transform: m_Father: {fileID: 2045505414} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &832352201 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 832352202} + - component: {fileID: 832352205} + - component: {fileID: 832352204} + - component: {fileID: 832352203} + m_Layer: 0 + m_Name: Wall + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &832352202 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 832352201} + m_LocalRotation: {x: 0.76604444, y: 0, z: 0, w: 0.64278764} + m_LocalPosition: {x: -1138, y: 59, z: 44} + m_LocalScale: {x: 175, y: 1, z: 30} + m_Children: [] + m_Father: {fileID: 256312161} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 100, y: 0, z: 0} +--- !u!64 &832352203 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 832352201} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &832352204 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 832352201} + m_Enabled: 0 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 471b6e54861f8bd41a48f36c077d5426, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &832352205 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 832352201} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &837778964 GameObject: m_ObjectHideFlags: 0 @@ -20110,7 +20427,7 @@ Transform: m_LocalScale: {x: 18.625084, y: 1.21024, z: 3.3996985} m_Children: [] m_Father: {fileID: 1282091942} - m_RootOrder: 18 + m_RootOrder: 17 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &943449318 BoxCollider: @@ -20397,6 +20714,8 @@ Transform: - {fileID: 384194924} - {fileID: 1983875393} - {fileID: 1932658587} + - {fileID: 256312161} + - {fileID: 362537537} m_Father: {fileID: 0} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -22330,7 +22649,7 @@ Transform: m_LocalScale: {x: 0.7111871, y: 0.039395437, z: 0.7532221} m_Children: [] m_Father: {fileID: 1282091942} - m_RootOrder: 9 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1051546448 BoxCollider: @@ -22615,7 +22934,7 @@ Transform: m_LocalScale: {x: 0.7111871, y: 0.039395437, z: 0.7532221} m_Children: [] m_Father: {fileID: 1282091942} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1058027852 BoxCollider: @@ -25927,7 +26246,7 @@ Transform: m_LocalScale: {x: 0.7111871, y: 0.039395437, z: 0.7532221} m_Children: [] m_Father: {fileID: 1282091942} - m_RootOrder: 14 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1185217562 BoxCollider: @@ -26022,7 +26341,7 @@ Transform: m_LocalScale: {x: 0.7111871, y: 0.039395437, z: 0.7532221} m_Children: [] m_Father: {fileID: 1282091942} - m_RootOrder: 10 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1186498619 BoxCollider: @@ -27115,7 +27434,7 @@ Transform: m_LocalScale: {x: 0.7111871, y: 0.039395437, z: 0.7532221} m_Children: [] m_Father: {fileID: 1282091942} - m_RootOrder: 16 + m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1213788333 BoxCollider: @@ -29380,7 +29699,6 @@ Transform: m_LocalScale: {x: 23.903923, y: 25.38365, z: 27.557295} m_Children: - {fileID: 2048174317} - - {fileID: 729717693} - {fileID: 1767156501} - {fileID: 1920775149} - {fileID: 1885653571} @@ -30419,7 +30737,7 @@ Transform: m_LocalScale: {x: 0.7111871, y: 0.039395437, z: 0.7532221} m_Children: [] m_Father: {fileID: 1282091942} - m_RootOrder: 17 + m_RootOrder: 16 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1312974144 BoxCollider: @@ -31161,6 +31479,102 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1321667154} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &1323629282 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1323629283} + - component: {fileID: 1323629286} + - component: {fileID: 1323629285} + - component: {fileID: 1323629284} + m_Layer: 0 + m_Name: Wall (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1323629283 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1323629282} + m_LocalRotation: {x: -0.70530045, y: 0.31120452, z: 0.26598492, w: 0.578753} + m_LocalPosition: {x: -132.7, y: 39.7, z: 806.7} + m_LocalScale: {x: 41, y: 1, z: 30} + m_Children: [] + m_Father: {fileID: 256312161} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: -100.905, y: 4.5410004, z: 43.867996} +--- !u!64 &1323629284 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1323629282} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &1323629285 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1323629282} + m_Enabled: 0 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 65c36ca7b1bcd1146983d55e65af47c9, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1323629286 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1323629282} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1325155980 GameObject: m_ObjectHideFlags: 0 @@ -33178,7 +33592,7 @@ Transform: m_LocalScale: {x: 0.7111871, y: 0.039395437, z: 0.7532221} m_Children: [] m_Father: {fileID: 1282091942} - m_RootOrder: 8 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1402193143 BoxCollider: @@ -38127,7 +38541,7 @@ Transform: m_LocalScale: {x: 0.7111871, y: 0.039395437, z: 0.7532221} m_Children: [] m_Father: {fileID: 1282091942} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1622034903 BoxCollider: @@ -41194,7 +41608,7 @@ Transform: m_LocalScale: {x: 0.7111871, y: 0.039395437, z: 0.7532221} m_Children: [] m_Father: {fileID: 1282091942} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1767156502 BoxCollider: @@ -44415,7 +44829,7 @@ Transform: m_LocalScale: {x: 18.625084, y: 1.21024, z: 3.3996985} m_Children: [] m_Father: {fileID: 1282091942} - m_RootOrder: 19 + m_RootOrder: 18 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1879828727 BoxCollider: @@ -44986,7 +45400,7 @@ Transform: m_LocalScale: {x: 0.7111871, y: 0.039395437, z: 0.7532221} m_Children: [] m_Father: {fileID: 1282091942} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1885653572 BoxCollider: @@ -45367,7 +45781,7 @@ Transform: m_LocalScale: {x: 0.7111871, y: 0.039395437, z: 0.7532221} m_Children: [] m_Father: {fileID: 1282091942} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1920775150 BoxCollider: @@ -45736,6 +46150,63 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1935874917} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &1937045932 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1937045933} + - component: {fileID: 1937045935} + - component: {fileID: 1937045934} + m_Layer: 0 + m_Name: Zone 1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1937045933 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1937045932} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -645.4, y: 53.9, z: 357.2} + m_LocalScale: {x: 13.250923, y: 1, z: 3.9377} + m_Children: [] + m_Father: {fileID: 362537537} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1937045934 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1937045932} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 61af63cea62ce8a4eb42a60e813f75e9, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!65 &1937045935 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1937045932} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 50, y: 50, z: 50} + m_Center: {x: 0, y: 0, z: 0} --- !u!1 &1940419781 GameObject: m_ObjectHideFlags: 0 @@ -45767,7 +46238,7 @@ Transform: m_LocalScale: {x: 0.7111871, y: 0.039395437, z: 0.7532221} m_Children: [] m_Father: {fileID: 1282091942} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1940419783 BoxCollider: @@ -46010,6 +46481,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4fceb627d9e440c48bbffc81a9a734da, type: 3} m_Name: m_EditorClassIdentifier: + RespawnPoint: {x: 0, y: 0, z: 0} --- !u!64 &1943425535 MeshCollider: m_ObjectHideFlags: 0 @@ -46335,6 +46807,63 @@ Transform: m_Father: {fileID: 147671898} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1963989099 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1963989100} + - component: {fileID: 1963989102} + - component: {fileID: 1963989101} + m_Layer: 0 + m_Name: Zone 3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1963989100 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1963989099} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -1490, y: 53.9, z: 357.2} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 362537537} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1963989101 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1963989099} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 61af63cea62ce8a4eb42a60e813f75e9, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!65 &1963989102 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1963989099} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1025, y: 50, z: 125} + m_Center: {x: 0, y: 0, z: 0} --- !u!1 &1967079344 GameObject: m_ObjectHideFlags: 0 @@ -48129,7 +48658,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2045505413} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -656, y: 399, z: 699} + m_LocalPosition: {x: -656, y: 399, z: 589} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 288242480} @@ -50557,7 +51086,7 @@ Transform: m_LocalScale: {x: 0.7111871, y: 0.039395437, z: 0.7532221} m_Children: [] m_Father: {fileID: 1282091942} - m_RootOrder: 15 + m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &2139656816 BoxCollider: @@ -52149,7 +52678,7 @@ GameObject: - component: {fileID: 3607330905212104824} m_Layer: 3 m_Name: PlayerModel - m_TagString: Untagged + m_TagString: Player m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -52161,7 +52690,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3607330905212104823} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 789ab0ea35dd29040894cf550605862c, type: 3} m_Name: diff --git a/Assets/Scripts/Environment/SlowTerrain.cs b/Assets/Scripts/Environment/SlowTerrain.cs new file mode 100644 index 0000000..3eb9902 --- /dev/null +++ b/Assets/Scripts/Environment/SlowTerrain.cs @@ -0,0 +1,26 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class SlowTerrain : MonoBehaviour +{ + //This will need to change to be dynamic (for things like roller skates) + //Also maybe add an isGrounded check? + private void OnTriggerEnter(Collider other) + { + Debug.Log("Slower!"); + if (other.gameObject.tag == "Player") + { + other.GetComponent().MaxVel = 10.0f; //if player enters trigger slow them down + Debug.Log("Slower"); + } + } + + private void OnTriggerExit(Collider other) + { + if (other.gameObject.tag == "Player") + { + other.GetComponent().MaxVel = 25.0f;//if player exits trigger return speed to default + } + } +} diff --git a/Assets/Scripts/Environment/SlowTerrain.cs.meta b/Assets/Scripts/Environment/SlowTerrain.cs.meta new file mode 100644 index 0000000..a78a1f9 --- /dev/null +++ b/Assets/Scripts/Environment/SlowTerrain.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 61af63cea62ce8a4eb42a60e813f75e9 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/KingAbilities.meta b/Assets/Scripts/KingAbilities.meta deleted file mode 100644 index 01b5665..0000000 --- a/Assets/Scripts/KingAbilities.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: e4d88fa8403c1ff499ee54632066a7ee -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/KingAbilities/Rain.cs b/Assets/Scripts/KingScripts/KingAbilities/Rain.cs similarity index 100% rename from Assets/Scripts/KingAbilities/Rain.cs rename to Assets/Scripts/KingScripts/KingAbilities/Rain.cs diff --git a/Assets/Scripts/KingAbilities/Rain.cs.meta b/Assets/Scripts/KingScripts/KingAbilities/Rain.cs.meta similarity index 100% rename from Assets/Scripts/KingAbilities/Rain.cs.meta rename to Assets/Scripts/KingScripts/KingAbilities/Rain.cs.meta diff --git a/Assets/Scripts/KingAbilities/Snow.cs b/Assets/Scripts/KingScripts/KingAbilities/Snow.cs similarity index 100% rename from Assets/Scripts/KingAbilities/Snow.cs rename to Assets/Scripts/KingScripts/KingAbilities/Snow.cs diff --git a/Assets/Scripts/KingAbilities/Snow.cs.meta b/Assets/Scripts/KingScripts/KingAbilities/Snow.cs.meta similarity index 100% rename from Assets/Scripts/KingAbilities/Snow.cs.meta rename to Assets/Scripts/KingScripts/KingAbilities/Snow.cs.meta diff --git a/Assets/Scripts/KingAbilities/Thunderstorm.cs b/Assets/Scripts/KingScripts/KingAbilities/Thunderstorm.cs similarity index 100% rename from Assets/Scripts/KingAbilities/Thunderstorm.cs rename to Assets/Scripts/KingScripts/KingAbilities/Thunderstorm.cs diff --git a/Assets/Scripts/KingAbilities/Thunderstorm.cs.meta b/Assets/Scripts/KingScripts/KingAbilities/Thunderstorm.cs.meta similarity index 100% rename from Assets/Scripts/KingAbilities/Thunderstorm.cs.meta rename to Assets/Scripts/KingScripts/KingAbilities/Thunderstorm.cs.meta