From f1213cd24727ed071df1c4804718bb15849ff936 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EB=8F=84=ED=99=98?= Date: Fri, 8 May 2026 22:45:22 +0900 Subject: [PATCH] =?UTF-8?q?=EC=94=AC=20=EC=A0=95=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Scenes/MainScene.unity | 335 +++++------------- Assets/Scripts/Unicorn/Boss.meta | 8 + Assets/Scripts/Unicorn/{Game => }/Enemy.cs | 0 .../Scripts/Unicorn/{Game => }/Enemy.cs.meta | 0 Assets/Scripts/Unicorn/Game.meta | 3 - Assets/Scripts/Unicorn/Game/Player/Player.cs | 7 - Assets/Scripts/Unicorn/{Game => }/Hitbox.meta | 0 .../Unicorn/{Game => }/Hitbox/DamageInfo.cs | 0 .../{Game => }/Hitbox/DamageInfo.cs.meta | 0 .../Scripts/Unicorn/{Game => }/Hitbox/SO.meta | 0 .../{Game => }/Hitbox/SO/ExampleAD.asset | 2 +- .../{Game => }/Hitbox/SO/ExampleAD.asset.meta | 0 .../{Game => }/Hitbox/UnicornAttackDataSO.cs | 0 .../Hitbox/UnicornAttackDataSO.cs.meta | 0 .../{Game => }/Hitbox/UnicornHitbox.cs | 0 .../{Game => }/Hitbox/UnicornHitbox.cs.meta | 0 .../Unicorn/{Game => }/LivingEntity.cs | 0 .../Unicorn/{Game => }/LivingEntity.cs.meta | 0 Assets/Scripts/Unicorn/{Game => }/Player.meta | 0 Assets/Scripts/Unicorn/Player/Player.cs | 18 + .../Unicorn/{Game => }/Player/Player.cs.meta | 0 .../Unicorn/{Game => }/Player/PlayerAttack.cs | 0 .../{Game => }/Player/PlayerAttack.cs.meta | 0 .../{Game => }/Player/PlayerMovement.cs | 0 .../{Game => }/Player/PlayerMovement.cs.meta | 0 ProjectSettings/EditorBuildSettings.asset | 2 +- 26 files changed, 120 insertions(+), 255 deletions(-) create mode 100644 Assets/Scripts/Unicorn/Boss.meta rename Assets/Scripts/Unicorn/{Game => }/Enemy.cs (100%) rename Assets/Scripts/Unicorn/{Game => }/Enemy.cs.meta (100%) delete mode 100644 Assets/Scripts/Unicorn/Game.meta delete mode 100644 Assets/Scripts/Unicorn/Game/Player/Player.cs rename Assets/Scripts/Unicorn/{Game => }/Hitbox.meta (100%) rename Assets/Scripts/Unicorn/{Game => }/Hitbox/DamageInfo.cs (100%) rename Assets/Scripts/Unicorn/{Game => }/Hitbox/DamageInfo.cs.meta (100%) rename Assets/Scripts/Unicorn/{Game => }/Hitbox/SO.meta (100%) rename Assets/Scripts/Unicorn/{Game => }/Hitbox/SO/ExampleAD.asset (97%) rename Assets/Scripts/Unicorn/{Game => }/Hitbox/SO/ExampleAD.asset.meta (100%) rename Assets/Scripts/Unicorn/{Game => }/Hitbox/UnicornAttackDataSO.cs (100%) rename Assets/Scripts/Unicorn/{Game => }/Hitbox/UnicornAttackDataSO.cs.meta (100%) rename Assets/Scripts/Unicorn/{Game => }/Hitbox/UnicornHitbox.cs (100%) rename Assets/Scripts/Unicorn/{Game => }/Hitbox/UnicornHitbox.cs.meta (100%) rename Assets/Scripts/Unicorn/{Game => }/LivingEntity.cs (100%) rename Assets/Scripts/Unicorn/{Game => }/LivingEntity.cs.meta (100%) rename Assets/Scripts/Unicorn/{Game => }/Player.meta (100%) create mode 100644 Assets/Scripts/Unicorn/Player/Player.cs rename Assets/Scripts/Unicorn/{Game => }/Player/Player.cs.meta (100%) rename Assets/Scripts/Unicorn/{Game => }/Player/PlayerAttack.cs (100%) rename Assets/Scripts/Unicorn/{Game => }/Player/PlayerAttack.cs.meta (100%) rename Assets/Scripts/Unicorn/{Game => }/Player/PlayerMovement.cs (100%) rename Assets/Scripts/Unicorn/{Game => }/Player/PlayerMovement.cs.meta (100%) diff --git a/Assets/Scenes/MainScene.unity b/Assets/Scenes/MainScene.unity index 81d15ac..06cf546 100644 --- a/Assets/Scenes/MainScene.unity +++ b/Assets/Scenes/MainScene.unity @@ -133,7 +133,8 @@ GameObject: - component: {fileID: 68822295} - component: {fileID: 68822296} - component: {fileID: 68822297} - m_Layer: 0 + - component: {fileID: 68822298} + m_Layer: 6 m_Name: Player m_TagString: Untagged m_Icon: {fileID: 0} @@ -315,6 +316,19 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Assembly-CSharp::PlayerAttack attackHitbox: {fileID: 275882238} +--- !u!114 &68822298 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 68822291} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 28098bcb033145e7aed508aa64877be6, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::Unicorn.Game.Player.Player + health: 200 --- !u!1 &78098707 GameObject: m_ObjectHideFlags: 0 @@ -482,7 +496,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &275882239 Transform: m_ObjectHideFlags: 0 @@ -502,85 +516,6 @@ Transform: - {fileID: 607806375} m_Father: {fileID: 68822293} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &367619576 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 367619579} - - component: {fileID: 367619578} - - component: {fileID: 367619577} - m_Layer: 0 - m_Name: EventSystem - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &367619577 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 367619576} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 01614664b831546d2ae94a42149d80ac, type: 3} - m_Name: - m_EditorClassIdentifier: Unity.InputSystem::UnityEngine.InputSystem.UI.InputSystemUIInputModule - m_SendPointerHoverToParent: 1 - m_MoveRepeatDelay: 0.5 - m_MoveRepeatRate: 0.1 - m_XRTrackingOrigin: {fileID: 0} - m_ActionsAsset: {fileID: -944628639613478452, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} - m_PointAction: {fileID: -1654692200621890270, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} - m_MoveAction: {fileID: -8784545083839296357, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} - m_SubmitAction: {fileID: 392368643174621059, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} - m_CancelAction: {fileID: 7727032971491509709, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} - m_LeftClickAction: {fileID: 3001919216989983466, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} - m_MiddleClickAction: {fileID: -2185481485913320682, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} - m_RightClickAction: {fileID: -4090225696740746782, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} - m_ScrollWheelAction: {fileID: 6240969308177333660, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} - m_TrackedDevicePositionAction: {fileID: 6564999863303420839, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} - m_TrackedDeviceOrientationAction: {fileID: 7970375526676320489, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} - m_DeselectOnBackgroundClick: 1 - m_PointerBehavior: 0 - m_CursorLockBehavior: 0 - m_ScrollDeltaPerTick: 6 ---- !u!114 &367619578 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 367619576} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} - m_Name: - m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.EventSystems.EventSystem - m_FirstSelected: {fileID: 0} - m_sendNavigationEvents: 1 - m_DragThreshold: 10 ---- !u!4 &367619579 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 367619576} - 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: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &519420028 GameObject: m_ObjectHideFlags: 0 @@ -803,12 +738,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 603434663} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: -5, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 17.777779, y: 1, z: 11.111112} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 1523163457} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!61 &603434666 BoxCollider2D: @@ -1092,7 +1027,7 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &681728483 +--- !u!1 &1291505767 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1100,178 +1035,62 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 681728488} - - component: {fileID: 681728487} - - component: {fileID: 681728486} - - component: {fileID: 681728485} - - component: {fileID: 681728489} - m_Layer: 8 - m_Name: Enemy + - component: {fileID: 1291505768} + m_Layer: 0 + m_Name: Controller m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!50 &681728485 -Rigidbody2D: - serializedVersion: 5 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 681728483} - m_BodyType: 0 - m_Simulated: 1 - m_UseFullKinematicContacts: 0 - m_UseAutoMass: 0 - m_Mass: 1 - m_LinearDamping: 0 - m_AngularDamping: 0.05 - m_GravityScale: 1 - 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: 0 ---- !u!61 &681728486 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 681728483} - 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} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 0.5} - 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!212 &681728487 -SpriteRenderer: - serializedVersion: 2 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 681728483} - 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: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, 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!4 &681728488 +--- !u!4 &1291505768 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 681728483} + m_GameObject: {fileID: 1291505767} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.32, y: -2.59, z: 0} + m_LocalPosition: {x: 1.27887, y: -2.06002, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 1398908074} + - {fileID: 1472544505} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &681728489 -MonoBehaviour: +--- !u!1 &1398908073 +GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 681728483} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 63fc82d3df1a3164584e678e0f04f817, type: 3} - m_Name: - m_EditorClassIdentifier: Assembly-CSharp::Unicorn.Game.Enemy - health: 20 + serializedVersion: 6 + m_Component: + - component: {fileID: 1398908074} + m_Layer: 0 + m_Name: Attack + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1398908074 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1398908073} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.75479996, y: -0.9598501, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1291505768} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1472544503 GameObject: m_ObjectHideFlags: 0 @@ -1309,11 +1128,43 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1472544503} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.67683, y: 0.09318, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -1.9556999, y: 2.1532, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] + m_Father: {fileID: 1291505768} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1523163456 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1523163457} + m_Layer: 0 + m_Name: Map + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1523163457 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1523163456} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -5, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 603434665} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1738655999 @@ -1627,7 +1478,5 @@ SceneRoots: - {fileID: 519420032} - {fileID: 619394802} - {fileID: 68822293} - - {fileID: 603434665} - - {fileID: 1472544505} - - {fileID: 681728488} - - {fileID: 367619579} + - {fileID: 1523163457} + - {fileID: 1291505768} diff --git a/Assets/Scripts/Unicorn/Boss.meta b/Assets/Scripts/Unicorn/Boss.meta new file mode 100644 index 0000000..ddbe4d3 --- /dev/null +++ b/Assets/Scripts/Unicorn/Boss.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: dfcbc90cc7a0c014e81c445f114b9772 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Unicorn/Game/Enemy.cs b/Assets/Scripts/Unicorn/Enemy.cs similarity index 100% rename from Assets/Scripts/Unicorn/Game/Enemy.cs rename to Assets/Scripts/Unicorn/Enemy.cs diff --git a/Assets/Scripts/Unicorn/Game/Enemy.cs.meta b/Assets/Scripts/Unicorn/Enemy.cs.meta similarity index 100% rename from Assets/Scripts/Unicorn/Game/Enemy.cs.meta rename to Assets/Scripts/Unicorn/Enemy.cs.meta diff --git a/Assets/Scripts/Unicorn/Game.meta b/Assets/Scripts/Unicorn/Game.meta deleted file mode 100644 index f71e8b1..0000000 --- a/Assets/Scripts/Unicorn/Game.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: a876daf45e834b59879bf88d11a77ebe -timeCreated: 1777908804 \ No newline at end of file diff --git a/Assets/Scripts/Unicorn/Game/Player/Player.cs b/Assets/Scripts/Unicorn/Game/Player/Player.cs deleted file mode 100644 index fb9cf6c..0000000 --- a/Assets/Scripts/Unicorn/Game/Player/Player.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace Unicorn.Game.Player -{ - public class Player: LivingEntity - { - - } -} \ No newline at end of file diff --git a/Assets/Scripts/Unicorn/Game/Hitbox.meta b/Assets/Scripts/Unicorn/Hitbox.meta similarity index 100% rename from Assets/Scripts/Unicorn/Game/Hitbox.meta rename to Assets/Scripts/Unicorn/Hitbox.meta diff --git a/Assets/Scripts/Unicorn/Game/Hitbox/DamageInfo.cs b/Assets/Scripts/Unicorn/Hitbox/DamageInfo.cs similarity index 100% rename from Assets/Scripts/Unicorn/Game/Hitbox/DamageInfo.cs rename to Assets/Scripts/Unicorn/Hitbox/DamageInfo.cs diff --git a/Assets/Scripts/Unicorn/Game/Hitbox/DamageInfo.cs.meta b/Assets/Scripts/Unicorn/Hitbox/DamageInfo.cs.meta similarity index 100% rename from Assets/Scripts/Unicorn/Game/Hitbox/DamageInfo.cs.meta rename to Assets/Scripts/Unicorn/Hitbox/DamageInfo.cs.meta diff --git a/Assets/Scripts/Unicorn/Game/Hitbox/SO.meta b/Assets/Scripts/Unicorn/Hitbox/SO.meta similarity index 100% rename from Assets/Scripts/Unicorn/Game/Hitbox/SO.meta rename to Assets/Scripts/Unicorn/Hitbox/SO.meta diff --git a/Assets/Scripts/Unicorn/Game/Hitbox/SO/ExampleAD.asset b/Assets/Scripts/Unicorn/Hitbox/SO/ExampleAD.asset similarity index 97% rename from Assets/Scripts/Unicorn/Game/Hitbox/SO/ExampleAD.asset rename to Assets/Scripts/Unicorn/Hitbox/SO/ExampleAD.asset index 23de5a2..df4f7da 100644 --- a/Assets/Scripts/Unicorn/Game/Hitbox/SO/ExampleAD.asset +++ b/Assets/Scripts/Unicorn/Hitbox/SO/ExampleAD.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4de4d4a74d5b4258863a8173560a93ab, type: 3} m_Name: ExampleAD m_EditorClassIdentifier: Assembly-CSharp::Unicorn.Game.Hitbox.UnicornAttackDataSO - damage: 5 + damage: 3 knockbackForce: 15 diff --git a/Assets/Scripts/Unicorn/Game/Hitbox/SO/ExampleAD.asset.meta b/Assets/Scripts/Unicorn/Hitbox/SO/ExampleAD.asset.meta similarity index 100% rename from Assets/Scripts/Unicorn/Game/Hitbox/SO/ExampleAD.asset.meta rename to Assets/Scripts/Unicorn/Hitbox/SO/ExampleAD.asset.meta diff --git a/Assets/Scripts/Unicorn/Game/Hitbox/UnicornAttackDataSO.cs b/Assets/Scripts/Unicorn/Hitbox/UnicornAttackDataSO.cs similarity index 100% rename from Assets/Scripts/Unicorn/Game/Hitbox/UnicornAttackDataSO.cs rename to Assets/Scripts/Unicorn/Hitbox/UnicornAttackDataSO.cs diff --git a/Assets/Scripts/Unicorn/Game/Hitbox/UnicornAttackDataSO.cs.meta b/Assets/Scripts/Unicorn/Hitbox/UnicornAttackDataSO.cs.meta similarity index 100% rename from Assets/Scripts/Unicorn/Game/Hitbox/UnicornAttackDataSO.cs.meta rename to Assets/Scripts/Unicorn/Hitbox/UnicornAttackDataSO.cs.meta diff --git a/Assets/Scripts/Unicorn/Game/Hitbox/UnicornHitbox.cs b/Assets/Scripts/Unicorn/Hitbox/UnicornHitbox.cs similarity index 100% rename from Assets/Scripts/Unicorn/Game/Hitbox/UnicornHitbox.cs rename to Assets/Scripts/Unicorn/Hitbox/UnicornHitbox.cs diff --git a/Assets/Scripts/Unicorn/Game/Hitbox/UnicornHitbox.cs.meta b/Assets/Scripts/Unicorn/Hitbox/UnicornHitbox.cs.meta similarity index 100% rename from Assets/Scripts/Unicorn/Game/Hitbox/UnicornHitbox.cs.meta rename to Assets/Scripts/Unicorn/Hitbox/UnicornHitbox.cs.meta diff --git a/Assets/Scripts/Unicorn/Game/LivingEntity.cs b/Assets/Scripts/Unicorn/LivingEntity.cs similarity index 100% rename from Assets/Scripts/Unicorn/Game/LivingEntity.cs rename to Assets/Scripts/Unicorn/LivingEntity.cs diff --git a/Assets/Scripts/Unicorn/Game/LivingEntity.cs.meta b/Assets/Scripts/Unicorn/LivingEntity.cs.meta similarity index 100% rename from Assets/Scripts/Unicorn/Game/LivingEntity.cs.meta rename to Assets/Scripts/Unicorn/LivingEntity.cs.meta diff --git a/Assets/Scripts/Unicorn/Game/Player.meta b/Assets/Scripts/Unicorn/Player.meta similarity index 100% rename from Assets/Scripts/Unicorn/Game/Player.meta rename to Assets/Scripts/Unicorn/Player.meta diff --git a/Assets/Scripts/Unicorn/Player/Player.cs b/Assets/Scripts/Unicorn/Player/Player.cs new file mode 100644 index 0000000..6e27031 --- /dev/null +++ b/Assets/Scripts/Unicorn/Player/Player.cs @@ -0,0 +1,18 @@ +using Unicorn.Game.Hitbox; +using UnityEngine; + +namespace Unicorn.Game.Player +{ + public class Player: LivingEntity + { + protected override void OnDamaged(DamageInfo info) + { + Debug.Log(health); + } + + protected override void OnDeath() + { + Debug.Log("주것서영."); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Unicorn/Game/Player/Player.cs.meta b/Assets/Scripts/Unicorn/Player/Player.cs.meta similarity index 100% rename from Assets/Scripts/Unicorn/Game/Player/Player.cs.meta rename to Assets/Scripts/Unicorn/Player/Player.cs.meta diff --git a/Assets/Scripts/Unicorn/Game/Player/PlayerAttack.cs b/Assets/Scripts/Unicorn/Player/PlayerAttack.cs similarity index 100% rename from Assets/Scripts/Unicorn/Game/Player/PlayerAttack.cs rename to Assets/Scripts/Unicorn/Player/PlayerAttack.cs diff --git a/Assets/Scripts/Unicorn/Game/Player/PlayerAttack.cs.meta b/Assets/Scripts/Unicorn/Player/PlayerAttack.cs.meta similarity index 100% rename from Assets/Scripts/Unicorn/Game/Player/PlayerAttack.cs.meta rename to Assets/Scripts/Unicorn/Player/PlayerAttack.cs.meta diff --git a/Assets/Scripts/Unicorn/Game/Player/PlayerMovement.cs b/Assets/Scripts/Unicorn/Player/PlayerMovement.cs similarity index 100% rename from Assets/Scripts/Unicorn/Game/Player/PlayerMovement.cs rename to Assets/Scripts/Unicorn/Player/PlayerMovement.cs diff --git a/Assets/Scripts/Unicorn/Game/Player/PlayerMovement.cs.meta b/Assets/Scripts/Unicorn/Player/PlayerMovement.cs.meta similarity index 100% rename from Assets/Scripts/Unicorn/Game/Player/PlayerMovement.cs.meta rename to Assets/Scripts/Unicorn/Player/PlayerMovement.cs.meta diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 835c33f..9935806 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/MainScene.unity guid: 8c9cfa26abfee488c85f1582747f6a02 m_configObjects: com.unity.input.settings.actions: {fileID: -944628639613478452, guid: 2bcd2660ca9b64942af0de543d8d7100, type: 3}