diff --git a/Assets/Animation/OrbAC.controller b/Assets/Animation/OrbAC.controller new file mode 100644 index 0000000000000000000000000000000000000000..0c7857bfe5157a3981e5724eea1b3b1368a8690d --- /dev/null +++ b/Assets/Animation/OrbAC.controller @@ -0,0 +1,12 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: OrbAC + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: [] diff --git a/Assets/Animation/OrbAC.controller.meta b/Assets/Animation/OrbAC.controller.meta new file mode 100644 index 0000000000000000000000000000000000000000..0363889b535eded78207432668dd1f8addb915da --- /dev/null +++ b/Assets/Animation/OrbAC.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6ca330494027360499ba25e42f9517ac +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/Orbs.meta b/Assets/Models/Orbs.meta new file mode 100644 index 0000000000000000000000000000000000000000..9faeb2bf925384a44c0c08b4c7e543ece28f0b48 --- /dev/null +++ b/Assets/Models/Orbs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b2b98d18040ca0e4b86976a21a8815b5 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/Orbs/New Material.mat b/Assets/Models/Orbs/New Material.mat new file mode 100644 index 0000000000000000000000000000000000000000..468515125c95f2772dcb2e67d0de84b41ef74ddd --- /dev/null +++ b/Assets/Models/Orbs/New Material.mat @@ -0,0 +1,78 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: New Material + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Models/Orbs/New Material.mat.meta b/Assets/Models/Orbs/New Material.mat.meta new file mode 100644 index 0000000000000000000000000000000000000000..21e7dd714c431e0fe532bf4ff6ef4b84c7136aa5 --- /dev/null +++ b/Assets/Models/Orbs/New Material.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0764e4aafb1382d42ac2525dcb01cbe3 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/Orbs/New Prefab.prefab b/Assets/Models/Orbs/New Prefab.prefab new file mode 100644 index 0000000000000000000000000000000000000000..5457e09e406ac3bc94231b4511bb0d8d915a8b3b --- /dev/null +++ b/Assets/Models/Orbs/New Prefab.prefab @@ -0,0 +1,32 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &913154556180306071 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1954601999220245212} + m_Layer: 0 + m_Name: New Prefab + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1954601999220245212 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 913154556180306071} + 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: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Models/Orbs/New Prefab.prefab.meta b/Assets/Models/Orbs/New Prefab.prefab.meta new file mode 100644 index 0000000000000000000000000000000000000000..61e8f1a4b26b6adb5115c995d33f2723f10440b5 --- /dev/null +++ b/Assets/Models/Orbs/New Prefab.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 26565627863666b48ad727d0d54dca8b +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/HealthOrb.prefab b/Assets/Prefabs/HealthOrb.prefab new file mode 100644 index 0000000000000000000000000000000000000000..ffc43edb7a0848c352feb7578b40fe97f37d3c7d --- /dev/null +++ b/Assets/Prefabs/HealthOrb.prefab @@ -0,0 +1,111 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &3588158734157641117 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3588158734157641114} + - component: {fileID: 3588158734157641115} + - component: {fileID: 3588158734157641116} + - component: {fileID: 3588158734157641112} + - component: {fileID: 3588158734157641113} + m_Layer: 0 + m_Name: HealthOrb + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3588158734157641114 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3588158734157641117} + m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068} + m_LocalPosition: {x: 4.5378504, y: -19.56922, z: -5.845105} + m_LocalScale: {x: 0.6, y: 0.6, z: 0.6} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} +--- !u!33 &3588158734157641115 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3588158734157641117} + m_Mesh: {fileID: 4300000, guid: 4f949ae83a043c64d9ee5d95fc9db193, type: 3} +--- !u!23 &3588158734157641116 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3588158734157641117} + 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: d6e7475a477721949a7fa2353ffb7e32, 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 &3588158734157641112 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3588158734157641117} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0.00000047683716, y: 0.00000015894568, z: 0.4968002} +--- !u!114 &3588158734157641113 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3588158734157641117} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 39ad8853be2e19d4080a73025c8ddaef, type: 3} + m_Name: + m_EditorClassIdentifier: + healthCure: 50 diff --git a/Assets/Prefabs/HealthOrb.prefab.meta b/Assets/Prefabs/HealthOrb.prefab.meta new file mode 100644 index 0000000000000000000000000000000000000000..58d60c41155a00e22a6c20cb38740b66100232e4 --- /dev/null +++ b/Assets/Prefabs/HealthOrb.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: aac30ada60983c94f83013fdcb907e50 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/PowerOrb.prefab b/Assets/Prefabs/PowerOrb.prefab new file mode 100644 index 0000000000000000000000000000000000000000..0b4636b101b74d13516599f246728de9f52ee3f5 --- /dev/null +++ b/Assets/Prefabs/PowerOrb.prefab @@ -0,0 +1,112 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &7353495639285174077 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7353495639285174066} + - component: {fileID: 7353495639285174067} + - component: {fileID: 7353495639285174076} + - component: {fileID: 7353495639285174064} + - component: {fileID: 7353495639285174065} + m_Layer: 0 + m_Name: PowerOrb + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 4294967295 + m_IsActive: 1 +--- !u!4 &7353495639285174066 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7353495639285174077} + m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068} + m_LocalPosition: {x: 11.53785, y: -19.56922, z: -6.8451056} + m_LocalScale: {x: 0.6, y: 0.6, z: 0.6} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} +--- !u!33 &7353495639285174067 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7353495639285174077} + m_Mesh: {fileID: 4300000, guid: 4f949ae83a043c64d9ee5d95fc9db193, type: 3} +--- !u!23 &7353495639285174076 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7353495639285174077} + 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: 2d4eb4632ff89504084de124ceedf2e4, 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 &7353495639285174064 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7353495639285174077} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: -0.00000047683716, y: -0.00000023841858, z: 0.49680042} +--- !u!114 &7353495639285174065 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7353495639285174077} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: da5499760b621854fac5236da702366e, type: 3} + m_Name: + m_EditorClassIdentifier: + powerBoost: 10 + gunBarrelEnd: {fileID: 0} diff --git a/Assets/Prefabs/PowerOrb.prefab.meta b/Assets/Prefabs/PowerOrb.prefab.meta new file mode 100644 index 0000000000000000000000000000000000000000..a46f0916d3089a53bde5abef489048898b76cd1a --- /dev/null +++ b/Assets/Prefabs/PowerOrb.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: c478d71c94921504b87784c7c4bcd502 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/SpeedOrb.prefab b/Assets/Prefabs/SpeedOrb.prefab new file mode 100644 index 0000000000000000000000000000000000000000..ae90a20f92ce1b97ba5e69a4b502bbd7a5e12983 --- /dev/null +++ b/Assets/Prefabs/SpeedOrb.prefab @@ -0,0 +1,111 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &7252448724166215845 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7252448724166215842} + - component: {fileID: 7252448724166215840} + - component: {fileID: 7252448724166215854} + - component: {fileID: 7252448724166215841} + - component: {fileID: 7252448724166215843} + m_Layer: 0 + m_Name: SpeedOrb + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 4294967295 + m_IsActive: 1 +--- !u!4 &7252448724166215842 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7252448724166215845} + m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068} + m_LocalPosition: {x: 12.53785, y: -19.56922, z: -6.8451056} + m_LocalScale: {x: 0.6, y: 0.6, z: 0.6} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} +--- !u!33 &7252448724166215840 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7252448724166215845} + m_Mesh: {fileID: 4300000, guid: 4f949ae83a043c64d9ee5d95fc9db193, type: 3} +--- !u!23 &7252448724166215854 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7252448724166215845} + 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: 4a2abd4f67aefc24b9c6cca2d197adc7, 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 &7252448724166215841 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7252448724166215845} + 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.00000023841858, z: 0.49680042} +--- !u!114 &7252448724166215843 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7252448724166215845} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 25e33eef9297dc24ab9a136afd537c2f, type: 3} + m_Name: + m_EditorClassIdentifier: + speedBoost: 1 diff --git a/Assets/Prefabs/SpeedOrb.prefab.meta b/Assets/Prefabs/SpeedOrb.prefab.meta new file mode 100644 index 0000000000000000000000000000000000000000..60a91d58819e09b8468cde8ea5956050eaf6a7e3 --- /dev/null +++ b/Assets/Prefabs/SpeedOrb.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 06b4fbcb61c53594badc59c1024eb8c2 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Level_01.unity b/Assets/Scenes/Level_01.unity index a16e570121ea2fb7750a842c4abc9f107b7f113e..2fe968daca545ddd32bcaeefa0b81ac36e6f28f9 100644 --- a/Assets/Scenes/Level_01.unity +++ b/Assets/Scenes/Level_01.unity @@ -7216,6 +7216,54 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1957751209 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1957751211} + - component: {fileID: 1957751210} + m_Layer: 0 + m_Name: GameObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1957751210 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1957751209} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a9f9ebf32259aa14f895d743e7dfb90e, type: 3} + m_Name: + m_EditorClassIdentifier: + orbPrefab: {fileID: 100000, guid: 9f185e9167e4f99489912e1b6d9899bf, type: 3} + respawnTime: 5 + spawnAudio: {fileID: 1735167570} + center: {x: 0, y: 0, z: 0} + size: {x: 10, y: 10, z: 10} +--- !u!4 &1957751211 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1957751209} + 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: 14 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1982076066 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Orbs/HealthOrb.cs b/Assets/Scripts/Orbs/HealthOrb.cs index 49edb809a3b1bb081ccbc3b8bd1095ed1ecccf67..33038cd441639425eae0c208a1b0f68549965b18 100644 --- a/Assets/Scripts/Orbs/HealthOrb.cs +++ b/Assets/Scripts/Orbs/HealthOrb.cs @@ -13,7 +13,7 @@ public class HealthOrb : MonoBehaviour if (other.gameObject == player && other.isTrigger == false){ PlayerHealth playerHealth = other.GetComponent<PlayerHealth>(); playerHealth.TakeCure(healthCure); - gameObject.SetActive(false); + Destroy(gameObject, 0f); } } } diff --git a/Assets/Scripts/Orbs/PowerOrb.cs b/Assets/Scripts/Orbs/PowerOrb.cs new file mode 100644 index 0000000000000000000000000000000000000000..1129f3a1e16a4c2cd60f2c52d965a8897ff42009 --- /dev/null +++ b/Assets/Scripts/Orbs/PowerOrb.cs @@ -0,0 +1,21 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class PowerOrb : MonoBehaviour +{ + public int powerBoost = 10; + GameObject player; + GameObject gunBarrelEnd; + + private void OnTriggerEnter(Collider other) + { + player = GameObject.FindGameObjectWithTag ("Player"); + gunBarrelEnd = player.transform.Find("GunBarrelEnd").gameObject; + if (other.gameObject == player && other.isTrigger == false){ + PlayerShooting playerShooting = gunBarrelEnd.GetComponent<PlayerShooting>(); + playerShooting.BoostPower(powerBoost); + Destroy(gameObject, 0f); + } + } +} diff --git a/Assets/Scripts/Orbs/PowerOrb.cs.meta b/Assets/Scripts/Orbs/PowerOrb.cs.meta new file mode 100644 index 0000000000000000000000000000000000000000..8ea281156caf89c881c44db047091fa694254753 --- /dev/null +++ b/Assets/Scripts/Orbs/PowerOrb.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: da5499760b621854fac5236da702366e +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Orbs/Spawner.cs b/Assets/Scripts/Orbs/Spawner.cs new file mode 100644 index 0000000000000000000000000000000000000000..e7d50ffe6169c626241fe52c94e7a4d1a7db8118 --- /dev/null +++ b/Assets/Scripts/Orbs/Spawner.cs @@ -0,0 +1,29 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Spawner : MonoBehaviour +{ + public GameObject orbPrefab; + public float respawnTime = 5.0f; + public Vector3 center; + public Vector3 size = new Vector3(20f, 20f, 20f); + + void Start() + { + StartCoroutine(OrbWave()); + } + + IEnumerator OrbWave(){ + while(true){ + yield return new WaitForSeconds(respawnTime); + SpawnOrb(); + } + } + + private void SpawnOrb(){ + Vector3 pos = center + new Vector3(Random.Range(-size.x/2, size.x/2), 0.5f,Random.Range(-size.z/2, size.z/2)); + Instantiate(orbPrefab, pos, Quaternion.identity); + } + +} diff --git a/Assets/Scripts/Orbs/Spawner.cs.meta b/Assets/Scripts/Orbs/Spawner.cs.meta new file mode 100644 index 0000000000000000000000000000000000000000..23e17b0cdfcfce5c39fdd4ceeb94274958c840b5 --- /dev/null +++ b/Assets/Scripts/Orbs/Spawner.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a9f9ebf32259aa14f895d743e7dfb90e +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Orbs/SpeedOrb.cs b/Assets/Scripts/Orbs/SpeedOrb.cs new file mode 100644 index 0000000000000000000000000000000000000000..21e50301e42a227c394856a3329a5b1536776b8a --- /dev/null +++ b/Assets/Scripts/Orbs/SpeedOrb.cs @@ -0,0 +1,19 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class SpeedOrb : MonoBehaviour +{ + public float speedBoost = 3f; + GameObject player; + + private void OnTriggerEnter(Collider other) + { + player = GameObject.FindGameObjectWithTag ("Player"); + if (other.gameObject == player && other.isTrigger == false){ + PlayerMovement playerMovement = other.GetComponent<PlayerMovement>(); + playerMovement.BoostSpeed(speedBoost); + Destroy(gameObject, 0f); + } + } +} diff --git a/Assets/Scripts/Orbs/SpeedOrb.cs.meta b/Assets/Scripts/Orbs/SpeedOrb.cs.meta new file mode 100644 index 0000000000000000000000000000000000000000..f1c979de26b6f673d8e0097513f97695d94e3b3c --- /dev/null +++ b/Assets/Scripts/Orbs/SpeedOrb.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 25e33eef9297dc24ab9a136afd537c2f +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Player/PlayerMovement.cs b/Assets/Scripts/Player/PlayerMovement.cs index f72bc7b304b3f1a75095f9503f8bf11403110a56..80f95f86f4099107a1356a36bc6be19aac0f05bd 100644 --- a/Assets/Scripts/Player/PlayerMovement.cs +++ b/Assets/Scripts/Player/PlayerMovement.cs @@ -75,4 +75,8 @@ public class PlayerMovement : MonoBehaviour bool walking = h != 0f || v != 0f; anim.SetBool("IsWalking", walking); } + + public void BoostSpeed(float amount){ + speed += amount; + } } diff --git a/Assets/Scripts/Player/PlayerShooting.cs b/Assets/Scripts/Player/PlayerShooting.cs index ebd9aaf206967e9a8c7b15e07c4d6d4da282c9bc..01a2557bd97be7924ebfc2c6b92ad6dde9feefb6 100644 --- a/Assets/Scripts/Player/PlayerShooting.cs +++ b/Assets/Scripts/Player/PlayerShooting.cs @@ -79,4 +79,8 @@ public class PlayerShooting : MonoBehaviour gunLine.SetPosition(1, shootRay.origin + shootRay.direction * range); } } + + public void BoostPower(int amount){ + damagePerShot += amount; + } } \ No newline at end of file