diff --git a/Assets/Prefabs/sword2.prefab b/Assets/Prefabs/sword2.prefab new file mode 100644 index 0000000000000000000000000000000000000000..750ff5a7216dc2ceb8dbd8b9648dbfe5c5b573d9 --- /dev/null +++ b/Assets/Prefabs/sword2.prefab @@ -0,0 +1,579 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2490934396627426510 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3015796629085603444} + - component: {fileID: 3337442696376404705} + - component: {fileID: 3337442696376404707} + - component: {fileID: 3337442696376404706} + m_Layer: 0 + m_Name: sword2 + m_TagString: PlayerWeapon + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3015796629085603444 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2490934396627426510} + m_LocalRotation: {x: -0.9525225, y: 0.28767118, z: 0.02100116, w: -0.09749435} + m_LocalPosition: {x: 0.41, y: 0.54, z: 0.89} + m_LocalScale: {x: 1.2, y: 1.2, z: 1.2} + m_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 95017235411930710} + - {fileID: 4310418983155083199} + - {fileID: 8871080390462586774} + - {fileID: 3310222577001448660} + - {fileID: 8545367348539669217} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 10, y: -174.4, z: 214.1} +--- !u!136 &3337442696376404705 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2490934396627426510} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + m_Radius: 0.15 + m_Height: 1.5 + m_Direction: 2 + m_Center: {x: 0, y: 0, z: -0.3} +--- !u!82 &3337442696376404707 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2490934396627426510} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 352735f28fe99b643a447f955cee8df3, type: 3} + m_PlayOnAwake: 0 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!114 &3337442696376404706 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2490934396627426510} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a6b58c9316ec3f049bf3341f992d65d5, type: 3} + m_Name: + m_EditorClassIdentifier: + damagePerShot: 10 +--- !u!1 &3055977476009974766 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8871080390462586774} + - component: {fileID: 7954828174225717701} + - component: {fileID: 446831981541988488} + m_Layer: 0 + m_Name: Cylinder027 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8871080390462586774 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3055977476009974766} + m_LocalRotation: {x: 0.000000057601167, y: 0.000000057601163, z: 0.7071068, w: 0.7071068} + m_LocalPosition: {x: 0.000095041556, y: 0.023773896, z: 0.22896565} + m_LocalScale: {x: 0.8642374, y: 0.85555595, z: 0.9451349} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3015796629085603444} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &7954828174225717701 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3055977476009974766} + m_Mesh: {fileID: -5365713564520892586, guid: c9a73f42c15ac4f48a92c5f435471f7f, type: 3} +--- !u!23 &446831981541988488 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3055977476009974766} + 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: 3514935808808263199, guid: c9a73f42c15ac4f48a92c5f435471f7f, type: 3} + 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!1 &4343155190623715822 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4310418983155083199} + - component: {fileID: 3464400395546875363} + - component: {fileID: 1543564817117647707} + m_Layer: 0 + m_Name: Box032 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4310418983155083199 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4343155190623715822} + m_LocalRotation: {x: -0.50000006, y: 0.49999997, z: 0.49999997, w: 0.50000006} + m_LocalPosition: {x: 0.000095041556, y: 0.023773896, z: -0.12259699} + m_LocalScale: {x: 1, y: 0.98756826, z: 0.69127303} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3015796629085603444} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &3464400395546875363 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4343155190623715822} + m_Mesh: {fileID: -8672714952799723808, guid: c9a73f42c15ac4f48a92c5f435471f7f, type: 3} +--- !u!23 &1543564817117647707 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4343155190623715822} + 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: 7443425614680984193, guid: c9a73f42c15ac4f48a92c5f435471f7f, type: 3} + 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!1 &6511934991304764853 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8545367348539669217} + - component: {fileID: 1097373595050953329} + - component: {fileID: 4296795728936331596} + m_Layer: 0 + m_Name: Loft267 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8545367348539669217 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6511934991304764853} + m_LocalRotation: {x: 0.0000006263812, y: 0.00000060994097, z: 0.6657147, w: 0.7462064} + m_LocalPosition: {x: 0.0000933936, y: 0.023777407, z: 0.025891064} + m_LocalScale: {x: 0.6255125, y: 0.9091524, z: 0.95385724} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3015796629085603444} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &1097373595050953329 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6511934991304764853} + m_Mesh: {fileID: 1623990466827161131, guid: c9a73f42c15ac4f48a92c5f435471f7f, type: 3} +--- !u!23 &4296795728936331596 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6511934991304764853} + 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: -4729289875415148296, guid: c9a73f42c15ac4f48a92c5f435471f7f, type: 3} + 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!1 &7536744369453175031 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3310222577001448660} + - component: {fileID: 1813505785772004361} + - component: {fileID: 3346880266315315799} + m_Layer: 0 + m_Name: Cylinder031 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3310222577001448660 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7536744369453175031} + m_LocalRotation: {x: -0.5, y: -0.5, z: 0.5, w: 0.5} + m_LocalPosition: {x: 0.000095041556, y: 0.023773896, z: -0.044700004} + m_LocalScale: {x: 1.2517605, y: 1.2517605, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3015796629085603444} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &1813505785772004361 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7536744369453175031} + m_Mesh: {fileID: -4890579382584212945, guid: c9a73f42c15ac4f48a92c5f435471f7f, type: 3} +--- !u!23 &3346880266315315799 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7536744369453175031} + 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: -8499701361930146817, guid: c9a73f42c15ac4f48a92c5f435471f7f, type: 3} + 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!1 &8026363880966253242 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 95017235411930710} + - component: {fileID: 2253184529184863781} + - component: {fileID: 6415157563968132573} + m_Layer: 0 + m_Name: Box029 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &95017235411930710 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8026363880966253242} + m_LocalRotation: {x: -0.50000006, y: 0.49999997, z: 0.49999997, w: 0.50000006} + m_LocalPosition: {x: 0.000095041556, y: 0.023773896, z: -0.03360747} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3015796629085603444} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &2253184529184863781 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8026363880966253242} + m_Mesh: {fileID: -4783894591166569364, guid: c9a73f42c15ac4f48a92c5f435471f7f, type: 3} +--- !u!23 &6415157563968132573 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8026363880966253242} + 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: 8486936951020155453, guid: c9a73f42c15ac4f48a92c5f435471f7f, type: 3} + 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} diff --git a/Assets/Prefabs/sword2.prefab.meta b/Assets/Prefabs/sword2.prefab.meta new file mode 100644 index 0000000000000000000000000000000000000000..32feda1135cd4e0b08e5996bb7e7a6e6327f3730 --- /dev/null +++ b/Assets/Prefabs/sword2.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 6f0f70ab322e39f4aa123adb2409d202 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Level_01.unity b/Assets/Scenes/Level_01.unity index a0489dc5fa8a18703356bcd016668c6d5c70b12d..ffaae3f427e991c45ea621f3d331bc4d0633a5c6 100644 --- a/Assets/Scenes/Level_01.unity +++ b/Assets/Scenes/Level_01.unity @@ -232,7 +232,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 11 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &47242820 PrefabInstance: @@ -733,7 +733,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 9 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 240, z: 0} --- !u!1001 &103794127 PrefabInstance: @@ -1111,7 +1111,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 8 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 130, z: 0} --- !u!1001 &178143675 PrefabInstance: @@ -1369,7 +1369,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 495562, guid: 149d6dcc67e8d1240bbc0dd6ddf0c1bd, type: 3} propertyPath: m_RootOrder - value: 2 + value: 3 objectReference: {fileID: 0} - target: {fileID: 495562, guid: 149d6dcc67e8d1240bbc0dd6ddf0c1bd, type: 3} propertyPath: m_LocalPosition.x @@ -1452,7 +1452,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &192641033 MonoBehaviour: @@ -1651,43 +1651,43 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: c9a73f42c15ac4f48a92c5f435471f7f, type: 3} propertyPath: m_LocalPosition.x - value: 0.3481183 + value: 0.41 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: c9a73f42c15ac4f48a92c5f435471f7f, type: 3} propertyPath: m_LocalPosition.y - value: 0.2721771 + value: 0.54 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: c9a73f42c15ac4f48a92c5f435471f7f, type: 3} propertyPath: m_LocalPosition.z - value: 0.30236545 + value: 0.89 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: c9a73f42c15ac4f48a92c5f435471f7f, type: 3} propertyPath: m_LocalRotation.w - value: -0.08594051 + value: -0.09749435 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: c9a73f42c15ac4f48a92c5f435471f7f, type: 3} propertyPath: m_LocalRotation.x - value: -0.1770037 + value: -0.9525225 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: c9a73f42c15ac4f48a92c5f435471f7f, type: 3} propertyPath: m_LocalRotation.y - value: -0.9799258 + value: 0.28767118 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: c9a73f42c15ac4f48a92c5f435471f7f, type: 3} propertyPath: m_LocalRotation.z - value: 0.032082822 + value: 0.02100116 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: c9a73f42c15ac4f48a92c5f435471f7f, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 5.354 + value: 10 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: c9a73f42c15ac4f48a92c5f435471f7f, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: -189.077 + value: -174.4 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: c9a73f42c15ac4f48a92c5f435471f7f, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 20.053 + value: 214.1 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: c9a73f42c15ac4f48a92c5f435471f7f, type: 3} propertyPath: m_ConstrainProportionsScale @@ -1695,15 +1695,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: c9a73f42c15ac4f48a92c5f435471f7f, type: 3} propertyPath: m_Name - value: sword + value: sword2 objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: c9a73f42c15ac4f48a92c5f435471f7f, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: c9a73f42c15ac4f48a92c5f435471f7f, type: 3} propertyPath: m_TagString - value: Sword + value: PlayerWeapon objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c9a73f42c15ac4f48a92c5f435471f7f, type: 3} @@ -2065,6 +2065,134 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 300986610} m_CullTransparentMesh: 1 +--- !u!1 &312147397 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: c9a73f42c15ac4f48a92c5f435471f7f, type: 3} + m_PrefabInstance: {fileID: 216831668} + m_PrefabAsset: {fileID: 0} +--- !u!82 &312147400 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 312147397} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 352735f28fe99b643a447f955cee8df3, type: 3} + m_PlayOnAwake: 0 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!114 &312147401 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 312147397} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a6b58c9316ec3f049bf3341f992d65d5, type: 3} + m_Name: + m_EditorClassIdentifier: + damagePerShot: 10 +--- !u!136 &312147402 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 312147397} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + m_Radius: 0.15 + m_Height: 1.5 + m_Direction: 2 + m_Center: {x: 0, y: 0, z: -0.3} --- !u!1001 &313615516 PrefabInstance: m_ObjectHideFlags: 0 @@ -2553,6 +2681,7 @@ GameObject: - component: {fileID: 450320209} - component: {fileID: 450320208} - component: {fileID: 450320213} + - component: {fileID: 450320207} m_Layer: 0 m_Name: ShotgunEnd m_TagString: PlayerWeapon @@ -2560,7 +2689,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 - m_IsActive: 1 --- !u!4 &450320206 Transform: m_ObjectHideFlags: 0 @@ -7798,7 +7926,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 30, y: 0, z: 0} --- !u!114 &453799218 MonoBehaviour: @@ -8364,6 +8492,100 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &567865089 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 567865091} + - component: {fileID: 567865090} + m_Layer: 0 + m_Name: Directional Light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!108 &567865090 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 567865089} + m_Enabled: 1 + serializedVersion: 10 + m_Type: 1 + m_Shape: 0 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Intensity: 1 + m_Range: 10 + m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 + m_CookieSize: 10 + m_Shadows: + m_Type: 0 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingLayerMask: 1 + m_Lightmapping: 4 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 + m_ShadowRadius: 0 + m_ShadowAngle: 0 +--- !u!4 &567865091 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 567865089} + m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} + m_LocalPosition: {x: 1.6880304, y: 0.96040744, z: 2.1515653} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} --- !u!1 &595596804 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6883341060921952336, guid: c133a0e3fc4f48c43a4306ef7a127b9a, type: 3} @@ -9521,7 +9743,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5233401772555657590, guid: 22f2e750f46b08145b81598aff3a067c, type: 3} propertyPath: m_RootOrder - value: 16 + value: 17 objectReference: {fileID: 0} - target: {fileID: 5233401772555657590, guid: 22f2e750f46b08145b81598aff3a067c, type: 3} propertyPath: m_LocalPosition.x @@ -9998,7 +10220,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 19 + m_RootOrder: 20 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &925461252 PrefabInstance: @@ -10569,7 +10791,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 17 + m_RootOrder: 18 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1003343661 PrefabInstance: @@ -10664,7 +10886,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400080, guid: f1d84cc28597f5641a3d9cbc4df7e306, type: 3} propertyPath: m_RootOrder - value: 5 + value: 6 objectReference: {fileID: 0} - target: {fileID: 400080, guid: f1d84cc28597f5641a3d9cbc4df7e306, type: 3} propertyPath: m_LocalScale.x @@ -16765,7 +16987,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!1001 &1331372521 PrefabInstance: @@ -16986,7 +17208,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: abd916789bc97d749bbd99ecea64cc61, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: abd916789bc97d749bbd99ecea64cc61, type: 3} propertyPath: m_TagString @@ -18113,7 +18335,7 @@ RectTransform: m_Children: - {fileID: 1600989857} m_Father: {fileID: 0} - m_RootOrder: 12 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -18568,7 +18790,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 845915290021937659, guid: 50754b1bd29cde544bf7b1e78400a3fd, type: 3} propertyPath: m_RootOrder - value: 15 + value: 16 objectReference: {fileID: 0} - target: {fileID: 845915290021937659, guid: 50754b1bd29cde544bf7b1e78400a3fd, type: 3} propertyPath: m_LocalPosition.x @@ -18843,7 +19065,7 @@ RectTransform: - {fileID: 1500555571} - {fileID: 639777914} m_Father: {fileID: 0} - m_RootOrder: 18 + m_RootOrder: 19 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -19249,7 +19471,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 409160, guid: ad67cddd729fb4342be2063a3f5ad7cc, type: 3} propertyPath: m_RootOrder - value: 3 + value: 4 objectReference: {fileID: 0} - target: {fileID: 409160, guid: ad67cddd729fb4342be2063a3f5ad7cc, type: 3} propertyPath: m_LocalPosition.x @@ -19407,7 +19629,7 @@ RectTransform: - {fileID: 1866292404} - {fileID: 845946675} m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -19752,7 +19974,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2033943898 GameObject: @@ -20209,7 +20431,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 10 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 230, z: 0} --- !u!114 &2135541938 stripped MonoBehaviour: @@ -20337,7 +20559,7 @@ RectTransform: m_Children: - {fileID: 992073966} m_Father: {fileID: 0} - m_RootOrder: 13 + m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -20639,7 +20861,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6391294135840490014, guid: 5f5f233d029030a4897e42369bff2504, type: 3} propertyPath: m_RootOrder - value: 14 + value: 15 objectReference: {fileID: 0} - target: {fileID: 6391294135840490014, guid: 5f5f233d029030a4897e42369bff2504, type: 3} propertyPath: m_LocalPosition.x diff --git a/Assets/Scripts/Weapons/Sword2.cs b/Assets/Scripts/Weapons/Sword2.cs new file mode 100644 index 0000000000000000000000000000000000000000..ea913893561ecfe36b0bc079893d956eecf0fe0e --- /dev/null +++ b/Assets/Scripts/Weapons/Sword2.cs @@ -0,0 +1,74 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Sword2 : MonoBehaviour +{ + public int damagePerShot = 20; + + private float timer = 0f; + private float attackDelay; + private Transform playerTransform; + + private int shootableMask; + private AudioSource swordAudio; + + private float startAtt = 0f; + private float attackDuration = 0.5f; + + void Start() + { + playerTransform = GameObject.FindGameObjectWithTag("Player").transform; + } + + void Awake() { + shootableMask = LayerMask.GetMask("Shootable"); + swordAudio = GetComponent<AudioSource>(); + } + + // Update is called once per frame + void Update() + { + timer += Time.deltaTime; + attackDelay -= Time.deltaTime; + + if (Input.GetButton("Fire1") && attackDelay <= 0) + { + swordAudio.Play(); + startAtt = timer; + attackDelay = 1f; + } + + if (startAtt != 0 && timer - startAtt < attackDuration) + { + this.spinSword(); + } + } + + void spinSword() + { + if (timer - startAtt < attackDuration / 2) + { + transform.position -= transform.forward * Time.deltaTime * 2f; + } + else + { + transform.position += transform.forward * Time.deltaTime * 2f; + } + } + + void OnTriggerEnter(Collider other) + { + if (startAtt != 0 && timer - startAtt < attackDuration) + { + if (other.gameObject.tag == "Enemy") + { + EnemyHealth enemyHealth = other.gameObject.GetComponent<EnemyHealth>(); + if (enemyHealth != null) + { + enemyHealth.TakeDamage(damagePerShot); + } + } + } + } +} diff --git a/Assets/Scripts/Weapons/Sword2.cs.meta b/Assets/Scripts/Weapons/Sword2.cs.meta new file mode 100644 index 0000000000000000000000000000000000000000..d5e6de6e1a1f76db01807b108dba6270fbcd9bf4 --- /dev/null +++ b/Assets/Scripts/Weapons/Sword2.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a6b58c9316ec3f049bf3341f992d65d5 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: