diff --git a/Assets/Cainos/Pixel Art Top Down - Basic/Prefab.meta b/Assets/Cainos/Pixel Art Top Down - Basic/Prefab.meta deleted file mode 100644 index 0c5bf59..0000000 --- a/Assets/Cainos/Pixel Art Top Down - Basic/Prefab.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 3af69c956b651b54d89bd0ac5fe3d951 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Cainos/Pixel Art Top Down - Basic/Prefab/Plant.meta b/Assets/Cainos/Pixel Art Top Down - Basic/Prefab/Plant.meta deleted file mode 100644 index 533e2fa..0000000 --- a/Assets/Cainos/Pixel Art Top Down - Basic/Prefab/Plant.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 6e068f10c8db1234c9574895dd2280d7 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Cainos/Pixel Art Top Down - Basic/Prefab/Player.meta b/Assets/Cainos/Pixel Art Top Down - Basic/Prefab/Player.meta deleted file mode 100644 index 8e40e19..0000000 --- a/Assets/Cainos/Pixel Art Top Down - Basic/Prefab/Player.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 86943c35447d4fe4282ca26a5cd88866 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Cainos/Pixel Art Top Down - Basic/Prefab/Props.meta b/Assets/Cainos/Pixel Art Top Down - Basic/Prefab/Props.meta deleted file mode 100644 index bffdd06..0000000 --- a/Assets/Cainos/Pixel Art Top Down - Basic/Prefab/Props.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f3956d0feadda754683fef2f9af5e33b -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Cainos/Pixel Art Top Down - Basic/Preset.meta b/Assets/Cainos/Pixel Art Top Down - Basic/Preset.meta deleted file mode 100644 index 3c2c266..0000000 --- a/Assets/Cainos/Pixel Art Top Down - Basic/Preset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: eb1b5889edcedb047aa2aba4aee7a1a6 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Cainos/Pixel Art Top Down - Basic/Scene.meta b/Assets/Cainos/Pixel Art Top Down - Basic/Scene.meta deleted file mode 100644 index 13258f4..0000000 --- a/Assets/Cainos/Pixel Art Top Down - Basic/Scene.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 35dbf421863535047b2c4a75eecde7b1 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Cainos/Pixel Art Top Down - Basic/Script.meta b/Assets/Cainos/Pixel Art Top Down - Basic/Script.meta deleted file mode 100644 index 860a053..0000000 --- a/Assets/Cainos/Pixel Art Top Down - Basic/Script.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 7a97a7c28363f86469ca706030baf601 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Cainos/Pixel Art Top Down - Basic/Shader.meta b/Assets/Cainos/Pixel Art Top Down - Basic/Shader.meta deleted file mode 100644 index 09bdf87..0000000 --- a/Assets/Cainos/Pixel Art Top Down - Basic/Shader.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 4cc2478dae4b9174cb95d0de4242b7e7 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Cainos/Pixel Art Top Down - Basic/Texture.meta b/Assets/Cainos/Pixel Art Top Down - Basic/Texture.meta deleted file mode 100644 index 3769097..0000000 --- a/Assets/Cainos/Pixel Art Top Down - Basic/Texture.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: d1d29e085db8a9d488ffa1c135989d1b -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Cainos/Pixel Art Top Down - Basic/Tile Palette.meta b/Assets/Cainos/Pixel Art Top Down - Basic/Tile Palette.meta deleted file mode 100644 index 8361a54..0000000 --- a/Assets/Cainos/Pixel Art Top Down - Basic/Tile Palette.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f327abfd98fde98469018782d88072f5 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Cainos/Pixel Art Top Down - Basic/Tile Palette/TP Grass.meta b/Assets/Cainos/Pixel Art Top Down - Basic/Tile Palette/TP Grass.meta deleted file mode 100644 index 73d34b4..0000000 --- a/Assets/Cainos/Pixel Art Top Down - Basic/Tile Palette/TP Grass.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: dcc868900f94f744a9c0858eed646b5b -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Cainos/Pixel Art Top Down - Basic/Tile Palette/TP Stone Ground.meta b/Assets/Cainos/Pixel Art Top Down - Basic/Tile Palette/TP Stone Ground.meta deleted file mode 100644 index 630da4c..0000000 --- a/Assets/Cainos/Pixel Art Top Down - Basic/Tile Palette/TP Stone Ground.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: ae43593ebec090a4783419eb43468f4c -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Cainos/Pixel Art Top Down - Basic/Tile Palette/TP Wall.meta b/Assets/Cainos/Pixel Art Top Down - Basic/Tile Palette/TP Wall.meta deleted file mode 100644 index 670acf8..0000000 --- a/Assets/Cainos/Pixel Art Top Down - Basic/Tile Palette/TP Wall.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 4e47daa727b18db4eaa4294ab2fdf7cb -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Cainos.meta b/Assets/Images/Tile.meta similarity index 77% rename from Assets/Cainos.meta rename to Assets/Images/Tile.meta index 1d3223f..25a6662 100644 --- a/Assets/Cainos.meta +++ b/Assets/Images/Tile.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f38072b243b2cd8438afb2a40ee28ecf +guid: 00d8e05b105db6347aff548b7cfe0db6 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Images/1_0.asset b/Assets/Images/Tile/1_0.asset similarity index 100% rename from Assets/Images/1_0.asset rename to Assets/Images/Tile/1_0.asset diff --git a/Assets/Images/1_0.asset.meta b/Assets/Images/Tile/1_0.asset.meta similarity index 100% rename from Assets/Images/1_0.asset.meta rename to Assets/Images/Tile/1_0.asset.meta diff --git a/Assets/Images/1_1.asset b/Assets/Images/Tile/1_1.asset similarity index 100% rename from Assets/Images/1_1.asset rename to Assets/Images/Tile/1_1.asset diff --git a/Assets/Images/1_1.asset.meta b/Assets/Images/Tile/1_1.asset.meta similarity index 100% rename from Assets/Images/1_1.asset.meta rename to Assets/Images/Tile/1_1.asset.meta diff --git a/Assets/Images/TestPalette.prefab b/Assets/Images/Tile/TestPalette.prefab similarity index 100% rename from Assets/Images/TestPalette.prefab rename to Assets/Images/Tile/TestPalette.prefab diff --git a/Assets/Images/TestPalette.prefab.meta b/Assets/Images/Tile/TestPalette.prefab.meta similarity index 100% rename from Assets/Images/TestPalette.prefab.meta rename to Assets/Images/Tile/TestPalette.prefab.meta diff --git a/Assets/Images/TestTile.png b/Assets/Images/Tile/TestTile.png similarity index 100% rename from Assets/Images/TestTile.png rename to Assets/Images/Tile/TestTile.png diff --git a/Assets/Images/TestTile.png.meta b/Assets/Images/Tile/TestTile.png.meta similarity index 100% rename from Assets/Images/TestTile.png.meta rename to Assets/Images/Tile/TestTile.png.meta diff --git a/Assets/Cainos/Pixel Art Top Down - Basic.meta b/Assets/Images/Weapon.meta similarity index 77% rename from Assets/Cainos/Pixel Art Top Down - Basic.meta rename to Assets/Images/Weapon.meta index 0485768..68f428b 100644 --- a/Assets/Cainos/Pixel Art Top Down - Basic.meta +++ b/Assets/Images/Weapon.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 431c10090819ad04a876974100ec2459 +guid: 0d3b687b5afcb0c4ab21a4edeeedd3e8 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Images/Weapon/sword.png b/Assets/Images/Weapon/sword.png new file mode 100644 index 0000000..f5dbb43 Binary files /dev/null and b/Assets/Images/Weapon/sword.png differ diff --git a/Assets/Images/Weapon/sword.png.meta b/Assets/Images/Weapon/sword.png.meta new file mode 100644 index 0000000..43e243e --- /dev/null +++ b/Assets/Images/Weapon/sword.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: 6a4a510da87d69a4cbbf76f51056f7af +TextureImporter: + internalIDToNameTable: + - first: + 213: -3753825769889500098 + second: sword_0 + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 32 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: sword_0 + rect: + serializedVersion: 2 + x: 5 + y: 3 + width: 24 + height: 24 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: e347705d95bb7ebc0800000000000000 + internalID: -3753825769889500098 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + sword_0: -3753825769889500098 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/InputSystem_Actions.inputactions b/Assets/InputSystem_Actions.inputactions index 4587629..6b44842 100644 --- a/Assets/InputSystem_Actions.inputactions +++ b/Assets/InputSystem_Actions.inputactions @@ -23,6 +23,15 @@ "processors": "", "interactions": "", "initialStateCheck": false + }, + { + "name": "Attack", + "type": "Button", + "id": "96541dd4-e6d5-4974-ae1f-0539bb1bb488", + "expectedControlType": "", + "processors": "", + "interactions": "", + "initialStateCheck": false } ], "bindings": [ @@ -69,6 +78,28 @@ "action": "Jump", "isComposite": false, "isPartOfComposite": false + }, + { + "name": "", + "id": "d68d6dd4-a961-418c-aac8-c8fd27de4477", + "path": "/leftButton", + "interactions": "", + "processors": "", + "groups": "", + "action": "Attack", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "0c24d2fb-36e8-4e61-9816-56c589a0da18", + "path": "/rightButton", + "interactions": "", + "processors": "", + "groups": "", + "action": "Attack", + "isComposite": false, + "isPartOfComposite": false } ] }, diff --git a/Assets/Cainos/Pixel Art Top Down - Basic/Animation.meta b/Assets/Prefabs.meta similarity index 77% rename from Assets/Cainos/Pixel Art Top Down - Basic/Animation.meta rename to Assets/Prefabs.meta index d8decec..041bf84 100644 --- a/Assets/Cainos/Pixel Art Top Down - Basic/Animation.meta +++ b/Assets/Prefabs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7fe619e4e8e7f7546b666e866c5adcdc +guid: 4d2f06cdde71c0345b1a75cb164a7956 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Prefabs/Player.prefab b/Assets/Prefabs/Player.prefab new file mode 100644 index 0000000..717b8bd --- /dev/null +++ b/Assets/Prefabs/Player.prefab @@ -0,0 +1,319 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1806294682707300264 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1023739552815324599} + - component: {fileID: 1470778168392290969} + m_Layer: 0 + m_Name: Sword + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1023739552815324599 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1806294682707300264} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0.16338597, w: 0.98656225} + m_LocalPosition: {x: 0, y: -0.2, z: 0} + m_LocalScale: {x: 2.7, y: 2.7, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4539706167822133972} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1470778168392290969 +SpriteRenderer: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1806294682707300264} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, 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: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 1 + m_MaskInteraction: 0 + m_Sprite: {fileID: 21300000, guid: 6a4a510da87d69a4cbbf76f51056f7af, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_SpriteSortPoint: 0 +--- !u!1 &9138407101546400895 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4539706167822133972} + - component: {fileID: 7073821485941705831} + - component: {fileID: 1665208702870125763} + - component: {fileID: 2556996269222904179} + - component: {fileID: 6376878406717916855} + - component: {fileID: 3588997328764402973} + - component: {fileID: 3365221526544536121} + m_Layer: 0 + m_Name: Player + m_TagString: Player + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4539706167822133972 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9138407101546400895} + serializedVersion: 2 + 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: 1023739552815324599} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &7073821485941705831 +SpriteRenderer: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9138407101546400895} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, 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: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_MaskInteraction: 0 + m_Sprite: {fileID: -9095717837082945937, guid: 207ee8102dd4143d288186ef0be518ee, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 2} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_SpriteSortPoint: 0 +--- !u!70 &1665208702870125763 +CapsuleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9138407101546400895} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 6200000, guid: aaf5132ed1338614e9cb4b375e0b610e, type: 2} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: 0} + m_Size: {x: 1, y: 2} + m_Direction: 0 +--- !u!50 &2556996269222904179 +Rigidbody2D: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9138407101546400895} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDamping: 0 + m_AngularDamping: 0.05 + m_GravityScale: 6 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_Interpolate: 1 + m_SleepingMode: 1 + m_CollisionDetection: 1 + m_Constraints: 4 +--- !u!114 &6376878406717916855 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9138407101546400895} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.InputSystem::UnityEngine.InputSystem.PlayerInput + m_Actions: {fileID: 0} + m_NotificationBehavior: 0 + m_UIInputModule: {fileID: 0} + m_DeviceLostEvent: + m_PersistentCalls: + m_Calls: [] + m_DeviceRegainedEvent: + m_PersistentCalls: + m_Calls: [] + m_ControlsChangedEvent: + m_PersistentCalls: + m_Calls: [] + m_ActionEvents: [] + m_NeverAutoSwitchControlSchemes: 0 + m_DefaultControlScheme: Keyboard&Mouse + m_DefaultActionMap: Player + m_SplitScreenIndex: -1 + m_Camera: {fileID: 0} +--- !u!114 &3588997328764402973 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9138407101546400895} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: eae62c41ce858ce478f29843ba0d3dea, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::PlayerController + moveSpeed: 9 + jumpSpeed: 18.2 + jumpCutMultiplier: 0.3 + minJumpDuration: 0.1 +--- !u!114 &3365221526544536121 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9138407101546400895} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b80ed589ee3f55249848caed7062f270, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::PlayerAttack + normalAttackBoxSize: {x: 2, y: 1} + dashAttackBoxSize: {x: 2, y: 1} + dashAttackDistance: 5 + attackOffset: 1 + enemyLayer: + serializedVersion: 2 + m_Bits: 64 diff --git a/Assets/Cainos/Pixel Art Top Down - Basic/Material.meta b/Assets/Prefabs/Player.prefab.meta similarity index 57% rename from Assets/Cainos/Pixel Art Top Down - Basic/Material.meta rename to Assets/Prefabs/Player.prefab.meta index 3e6eca2..0261693 100644 --- a/Assets/Cainos/Pixel Art Top Down - Basic/Material.meta +++ b/Assets/Prefabs/Player.prefab.meta @@ -1,7 +1,6 @@ fileFormatVersion: 2 -guid: cda378a8bb10a1e41ad704bda334a5d9 -folderAsset: yes -DefaultImporter: +guid: ae58a5fa402b1d941b0878d356d1389d +PrefabImporter: externalObjects: {} userData: assetBundleName: diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/tAttackScene.unity similarity index 82% rename from Assets/Scenes/SampleScene.unity rename to Assets/Scenes/tAttackScene.unity index 188594a..051cc90 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/tAttackScene.unity @@ -385,212 +385,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &965362357 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 965362360} - - component: {fileID: 965362359} - - component: {fileID: 965362358} - - component: {fileID: 965362361} - - component: {fileID: 965362362} - - component: {fileID: 965362363} - m_Layer: 0 - m_Name: Player - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!70 &965362358 -CapsuleCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 965362357} - m_Enabled: 1 - serializedVersion: 3 - m_Density: 1 - m_Material: {fileID: 6200000, guid: aaf5132ed1338614e9cb4b375e0b610e, type: 2} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_ForceSendLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ForceReceiveLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ContactCaptureLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_CallbackLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_CompositeOperation: 0 - m_CompositeOrder: 0 - m_Offset: {x: 0, y: 0} - m_Size: {x: 1, y: 2} - m_Direction: 0 ---- !u!212 &965362359 -SpriteRenderer: - serializedVersion: 2 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 965362357} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_ForceMeshLod: -1 - m_MeshLodSelectionBias: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, 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: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_GlobalIlluminationMeshLod: 0 - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_MaskInteraction: 0 - m_Sprite: {fileID: -9095717837082945937, guid: 207ee8102dd4143d288186ef0be518ee, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 2} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_SpriteSortPoint: 0 ---- !u!4 &965362360 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 965362357} - serializedVersion: 2 - 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: 1252813200} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!50 &965362361 -Rigidbody2D: - serializedVersion: 5 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 965362357} - m_BodyType: 0 - m_Simulated: 1 - m_UseFullKinematicContacts: 0 - m_UseAutoMass: 0 - m_Mass: 1 - m_LinearDamping: 0 - m_AngularDamping: 0.05 - m_GravityScale: 6 - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_Interpolate: 0 - m_SleepingMode: 1 - m_CollisionDetection: 0 - m_Constraints: 4 ---- !u!114 &965362362 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 965362357} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3} - m_Name: - m_EditorClassIdentifier: Unity.InputSystem::UnityEngine.InputSystem.PlayerInput - m_Actions: {fileID: -944628639613478452, guid: 2bcd2660ca9b64942af0de543d8d7100, type: 3} - m_NotificationBehavior: 0 - m_UIInputModule: {fileID: 0} - m_DeviceLostEvent: - m_PersistentCalls: - m_Calls: [] - m_DeviceRegainedEvent: - m_PersistentCalls: - m_Calls: [] - m_ControlsChangedEvent: - m_PersistentCalls: - m_Calls: [] - m_ActionEvents: [] - m_NeverAutoSwitchControlSchemes: 0 - m_DefaultControlScheme: Keyboard&Mouse - m_DefaultActionMap: Player - m_SplitScreenIndex: -1 - m_Camera: {fileID: 0} ---- !u!114 &965362363 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 965362357} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: eae62c41ce858ce478f29843ba0d3dea, type: 3} - m_Name: - m_EditorClassIdentifier: Assembly-CSharp::PlayerController - moveSpeed: 9 - jumpSpeed: 18.2 - jumpCutMultiplier: 0.3 - minJumpDuration: 0.1 --- !u!1 &994327116 GameObject: m_ObjectHideFlags: 0 @@ -1195,7 +989,7 @@ TilemapCollider2D: m_MaximumTileChangeCount: 1000 m_ExtrusionFactor: 0 m_UseDelaunayMesh: 0 ---- !u!1 &1252813199 +--- !u!1 &1290102946 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1203,70 +997,24 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1252813200} - m_Layer: 0 - m_Name: e + - component: {fileID: 1290102948} + - component: {fileID: 1290102947} + - component: {fileID: 1290102949} + m_Layer: 6 + m_Name: Triangle m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1252813200 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1252813199} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: 0.14962232, w: 0.98874325} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1254411353} - m_Father: {fileID: 965362360} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: -1422.79} ---- !u!1 &1254411352 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1254411353} - - component: {fileID: 1254411354} - m_Layer: 0 - m_Name: Square - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1254411353 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1254411352} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.04, y: 0.54, z: 0} - m_LocalScale: {x: 3.04, y: 0.22, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1252813200} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &1254411354 +--- !u!212 &1290102947 SpriteRenderer: serializedVersion: 2 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1254411352} + m_GameObject: {fileID: 1290102946} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -1308,7 +1056,7 @@ SpriteRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_MaskInteraction: 0 - m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} + m_Sprite: {fileID: 7482667652216324306, guid: 75f5f34dc1b5347e0b8351032682f224, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -1318,11 +1066,134 @@ SpriteRenderer: m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_SpriteSortPoint: 0 +--- !u!4 &1290102948 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1290102946} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.43, y: -0.11, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &1290102949 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1290102946} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: 0.21133333} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.28866667} + oldSize: {x: 1, y: 1} + newSize: {x: 1, y: 1} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Size: {x: 1, y: 1} + m_EdgeRadius: 0 +--- !u!1001 &9062861311486568808 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4539706167822133972, guid: ae58a5fa402b1d941b0878d356d1389d, type: 3} + propertyPath: m_LocalPosition.x + value: -3.1 + objectReference: {fileID: 0} + - target: {fileID: 4539706167822133972, guid: ae58a5fa402b1d941b0878d356d1389d, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4539706167822133972, guid: ae58a5fa402b1d941b0878d356d1389d, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4539706167822133972, guid: ae58a5fa402b1d941b0878d356d1389d, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4539706167822133972, guid: ae58a5fa402b1d941b0878d356d1389d, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4539706167822133972, guid: ae58a5fa402b1d941b0878d356d1389d, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4539706167822133972, guid: ae58a5fa402b1d941b0878d356d1389d, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4539706167822133972, guid: ae58a5fa402b1d941b0878d356d1389d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4539706167822133972, guid: ae58a5fa402b1d941b0878d356d1389d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4539706167822133972, guid: ae58a5fa402b1d941b0878d356d1389d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6376878406717916855, guid: ae58a5fa402b1d941b0878d356d1389d, type: 3} + propertyPath: m_Actions + value: + objectReference: {fileID: -944628639613478452, guid: 2bcd2660ca9b64942af0de543d8d7100, type: 3} + - target: {fileID: 9138407101546400895, guid: ae58a5fa402b1d941b0878d356d1389d, type: 3} + propertyPath: m_Name + value: Player + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: ae58a5fa402b1d941b0878d356d1389d, type: 3} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 m_Roots: - {fileID: 519420032} - {fileID: 619394802} - - {fileID: 965362360} + - {fileID: 9062861311486568808} - {fileID: 435424070} + - {fileID: 1290102948} diff --git a/Assets/Scenes/SampleScene.unity.meta b/Assets/Scenes/tAttackScene.unity.meta similarity index 100% rename from Assets/Scenes/SampleScene.unity.meta rename to Assets/Scenes/tAttackScene.unity.meta diff --git a/Assets/Scripts/Entity.cs b/Assets/Scripts/Entity.cs index 3b28ab4..5b8fa60 100644 --- a/Assets/Scripts/Entity.cs +++ b/Assets/Scripts/Entity.cs @@ -20,7 +20,7 @@ public class Entity : MonoBehaviour attackDamage = data.attackDamage; } - public virtual void TakeDaamge(float damage) + public virtual void TakeDamge(float damage) { currentHealth -= damage; OnTakeDamage?.Invoke(damage); diff --git a/Assets/Scripts/Player/PlayerAttack.cs b/Assets/Scripts/Player/PlayerAttack.cs new file mode 100644 index 0000000..f285398 --- /dev/null +++ b/Assets/Scripts/Player/PlayerAttack.cs @@ -0,0 +1,112 @@ +using System.Collections; +using UnityEngine; +using UnityEngine.InputSystem; + +public class PlayerAttack : MonoBehaviour +{ + [SerializeField] private Vector2 normalAttackBoxSize = new Vector2(2, 1); + [SerializeField] private Vector2 dashAttackBoxSize = new Vector2(2, 1); + [SerializeField] private float dashAttackDistance = 5f; + [SerializeField] private float attackOffset = 1.0f; + [SerializeField] private LayerMask enemyLayer; + [SerializeField] private float dashSpeed = 15f; + + private float normalAttackAngle = 0f; + private Vector2 dashAttackDirection = Vector2.zero; + private Vector2 attackOrigin; + + public bool isDashing { get; private set; } = false; + private Camera cam; + private Rigidbody2D rb; + + private void Start() + { + cam = Camera.main; + rb = GetComponent(); + } + + private void Update() + { + if(!isDashing) + SetAttackAngle(); + } + + private void OnAttack(InputValue value) + { + if (!value.isPressed || isDashing) return; + + if (Mouse.current.leftButton.isPressed) + { + Debug.Log("일반공격"); + NormalAttack(); + } + + if (Mouse.current.rightButton.isPressed) + { + Debug.Log("대쉬공격"); + StartCoroutine(DashAttackRoutine()); + } + } + + private void SetAttackAngle() + { + Vector2 mousePositionVector = cam.ScreenToWorldPoint(Mouse.current.position.value); + Vector2 direction = (mousePositionVector - (Vector2)transform.position).normalized; + + normalAttackAngle = Mathf.Atan2(direction.y, direction.x) * Mathf.Rad2Deg; + dashAttackDirection = direction; + attackOrigin = (Vector2)transform.position + (direction * attackOffset); + } + + private void NormalAttack() + { + Collider2D[] enemies = Physics2D.OverlapBoxAll(attackOrigin, normalAttackBoxSize, normalAttackAngle, enemyLayer); + foreach (Collider2D target in enemies) + { + Debug.Log("일반공격 적중: " + target.name); + } + } + + private IEnumerator DashAttackRoutine() + { + isDashing = true; + rb.linearVelocity = Vector2.zero; + + float dashDuration = dashAttackDistance / dashSpeed; + float elapsedTime = 0f; + + rb.linearVelocity = dashAttackDirection * dashSpeed; + Debug.Log(dashAttackDirection); + + float originGravity = rb.gravityScale; + + rb.gravityScale = 0; + while (elapsedTime < dashDuration) + { + Vector2 currentOrigin = (Vector2)transform.position + (dashAttackDirection * attackOffset); + + RaycastHit2D[] enemies = Physics2D.BoxCastAll(currentOrigin, dashAttackBoxSize, normalAttackAngle, dashAttackDirection, 0f, enemyLayer); + + foreach (RaycastHit2D target in enemies) + { + Debug.Log("대쉬 공격 적중: " + target.collider.name); + Destroy(target.collider.gameObject); + } + + elapsedTime += Time.deltaTime; + yield return null; + } + rb.linearVelocity = Vector2.zero; + isDashing = false; + rb.gravityScale = originGravity; + } + + private void OnDrawGizmos() + { + Vector2 drawStartPos = Application.isPlaying ? attackOrigin : (Vector2)transform.position + (Vector2.right * attackOffset); + + Gizmos.color = new Color(1, 0, 0, 0.5f); + Gizmos.matrix = Matrix4x4.TRS(drawStartPos, Quaternion.Euler(0, 0, normalAttackAngle), Vector3.one); + Gizmos.DrawCube(Vector3.zero, normalAttackBoxSize); + } +} \ No newline at end of file diff --git a/Assets/Scripts/Player/PlayerAttack.cs.meta b/Assets/Scripts/Player/PlayerAttack.cs.meta new file mode 100644 index 0000000..9d0162f --- /dev/null +++ b/Assets/Scripts/Player/PlayerAttack.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: b80ed589ee3f55249848caed7062f270 \ No newline at end of file diff --git a/Assets/Scripts/Player/PlayerController.cs b/Assets/Scripts/Player/PlayerController.cs index 19c991f..04ec8ee 100644 --- a/Assets/Scripts/Player/PlayerController.cs +++ b/Assets/Scripts/Player/PlayerController.cs @@ -5,6 +5,7 @@ using UnityEngine.InputSystem; public class PlayerController : MonoBehaviour { private Rigidbody2D _rigidbody; + private PlayerAttack _playerAttack; private Vector2 inputVector; private int maxJumpCount = 2; @@ -21,6 +22,7 @@ public class PlayerController : MonoBehaviour private void Start() { _rigidbody = gameObject.GetComponent(); + _playerAttack = gameObject.GetComponent(); } private void FixedUpdate() @@ -32,7 +34,10 @@ public class PlayerController : MonoBehaviour currentJumpCount = maxJumpCount; } - MovePlayer(); + if(!_playerAttack.isDashing) + { + MovePlayer(); + } } private void OnMove(InputValue value) diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index d712d2d..4f3263b 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -6,7 +6,7 @@ EditorBuildSettings: serializedVersion: 2 m_Scenes: - enabled: 1 - path: Assets/Scenes/SampleScene.unity + path: Assets/Scenes/tAttackScene.unity guid: 8c9cfa26abfee488c85f1582747f6a02 m_configObjects: com.unity.input.settings.actions: {fileID: -944628639613478452, guid: 2bcd2660ca9b64942af0de543d8d7100, type: 3} diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 03bf26e..bfb2ee5 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -11,7 +11,7 @@ TagManager: - Ground - Water - UI - - + - Enemy - - -