diff --git a/Assets/0_Scenes/Game.unity b/Assets/0_Scenes/Game.unity index c9140eb..cfc7639 100644 --- a/Assets/0_Scenes/Game.unity +++ b/Assets/0_Scenes/Game.unity @@ -258,6 +258,7 @@ GameObject: m_Component: - component: {fileID: 1027484182} - component: {fileID: 1027484181} + - component: {fileID: 1027484183} m_Layer: 0 m_Name: Player m_TagString: Untagged @@ -282,7 +283,10 @@ MonoBehaviour: dashCooldown: 1 maxSpeed: 8 accelerationTime: 2 - dashTime: 0.2 + dashTime: 0.3 + moveTime: 0 + playerState: 0 + idleState: 0 --- !u!4 &1027484182 Transform: m_ObjectHideFlags: 0 @@ -299,6 +303,20 @@ Transform: - {fileID: 1451512198} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1027484183 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1027484180} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a39f177316563f44b93781c9c27e5266, type: 3} + m_Name: + m_EditorClassIdentifier: + attackTime: 0.2 + attackCooldown: 0.5 --- !u!1 &1451512195 GameObject: m_ObjectHideFlags: 0 @@ -418,7 +436,7 @@ GameObject: - component: {fileID: 1578057062} m_Layer: 0 m_Name: MainCamera - m_TagString: Untagged + m_TagString: MainCamera m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -482,7 +500,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1578057060} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 diff --git a/Assets/0_Scenes/Title.unity b/Assets/0_Scenes/Title.unity index 12b6863..7ae86dd 100644 --- a/Assets/0_Scenes/Title.unity +++ b/Assets/0_Scenes/Title.unity @@ -120,7 +120,7 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &25213554 +--- !u!1 &164691235 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -128,270 +128,9 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 25213555} - - component: {fileID: 25213558} - - component: {fileID: 25213557} - - component: {fileID: 25213556} - m_Layer: 5 - m_Name: Button (Legacy) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &25213555 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 25213554} - 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: 576685335} - m_Father: {fileID: 1984215679} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 160, y: 30} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &25213556 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 25213554} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 25213557} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1474302671} - m_TargetAssemblyTypeName: GameManager, Assembly-CSharp - m_MethodName: NextScene - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 ---- !u!114 &25213557 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 25213554} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &25213558 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 25213554} - m_CullTransparentMesh: 1 ---- !u!1 &519420028 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 519420032} - - component: {fileID: 519420031} - - component: {fileID: 519420030} - m_Layer: 0 - m_Name: Main Camera - m_TagString: MainCamera - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &519420030 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 519420028} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} - m_Name: - m_EditorClassIdentifier: - m_RenderShadows: 1 - m_RequiresDepthTextureOption: 2 - m_RequiresOpaqueTextureOption: 2 - m_CameraType: 0 - m_Cameras: [] - m_RendererIndex: -1 - m_VolumeLayerMask: - serializedVersion: 2 - m_Bits: 1 - m_VolumeTrigger: {fileID: 0} - m_VolumeFrameworkUpdateModeOption: 2 - m_RenderPostProcessing: 0 - m_Antialiasing: 0 - m_AntialiasingQuality: 2 - m_StopNaN: 0 - m_Dithering: 0 - m_ClearDepth: 1 - m_AllowXRRendering: 1 - m_AllowHDROutput: 1 - m_UseScreenCoordOverride: 0 - m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} - m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} - m_RequiresDepthTexture: 0 - m_RequiresColorTexture: 0 - m_Version: 2 - m_TaaSettings: - m_Quality: 3 - m_FrameInfluence: 0.1 - m_JitterScale: 1 - m_MipBias: 0 - m_VarianceClampScale: 0.9 - m_ContrastAdaptiveSharpening: 0 ---- !u!20 &519420031 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 519420028} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 2 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} - m_projectionMatrixMode: 1 - m_GateFitMode: 2 - m_FOVAxisMode: 0 - m_Iso: 200 - m_ShutterSpeed: 0.005 - m_Aperture: 16 - m_FocusDistance: 10 - m_FocalLength: 50 - m_BladeCount: 5 - m_Curvature: {x: 2, y: 11} - m_BarrelClipping: 0.25 - m_Anamorphism: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 34 - orthographic: 1 - orthographic size: 5 - m_Depth: -1 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 0 - m_HDR: 1 - m_AllowMSAA: 0 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 0 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 ---- !u!4 &519420032 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 519420028} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -10} - 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 &576685334 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 576685335} - - component: {fileID: 576685337} - - component: {fileID: 576685336} + - component: {fileID: 164691236} + - component: {fileID: 164691238} + - component: {fileID: 164691237} m_Layer: 5 m_Name: Text (Legacy) m_TagString: Untagged @@ -399,32 +138,32 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &576685335 +--- !u!224 &164691236 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 576685334} + m_GameObject: {fileID: 164691235} 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: 25213555} + m_Father: {fileID: 1617917833} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &576685336 +--- !u!114 &164691237 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 576685334} + m_GameObject: {fileID: 164691235} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} @@ -452,14 +191,267 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: Button ---- !u!222 &576685337 +--- !u!222 &164691238 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 576685334} + m_GameObject: {fileID: 164691235} m_CullTransparentMesh: 1 +--- !u!1 &1113527984 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1113527988} + - component: {fileID: 1113527987} + - component: {fileID: 1113527986} + - component: {fileID: 1113527985} + m_Layer: 5 + m_Name: Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1113527985 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1113527984} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &1113527986 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1113527984} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!223 &1113527987 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1113527984} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!224 &1113527988 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1113527984} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1617917833} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!1 &1288082627 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1288082630} + - component: {fileID: 1288082629} + - component: {fileID: 1288082628} + m_Layer: 0 + m_Name: EventSystem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1288082628 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1288082627} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} + m_Name: + m_EditorClassIdentifier: + m_SendPointerHoverToParent: 1 + m_HorizontalAxis: Horizontal + m_VerticalAxis: Vertical + m_SubmitButton: Submit + m_CancelButton: Cancel + m_InputActionsPerSecond: 10 + m_RepeatDelay: 0.5 + m_ForceModuleActive: 0 +--- !u!114 &1288082629 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1288082627} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_FirstSelected: {fileID: 0} + m_sendNavigationEvents: 1 + m_DragThreshold: 10 +--- !u!4 &1288082630 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1288082627} + 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 &1357689176 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1357689179} + - component: {fileID: 1357689178} + m_Layer: 0 + m_Name: MainCamera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!20 &1357689178 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1357689176} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &1357689179 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1357689176} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 896.5191, y: 547.0058, z: -0.9581684} + 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 &1474302670 GameObject: m_ObjectHideFlags: 0 @@ -628,7 +620,7 @@ MonoBehaviour: eftSuond: [] nowMusic: 0 eftSound: {fileID: 0} ---- !u!1 &1509563516 +--- !u!1 &1617917832 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -636,184 +628,136 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1509563519} - - component: {fileID: 1509563518} - - component: {fileID: 1509563517} - m_Layer: 0 - m_Name: EventSystem - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1509563517 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1509563516} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 01614664b831546d2ae94a42149d80ac, type: 3} - m_Name: - m_EditorClassIdentifier: - 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 &1509563518 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1509563516} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} - m_Name: - m_EditorClassIdentifier: - m_FirstSelected: {fileID: 0} - m_sendNavigationEvents: 1 - m_DragThreshold: 10 ---- !u!4 &1509563519 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1509563516} - 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 &1984215675 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1984215679} - - component: {fileID: 1984215678} - - component: {fileID: 1984215677} - - component: {fileID: 1984215676} + - component: {fileID: 1617917833} + - component: {fileID: 1617917836} + - component: {fileID: 1617917835} + - component: {fileID: 1617917834} m_Layer: 5 - m_Name: Canvas + m_Name: Button (Legacy) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &1984215676 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1984215675} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 4294967295 ---- !u!114 &1984215677 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1984215675} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} - m_Name: - m_EditorClassIdentifier: - m_UiScaleMode: 0 - m_ReferencePixelsPerUnit: 100 - m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} - m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 - m_PhysicalUnit: 3 - m_FallbackScreenDPI: 96 - m_DefaultSpriteDPI: 96 - m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 0 ---- !u!223 &1984215678 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1984215675} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 0 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_VertexColorAlwaysGammaSpace: 0 - m_AdditionalShaderChannelsFlag: 0 - m_UpdateRectTransformForStandalone: 0 - m_SortingLayerID: 0 - m_SortingOrder: 0 - m_TargetDisplay: 0 ---- !u!224 &1984215679 +--- !u!224 &1617917833 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1984215675} + m_GameObject: {fileID: 1617917832} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 25213555} - m_Father: {fileID: 0} + - {fileID: 164691236} + m_Father: {fileID: 1113527988} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0, y: 0} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1617917834 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1617917832} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1617917835} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1474302671} + m_TargetAssemblyTypeName: GameManager, Assembly-CSharp + m_MethodName: NextScene + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &1617917835 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1617917832} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1617917836 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1617917832} + m_CullTransparentMesh: 1 --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 m_Roots: - - {fileID: 519420032} - {fileID: 1474302672} - - {fileID: 1509563519} - - {fileID: 1984215679} + - {fileID: 1113527988} + - {fileID: 1288082630} + - {fileID: 1357689179} diff --git a/Assets/1_Script/Play/PlayManager.cs b/Assets/1_Script/Play/PlayManager.cs index 559ef43..b277c09 100644 --- a/Assets/1_Script/Play/PlayManager.cs +++ b/Assets/1_Script/Play/PlayManager.cs @@ -33,6 +33,7 @@ public class PlayManager : SingletonMonoBehaviour public Action keyDup = null; public Action kewEsc = null; public Action keySpace = null; + public Action leftMouve = null; private void OnGUI() { keyEvent = Event.current; @@ -81,5 +82,11 @@ public class PlayManager : SingletonMonoBehaviour } } } - + private void Update() + { + if (Input.GetMouseButtonDown(0)) + { + leftMouve?.Invoke(); + } + } } diff --git a/Assets/1_Script/Player/PlayerAttack.cs b/Assets/1_Script/Player/PlayerAttack.cs new file mode 100644 index 0000000..b17318f --- /dev/null +++ b/Assets/1_Script/Player/PlayerAttack.cs @@ -0,0 +1,97 @@ +using System.Collections; +using UnityEngine; +using static PlayerController; + +public class PlayerAttack : MonoBehaviour +{ + Animator animator; + PlayerController controller; + public float attackTime = 0.5f; // °ø°Ý ÈÄ Äð´Ù¿î + private int attackCount = 0; // ÇöÀç °ø°Ý Ƚ¼ö + private float lastAttackTime; + private bool canAttack = true; + private int attackIdx = 0; // °ø°Ý ¾Ö´Ï¸ÞÀÌ¼Ç À妽º (0,1 ¹Ýº¹) + + private string[] anim_Strings = { "AttackIdx", "AttackState", "idleState" }; + + private void Start() + { + controller = GetComponent(); + animator = GetComponentInChildren(); + PlayManager.Instance.leftMouve += Attack; + } + + private void Update() + { + if (controller.playerState == PlayerState.Dash) return; + + if (attackCount > 0 && Time.time - lastAttackTime >= attackTime) + { + AttackStop(); // ÀϹÝÀûÀÎ °æ¿ì´Â ±×³É AttackStop() + } + } + + void Attack() + { + if(!canAttack) return; + controller.playerState = PlayerState.Attack; + lastAttackTime = Time.time; + attackCount++; + + Debug.Log($"Attack Count: {attackCount}, Attack Index: {attackIdx}"); + + animator.SetInteger(anim_Strings[0], attackIdx); + attackIdx = (attackIdx + 1) % 2; + + AttackRot(); + animator.SetFloat(anim_Strings[1], controller.idleState); + + if (attackCount >= 3) + { + StartCoroutine(AttackCooldown()); // ¸¶Áö¸· °ø°ÝÀ̸é Äð´Ù¿î ½ÇÇà + } + } + + public void AttackStop() + { + attackCount = 0; + controller.playerState = PlayerState.Idle; + animator.SetInteger(anim_Strings[0], -1); + } + + IEnumerator AttackCooldown() + { + canAttack = false; + yield return new WaitForSeconds(attackTime); + AttackStop(); // ¸¶Áö¸· °ø°Ý ÈÄ Stop + canAttack = true; + } + + private void AttackRot() + { + Vector3 playerScreenPos = Camera.main.WorldToScreenPoint(transform.position); + Vector3 mouseScreenPos = Input.mousePosition; + + bool isLeft = mouseScreenPos.x < playerScreenPos.x; + + if (Mathf.Abs(mouseScreenPos.x - playerScreenPos.x) > Mathf.Abs(mouseScreenPos.y - playerScreenPos.y)) + { + transform.GetChild(0).localEulerAngles = isLeft ? new Vector3(0, 180, 0) : new Vector3(0, 0, 0); + animator.SetFloat(anim_Strings[2], 1); + controller.idleState = 1f; + } + else + { + if (mouseScreenPos.y > playerScreenPos.y) + { + animator.SetFloat(anim_Strings[2], 0.5f); + controller.idleState = 2f / 3f; + } + else + { + animator.SetFloat(anim_Strings[2], 0); + controller.idleState = 1f / 3f; + } + } + } +} diff --git a/Assets/1_Script/Player/PlayerAttack.cs.meta b/Assets/1_Script/Player/PlayerAttack.cs.meta new file mode 100644 index 0000000..e4936cf --- /dev/null +++ b/Assets/1_Script/Player/PlayerAttack.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a39f177316563f44b93781c9c27e5266 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/1_Script/Player/PlayerContoller.cs b/Assets/1_Script/Player/PlayerContoller.cs index af45505..67011b2 100644 --- a/Assets/1_Script/Player/PlayerContoller.cs +++ b/Assets/1_Script/Player/PlayerContoller.cs @@ -1,4 +1,5 @@ using System.Collections; +using System.Collections.Generic; using UnityEngine; public class PlayerController : MonoBehaviour @@ -8,21 +9,21 @@ public class PlayerController : MonoBehaviour public float dashCooldown = 1f; // ´ë½Ã ÄðŸÀÓ public float maxSpeed = 8f; // ÃÖ´ë ¼Óµµ (2~3ÃÊ ÈÄ ÃÖ´ë ¼Óµµ µµ´Þ) public float accelerationTime = 2f; // 2ÃÊ µ¿¾È °¡¼Ó - private float moveTime = 0f; // À̵¿ÇÑ ½Ã°£ public float dashTime = 0.5f; - private bool canDash = true; // ´ë½Ã °¡´É ¿©ºÎ + public float moveTime = 0f; // À̵¿ÇÑ ½Ã°£ + public enum PlayerState { Idle, Walking, Dash, Attack } + public PlayerState playerState; private Vector2 moveDirection = Vector2.zero; // ÇöÀç À̵¿ ¹æÇâ - private bool isWalking = false; // À̵¿ ÁßÀÎÁö ¿©ºÎ - private float dashValue; + private string[] anim_Strings = { "PosX", "PosY", "idleState" }; + PlayerAttack playerAttack; Animator animator; - SpriteRenderer spriteRenderer; - private float idleState = 0f; // 0: ¿À¸¥ÂÊ, 0.333: ¿ÞÂÊ, 0.666: À§, 1: ¾Æ·¡ + public float idleState = 0f; // 0: ¿À¸¥ÂÊ, 0.333: ¿ÞÂÊ, 0.666: À§, 1: ¾Æ·¡ void Start() { - spriteRenderer = GetComponentInChildren(); animator = GetComponentInChildren(); + playerAttack = GetComponent(); // Ű À̺¥Æ®¿Í ½ºÇÁ¶óÀÌÆ® ¹× ȸÀü ó¸® ¿¬°á PlayManager.Instance.keySdown += () => SetMovement(Vector2.down, 1f / 3f); // ¾Æ·¡ @@ -30,7 +31,7 @@ public class PlayerController : MonoBehaviour PlayManager.Instance.keyAdown += () => SetMovement(Vector2.left, 1f); // ¿ÞÂÊ PlayManager.Instance.keyDdown += () => SetMovement(Vector2.right, 1f); // ¿À¸¥ÂÊ - // ´ë½Ã ±â´É ¿¬°á + // ´ë½Ã ±â´É PlayManager.Instance.keySpace += Dash; } @@ -42,22 +43,20 @@ public class PlayerController : MonoBehaviour // À̵¿ ó¸® void HandleMovement() { - if (!canDash) return; + if (playerState == PlayerState.Dash || playerState == PlayerState.Attack) return; moveDirection = Vector2.zero; // ¸Å ÇÁ·¹ÀÓ ÃʱâÈ­ - // Ű »óŸ¦ Á÷Á¢ È®ÀÎÇÏ°í ¹æÇâ °áÁ¤ if (Input.GetKey(KeyCode.A)) moveDirection += Vector2.left; if (Input.GetKey(KeyCode.D)) moveDirection += Vector2.right; if (Input.GetKey(KeyCode.W)) moveDirection += Vector2.up; if (Input.GetKey(KeyCode.S)) moveDirection += Vector2.down; // À̵¿ ¿©ºÎ ÆÇº° - isWalking = moveDirection != Vector2.zero; - animator.SetBool("isWalking", isWalking); - - // À̵¿ ¹æÇâÀÌ ÀÖÀ» ¶§¸¸ À̵¿ - if (isWalking) + if (moveDirection != Vector2.zero) { + animator.SetBool("isWalking", true); + + playerState = PlayerState.Walking; moveTime += Time.deltaTime; // 2ÃÊ ÀÌ»ó À̵¿Çϸé Áï½Ã ¼Óµµ¸¦ maxSpeed·Î Áõ°¡ float currentSpeed = HandleAcceleration(); @@ -66,41 +65,44 @@ public class PlayerController : MonoBehaviour // A ¶Ç´Â D°¡ ´­¸° »óŶó¸é Side ¾Ö´Ï¸ÞÀ̼ÇÀ» ¿ì¼± Àû¿ë if (moveDirection.x != 0) { - animator.SetFloat("moveX", 1); // ¹«Á¶°Ç Side ¾Ö´Ï¸ÞÀÌ¼Ç - animator.SetFloat("moveY", 0); // À§/¾Æ·¡´Â ¹«½Ã + animator.SetFloat(anim_Strings[0], 1); + animator.SetFloat(anim_Strings[1], 0); } else { - animator.SetFloat("moveX", 0); - animator.SetFloat("moveY", moveDirection.y); + animator.SetFloat(anim_Strings[0], 0); + animator.SetFloat(anim_Strings[1], moveDirection.y); } - // ȸÀü ó¸® if (Mathf.Abs(moveDirection.x) > 0) { - if (moveDirection.x < 0 && transform.GetChild(0).localEulerAngles.y != 180) - { - transform.GetChild(0).localEulerAngles = new Vector3(0, 180, 0); - } - else if (moveDirection.x > 0 && transform.GetChild(0).localEulerAngles.y != 0) - { - transform.GetChild(0).localEulerAngles = new Vector3(0, 0, 0); - } + PlayerRot(moveDirection); } } else { // À̵¿ÇÏÁö ¾ÊÀ¸¸é Idle »óŸ¦ ¼³Á¤ moveTime = 0f; - animator.SetFloat("moveX", 0); - animator.SetFloat("moveY", 0); - animator.SetFloat("idleState", idleState); + animator.SetBool("isWalking", false); + animator.SetFloat(anim_Strings[0], 0); + animator.SetFloat(anim_Strings[1], 0); + animator.SetFloat(anim_Strings[2], idleState); + } + } + private void PlayerRot(Vector2 direction) + { + if (direction.x < 0 && transform.GetChild(0).localEulerAngles.y != 180) + { + transform.GetChild(0).localEulerAngles = new Vector3(0, 180, 0); + } + else if (direction.x > 0 && transform.GetChild(0).localEulerAngles.y != 0) + { + transform.GetChild(0).localEulerAngles = new Vector3(0, 0, 0); } - } float HandleAcceleration() { - if (isWalking) + if (playerState == PlayerState.Walking) { moveTime += Time.deltaTime; if (moveTime >= accelerationTime) @@ -113,12 +115,12 @@ public class PlayerController : MonoBehaviour // ´ë½Ã ó¸® void Dash() { - if (canDash) + if (playerState != PlayerState.Dash) { - canDash = false; - isWalking = false; + playerState = PlayerState.Dash; animator.SetTrigger("DodgeTrigger"); - + playerAttack.AttackStop(); + moveTime = 0f; StartCoroutine(DashCoroutine()); // ´ë½Ã ½ÃÀÛ } } @@ -137,7 +139,7 @@ public class PlayerController : MonoBehaviour } transform.position = targetPosition; - canDash = true; + playerState = PlayerState.Idle; } // À̵¿ ¹æÇâ°ú ½ºÇÁ¶óÀÌÆ®, ȸÀü ó¸® void SetMovement(Vector2 direction, float idleStateValue) @@ -145,4 +147,5 @@ public class PlayerController : MonoBehaviour moveDirection = direction; idleState = idleStateValue; } -} + +} \ No newline at end of file diff --git a/Assets/1_Script/Test.cs b/Assets/1_Script/Test.cs new file mode 100644 index 0000000..b02c43a --- /dev/null +++ b/Assets/1_Script/Test.cs @@ -0,0 +1,15 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Test : MonoBehaviour +{ + + void Update() + { + if(Input.GetKeyDown(KeyCode.W)) + { + transform.position += Vector3.up; + } + } +} diff --git a/Assets/1_Script/Test.cs.meta b/Assets/1_Script/Test.cs.meta new file mode 100644 index 0000000..6283610 --- /dev/null +++ b/Assets/1_Script/Test.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 4516b850d6efd2e4f99a556620b38ce7 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/2_Sprite/Chracters_Movement/Ine/Attack.meta b/Assets/2_Sprite/Chracters_Movement/Ine/Attack.meta new file mode 100644 index 0000000..9c46347 --- /dev/null +++ b/Assets/2_Sprite/Chracters_Movement/Ine/Attack.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 287c7d3ca4471344092e3f3b465a9111 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/2_Sprite/Chracters_Movement/Ine/Attack/ine_attack_back_1-2.png b/Assets/2_Sprite/Chracters_Movement/Ine/Attack/ine_attack_back_1-2.png new file mode 100644 index 0000000..abfeb2f Binary files /dev/null and b/Assets/2_Sprite/Chracters_Movement/Ine/Attack/ine_attack_back_1-2.png differ diff --git a/Assets/2_Sprite/Chracters_Movement/Ine/Attack/ine_attack_back_1-2.png.meta b/Assets/2_Sprite/Chracters_Movement/Ine/Attack/ine_attack_back_1-2.png.meta new file mode 100644 index 0000000..e4ae05c --- /dev/null +++ b/Assets/2_Sprite/Chracters_Movement/Ine/Attack/ine_attack_back_1-2.png.meta @@ -0,0 +1,252 @@ +fileFormatVersion: 2 +guid: b215869bce738874e8571578712561b2 +TextureImporter: + internalIDToNameTable: + - first: + 213: 7471230947783674214 + second: ine_attack_back_1-2_0 + - first: + 213: 2425457128842875911 + second: ine_attack_back_1-2_1 + - first: + 213: 3431530335034378245 + second: ine_attack_back_1-2_2 + - first: + 213: 5927189054070903759 + second: ine_attack_back_1-2_3 + - first: + 213: 5746959999336544401 + second: ine_attack_back_1-2_4 + - first: + 213: 2893779901101772155 + second: ine_attack_back_1-2_5 + externalObjects: {} + serializedVersion: 12 + 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: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + 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: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: ine_attack_back_1-2_0 + rect: + serializedVersion: 2 + x: 40 + y: 12 + width: 110 + height: 150 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 6690d8576f42fa760800000000000000 + internalID: 7471230947783674214 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: ine_attack_back_1-2_1 + rect: + serializedVersion: 2 + x: 230 + y: 12 + width: 110 + height: 150 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 7045e967864f8a120800000000000000 + internalID: 2425457128842875911 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: ine_attack_back_1-2_2 + rect: + serializedVersion: 2 + x: 420 + y: 12 + width: 110 + height: 150 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 50883bf98ae3f9f20800000000000000 + internalID: 3431530335034378245 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: ine_attack_back_1-2_3 + rect: + serializedVersion: 2 + x: 610 + y: 12 + width: 110 + height: 150 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: fc3da748a0b914250800000000000000 + internalID: 5927189054070903759 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: ine_attack_back_1-2_4 + rect: + serializedVersion: 2 + x: 800 + y: 12 + width: 110 + height: 150 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 19875d2bbad41cf40800000000000000 + internalID: 5746959999336544401 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 0af8f4f0ae4557c48b420ddae9ee47a6 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: + ine_attack_back_1-2_0: 7471230947783674214 + ine_attack_back_1-2_1: 2425457128842875911 + ine_attack_back_1-2_2: 3431530335034378245 + ine_attack_back_1-2_3: 5927189054070903759 + ine_attack_back_1-2_4: 5746959999336544401 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/2_Sprite/Chracters_Movement/Ine/Attack/ine_attack_back_2-2.png b/Assets/2_Sprite/Chracters_Movement/Ine/Attack/ine_attack_back_2-2.png new file mode 100644 index 0000000..da2748c Binary files /dev/null and b/Assets/2_Sprite/Chracters_Movement/Ine/Attack/ine_attack_back_2-2.png differ diff --git a/Assets/2_Sprite/Chracters_Movement/Ine/Attack/ine_attack_back_2-2.png.meta b/Assets/2_Sprite/Chracters_Movement/Ine/Attack/ine_attack_back_2-2.png.meta new file mode 100644 index 0000000..a07d7d7 --- /dev/null +++ b/Assets/2_Sprite/Chracters_Movement/Ine/Attack/ine_attack_back_2-2.png.meta @@ -0,0 +1,283 @@ +fileFormatVersion: 2 +guid: 4ef802f60a5c0cb4a841208fd5fe1006 +TextureImporter: + internalIDToNameTable: + - first: + 213: -6877926139416385424 + second: ine_attack_back_2-2_0 + - first: + 213: -3248521065270695670 + second: ine_attack_back_2-2_1 + - first: + 213: 2461339538726397187 + second: ine_attack_back_2-2_2 + - first: + 213: -5265024781291834707 + second: ine_attack_back_2-2_3 + - first: + 213: -690383920776322176 + second: ine_attack_back_2-2_4 + - first: + 213: -347534010286901449 + second: ine_attack_back_2-2_5 + - first: + 213: -3781149747603209048 + second: ine_attack_back_2-2_6 + - first: + 213: -8361469319736832199 + second: ine_attack_back_2-2_7 + - first: + 213: 2169467687063179881 + second: ine_attack_back_2-2_8 + externalObjects: {} + serializedVersion: 12 + 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: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + 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: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: ine_attack_back_2-2_0 + rect: + serializedVersion: 2 + x: 40 + y: 12 + width: 110 + height: 150 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 4f31807120fcf444abddf8ddda31bc21 + internalID: -1976387287 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: ine_attack_back_2-2_1 + rect: + serializedVersion: 2 + x: 230 + y: 12 + width: 110 + height: 150 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 345cd8833d408314a857a71b2ffb2439 + internalID: -1988095068 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: ine_attack_back_2-2_2 + rect: + serializedVersion: 2 + x: 420 + y: 12 + width: 110 + height: 150 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 8c097f5cdb9a792459a80bd2185dfc6e + internalID: 1644878133 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: ine_attack_back_2-2_3 + rect: + serializedVersion: 2 + x: 610 + y: 12 + width: 110 + height: 150 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: f4f8cd50399ec414e9544fd8e3d3207a + internalID: 1688568008 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: ine_attack_back_2-2_4 + rect: + serializedVersion: 2 + x: 800 + y: 12 + width: 110 + height: 150 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: f1b3f903a936d8d46b79107815e50730 + internalID: -1409976522 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: ine_attack_back_2-2_5 + rect: + serializedVersion: 2 + x: 990 + y: 12 + width: 110 + height: 150 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 030dbf891355d804cb874f6780fae350 + internalID: 452242741 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 67642336b723b8c4dbfc9e00586a7fa1 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: + ine_attack_back_2-2_0: -1976387287 + ine_attack_back_2-2_1: -1988095068 + ine_attack_back_2-2_2: 1644878133 + ine_attack_back_2-2_3: 1688568008 + ine_attack_back_2-2_4: -1409976522 + ine_attack_back_2-2_5: 452242741 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/2_Sprite/Chracters_Movement/Ine/Attack/ine_attack_front_1-2.png b/Assets/2_Sprite/Chracters_Movement/Ine/Attack/ine_attack_front_1-2.png new file mode 100644 index 0000000..021fb30 Binary files /dev/null and b/Assets/2_Sprite/Chracters_Movement/Ine/Attack/ine_attack_front_1-2.png differ diff --git a/Assets/2_Sprite/Chracters_Movement/Ine/Attack/ine_attack_front_1-2.png.meta b/Assets/2_Sprite/Chracters_Movement/Ine/Attack/ine_attack_front_1-2.png.meta new file mode 100644 index 0000000..00fbc63 --- /dev/null +++ b/Assets/2_Sprite/Chracters_Movement/Ine/Attack/ine_attack_front_1-2.png.meta @@ -0,0 +1,249 @@ +fileFormatVersion: 2 +guid: 8b709a4fd124dd64e82755ab598c6084 +TextureImporter: + internalIDToNameTable: + - first: + 213: 5088937330057466601 + second: ine_attack_front_1-2_0 + - first: + 213: 431094849792745967 + second: ine_attack_front_1-2_1 + - first: + 213: -5683676489144693813 + second: ine_attack_front_1-2_2 + - first: + 213: 4004426637292511752 + second: ine_attack_front_1-2_3 + - first: + 213: 8414038056135557841 + second: ine_attack_front_1-2_4 + externalObjects: {} + serializedVersion: 12 + 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: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + 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: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: ine_attack_front_1-2_0 + rect: + serializedVersion: 2 + x: 64 + y: 16 + width: 80 + height: 128 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: b8facd7f840a6c74a8a3e25d9c24c68e + internalID: 1008034964 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: ine_attack_front_1-2_1 + rect: + serializedVersion: 2 + x: 260 + y: 12 + width: 76 + height: 124 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 409a0b03b5b44ad499523dbcce91410d + internalID: 1447787678 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: ine_attack_front_1-2_2 + rect: + serializedVersion: 2 + x: 444 + y: 12 + width: 80 + height: 132 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 8c3605f8e6bee594195c5f640663583a + internalID: -234470029 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: ine_attack_front_1-2_3 + rect: + serializedVersion: 2 + x: 640 + y: 12 + width: 76 + height: 132 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 79937d090b7f21540a9f6b611856547f + internalID: 1788046834 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: ine_attack_front_1-2_4 + rect: + serializedVersion: 2 + x: 832 + y: 12 + width: 76 + height: 132 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: e538fff7188115b43ab1c85bcc2a9b73 + internalID: 1219136660 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: a5f9e318bfc649b4284cbfd354bbc51a + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: + ine_attack_front_1-2_0: 1008034964 + ine_attack_front_1-2_1: 1447787678 + ine_attack_front_1-2_2: -234470029 + ine_attack_front_1-2_3: 1788046834 + ine_attack_front_1-2_4: 1219136660 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/2_Sprite/Chracters_Movement/Ine/Attack/ine_attack_front_2-2.png b/Assets/2_Sprite/Chracters_Movement/Ine/Attack/ine_attack_front_2-2.png new file mode 100644 index 0000000..7fe0820 Binary files /dev/null and b/Assets/2_Sprite/Chracters_Movement/Ine/Attack/ine_attack_front_2-2.png differ diff --git a/Assets/2_Sprite/Chracters_Movement/Ine/Attack/ine_attack_front_2-2.png.meta b/Assets/2_Sprite/Chracters_Movement/Ine/Attack/ine_attack_front_2-2.png.meta new file mode 100644 index 0000000..90a96e6 --- /dev/null +++ b/Assets/2_Sprite/Chracters_Movement/Ine/Attack/ine_attack_front_2-2.png.meta @@ -0,0 +1,280 @@ +fileFormatVersion: 2 +guid: f0dc1f3b2ec00be4ea4e7119b9427294 +TextureImporter: + internalIDToNameTable: + - first: + 213: 693305959375088227 + second: ine_attack_front_2-2_0 + - first: + 213: -4166649983989653945 + second: ine_attack_front_2-2_1 + - first: + 213: -4974078734378503661 + second: ine_attack_front_2-2_2 + - first: + 213: -1527599699941887418 + second: ine_attack_front_2-2_3 + - first: + 213: -5684855754454637743 + second: ine_attack_front_2-2_4 + - first: + 213: 4865047486794111968 + second: ine_attack_front_2-2_5 + - first: + 213: 3883254925479525048 + second: ine_attack_front_2-2_6 + - first: + 213: -4016109734611646085 + second: ine_attack_front_2-2_7 + externalObjects: {} + serializedVersion: 12 + 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: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + 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: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: ine_attack_front_2-2_0 + rect: + serializedVersion: 2 + x: 40 + y: 2 + width: 110 + height: 150 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: d2f5b9824b46a6c4c8874534960eb0d9 + internalID: 1281397944 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: ine_attack_front_2-2_1 + rect: + serializedVersion: 2 + x: 230 + y: 2 + width: 110 + height: 150 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 9d5c97035280b934db33ce23b5ad2ef5 + internalID: -333171934 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: ine_attack_front_2-2_2 + rect: + serializedVersion: 2 + x: 420 + y: 2 + width: 110 + height: 150 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 179e2c4565d4ed840ba9bd356d985bf1 + internalID: -374449531 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: ine_attack_front_2-2_3 + rect: + serializedVersion: 2 + x: 610 + y: 2 + width: 110 + height: 150 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 2ccdc2382859c154ea1ea6cb2ee23761 + internalID: -1290422980 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: ine_attack_front_2-2_4 + rect: + serializedVersion: 2 + x: 800 + y: 2 + width: 110 + height: 150 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 6ed3f2356b48ac740a095c513839b5e3 + internalID: -471732677 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: ine_attack_front_2-2_5 + rect: + serializedVersion: 2 + x: 990 + y: 2 + width: 110 + height: 150 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: edce3beef41b62646ba44a2d79bd7041 + internalID: 663855216 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: dddc23593935a3c4d9cb14ba069b6fbc + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: + ine_attack_front_2-2_0: 1281397944 + ine_attack_front_2-2_1: -333171934 + ine_attack_front_2-2_2: -374449531 + ine_attack_front_2-2_3: -1290422980 + ine_attack_front_2-2_4: -471732677 + ine_attack_front_2-2_5: 663855216 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/2_Sprite/Chracters_Movement/Ine/Attack/ine_attack_side_1-2.png b/Assets/2_Sprite/Chracters_Movement/Ine/Attack/ine_attack_side_1-2.png new file mode 100644 index 0000000..8ce0062 Binary files /dev/null and b/Assets/2_Sprite/Chracters_Movement/Ine/Attack/ine_attack_side_1-2.png differ diff --git a/Assets/2_Sprite/Chracters_Movement/Ine/Attack/ine_attack_side_1-2.png.meta b/Assets/2_Sprite/Chracters_Movement/Ine/Attack/ine_attack_side_1-2.png.meta new file mode 100644 index 0000000..e5dbda5 --- /dev/null +++ b/Assets/2_Sprite/Chracters_Movement/Ine/Attack/ine_attack_side_1-2.png.meta @@ -0,0 +1,252 @@ +fileFormatVersion: 2 +guid: c082091bc8862d842bef78cf93901bfb +TextureImporter: + internalIDToNameTable: + - first: + 213: 831642062112434637 + second: ine_attack_side_1-2_0 + - first: + 213: -6738793578547111751 + second: ine_attack_side_1-2_1 + - first: + 213: -1633342872888039391 + second: ine_attack_side_1-2_2 + - first: + 213: -3714034167139948515 + second: ine_attack_side_1-2_3 + - first: + 213: -1356409518877520100 + second: ine_attack_side_1-2_4 + - first: + 213: -3624834171128004693 + second: ine_attack_side_1-2_5 + externalObjects: {} + serializedVersion: 12 + 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: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + 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: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: ine_attack_side_1-2_0 + rect: + serializedVersion: 2 + x: 15 + y: 2 + width: 120 + height: 150 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 76780aa44389b864cb754c131f0ed9c7 + internalID: 316711938 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: ine_attack_side_1-2_1 + rect: + serializedVersion: 2 + x: 210 + y: 2 + width: 120 + height: 150 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 9feb9f6ade698854c8474e39ac152136 + internalID: -1795958882 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: ine_attack_side_1-2_2 + rect: + serializedVersion: 2 + x: 405 + y: 2 + width: 120 + height: 150 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 67ce789b581284943a13b23b7921ccc3 + internalID: 1997721083 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: ine_attack_side_1-2_3 + rect: + serializedVersion: 2 + x: 600 + y: 2 + width: 120 + height: 150 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 262669a9700d98f4fb8536d30392714b + internalID: -1261394786 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: ine_attack_side_1-2_4 + rect: + serializedVersion: 2 + x: 795 + y: 2 + width: 120 + height: 150 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: b9bb4837ad745cf4db2b0e71f2625c11 + internalID: 1418345699 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: aa6d0a6be49ae5144b69accc19511102 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: + ine_attack_side_1-2_0: 316711938 + ine_attack_side_1-2_1: -1795958882 + ine_attack_side_1-2_2: 1997721083 + ine_attack_side_1-2_3: -1261394786 + ine_attack_side_1-2_4: 1418345699 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/2_Sprite/Chracters_Movement/Ine/Attack/ine_attack_side_2-2.png b/Assets/2_Sprite/Chracters_Movement/Ine/Attack/ine_attack_side_2-2.png new file mode 100644 index 0000000..70170aa Binary files /dev/null and b/Assets/2_Sprite/Chracters_Movement/Ine/Attack/ine_attack_side_2-2.png differ diff --git a/Assets/2_Sprite/Chracters_Movement/Ine/Attack/ine_attack_side_2-2.png.meta b/Assets/2_Sprite/Chracters_Movement/Ine/Attack/ine_attack_side_2-2.png.meta new file mode 100644 index 0000000..9b5c0e2 --- /dev/null +++ b/Assets/2_Sprite/Chracters_Movement/Ine/Attack/ine_attack_side_2-2.png.meta @@ -0,0 +1,274 @@ +fileFormatVersion: 2 +guid: 349e52fbfcd083844b6782672e2e3b98 +TextureImporter: + internalIDToNameTable: + - first: + 213: -7725041550612361509 + second: ine_attack_side_2-2_0 + - first: + 213: 1695415619059665800 + second: ine_attack_side_2-2_1 + - first: + 213: -8916978950500764155 + second: ine_attack_side_2-2_2 + - first: + 213: 2200578345726628840 + second: ine_attack_side_2-2_3 + - first: + 213: -4892979765786208102 + second: ine_attack_side_2-2_4 + - first: + 213: 5081494772994642528 + second: ine_attack_side_2-2_5 + externalObjects: {} + serializedVersion: 12 + 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: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + 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: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: ine_attack_side_2-2_0 + rect: + serializedVersion: 2 + x: 15 + y: 2 + width: 120 + height: 150 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: c71f57c66511c3a4e987ded7583970e3 + internalID: 1501756377 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: ine_attack_side_2-2_1 + rect: + serializedVersion: 2 + x: 210 + y: 2 + width: 120 + height: 150 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 1e74ba7ef28eb1d4bb4cc0e19e9b190d + internalID: -1275925372 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: ine_attack_side_2-2_2 + rect: + serializedVersion: 2 + x: 405 + y: 2 + width: 120 + height: 150 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 1dadb73f27c438241b0db290c3dfbe43 + internalID: -227162794 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: ine_attack_side_2-2_3 + rect: + serializedVersion: 2 + x: 600 + y: 2 + width: 120 + height: 150 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: a6eeb844c6833de459f962163cd04eeb + internalID: -807621756 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: ine_attack_side_2-2_4 + rect: + serializedVersion: 2 + x: 795 + y: 2 + width: 120 + height: 150 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: d3dce5ada0dd7874cb7663bfe2bcd80f + internalID: -1150560927 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: ine_attack_side_2-2_5 + rect: + serializedVersion: 2 + x: 990 + y: 2 + width: 120 + height: 150 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: cc572982d2227c745ada515f23836b87 + internalID: -1992259958 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 8ea83feec5baa9646b86374657f97ce1 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: + ine_attack_side_2-2_0: 1501756377 + ine_attack_side_2-2_1: -1275925372 + ine_attack_side_2-2_2: -227162794 + ine_attack_side_2-2_3: -807621756 + ine_attack_side_2-2_4: -1150560927 + ine_attack_side_2-2_5: -1992259958 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/5_Anim/Character/Ine/AnimCtl_Ine.controller b/Assets/5_Anim/Character/Ine/AnimCtl_Ine.controller index ce9369e..d962ea8 100644 --- a/Assets/5_Anim/Character/Ine/AnimCtl_Ine.controller +++ b/Assets/5_Anim/Character/Ine/AnimCtl_Ine.controller @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1101 &-8187204793974086484 +--- !u!1101 &-8537870212262983865 AnimatorStateTransition: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -17,14 +17,81 @@ AnimatorStateTransition: m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0 - m_TransitionOffset: 0.001809741 - m_ExitTime: 0.99999994 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0 m_HasExitTime: 0 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1101 &-8387652624220745442 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 6 + m_ConditionEvent: AttackIdx + m_EventTreshold: -1 + - m_ConditionMode: 1 + m_ConditionEvent: isWalking + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 8916632400208463748} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.39999998 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!206 &-8001846986610640769 +BlendTree: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: BlendTree + m_Childs: + - serializedVersion: 2 + m_Motion: {fileID: 0} + m_Threshold: 0 + m_Position: {x: 0, y: 0} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: PosX + m_Mirror: 0 + - serializedVersion: 2 + m_Motion: {fileID: 0} + m_Threshold: 0.5 + m_Position: {x: 0, y: 0} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: PosX + m_Mirror: 0 + - serializedVersion: 2 + m_Motion: {fileID: 0} + m_Threshold: 1 + m_Position: {x: 0, y: 0} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: PosX + m_Mirror: 0 + m_BlendParameter: PosX + m_BlendParameterY: PosX + m_MinThreshold: 0 + m_MaxThreshold: 1 + m_UseAutomaticThresholds: 1 + m_NormalizedBlendValues: 0 + m_BlendType: 0 --- !u!1102 &-7887370700708874382 AnimatorState: serializedVersion: 6 @@ -53,6 +120,31 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &-7838674405646194595 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 6 + m_ConditionEvent: AttackIdx + m_EventTreshold: 1 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -6328402681739075094} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.7 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1101 &-7741661000010744119 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -103,6 +195,170 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1101 &-7165183997443764953 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: DodgeTrigger + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -7887370700708874382} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.39999998 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-6827491313133175732 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 6 + m_ConditionEvent: AttackIdx + m_EventTreshold: -1 + - m_ConditionMode: 2 + m_ConditionEvent: isWalking + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 7216141104932533708} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.5 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-6654900500824835769 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 6 + m_ConditionEvent: AttackIdx + m_EventTreshold: -1 + - m_ConditionMode: 2 + m_ConditionEvent: isWalking + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 7216141104932533708} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.5 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-6445088845713256964 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 6 + m_ConditionEvent: AttackIdx + m_EventTreshold: -1 + - m_ConditionMode: 1 + m_ConditionEvent: isWalking + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 8916632400208463748} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.39999998 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &-6328402681739075094 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Attack_02 + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -476288979744914789} + - {fileID: 1477102557937396473} + - {fileID: -6654900500824835769} + - {fileID: -5003745128318212238} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7390563670407345976} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &-5003745128318212238 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: DodgeTrigger + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -7887370700708874382} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.5 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1101 &-3866436116635659990 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -128,6 +384,170 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1101 &-3129536623637096915 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 0} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 1 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.39999998 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-2987906583819856654 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 6 + m_ConditionEvent: AttackIdx + m_EventTreshold: 1 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -6328402681739075094} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!206 &-2779681242335224141 +BlendTree: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Attack_01 + m_Childs: + - serializedVersion: 2 + m_Motion: {fileID: 7400000, guid: fac494e915f756c4d85f46e0bcf831fd, type: 2} + m_Threshold: 0 + m_Position: {x: 0, y: 0} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: PosX + m_Mirror: 0 + - serializedVersion: 2 + m_Motion: {fileID: 7400000, guid: d48165f79eedea046ae9f3489ae0aefe, type: 2} + m_Threshold: 0.5 + m_Position: {x: 0, y: 0} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: PosX + m_Mirror: 0 + - serializedVersion: 2 + m_Motion: {fileID: 7400000, guid: 1584c4f1162c3ec4a81a69cfa1381e0c, type: 2} + m_Threshold: 1 + m_Position: {x: 0, y: 0} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: PosX + m_Mirror: 0 + m_BlendParameter: AttackState + m_BlendParameterY: PosX + m_MinThreshold: 0 + m_MaxThreshold: 1 + m_UseAutomaticThresholds: 1 + m_NormalizedBlendValues: 0 + m_BlendType: 0 +--- !u!1101 &-1809099419944564976 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 6 + m_ConditionEvent: AttackIdx + m_EventTreshold: -1 + - m_ConditionMode: 2 + m_ConditionEvent: isWalking + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 7216141104932533708} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.39999998 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1107 &-771651103483236613 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Attack + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: -6328402681739075094} + m_Position: {x: 390, y: -40, z: 0} + - serializedVersion: 1 + m_State: {fileID: 699348294161046153} + m_Position: {x: 690, y: -40, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: -70, y: 120, z: 0} + m_EntryPosition: {x: 110, y: 300, z: 0} + m_ExitPosition: {x: 290, y: 260, z: 0} + m_ParentStateMachinePosition: {x: 500, y: 100, z: 0} + m_DefaultState: {fileID: -6328402681739075094} +--- !u!1101 &-476288979744914789 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 6 + m_ConditionEvent: AttackIdx + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 699348294161046153} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.24999997 + m_TransitionOffset: 0 + m_ExitTime: 0.5560064 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -137,13 +557,13 @@ AnimatorController: m_Name: AnimCtl_Ine serializedVersion: 5 m_AnimatorParameters: - - m_Name: moveX + - m_Name: PosX m_Type: 1 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 m_Controller: {fileID: 9100000} - - m_Name: moveY + - m_Name: PosY m_Type: 1 m_DefaultFloat: 0 m_DefaultInt: 0 @@ -167,6 +587,24 @@ AnimatorController: m_DefaultInt: 0 m_DefaultBool: 0 m_Controller: {fileID: 9100000} + - m_Name: IsAttack + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + - m_Name: AttackState + m_Type: 1 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + - m_Name: AttackIdx + m_Type: 3 + m_DefaultFloat: 0 + m_DefaultInt: -1 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -180,6 +618,128 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} +--- !u!1101 &365728724039699703 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 6 + m_ConditionEvent: AttackIdx + m_EventTreshold: 1 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -6328402681739075094} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.20146747 + m_TransitionOffset: 0.02130696 + m_ExitTime: 0.51647806 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!206 &394018960249486609 +BlendTree: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Attack_02 + m_Childs: + - serializedVersion: 2 + m_Motion: {fileID: 7400000, guid: 83ded048f5b080e42acdd1a7f5e3e4bb, type: 2} + m_Threshold: 0 + m_Position: {x: 0, y: 0} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: PosX + m_Mirror: 0 + - serializedVersion: 2 + m_Motion: {fileID: 7400000, guid: 76d7692b77813c847a473811fc9fc3bf, type: 2} + m_Threshold: 0.5 + m_Position: {x: 0, y: 0} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: PosX + m_Mirror: 0 + - serializedVersion: 2 + m_Motion: {fileID: 7400000, guid: f620b4409bff3054b8e67f97cac0786f, type: 2} + m_Threshold: 1 + m_Position: {x: 0, y: 0} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: PosX + m_Mirror: 0 + m_BlendParameter: AttackState + m_BlendParameterY: PosX + m_MinThreshold: 0 + m_MaxThreshold: 1 + m_UseAutomaticThresholds: 1 + m_NormalizedBlendValues: 0 + m_BlendType: 0 +--- !u!1102 &699348294161046153 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Attack_01 + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 365728724039699703} + - {fileID: 8976018309466006806} + - {fileID: -8387652624220745442} + - {fileID: 4921585450168509714} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 8264499188535814984} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &1477102557937396473 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 6 + m_ConditionEvent: AttackIdx + m_EventTreshold: -1 + - m_ConditionMode: 1 + m_ConditionEvent: isWalking + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 8916632400208463748} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.5 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!206 &1675891657466216928 BlendTree: m_ObjectHideFlags: 1 @@ -219,6 +779,45 @@ BlendTree: m_UseAutomaticThresholds: 1 m_NormalizedBlendValues: 0 m_BlendType: 0 +--- !u!206 &2743666210950343112 +BlendTree: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Attack_01 + m_Childs: + - serializedVersion: 2 + m_Motion: {fileID: 7400000, guid: fac494e915f756c4d85f46e0bcf831fd, type: 2} + m_Threshold: 0 + m_Position: {x: 0, y: 0} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: PosX + m_Mirror: 0 + - serializedVersion: 2 + m_Motion: {fileID: 7400000, guid: d48165f79eedea046ae9f3489ae0aefe, type: 2} + m_Threshold: 0.5 + m_Position: {x: 0, y: 0} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: PosX + m_Mirror: 0 + - serializedVersion: 2 + m_Motion: {fileID: 7400000, guid: 1584c4f1162c3ec4a81a69cfa1381e0c, type: 2} + m_Threshold: 1 + m_Position: {x: 0, y: 0} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: PosX + m_Mirror: 0 + m_BlendParameter: AttackState + m_BlendParameterY: PosX + m_MinThreshold: 0 + m_MaxThreshold: 1 + m_UseAutomaticThresholds: 1 + m_NormalizedBlendValues: 0 + m_BlendType: 0 --- !u!206 &2795626619066008752 BlendTree: m_ObjectHideFlags: 1 @@ -251,8 +850,8 @@ BlendTree: m_CycleOffset: 0 m_DirectBlendParameter: moveX m_Mirror: 0 - m_BlendParameter: moveX - m_BlendParameterY: moveY + m_BlendParameter: PosX + m_BlendParameterY: PosY m_MinThreshold: 0 m_MaxThreshold: 1 m_UseAutomaticThresholds: 1 @@ -294,24 +893,43 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: 8916632400208463748} - m_Position: {x: 380, y: 140, z: 0} + m_Position: {x: 260, y: 110, z: 0} - serializedVersion: 1 m_State: {fileID: 7216141104932533708} - m_Position: {x: 380, y: 40, z: 0} - - serializedVersion: 1 - m_State: {fileID: -7887370700708874382} - m_Position: {x: 630, y: 90, z: 0} + m_Position: {x: 260, y: 210, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] m_StateMachineTransitions: {} m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_AnyStatePosition: {x: 590, y: 10, z: 0} m_EntryPosition: {x: 50, y: 120, z: 0} m_ExitPosition: {x: 910, y: 220, z: 0} - m_ParentStateMachinePosition: {x: 900, y: 20, z: 0} + m_ParentStateMachinePosition: {x: 870, y: 130, z: 0} m_DefaultState: {fileID: 8916632400208463748} ---- !u!1101 &5740864659957009709 +--- !u!1101 &3766025238035238451 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 0} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 1 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.5 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &4921585450168509714 AnimatorStateTransition: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -328,9 +946,62 @@ AnimatorStateTransition: m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0 + m_TransitionDuration: 0.25 m_TransitionOffset: 0 - m_ExitTime: 0.000000026465251 + m_ExitTime: 0.39999998 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &5427976897112605097 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 6 + m_ConditionEvent: AttackIdx + m_EventTreshold: -1 + - m_ConditionMode: 1 + m_ConditionEvent: isWalking + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 8916632400208463748} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.5 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &5907965936950404198 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: DodgeTrigger + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -7887370700708874382} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.5 m_HasExitTime: 0 m_HasFixedDuration: 1 m_InterruptionSource: 0 @@ -344,20 +1015,130 @@ AnimatorStateMachine: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Base Layer - m_ChildStates: [] + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: -7887370700708874382} + m_Position: {x: 450, y: 20, z: 0} m_ChildStateMachines: - serializedVersion: 1 m_StateMachine: {fileID: 3486942286685794114} - m_Position: {x: 340, y: 120, z: 0} + m_Position: {x: 320, y: 130, z: 0} + - serializedVersion: 1 + m_StateMachine: {fileID: -771651103483236613} + m_Position: {x: 590, y: 130, z: 0} m_AnyStateTransitions: [] m_EntryTransitions: [] m_StateMachineTransitions: {} m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_AnyStatePosition: {x: 40, y: 100, z: 0} m_EntryPosition: {x: 50, y: 120, z: 0} - m_ExitPosition: {x: 800, y: 120, z: 0} + m_ExitPosition: {x: 870, y: 240, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: 7216141104932533708} +--- !u!1101 &6527257459298718537 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: DodgeTrigger + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -7887370700708874382} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.7 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &6749622186955189613 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 6 + m_ConditionEvent: AttackIdx + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 699348294161046153} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.7 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!206 &6929083226526445313 +BlendTree: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Attack_02 + m_Childs: + - serializedVersion: 2 + m_Motion: {fileID: 7400000, guid: 83ded048f5b080e42acdd1a7f5e3e4bb, type: 2} + m_Threshold: 0 + m_Position: {x: 0, y: 0} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: PosX + m_Mirror: 0 + - serializedVersion: 2 + m_Motion: {fileID: 7400000, guid: 76d7692b77813c847a473811fc9fc3bf, type: 2} + m_Threshold: 0.5 + m_Position: {x: 0, y: 0} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: PosX + m_Mirror: 0 + - serializedVersion: 2 + m_Motion: {fileID: 7400000, guid: f620b4409bff3054b8e67f97cac0786f, type: 2} + m_Threshold: 1 + m_Position: {x: 0, y: 0} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: PosX + m_Mirror: 0 + m_BlendParameter: AttackState + m_BlendParameterY: PosX + m_MinThreshold: 0 + m_MaxThreshold: 1 + m_UseAutomaticThresholds: 1 + m_NormalizedBlendValues: 0 + m_BlendType: 0 +--- !u!206 &7055349719774567518 +BlendTree: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: BlendTree + m_Childs: [] + m_BlendParameter: PosX + m_BlendParameterY: PosX + m_MinThreshold: 0 + m_MaxThreshold: 1 + m_UseAutomaticThresholds: 1 + m_NormalizedBlendValues: 0 + m_BlendType: 0 --- !u!1102 &7216141104932533708 AnimatorState: serializedVersion: 6 @@ -370,7 +1151,9 @@ AnimatorState: m_CycleOffset: 0 m_Transitions: - {fileID: 3276299015312782530} - - {fileID: 5740864659957009709} + - {fileID: 7591452242411202448} + - {fileID: -2987906583819856654} + - {fileID: -8537870212262983865} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -386,6 +1169,45 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!206 &7390563670407345976 +BlendTree: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Blend Tree + m_Childs: + - serializedVersion: 2 + m_Motion: {fileID: 7400000, guid: 83ded048f5b080e42acdd1a7f5e3e4bb, type: 2} + m_Threshold: 0 + m_Position: {x: 0, y: 0} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: PosX + m_Mirror: 0 + - serializedVersion: 2 + m_Motion: {fileID: 7400000, guid: 76d7692b77813c847a473811fc9fc3bf, type: 2} + m_Threshold: 0.5 + m_Position: {x: 0, y: 0} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: PosX + m_Mirror: 0 + - serializedVersion: 2 + m_Motion: {fileID: 7400000, guid: f620b4409bff3054b8e67f97cac0786f, type: 2} + m_Threshold: 1 + m_Position: {x: 0, y: 0} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: PosX + m_Mirror: 0 + m_BlendParameter: AttackState + m_BlendParameterY: PosX + m_MinThreshold: 0 + m_MaxThreshold: 1 + m_UseAutomaticThresholds: 1 + m_NormalizedBlendValues: 0 + m_BlendType: 0 --- !u!206 &7460517582495976055 BlendTree: m_ObjectHideFlags: 1 @@ -418,13 +1240,77 @@ BlendTree: m_CycleOffset: 0 m_DirectBlendParameter: moveX m_Mirror: 0 - m_BlendParameter: moveX - m_BlendParameterY: moveY + m_BlendParameter: PosX + m_BlendParameterY: PosY m_MinThreshold: 1 m_MaxThreshold: 1 m_UseAutomaticThresholds: 1 m_NormalizedBlendValues: 0 m_BlendType: 1 +--- !u!1101 &7591452242411202448 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 6 + m_ConditionEvent: AttackIdx + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 699348294161046153} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!206 &8264499188535814984 +BlendTree: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Blend Tree + m_Childs: + - serializedVersion: 2 + m_Motion: {fileID: 7400000, guid: fac494e915f756c4d85f46e0bcf831fd, type: 2} + m_Threshold: 0 + m_Position: {x: 0, y: -1} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: PosX + m_Mirror: 0 + - serializedVersion: 2 + m_Motion: {fileID: 7400000, guid: d48165f79eedea046ae9f3489ae0aefe, type: 2} + m_Threshold: 0.5 + m_Position: {x: 0, y: 1} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: PosX + m_Mirror: 0 + - serializedVersion: 2 + m_Motion: {fileID: 7400000, guid: 1584c4f1162c3ec4a81a69cfa1381e0c, type: 2} + m_Threshold: 1 + m_Position: {x: -1, y: 0} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: PosX + m_Mirror: 0 + m_BlendParameter: AttackState + m_BlendParameterY: PosY + m_MinThreshold: 0 + m_MaxThreshold: 1 + m_UseAutomaticThresholds: 1 + m_NormalizedBlendValues: 0 + m_BlendType: 0 --- !u!1102 &8916632400208463748 AnimatorState: serializedVersion: 6 @@ -437,7 +1323,9 @@ AnimatorState: m_CycleOffset: 0 m_Transitions: - {fileID: -7699645868367422385} - - {fileID: -8187204793974086484} + - {fileID: -7838674405646194595} + - {fileID: 6749622186955189613} + - {fileID: 6527257459298718537} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -453,3 +1341,31 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &8976018309466006806 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 6 + m_ConditionEvent: AttackIdx + m_EventTreshold: -1 + - m_ConditionMode: 2 + m_ConditionEvent: isWalking + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 7216141104932533708} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.39999998 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 diff --git a/Assets/5_Anim/Character/Ine/Attack.meta b/Assets/5_Anim/Character/Ine/Attack.meta new file mode 100644 index 0000000..b0251cb --- /dev/null +++ b/Assets/5_Anim/Character/Ine/Attack.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 06af71f1b44af4248b45df2ebc164835 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/5_Anim/Character/Ine/Attack/Ine_Attack_Back_01.anim b/Assets/5_Anim/Character/Ine/Attack/Ine_Attack_Back_01.anim new file mode 100644 index 0000000..d3f35c2 --- /dev/null +++ b/Assets/5_Anim/Character/Ine/Attack/Ine_Attack_Back_01.anim @@ -0,0 +1,84 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Ine_Attack_Back_01 + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: 7471230947783674214, guid: b215869bce738874e8571578712561b2, type: 3} + - time: 0.083333336 + value: {fileID: 2425457128842875911, guid: b215869bce738874e8571578712561b2, type: 3} + - time: 0.16666667 + value: {fileID: 3431530335034378245, guid: b215869bce738874e8571578712561b2, type: 3} + - time: 0.25 + value: {fileID: 5927189054070903759, guid: b215869bce738874e8571578712561b2, type: 3} + - time: 0.33333334 + value: {fileID: 5746959999336544401, guid: b215869bce738874e8571578712561b2, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + m_SampleRate: 12 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: 7471230947783674214, guid: b215869bce738874e8571578712561b2, type: 3} + - {fileID: 2425457128842875911, guid: b215869bce738874e8571578712561b2, type: 3} + - {fileID: 3431530335034378245, guid: b215869bce738874e8571578712561b2, type: 3} + - {fileID: 5927189054070903759, guid: b215869bce738874e8571578712561b2, type: 3} + - {fileID: 5746959999336544401, guid: b215869bce738874e8571578712561b2, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.4166667 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/5_Anim/Character/Ine/Attack/Ine_Attack_Back_01.anim.meta b/Assets/5_Anim/Character/Ine/Attack/Ine_Attack_Back_01.anim.meta new file mode 100644 index 0000000..398ee43 --- /dev/null +++ b/Assets/5_Anim/Character/Ine/Attack/Ine_Attack_Back_01.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d48165f79eedea046ae9f3489ae0aefe +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/5_Anim/Character/Ine/Attack/Ine_Attack_Back_02.anim b/Assets/5_Anim/Character/Ine/Attack/Ine_Attack_Back_02.anim new file mode 100644 index 0000000..51b3b46 --- /dev/null +++ b/Assets/5_Anim/Character/Ine/Attack/Ine_Attack_Back_02.anim @@ -0,0 +1,87 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Ine_Attack_Back_02 + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: -1976387287, guid: 4ef802f60a5c0cb4a841208fd5fe1006, type: 3} + - time: 0.083333336 + value: {fileID: -1988095068, guid: 4ef802f60a5c0cb4a841208fd5fe1006, type: 3} + - time: 0.16666667 + value: {fileID: 1644878133, guid: 4ef802f60a5c0cb4a841208fd5fe1006, type: 3} + - time: 0.25 + value: {fileID: 1688568008, guid: 4ef802f60a5c0cb4a841208fd5fe1006, type: 3} + - time: 0.33333334 + value: {fileID: -1409976522, guid: 4ef802f60a5c0cb4a841208fd5fe1006, type: 3} + - time: 0.41666666 + value: {fileID: 452242741, guid: 4ef802f60a5c0cb4a841208fd5fe1006, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + m_SampleRate: 12 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: -1976387287, guid: 4ef802f60a5c0cb4a841208fd5fe1006, type: 3} + - {fileID: -1988095068, guid: 4ef802f60a5c0cb4a841208fd5fe1006, type: 3} + - {fileID: 1644878133, guid: 4ef802f60a5c0cb4a841208fd5fe1006, type: 3} + - {fileID: 1688568008, guid: 4ef802f60a5c0cb4a841208fd5fe1006, type: 3} + - {fileID: -1409976522, guid: 4ef802f60a5c0cb4a841208fd5fe1006, type: 3} + - {fileID: 452242741, guid: 4ef802f60a5c0cb4a841208fd5fe1006, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.5 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/5_Anim/Character/Ine/Attack/Ine_Attack_Back_02.anim.meta b/Assets/5_Anim/Character/Ine/Attack/Ine_Attack_Back_02.anim.meta new file mode 100644 index 0000000..d2bfd7c --- /dev/null +++ b/Assets/5_Anim/Character/Ine/Attack/Ine_Attack_Back_02.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 76d7692b77813c847a473811fc9fc3bf +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/5_Anim/Character/Ine/Attack/Ine_Attack_Front_01.anim b/Assets/5_Anim/Character/Ine/Attack/Ine_Attack_Front_01.anim new file mode 100644 index 0000000..a46b2bf --- /dev/null +++ b/Assets/5_Anim/Character/Ine/Attack/Ine_Attack_Front_01.anim @@ -0,0 +1,84 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Ine_Attack_Front_01 + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: 1008034964, guid: 8b709a4fd124dd64e82755ab598c6084, type: 3} + - time: 0.083333336 + value: {fileID: 1447787678, guid: 8b709a4fd124dd64e82755ab598c6084, type: 3} + - time: 0.16666667 + value: {fileID: -234470029, guid: 8b709a4fd124dd64e82755ab598c6084, type: 3} + - time: 0.25 + value: {fileID: 1788046834, guid: 8b709a4fd124dd64e82755ab598c6084, type: 3} + - time: 0.33333334 + value: {fileID: 1219136660, guid: 8b709a4fd124dd64e82755ab598c6084, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + m_SampleRate: 12 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: 1008034964, guid: 8b709a4fd124dd64e82755ab598c6084, type: 3} + - {fileID: 1447787678, guid: 8b709a4fd124dd64e82755ab598c6084, type: 3} + - {fileID: -234470029, guid: 8b709a4fd124dd64e82755ab598c6084, type: 3} + - {fileID: 1788046834, guid: 8b709a4fd124dd64e82755ab598c6084, type: 3} + - {fileID: 1219136660, guid: 8b709a4fd124dd64e82755ab598c6084, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.4166667 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/5_Anim/Character/Ine/Attack/Ine_Attack_Front_01.anim.meta b/Assets/5_Anim/Character/Ine/Attack/Ine_Attack_Front_01.anim.meta new file mode 100644 index 0000000..d695e80 --- /dev/null +++ b/Assets/5_Anim/Character/Ine/Attack/Ine_Attack_Front_01.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fac494e915f756c4d85f46e0bcf831fd +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/5_Anim/Character/Ine/Attack/Ine_Attack_Front_02.anim b/Assets/5_Anim/Character/Ine/Attack/Ine_Attack_Front_02.anim new file mode 100644 index 0000000..b4bbed9 --- /dev/null +++ b/Assets/5_Anim/Character/Ine/Attack/Ine_Attack_Front_02.anim @@ -0,0 +1,87 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Ine_Attack_Front_02 + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: 1281397944, guid: f0dc1f3b2ec00be4ea4e7119b9427294, type: 3} + - time: 0.083333336 + value: {fileID: -333171934, guid: f0dc1f3b2ec00be4ea4e7119b9427294, type: 3} + - time: 0.16666667 + value: {fileID: -374449531, guid: f0dc1f3b2ec00be4ea4e7119b9427294, type: 3} + - time: 0.25 + value: {fileID: -1290422980, guid: f0dc1f3b2ec00be4ea4e7119b9427294, type: 3} + - time: 0.33333334 + value: {fileID: -471732677, guid: f0dc1f3b2ec00be4ea4e7119b9427294, type: 3} + - time: 0.41666666 + value: {fileID: 663855216, guid: f0dc1f3b2ec00be4ea4e7119b9427294, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + m_SampleRate: 12 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: 1281397944, guid: f0dc1f3b2ec00be4ea4e7119b9427294, type: 3} + - {fileID: -333171934, guid: f0dc1f3b2ec00be4ea4e7119b9427294, type: 3} + - {fileID: -374449531, guid: f0dc1f3b2ec00be4ea4e7119b9427294, type: 3} + - {fileID: -1290422980, guid: f0dc1f3b2ec00be4ea4e7119b9427294, type: 3} + - {fileID: -471732677, guid: f0dc1f3b2ec00be4ea4e7119b9427294, type: 3} + - {fileID: 663855216, guid: f0dc1f3b2ec00be4ea4e7119b9427294, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.5 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/5_Anim/Character/Ine/Attack/Ine_Attack_Front_02.anim.meta b/Assets/5_Anim/Character/Ine/Attack/Ine_Attack_Front_02.anim.meta new file mode 100644 index 0000000..6eb7369 --- /dev/null +++ b/Assets/5_Anim/Character/Ine/Attack/Ine_Attack_Front_02.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 83ded048f5b080e42acdd1a7f5e3e4bb +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/5_Anim/Character/Ine/Attack/Ine_Attack_SIde_02.anim b/Assets/5_Anim/Character/Ine/Attack/Ine_Attack_SIde_02.anim new file mode 100644 index 0000000..5e596c9 --- /dev/null +++ b/Assets/5_Anim/Character/Ine/Attack/Ine_Attack_SIde_02.anim @@ -0,0 +1,87 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Ine_Attack_SIde_02 + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: 1501756377, guid: 349e52fbfcd083844b6782672e2e3b98, type: 3} + - time: 0.083333336 + value: {fileID: -1275925372, guid: 349e52fbfcd083844b6782672e2e3b98, type: 3} + - time: 0.16666667 + value: {fileID: -227162794, guid: 349e52fbfcd083844b6782672e2e3b98, type: 3} + - time: 0.25 + value: {fileID: -807621756, guid: 349e52fbfcd083844b6782672e2e3b98, type: 3} + - time: 0.33333334 + value: {fileID: -1150560927, guid: 349e52fbfcd083844b6782672e2e3b98, type: 3} + - time: 0.41666666 + value: {fileID: -1992259958, guid: 349e52fbfcd083844b6782672e2e3b98, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + m_SampleRate: 12 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: 1501756377, guid: 349e52fbfcd083844b6782672e2e3b98, type: 3} + - {fileID: -1275925372, guid: 349e52fbfcd083844b6782672e2e3b98, type: 3} + - {fileID: -227162794, guid: 349e52fbfcd083844b6782672e2e3b98, type: 3} + - {fileID: -807621756, guid: 349e52fbfcd083844b6782672e2e3b98, type: 3} + - {fileID: -1150560927, guid: 349e52fbfcd083844b6782672e2e3b98, type: 3} + - {fileID: -1992259958, guid: 349e52fbfcd083844b6782672e2e3b98, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.5 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/5_Anim/Character/Ine/Attack/Ine_Attack_SIde_02.anim.meta b/Assets/5_Anim/Character/Ine/Attack/Ine_Attack_SIde_02.anim.meta new file mode 100644 index 0000000..627e214 --- /dev/null +++ b/Assets/5_Anim/Character/Ine/Attack/Ine_Attack_SIde_02.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f620b4409bff3054b8e67f97cac0786f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/5_Anim/Character/Ine/Attack/Ine_Attack_Side_01.anim b/Assets/5_Anim/Character/Ine/Attack/Ine_Attack_Side_01.anim new file mode 100644 index 0000000..faa5eac --- /dev/null +++ b/Assets/5_Anim/Character/Ine/Attack/Ine_Attack_Side_01.anim @@ -0,0 +1,84 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Ine_Attack_Side_01 + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: 316711938, guid: c082091bc8862d842bef78cf93901bfb, type: 3} + - time: 0.083333336 + value: {fileID: -1795958882, guid: c082091bc8862d842bef78cf93901bfb, type: 3} + - time: 0.16666667 + value: {fileID: 1997721083, guid: c082091bc8862d842bef78cf93901bfb, type: 3} + - time: 0.25 + value: {fileID: -1261394786, guid: c082091bc8862d842bef78cf93901bfb, type: 3} + - time: 0.33333334 + value: {fileID: 1418345699, guid: c082091bc8862d842bef78cf93901bfb, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + m_SampleRate: 12 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: 316711938, guid: c082091bc8862d842bef78cf93901bfb, type: 3} + - {fileID: -1795958882, guid: c082091bc8862d842bef78cf93901bfb, type: 3} + - {fileID: 1997721083, guid: c082091bc8862d842bef78cf93901bfb, type: 3} + - {fileID: -1261394786, guid: c082091bc8862d842bef78cf93901bfb, type: 3} + - {fileID: 1418345699, guid: c082091bc8862d842bef78cf93901bfb, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.4166667 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/5_Anim/Character/Ine/Attack/Ine_Attack_Side_01.anim.meta b/Assets/5_Anim/Character/Ine/Attack/Ine_Attack_Side_01.anim.meta new file mode 100644 index 0000000..af5ecd3 --- /dev/null +++ b/Assets/5_Anim/Character/Ine/Attack/Ine_Attack_Side_01.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1584c4f1162c3ec4a81a69cfa1381e0c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 82ab0f5..2862ecf 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -5,7 +5,14 @@ EditorBuildSettings: m_ObjectHideFlags: 0 serializedVersion: 2 m_Scenes: - - enabled: 1 + - enabled: 0 path: Assets/Scenes/SampleScene.unity guid: 2cda990e2423bbf4892e6590ba056729 + - enabled: 1 + path: Assets/0_Scenes/Title.unity + guid: 8c9cfa26abfee488c85f1582747f6a02 + - enabled: 1 + path: Assets/0_Scenes/Game.unity + guid: 90644a73050b52a49bca5ed57bcae523 m_configObjects: {} + m_UseUCBPForAssetBundles: 0