diff --git a/Assets/PowerOrb.cs b/Assets/PowerOrb.cs index a4dbc60b4858f6608a19104cfc5d00cd4f15ae9b..67a860f6fdd70d05838a784ef3499ea217cc6167 100644 --- a/Assets/PowerOrb.cs +++ b/Assets/PowerOrb.cs @@ -4,7 +4,6 @@ using UnityEngine; public class PowerOrb : MonoBehaviour { - public Transform playershooting; public int val = 1; public string type = "Power"; diff --git a/Assets/Prefabs/Diagonal.prefab b/Assets/Prefabs/Diagonal.prefab new file mode 100644 index 0000000000000000000000000000000000000000..31eda20ca1d4380e1970dfc2b3820bc6221ecf7d --- /dev/null +++ b/Assets/Prefabs/Diagonal.prefab @@ -0,0 +1,132 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &5874108024064317340 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5874108024064317336} + - component: {fileID: 5874108024064317343} + - component: {fileID: 5874108024064317342} + - component: {fileID: 5874108024064317341} + - component: {fileID: 5874108024064317337} + - component: {fileID: 5874108024064317338} + m_Layer: 0 + m_Name: Diagonal + m_TagString: WeaponUpgrade + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5874108024064317336 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5874108024064317340} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -6.71, y: 0.52, z: 5.04} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &5874108024064317343 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5874108024064317340} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &5874108024064317342 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5874108024064317340} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + 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: 842fa233f73b3384fbdf79e46d8d73ea, 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!65 &5874108024064317341 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5874108024064317340} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!54 &5874108024064317337 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5874108024064317340} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 126 + m_CollisionDetection: 0 +--- !u!114 &5874108024064317338 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5874108024064317340} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7f1cacb25cfc8344b9027095e499589d, type: 3} + m_Name: + m_EditorClassIdentifier: + val: 1 + type: Diagonal + Upgrades: [] diff --git a/Assets/Prefabs/Diagonal.prefab.meta b/Assets/Prefabs/Diagonal.prefab.meta new file mode 100644 index 0000000000000000000000000000000000000000..1bcef3cd61275e5a4619aaf3ccf0b8f782282805 --- /dev/null +++ b/Assets/Prefabs/Diagonal.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 43ce42d985e9f404e9463c2dac1b4649 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Environment.prefab b/Assets/Prefabs/Environment.prefab index feccc5e12474360c464945563b4c766b39960468..7b13d7f792afc3cc3d0dabcdb329290da56a496d 100644 --- a/Assets/Prefabs/Environment.prefab +++ b/Assets/Prefabs/Environment.prefab @@ -28,6 +28,7 @@ Transform: m_LocalRotation: {x: 0, y: -0.58778524, z: 0, w: 0.809017} m_LocalPosition: {x: -8.4, y: 0, z: -7} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 401306} - {fileID: 412392} @@ -113,6 +114,7 @@ Transform: m_LocalRotation: {x: 0, y: -0.0006887866, z: 0, w: 0.9999998} m_LocalPosition: {x: -3.0224, y: 0.82506, z: -0.89312} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 478000} m_RootOrder: 1 @@ -157,6 +159,7 @@ Transform: m_LocalRotation: {x: 0, y: 0.9998874, z: 0, w: -0.015008719} m_LocalPosition: {x: 0.03159827, y: 0.82506, z: -0.24047723} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 493074} m_RootOrder: 0 @@ -201,6 +204,7 @@ Transform: m_LocalRotation: {x: 0, y: -0.3826835, z: 0, w: 0.92387956} m_LocalPosition: {x: -0.227, y: 0, z: 35.299} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 487854} - {fileID: 468958} @@ -210,7 +214,7 @@ Transform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!95 &9533672 Animator: - serializedVersion: 3 + serializedVersion: 4 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -223,6 +227,7 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 @@ -255,6 +260,7 @@ Transform: m_LocalRotation: {x: 0, y: 0.3560854, z: 0, w: -0.9344534} m_LocalPosition: {x: -8.35, y: 0, z: 12} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 405318} - {fileID: 456430} @@ -342,6 +348,7 @@ Transform: m_LocalRotation: {x: 0.0016750003, y: -0.09233802, z: -0.0020640003, w: 0.9957242} m_LocalPosition: {x: 0.89604, y: -0.07933, z: -1.2022} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 417662} m_RootOrder: 4 @@ -387,6 +394,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 10.5, y: 0, z: 18.25} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 432662} m_Father: {fileID: 495562} @@ -471,6 +479,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -24.41047, y: 0, z: -24.377798} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 411924} m_RootOrder: 1 @@ -552,6 +561,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: -0.0677541, w: 0.99770206} m_LocalPosition: {x: -0.24472, y: 0, z: -0.0144} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 451588} m_RootOrder: 0 @@ -598,6 +608,7 @@ Transform: m_LocalRotation: {x: 0, y: -0.38268334, z: 0, w: 0.92387956} m_LocalPosition: {x: -22.25, y: 0, z: 8.75} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 491586} m_Father: {fileID: 495562} @@ -693,6 +704,7 @@ Transform: m_LocalRotation: {x: 0, y: 0.0000004539017, z: 0, w: 1} m_LocalPosition: {x: -23.68288, y: 14.987, z: 0.76412934} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 413574} m_RootOrder: 0 @@ -737,6 +749,7 @@ Transform: m_LocalRotation: {x: 0.0016750003, y: -0.09233802, z: -0.0020640003, w: 0.9957242} m_LocalPosition: {x: 0.89603996, y: -0.07933, z: -1.2021999} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 417662} m_RootOrder: 5 @@ -781,6 +794,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: -0.077676095, w: 0.99697864} m_LocalPosition: {x: 0.80663, y: 0, z: -0.0144} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 451588} m_RootOrder: 1 @@ -825,6 +839,7 @@ Transform: m_LocalRotation: {x: 0.00000008141287, y: 0.0341358, z: 0.000000002780714, w: 0.99941725} m_LocalPosition: {x: 0.97681457, y: -0.21199042, z: 1.5882188} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 487010} m_RootOrder: 0 @@ -869,6 +884,7 @@ Transform: m_LocalRotation: {x: -0.000000057601167, y: -0.7071068, z: 0.000000057601167, w: 0.7071068} m_LocalPosition: {x: 3.235, y: 1.9474, z: 0.012} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 450098} m_RootOrder: 0 @@ -916,6 +932,7 @@ Transform: m_LocalRotation: {x: 0.052335963, y: 0, z: 0, w: 0.99862957} m_LocalPosition: {x: -3, y: 0, z: 5.5} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 495562} m_RootOrder: 5 @@ -1011,6 +1028,7 @@ Transform: m_LocalRotation: {x: -0.000000057601167, y: -0.7071068, z: 0.000000057601167, w: 0.7071068} m_LocalPosition: {x: 0.007, y: 1.947, z: -3.239} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 450098} m_RootOrder: 3 @@ -1056,6 +1074,7 @@ Transform: m_LocalRotation: {x: 0, y: 0.3826835, z: 0, w: 0.92387956} m_LocalPosition: {x: -17.6, y: 15, z: -18} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 495562} m_RootOrder: 1 @@ -1100,6 +1119,7 @@ Transform: m_LocalRotation: {x: 0, y: -0.71320504, z: 0, w: 0.7009555} m_LocalPosition: {x: 0.52, y: 1.1403, z: 0.55} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 474944} m_RootOrder: 0 @@ -1144,6 +1164,7 @@ Transform: m_LocalRotation: {x: 0, y: 0.99950045, z: 0, w: 0.031606615} m_LocalPosition: {x: 1.276696, y: 0.82506, z: -1.6618674} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 493074} m_RootOrder: 1 @@ -1189,6 +1210,7 @@ Transform: 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: 413574} m_RootOrder: 2 @@ -1272,6 +1294,7 @@ Transform: m_LocalRotation: {x: 0.048352122, y: 0.38215902, z: -0.020028107, w: 0.9226134} m_LocalPosition: {x: 28.35, y: 0, z: 5.4} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 495562} m_RootOrder: 9 @@ -1385,6 +1408,7 @@ Transform: m_LocalRotation: {x: 0, y: 0.70710635, z: 0, w: 0.7071073} m_LocalPosition: {x: 0.887669, y: 14.987, z: -27.112844} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 413574} m_RootOrder: 1 @@ -1676,6 +1700,7 @@ Transform: m_LocalRotation: {x: -0.000000080965215, y: -0.3762324, z: 0.000000008967829, w: 0.92652535} m_LocalPosition: {x: 0.6489084, y: -0.21199329, z: 1.2470189} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 487010} m_RootOrder: 2 @@ -1722,6 +1747,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 13, y: 0.03, z: -3} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 402094} - {fileID: 459910} @@ -1784,7 +1810,7 @@ MeshRenderer: m_AdditionalVertexStreams: {fileID: 0} --- !u!95 &9545848 Animator: - serializedVersion: 3 + serializedVersion: 4 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -1797,6 +1823,7 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 1 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 @@ -1828,6 +1855,7 @@ Transform: m_LocalRotation: {x: 0, y: 0.9146616, z: 0, w: 0.40422058} m_LocalPosition: {x: 1.6914383, y: 1.143, z: 2.7112548} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 493074} m_RootOrder: 4 @@ -1873,6 +1901,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -24.41047, y: 0, z: -24.377798} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 411924} m_RootOrder: 0 @@ -1954,6 +1983,7 @@ Transform: m_LocalRotation: {x: 0.0006263483, y: 0.3441477, z: -0.0025832276, w: 0.9389118} m_LocalPosition: {x: -0.88208, y: 0.46949, z: 1.2933} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 417662} m_RootOrder: 2 @@ -1998,6 +2028,7 @@ Transform: m_LocalRotation: {x: 0, y: -0.7132048, z: 0, w: 0.7009558} m_LocalPosition: {x: 1.44, y: 0.088614, z: 1.41} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 474944} m_RootOrder: 1 @@ -2043,6 +2074,7 @@ Transform: m_LocalRotation: {x: 0, y: 0.3826835, z: 0, w: -0.9238795} m_LocalPosition: {x: 17.5, y: 15, z: -17.5} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 495562} m_RootOrder: 0 @@ -2087,6 +2119,7 @@ Transform: m_LocalRotation: {x: -0, y: -0.15626194, z: 0, w: 0.98771566} m_LocalPosition: {x: 1.5784, y: 0, z: 0.49293} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 451588} m_RootOrder: 3 @@ -2131,6 +2164,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.32199955, y: 0, z: 0.3579998} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 410184} m_RootOrder: 0 @@ -2176,6 +2210,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 21, y: 0, z: 3.3} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 435136} - {fileID: 464722} @@ -2261,6 +2296,7 @@ Transform: m_LocalRotation: {x: 0, y: 0.7579663, z: 0, w: 0.6522938} m_LocalPosition: {x: 0.13818955, y: 1.143, z: 3.1276364} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 493074} m_RootOrder: 5 @@ -2305,6 +2341,7 @@ Transform: m_LocalRotation: {x: -0.000000057601167, y: -0.7071068, z: 0.000000057601167, w: 0.7071068} m_LocalPosition: {x: -3.237, y: 1.9474, z: -0.002} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 450098} m_RootOrder: 2 @@ -2351,6 +2388,7 @@ Transform: m_LocalRotation: {x: 0, y: 0.9914449, z: 0, w: 0.130526} m_LocalPosition: {x: -15.75, y: 0, z: -1.85} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 426076} - {fileID: 421964} @@ -2434,6 +2472,7 @@ Transform: m_LocalRotation: {x: -0.0004249906, y: 0.6717409, z: 0.00041580238, w: 0.740786} m_LocalPosition: {x: 0.6562799, y: -0.21199366, z: -1.1401823} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 487010} m_RootOrder: 1 @@ -2479,6 +2518,7 @@ Transform: m_LocalRotation: {x: 0, y: -0.38268334, z: 0, w: 0.92387956} m_LocalPosition: {x: -0.2, y: 0, z: 35.4} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 498982} - {fileID: 476038} @@ -2563,6 +2603,7 @@ Transform: m_LocalRotation: {x: 0, y: 0.4718639, z: 0, w: 0.8816714} m_LocalPosition: {x: 1.314, y: 0.60528, z: -2.1787} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 403060} m_RootOrder: 0 @@ -2607,6 +2648,7 @@ Transform: m_LocalRotation: {x: 0, y: 0.99539435, z: 0, w: -0.095865175} m_LocalPosition: {x: 2.8839662, y: 1.143, z: 0.18214273} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 493074} m_RootOrder: 2 @@ -2655,6 +2697,7 @@ Transform: m_LocalRotation: {x: 0, y: 0.3826835, z: 0, w: 0.92387956} m_LocalPosition: {x: 4.3, y: 0, z: 25} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 495562} m_RootOrder: 10 @@ -2778,6 +2821,7 @@ Transform: m_LocalRotation: {x: 0.00000008068918, y: 0.1372725, z: 0.000000011182265, w: 0.99053335} m_LocalPosition: {x: -5.48, y: 0.212, z: -21.53} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 408118} - {fileID: 447054} @@ -2837,7 +2881,7 @@ MeshRenderer: m_AdditionalVertexStreams: {fileID: 0} --- !u!95 &9521172 Animator: - serializedVersion: 3 + serializedVersion: 4 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -2850,6 +2894,7 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 @@ -2881,6 +2926,7 @@ Transform: m_LocalRotation: {x: 0, y: 0.70661974, z: 0, w: 0.70759356} m_LocalPosition: {x: 0.32166278, y: 0.82506, z: 2.4051168} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 478000} m_RootOrder: 0 @@ -2925,6 +2971,7 @@ Transform: m_LocalRotation: {x: 0, y: 0.16916445, z: 0, w: 0.98558784} m_LocalPosition: {x: -3.9169, y: 0.82506, z: -2.3661} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 478000} m_RootOrder: 2 @@ -2969,6 +3016,7 @@ Transform: m_LocalRotation: {x: -0.05097259, y: 0.16044623, z: -0.30680922, w: 0.9367641} m_LocalPosition: {x: -1.616, y: 1.2185, z: -0.16138} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 417662} m_RootOrder: 3 @@ -3013,6 +3061,7 @@ Transform: m_LocalRotation: {x: 0.0016751704, y: -0.092338376, z: -0.0020635158, w: 0.99572414} m_LocalPosition: {x: 0.89954, y: 0.84134, z: -1.1988} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 417662} m_RootOrder: 0 @@ -3057,6 +3106,7 @@ Transform: m_LocalRotation: {x: 0, y: 0.9981173, z: 0, w: 0.06133443} m_LocalPosition: {x: 2.7687528, y: 1.143, z: 1.5227846} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 493074} m_RootOrder: 3 @@ -3085,7 +3135,7 @@ GameObject: - component: {fileID: 495562} m_Layer: 7 m_Name: Environment - m_TagString: Untagged + m_TagString: WeaponUpgrade m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 4294967295 @@ -3100,6 +3150,7 @@ Transform: 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: 410292} - {fileID: 441198} @@ -3149,6 +3200,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -24.41047, y: 0, z: -24.377798} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 411924} m_RootOrder: 2 @@ -3230,6 +3282,7 @@ Transform: m_LocalRotation: {x: -0.000000057601167, y: -0.7071068, z: 0.000000057601167, w: 0.7071068} m_LocalPosition: {x: 0.004, y: 1.947, z: 3.238} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 450098} m_RootOrder: 1 @@ -3278,6 +3331,7 @@ Transform: m_LocalRotation: {x: 0.89406, y: 0.000000079651045, z: 0.44794723, w: -0.0000001421227} m_LocalPosition: {x: 8.255001, y: 1.861, z: 7.9990005} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 495562} m_RootOrder: 12 @@ -3334,7 +3388,7 @@ MeshRenderer: m_AdditionalVertexStreams: {fileID: 0} --- !u!95 &9530364 Animator: - serializedVersion: 3 + serializedVersion: 4 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -3347,6 +3401,7 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 @@ -3391,6 +3446,7 @@ Transform: m_LocalRotation: {x: 0, y: 0.38877627, z: 0, w: 0.92133224} m_LocalPosition: {x: -1.4012383, y: 0.82506, z: 3.2302258} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 478000} m_RootOrder: 3 @@ -3435,6 +3491,7 @@ Transform: m_LocalRotation: {x: 0.0010841554, y: 0.16834535, z: -0.002427002, w: 0.9857245} m_LocalPosition: {x: -0.95181, y: 0.84134, z: -0.39239} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 417662} m_RootOrder: 1 @@ -3479,6 +3536,7 @@ Transform: m_LocalRotation: {x: -0.000000013660885, y: -0.15626231, z: 0.00000008634884, w: 0.9877156} m_LocalPosition: {x: 1.9444, y: 0, z: 0.49293} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 451588} m_RootOrder: 2 @@ -3524,6 +3582,7 @@ Transform: m_LocalRotation: {x: 0, y: 0.46174863, z: 0, w: 0.8870109} m_LocalPosition: {x: 5.5, y: 0, z: -14.25} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 425244} - {fileID: 447950} diff --git a/Assets/Prefabs/Faster.prefab b/Assets/Prefabs/Faster.prefab new file mode 100644 index 0000000000000000000000000000000000000000..ee6fe1c77ba70941904759efc5b7faa492623dc0 --- /dev/null +++ b/Assets/Prefabs/Faster.prefab @@ -0,0 +1,131 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &7098508659203559947 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7098508659203559951} + - component: {fileID: 7098508659203559948} + - component: {fileID: 7098508659203559949} + - component: {fileID: 7098508659203559946} + - component: {fileID: 7098508659203559950} + - component: {fileID: 7098508659203559937} + m_Layer: 0 + m_Name: Faster + m_TagString: WeaponUpgrade + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7098508659203559951 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7098508659203559947} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -6.71, y: 0.52, z: 2.88} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &7098508659203559948 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7098508659203559947} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &7098508659203559949 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7098508659203559947} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + 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: 0e4a927a9d437f647a4eee51dfb89149, 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!65 &7098508659203559946 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7098508659203559947} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!54 &7098508659203559950 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7098508659203559947} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 126 + m_CollisionDetection: 0 +--- !u!114 &7098508659203559937 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7098508659203559947} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7f1cacb25cfc8344b9027095e499589d, type: 3} + m_Name: + m_EditorClassIdentifier: + val: 1 + type: Faster diff --git a/Assets/Prefabs/Faster.prefab.meta b/Assets/Prefabs/Faster.prefab.meta new file mode 100644 index 0000000000000000000000000000000000000000..0b8eb007cbdba06a761c2bc33e1611f511fa950e --- /dev/null +++ b/Assets/Prefabs/Faster.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: a06a8bdf200ebee41b3eb2149a104812 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/HealthOrb.prefab b/Assets/Prefabs/HealthOrb.prefab new file mode 100644 index 0000000000000000000000000000000000000000..2bb81d05bb64562b9e4e77e3d2a9ad4a751a15ac --- /dev/null +++ b/Assets/Prefabs/HealthOrb.prefab @@ -0,0 +1,131 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &8864378202963438693 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8864378202963438689} + - component: {fileID: 8864378202963438688} + - component: {fileID: 8864378202963438695} + - component: {fileID: 8864378202963438694} + - component: {fileID: 8864378202963438690} + - component: {fileID: 8864378202963438691} + m_Layer: 0 + m_Name: HealthOrb + m_TagString: PowerUp + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8864378202963438689 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8864378202963438693} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -6.0968103, y: -1.39, z: 0.9399986} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &8864378202963438688 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8864378202963438693} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &8864378202963438695 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8864378202963438693} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + 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: 16f5385b554360143b3e5658197d2e4b, 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!135 &8864378202963438694 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8864378202963438693} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.5 + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &8864378202963438690 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8864378202963438693} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7dbce9f6c122aca4a8659c1c7af8c411, type: 3} + m_Name: + m_EditorClassIdentifier: + val: 1 + type: Health +--- !u!54 &8864378202963438691 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8864378202963438693} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 126 + m_CollisionDetection: 0 diff --git a/Assets/Prefabs/HealthOrb.prefab.meta b/Assets/Prefabs/HealthOrb.prefab.meta new file mode 100644 index 0000000000000000000000000000000000000000..88899d26e534f574af27cf013fc3ffcb7684d542 --- /dev/null +++ b/Assets/Prefabs/HealthOrb.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 0cbabac36bc114441900d4c11dd140a1 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/PowerOrb.prefab b/Assets/Prefabs/PowerOrb.prefab new file mode 100644 index 0000000000000000000000000000000000000000..7c7325dea582c465965bbf9970c8b31a7475bc37 --- /dev/null +++ b/Assets/Prefabs/PowerOrb.prefab @@ -0,0 +1,131 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1887259071801809024 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1887259071801809031} + - component: {fileID: 1887259071801809028} + - component: {fileID: 1887259071801809029} + - component: {fileID: 1887259071801809026} + - component: {fileID: 1887259071801809030} + - component: {fileID: 1887259071801809033} + m_Layer: 0 + m_Name: PowerOrb + m_TagString: PowerUp + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1887259071801809031 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1887259071801809024} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -5.2300005, y: -1.07, z: -0.88000107} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &1887259071801809028 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1887259071801809024} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &1887259071801809029 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1887259071801809024} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + 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: 6b5c24d7a55839944bc4415eb3395d10, 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!135 &1887259071801809026 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1887259071801809024} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.5 + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &1887259071801809030 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1887259071801809024} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7dbce9f6c122aca4a8659c1c7af8c411, type: 3} + m_Name: + m_EditorClassIdentifier: + val: 1 + type: Power +--- !u!54 &1887259071801809033 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1887259071801809024} + serializedVersion: 2 + m_Mass: 0.0000001 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 126 + m_CollisionDetection: 0 diff --git a/Assets/Prefabs/PowerOrb.prefab.meta b/Assets/Prefabs/PowerOrb.prefab.meta new file mode 100644 index 0000000000000000000000000000000000000000..aaa16902e0f1924ba0e7f170f1fbd7683c38bf19 --- /dev/null +++ b/Assets/Prefabs/PowerOrb.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 66381b31b9c3aea42948f9c82a0fcd3e +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/SpeedOrb.prefab b/Assets/Prefabs/SpeedOrb.prefab new file mode 100644 index 0000000000000000000000000000000000000000..0101f83b8d2302b13eddf763f99137b092b03d1d --- /dev/null +++ b/Assets/Prefabs/SpeedOrb.prefab @@ -0,0 +1,131 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &3626280443058068815 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3626280443058068811} + - component: {fileID: 3626280443058068808} + - component: {fileID: 3626280443058068809} + - component: {fileID: 3626280443058068814} + - component: {fileID: 3626280443058068810} + - component: {fileID: 3626280443058068805} + m_Layer: 0 + m_Name: SpeedOrb + m_TagString: PowerUp + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3626280443058068811 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3626280443058068815} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -8.510001, y: -1.22, z: -0.9858322} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &3626280443058068808 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3626280443058068815} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &3626280443058068809 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3626280443058068815} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + 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: ddd1fa8f3ace08d4fbf61019ce2dba64, 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!135 &3626280443058068814 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3626280443058068815} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.5 + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &3626280443058068810 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3626280443058068815} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7dbce9f6c122aca4a8659c1c7af8c411, type: 3} + m_Name: + m_EditorClassIdentifier: + val: 1 + type: Speed +--- !u!54 &3626280443058068805 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3626280443058068815} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 126 + m_CollisionDetection: 0 diff --git a/Assets/Prefabs/SpeedOrb.prefab.meta b/Assets/Prefabs/SpeedOrb.prefab.meta new file mode 100644 index 0000000000000000000000000000000000000000..3057b5c7b80e4c3745490df98454ce8adbe9be0c --- /dev/null +++ b/Assets/Prefabs/SpeedOrb.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 2368f8be96d23874a9ddfe4dd65097bc +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Level_01.unity b/Assets/Scenes/Level_01.unity index d70737a048d8643763de622dce865a5abb3cedf7..28077bd07d04b89aa82bbdb47adbbf1f28bd66aa 100644 --- a/Assets/Scenes/Level_01.unity +++ b/Assets/Scenes/Level_01.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.45061505, g: 0.498609, b: 0.56437516, a: 1} + m_IndirectSpecularColor: {r: 0.4506148, g: 0.49860865, b: 0.56437486, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -155,6 +155,8 @@ MonoBehaviour: m_EditorClassIdentifier: playerHealth: {fileID: 1509913240} spawnTime: 3 + Diagonal: {fileID: 0} + Speed: {fileID: 0} totalWeight: 0 isZenMode: 0 weightPerLevel: 10 @@ -169,6 +171,7 @@ Transform: 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: 0} m_RootOrder: 8 @@ -224,6 +227,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 10.9, y: 0, z: -13.45} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 13 @@ -278,6 +282,7 @@ Transform: m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 100, y: 100, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 3 @@ -314,6 +319,7 @@ Transform: 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: 114823662} m_RootOrder: 0 @@ -543,139 +549,11 @@ Transform: 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: 114823662} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &339259349 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 339259355} - - component: {fileID: 339259354} - - component: {fileID: 339259353} - - component: {fileID: 339259352} - - component: {fileID: 339259351} - - component: {fileID: 339259350} - m_Layer: 0 - m_Name: Diagonal (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &339259350 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 339259349} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7f1cacb25cfc8344b9027095e499589d, type: 3} - m_Name: - m_EditorClassIdentifier: - playershooting: {fileID: 0} - val: 1 - type: Diagonal ---- !u!54 &339259351 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 339259349} - serializedVersion: 2 - m_Mass: 1 - m_Drag: 0 - m_AngularDrag: 0.05 - m_UseGravity: 1 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 126 - m_CollisionDetection: 0 ---- !u!65 &339259352 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 339259349} - m_Material: {fileID: 0} - m_IsTrigger: 1 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!23 &339259353 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 339259349} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - 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: 842fa233f73b3384fbdf79e46d8d73ea, 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 &339259354 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 339259349} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!4 &339259355 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 339259349} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -6.71, y: 0.52, z: 7.13} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 17 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &348062983 PrefabInstance: m_ObjectHideFlags: 0 @@ -832,6 +710,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1628631203} - {fileID: 1355904404} @@ -852,7 +731,7 @@ RectTransform: m_Pivot: {x: 0, y: 0} --- !u!95 &360206200 Animator: - serializedVersion: 3 + serializedVersion: 4 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -865,6 +744,7 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 @@ -949,6 +829,7 @@ Transform: m_LocalRotation: {x: 0.2588191, y: 0, z: 0, w: 0.9659258} m_LocalPosition: {x: 1, y: 15, z: -22} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -978,6 +859,10 @@ PrefabInstance: propertyPath: m_Name value: Environment objectReference: {fileID: 0} + - target: {fileID: 186378, guid: 149d6dcc67e8d1240bbc0dd6ddf0c1bd, type: 3} + propertyPath: m_TagString + value: Untagged + objectReference: {fileID: 0} - target: {fileID: 495562, guid: 149d6dcc67e8d1240bbc0dd6ddf0c1bd, type: 3} propertyPath: m_RootOrder value: 1 @@ -1107,477 +992,108 @@ GameObject: - component: {fileID: 688119341} - component: {fileID: 688119340} - component: {fileID: 688119342} + - component: {fileID: 688119343} m_Layer: 0 m_Name: GameManager m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &688119340 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 688119339} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d9c9e0011c2ed97428a4efc03b455359, type: 3} - m_Name: - m_EditorClassIdentifier: - playerHealth: {fileID: 1509913240} - warningText: {fileID: 1086032144} - gameOverText: {fileID: 1888692063} - restartDelay: 5 - canvasAnimator: {fileID: 360206200} ---- !u!4 &688119341 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 688119339} - 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: [] - m_Father: {fileID: 0} - m_RootOrder: 12 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &688119342 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 688119339} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ddbd43c1967d75e49a768197e015804e, type: 3} - m_Name: - m_EditorClassIdentifier: - thirdCamera: {fileID: 438410090} - firstCamera: {fileID: 1234677074} - playerMovement: {fileID: 1509913239} - playerFPController: {fileID: 1509913251} ---- !u!1 &735472279 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 735472280} - m_Layer: 0 - m_Name: ZombearSpawnPoint - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &735472280 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 735472279} - m_LocalRotation: {x: 0, y: 0.8660254, z: -0, w: -0.5} - m_LocalPosition: {x: 22.5, y: 0, z: 15} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 10 - m_LocalEulerAnglesHint: {x: 0, y: 240, z: 0} ---- !u!1 &749927201 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 749927205} - - component: {fileID: 749927204} - - component: {fileID: 749927203} - - component: {fileID: 749927202} - - component: {fileID: 749927206} - - component: {fileID: 749927207} - m_Layer: 0 - m_Name: HealthOrb - m_TagString: PowerUp - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!135 &749927202 -SphereCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 749927201} - m_Material: {fileID: 0} - m_IsTrigger: 1 - m_Enabled: 1 - serializedVersion: 2 - m_Radius: 0.5 - m_Center: {x: 0, y: 0, z: 0} ---- !u!23 &749927203 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 749927201} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - 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: 16f5385b554360143b3e5658197d2e4b, 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 &749927204 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 749927201} - m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} ---- !u!4 &749927205 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 749927201} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -6.0968103, y: -1.39, z: 0.9399986} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 18 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &749927206 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 749927201} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7dbce9f6c122aca4a8659c1c7af8c411, type: 3} - m_Name: - m_EditorClassIdentifier: - playershooting: {fileID: 0} - val: 1 - type: Health ---- !u!54 &749927207 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 749927201} - serializedVersion: 2 - m_Mass: 1 - m_Drag: 0 - m_AngularDrag: 0.05 - m_UseGravity: 1 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 126 - m_CollisionDetection: 0 ---- !u!1 &793736712 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 793736716} - - component: {fileID: 793736715} - - component: {fileID: 793736714} - - component: {fileID: 793736713} - - component: {fileID: 793736717} - - component: {fileID: 793736718} - m_Layer: 0 - m_Name: Diagonal - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!65 &793736713 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 793736712} - m_Material: {fileID: 0} - m_IsTrigger: 1 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!23 &793736714 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 793736712} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - 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: 842fa233f73b3384fbdf79e46d8d73ea, 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 &793736715 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 793736712} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!4 &793736716 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 793736712} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -6.71, y: 0.52, z: 5.04} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 15 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!54 &793736717 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 793736712} - serializedVersion: 2 - m_Mass: 1 - m_Drag: 0 - m_AngularDrag: 0.05 - m_UseGravity: 1 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 126 - m_CollisionDetection: 0 ---- !u!114 &793736718 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 793736712} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7f1cacb25cfc8344b9027095e499589d, type: 3} - m_Name: - m_EditorClassIdentifier: - playershooting: {fileID: 0} - val: 1 - type: Diagonal ---- !u!1 &959090257 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 959090262} - - component: {fileID: 959090261} - - component: {fileID: 959090260} - - component: {fileID: 959090259} - - component: {fileID: 959090263} - - component: {fileID: 959090264} - m_Layer: 0 - m_Name: PowerOrb - m_TagString: PowerUp - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!135 &959090259 -SphereCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 959090257} - m_Material: {fileID: 0} - m_IsTrigger: 1 - m_Enabled: 1 - serializedVersion: 2 - m_Radius: 0.5 - m_Center: {x: 0, y: 0, z: 0} ---- !u!23 &959090260 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 959090257} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - 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: 6b5c24d7a55839944bc4415eb3395d10, 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 &959090261 -MeshFilter: + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &688119340 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 959090257} - m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} ---- !u!4 &959090262 + m_GameObject: {fileID: 688119339} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d9c9e0011c2ed97428a4efc03b455359, type: 3} + m_Name: + m_EditorClassIdentifier: + playerHealth: {fileID: 1509913240} + warningText: {fileID: 1086032144} + gameOverText: {fileID: 1888692063} + restartDelay: 5 + canvasAnimator: {fileID: 360206200} +--- !u!4 &688119341 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 959090257} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -5.2300005, y: -1.07, z: -0.88000107} + m_GameObject: {fileID: 688119339} + 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: 0} - m_RootOrder: 20 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &959090263 +--- !u!114 &688119342 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 959090257} + m_GameObject: {fileID: 688119339} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7dbce9f6c122aca4a8659c1c7af8c411, type: 3} + m_Script: {fileID: 11500000, guid: ddbd43c1967d75e49a768197e015804e, type: 3} m_Name: m_EditorClassIdentifier: - playershooting: {fileID: 114823662} - val: 1 - type: Power ---- !u!54 &959090264 -Rigidbody: + thirdCamera: {fileID: 438410090} + firstCamera: {fileID: 1234677074} + playerMovement: {fileID: 1509913239} + playerFPController: {fileID: 1509913251} +--- !u!114 &688119343 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 959090257} - serializedVersion: 2 - m_Mass: 0.0000001 - m_Drag: 0 - m_AngularDrag: 0.05 - m_UseGravity: 1 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 126 - m_CollisionDetection: 0 + m_GameObject: {fileID: 688119339} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 740d3c9da1af1ee49894f4e43fcfe767, type: 3} + m_Name: + m_EditorClassIdentifier: + Diagonal: {fileID: 5874108024064317340, guid: 43ce42d985e9f404e9463c2dac1b4649, type: 3} + Faster: {fileID: 7098508659203559947, guid: a06a8bdf200ebee41b3eb2149a104812, type: 3} + dropRate: 0.2 +--- !u!1 &735472279 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 735472280} + m_Layer: 0 + m_Name: ZombearSpawnPoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &735472280 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 735472279} + m_LocalRotation: {x: 0, y: 0.8660254, z: -0, w: -0.5} + m_LocalPosition: {x: 22.5, y: 0, z: 15} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 10 + m_LocalEulerAnglesHint: {x: 0, y: 240, z: 0} --- !u!1 &965512402 GameObject: m_ObjectHideFlags: 0 @@ -1701,6 +1217,7 @@ Transform: 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: 0} m_RootOrder: 4 @@ -1731,6 +1248,7 @@ Transform: m_LocalRotation: {x: 0, y: 0.9063079, z: -0, w: -0.42261827} m_LocalPosition: {x: 0, y: 0, z: 32} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 11 @@ -1763,6 +1281,7 @@ RectTransform: 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: 360206199} m_RootOrder: 4 @@ -1843,6 +1362,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.2, y: 0.697, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1509913241} m_RootOrder: 3 @@ -1940,6 +1460,7 @@ RectTransform: 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: 360206199} m_RootOrder: 1 @@ -1987,135 +1508,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1355904403} m_CullTransparentMesh: 1 ---- !u!1 &1400821698 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1400821702} - - component: {fileID: 1400821701} - - component: {fileID: 1400821700} - - component: {fileID: 1400821699} - - component: {fileID: 1400821703} - - component: {fileID: 1400821704} - m_Layer: 0 - m_Name: Faster - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!65 &1400821699 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1400821698} - m_Material: {fileID: 0} - m_IsTrigger: 1 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!23 &1400821700 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1400821698} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - 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: 0e4a927a9d437f647a4eee51dfb89149, 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 &1400821701 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1400821698} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!4 &1400821702 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1400821698} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -6.71, y: 0.52, z: 2.88} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 16 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!54 &1400821703 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1400821698} - serializedVersion: 2 - m_Mass: 1 - m_Drag: 0 - m_AngularDrag: 0.05 - m_UseGravity: 1 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 126 - m_CollisionDetection: 0 ---- !u!114 &1400821704 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1400821698} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7f1cacb25cfc8344b9027095e499589d, type: 3} - m_Name: - m_EditorClassIdentifier: - playershooting: {fileID: 0} - val: 1 - type: Faster --- !u!1 &1406103759 GameObject: m_ObjectHideFlags: 0 @@ -2145,6 +1537,7 @@ RectTransform: 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: 360206199} m_RootOrder: 3 @@ -2238,6 +1631,7 @@ RectTransform: 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: 360206199} m_RootOrder: 6 @@ -2315,6 +1709,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -16.6, y: 0, z: -5.59} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 14 @@ -2660,6 +2055,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_RenderMode: 0 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0 m_MaxParticleSize: 1 @@ -2683,6 +2079,10 @@ ParticleSystemRenderer: m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} + m_MeshWeighting: 1 + m_MeshWeighting1: 1 + m_MeshWeighting2: 1 + m_MeshWeighting3: 1 m_MaskInteraction: 0 --- !u!198 &1509913244 ParticleSystem: @@ -7937,6 +7337,7 @@ Transform: 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: 114823662} m_RootOrder: 2 @@ -7969,6 +7370,7 @@ RectTransform: 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: 360206199} m_RootOrder: 0 @@ -8016,135 +7418,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1628631202} m_CullTransparentMesh: 1 ---- !u!1 &1763419506 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1763419510} - - component: {fileID: 1763419509} - - component: {fileID: 1763419508} - - component: {fileID: 1763419507} - - component: {fileID: 1763419511} - - component: {fileID: 1763419512} - m_Layer: 0 - m_Name: SpeedOrb - m_TagString: PowerUp - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!135 &1763419507 -SphereCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1763419506} - m_Material: {fileID: 0} - m_IsTrigger: 1 - m_Enabled: 1 - serializedVersion: 2 - m_Radius: 0.5 - m_Center: {x: 0, y: 0, z: 0} ---- !u!23 &1763419508 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1763419506} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - 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: ddd1fa8f3ace08d4fbf61019ce2dba64, 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 &1763419509 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1763419506} - m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} ---- !u!4 &1763419510 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1763419506} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -8.510001, y: -1.22, z: -0.9858322} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 19 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1763419511 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1763419506} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7dbce9f6c122aca4a8659c1c7af8c411, type: 3} - m_Name: - m_EditorClassIdentifier: - playershooting: {fileID: 0} - val: 1 - type: Speed ---- !u!54 &1763419512 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1763419506} - serializedVersion: 2 - m_Mass: 1 - m_Drag: 0 - m_AngularDrag: 0.05 - m_UseGravity: 1 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 126 - m_CollisionDetection: 0 --- !u!1 &1764335589 GameObject: m_ObjectHideFlags: 0 @@ -8172,6 +7445,7 @@ Transform: 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: 114823662} m_RootOrder: 1 @@ -8303,6 +7577,7 @@ RectTransform: 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: 360206199} m_RootOrder: 7 @@ -8382,6 +7657,7 @@ RectTransform: 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: 360206199} m_RootOrder: 2 @@ -8462,9 +7738,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0632086a44af40646adb4a17172115b6, type: 3} m_Name: m_EditorClassIdentifier: - PowerOrb: {fileID: 959090257} - SpeedOrb: {fileID: 1763419506} - HealthOrb: {fileID: 749927201} + PowerOrb: {fileID: 1887259071801809024, guid: 66381b31b9c3aea42948f9c82a0fcd3e, type: 3} + SpeedOrb: {fileID: 3626280443058068815, guid: 2368f8be96d23874a9ddfe4dd65097bc, type: 3} + HealthOrb: {fileID: 8864378202963438693, guid: 0cbabac36bc114441900d4c11dd140a1, type: 3} xPos: 0 zPos: 0 orbType: 0 @@ -8478,9 +7754,10 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 13.871423, y: 2.643187, z: 33.03375} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 21 + m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2037564801 GameObject: @@ -8510,6 +7787,7 @@ RectTransform: 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: 360206199} m_RootOrder: 5 @@ -8587,6 +7865,7 @@ Transform: m_LocalRotation: {x: 0, y: 0.9063079, z: 0, w: 0.42261827} m_LocalPosition: {x: -20.5, y: 0, z: 12.5} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 9 @@ -8620,6 +7899,7 @@ RectTransform: 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: 360206199} m_RootOrder: 8 @@ -8747,6 +8027,7 @@ Transform: 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: 0} m_RootOrder: 7 diff --git a/Assets/Scripts/Managers/EnemyManager.cs b/Assets/Scripts/Managers/EnemyManager.cs index e9a8f64ce3492ad305516b4cfc644d871c26d3b6..cd11ada409c6ab0997c05579e7b5527907558469 100644 --- a/Assets/Scripts/Managers/EnemyManager.cs +++ b/Assets/Scripts/Managers/EnemyManager.cs @@ -1,10 +1,14 @@ using UnityEngine; +using System.Collections; public class EnemyManager : MonoBehaviour { public PlayerHealth playerHealth; public float spawnTime = 3f; + public GameObject Diagonal; + public GameObject Speed; + public int totalWeight; public static int remainingEnemies = 0; public static int remainingWeight; @@ -23,6 +27,8 @@ public class EnemyManager : MonoBehaviour if (isZenMode) { InvokeRepeating("Spawn", spawnTime, spawnTime); + InvokeRepeating("Spawn", spawnTime, spawnTime); + } else { @@ -33,6 +39,8 @@ public class EnemyManager : MonoBehaviour } + + void Update() { if (playerHealth.isDead) { return; } diff --git a/Assets/WeaponManager.cs b/Assets/WeaponManager.cs new file mode 100644 index 0000000000000000000000000000000000000000..82775497c26eaf0e620b7f50b6d38e2939915b1d --- /dev/null +++ b/Assets/WeaponManager.cs @@ -0,0 +1,36 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class WeaponManager : MonoBehaviour +{ + // Start is called before the first frame update + public GameObject Diagonal; + public GameObject Faster; + + public float dropRate = 0.1f; + float timeToDrop = 10; + + void Start() + { + } + + void WeaponUpgrade(){ + var diagonalUpgrade = Instantiate(Diagonal, new Vector3(-10, 0.6f, 0), Quaternion.identity); + var fasterUpgrade = Instantiate(Faster, new Vector3(0, 0.6f, 0), Quaternion.identity); + + Destroy(diagonalUpgrade, 12f); + Destroy(fasterUpgrade, 12f); + + + + + } + + void Update(){ + if(Time.time >= timeToDrop){ + timeToDrop += 1 / dropRate ; + WeaponUpgrade(); + } + } +} diff --git a/Assets/WeaponManager.cs.meta b/Assets/WeaponManager.cs.meta new file mode 100644 index 0000000000000000000000000000000000000000..90c3d789d5ec45d35488f91592516eb73a53d5e4 --- /dev/null +++ b/Assets/WeaponManager.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 740d3c9da1af1ee49894f4e43fcfe767 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/WeaponOrb.cs b/Assets/WeaponOrb.cs index 796ca8b34aad828526043ec17197bedc0270a44d..96f2cc5810586890184e7c60268e7c3775480615 100644 --- a/Assets/WeaponOrb.cs +++ b/Assets/WeaponOrb.cs @@ -4,9 +4,9 @@ using UnityEngine; public class WeaponOrb : MonoBehaviour { - public Transform playershooting; public int val = 1; public string type = "Direction"; + public GameObject[] Upgrades; void OnTriggerEnter (Collider other){ if(other.tag == "Player" && other.GetType().Name != "SphereCollider" @@ -30,13 +30,22 @@ public class WeaponOrb : MonoBehaviour switch(type) { case "Faster": - playerShooting.timeBetweenBullets -= 0.03f; - break; + playerShooting.timeBetweenBullets -= 0.03f; + break; default: + if(playerShooting.gunDirectionLevel == 3){ + break; + } playerShooting.gunDirectionLevel += 1; break; } - Destroy(gameObject); + var upgrades = GameObject.FindGameObjectsWithTag("WeaponUpgrade"); + + foreach(var u in upgrades) + { + Destroy(u); + } + } } } diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index b9bf3e6e84db0817ead6049ca60c2b7e55610051..0d22176294fa898c1142c5cb23e62afaf2bfc516 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2021.1.16f1 -m_EditorVersionWithRevision: 2021.1.16f1 (5fa502fca597) +m_EditorVersion: 2021.2.18f1 +m_EditorVersionWithRevision: 2021.2.18f1 (0c6e675195cf) diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 0acfa6defe70fe8b22c87b82bc121b3cc6498588..7c253535492ca011a1cece435cb09f0cde6b51b2 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -6,6 +6,7 @@ TagManager: tags: - Enemy - PowerUp + - WeaponUpgrade layers: - Default - TransparentFX diff --git a/README.md b/README.md index 36546699482c4cfce185dc9b957d408c2c8a0e9e..61a443ee74cee55660b97191821f508f3c053e26 100644 --- a/README.md +++ b/README.md @@ -25,6 +25,13 @@ > - FPS Mode > Game ini menyediakan fps mode / first person. Cara player bergerak dan menyerang musuh akan berbeda dengan mode yang biasanya. +> - Zen Mode <br> +> Zen mode merupakan mode game dimana monster akan di-summon secara terus menerus setiap 3 detik. Pada mode ini player yang dapat bertahan paling lama akan memiliki score yang paling besar juga karena scoring system yang dipakai adalah berdasarkan waktu bertahan yang paling lama. + +> - Wave Mode <br> +> Wave mode merupakan mode game dengan 12 level dimana untuk memenangkannya, player harus membunuh semua monster pada setiap levelnya. Semakin tinggi levelnya, semakin banyak pula monster yang akan di-summon. Scoring system yang dipakai adalah score akan bertambah setiap ada monster yang mati (termasuk suicide attack). + + ### Library yang digunakan dan justifikasi penggunaannya. > - Semua Library yang digunakan merupakan bawaan dari UnityEngine seperti,