From 9467caad36d70e2828b6a35c9b9b47800cf0da26 Mon Sep 17 00:00:00 2001 From: xhxy <2290327506@qq.com> Date: Sun, 23 Feb 2025 22:04:56 +0800 Subject: [PATCH] =?UTF-8?q?=E6=80=AA=E7=89=A9=E5=9F=BA=E6=9C=AC=E7=A7=BB?= =?UTF-8?q?=E5=8A=A8=E5=8A=A8=E7=94=BB=EF=BC=8C=E6=95=99=E5=AD=A6=E4=B8=8D?= =?UTF-8?q?=E5=A5=BD=EF=BC=8C=E8=87=AA=E5=B7=B1=E7=94=A8=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=9C=BA=E6=9B=B4=E5=A5=BD=EF=BC=8C=E4=B8=8D=E5=8F=82=E8=80=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Animations/Enemy.meta | 8 + Assets/Animations/Enemy/Boar.meta | 8 + Assets/Animations/Enemy/Boar/Boar.controller | 446 ++++++++++++++++++ .../Enemy/Boar/Boar.controller.meta | 8 + Assets/Animations/Enemy/Boar/BoarDead.anim | 81 ++++ .../Animations/Enemy/Boar/BoarDead.anim.meta | 8 + Assets/Animations/Enemy/Boar/Hurt.anim | 81 ++++ Assets/Animations/Enemy/Boar/Hurt.anim.meta | 8 + Assets/Animations/Enemy/Boar/Idle.anim | 84 ++++ Assets/Animations/Enemy/Boar/Idle.anim.meta | 8 + Assets/Animations/Enemy/Boar/Run.anim | 90 ++++ Assets/Animations/Enemy/Boar/Run.anim.meta | 8 + Assets/Animations/Enemy/Boar/Walk.anim | 90 ++++ Assets/Animations/Enemy/Boar/Walk.anim.meta | 8 + .../Mob/Boar/Hit-Vanish/Hit-Sheet.png.meta | 100 +++- .../Mob/Boar/Run/Run-Sheet.png.meta | 144 +++++- .../Mob/Boar/Walk/Walk-Base-Sheet.png.meta | 144 +++++- Assets/Scenes/SampleScene.unity | 129 ++++- Assets/Scripts/Enemy.meta | 8 + Assets/Scripts/Enemy/Boar.cs | 12 + Assets/Scripts/Enemy/Boar.cs.meta | 11 + Assets/Scripts/Enemy/Enemy.cs | 132 ++++++ Assets/Scripts/Enemy/Enemy.cs.meta | 11 + Assets/Scripts/General/PhysicsCheck.cs | 29 +- Assets/Scripts/Player/PlayerController.cs | 4 + 25 files changed, 1626 insertions(+), 34 deletions(-) create mode 100644 Assets/Animations/Enemy.meta create mode 100644 Assets/Animations/Enemy/Boar.meta create mode 100644 Assets/Animations/Enemy/Boar/Boar.controller create mode 100644 Assets/Animations/Enemy/Boar/Boar.controller.meta create mode 100644 Assets/Animations/Enemy/Boar/BoarDead.anim create mode 100644 Assets/Animations/Enemy/Boar/BoarDead.anim.meta create mode 100644 Assets/Animations/Enemy/Boar/Hurt.anim create mode 100644 Assets/Animations/Enemy/Boar/Hurt.anim.meta create mode 100644 Assets/Animations/Enemy/Boar/Idle.anim create mode 100644 Assets/Animations/Enemy/Boar/Idle.anim.meta create mode 100644 Assets/Animations/Enemy/Boar/Run.anim create mode 100644 Assets/Animations/Enemy/Boar/Run.anim.meta create mode 100644 Assets/Animations/Enemy/Boar/Walk.anim create mode 100644 Assets/Animations/Enemy/Boar/Walk.anim.meta create mode 100644 Assets/Scripts/Enemy.meta create mode 100644 Assets/Scripts/Enemy/Boar.cs create mode 100644 Assets/Scripts/Enemy/Boar.cs.meta create mode 100644 Assets/Scripts/Enemy/Enemy.cs create mode 100644 Assets/Scripts/Enemy/Enemy.cs.meta diff --git a/Assets/Animations/Enemy.meta b/Assets/Animations/Enemy.meta new file mode 100644 index 0000000..140bd7e --- /dev/null +++ b/Assets/Animations/Enemy.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e440aa55a6c8db449928541981e4a4b0 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/Enemy/Boar.meta b/Assets/Animations/Enemy/Boar.meta new file mode 100644 index 0000000..4685f9f --- /dev/null +++ b/Assets/Animations/Enemy/Boar.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: eac34db2d5b96994aaba72e224fa9915 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/Enemy/Boar/Boar.controller b/Assets/Animations/Enemy/Boar/Boar.controller new file mode 100644 index 0000000..bdfc8a5 --- /dev/null +++ b/Assets/Animations/Enemy/Boar/Boar.controller @@ -0,0 +1,446 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1101 &-7773450157422197147 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 2 + m_ConditionEvent: run + m_EventTreshold: 0 + - m_ConditionMode: 1 + m_ConditionEvent: walk + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 3416593373942573622} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.6666666 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &-5972957789490968441 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Run + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 1363442067550397962} + - {fileID: -7773450157422197147} + 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: 7400000, guid: 9fbd099466828d8468a5c126db27c6eb, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &-4125833118806927423 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: BoarDead + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + 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: 7400000, guid: d837933990b073e45bde01246b54c81e, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &-3804093488813123684 +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: dead + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -4125833118806927423} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1107 &-3643905433954688897 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: -2216222007917264120} + m_Position: {x: 320, y: 120, z: 0} + - serializedVersion: 1 + m_State: {fileID: 3416593373942573622} + m_Position: {x: 330, y: 240, z: 0} + - serializedVersion: 1 + m_State: {fileID: -5972957789490968441} + m_Position: {x: 580, y: 120, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1992280842506773188} + m_Position: {x: 330, y: 10, z: 0} + - serializedVersion: 1 + m_State: {fileID: -4125833118806927423} + m_Position: {x: 30, y: -100, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: + - {fileID: -659823723598374551} + - {fileID: -3804093488813123684} + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 600, y: 20, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: -2216222007917264120} +--- !u!1101 &-2544747296328106670 +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: run + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -5972957789490968441} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.7647059 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &-2216222007917264120 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Idle + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 8419079349636824924} + - {fileID: -2544747296328106670} + 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: 7400000, guid: fe4b303bfe502b648a747fd3e261654f, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &-711477706870563271 +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 + m_TransitionOffset: 0 + m_ExitTime: 1 + m_HasExitTime: 1 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-659823723598374551 +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: hurt + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1992280842506773188} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 0 +--- !u!1101 &-642217144865927270 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 2 + m_ConditionEvent: walk + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -2216222007917264120} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.82608694 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Boar + serializedVersion: 5 + m_AnimatorParameters: + - m_Name: walk + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + - m_Name: run + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + - m_Name: hurt + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + - m_Name: dead + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -3643905433954688897} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1101 &1363442067550397962 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 2 + m_ConditionEvent: run + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -2216222007917264120} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.6666666 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &1992280842506773188 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Hurt + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -711477706870563271} + 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: 7400000, guid: 823a133142ad70a4dadcee61fe5189be, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &2278841130845382546 +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: run + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -5972957789490968441} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.82608694 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &3416593373942573622 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Walk + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 2278841130845382546} + - {fileID: -642217144865927270} + 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: 7400000, guid: 708c5289140426f4b9cfd8c45816bd61, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &8419079349636824924 +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: walk + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 3416593373942573622} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.7647059 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 diff --git a/Assets/Animations/Enemy/Boar/Boar.controller.meta b/Assets/Animations/Enemy/Boar/Boar.controller.meta new file mode 100644 index 0000000..eaed1a9 --- /dev/null +++ b/Assets/Animations/Enemy/Boar/Boar.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 277b1e15c56d4374d9db875c279a43c7 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/Enemy/Boar/BoarDead.anim b/Assets/Animations/Enemy/Boar/BoarDead.anim new file mode 100644 index 0000000..3eaa792 --- /dev/null +++ b/Assets/Animations/Enemy/Boar/BoarDead.anim @@ -0,0 +1,81 @@ +%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: BoarDead + 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: -333876248, guid: 84a335ba3efa10941939eaf06dff2f0a, type: 3} + - time: 0.125 + value: {fileID: 1109792539, guid: 84a335ba3efa10941939eaf06dff2f0a, type: 3} + - time: 0.25 + value: {fileID: 569031420, guid: 84a335ba3efa10941939eaf06dff2f0a, type: 3} + - time: 0.375 + value: {fileID: -2029691963, guid: 84a335ba3efa10941939eaf06dff2f0a, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + m_SampleRate: 16 + 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: -333876248, guid: 84a335ba3efa10941939eaf06dff2f0a, type: 3} + - {fileID: 1109792539, guid: 84a335ba3efa10941939eaf06dff2f0a, type: 3} + - {fileID: 569031420, guid: 84a335ba3efa10941939eaf06dff2f0a, type: 3} + - {fileID: -2029691963, guid: 84a335ba3efa10941939eaf06dff2f0a, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.4375 + 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/Animations/Enemy/Boar/BoarDead.anim.meta b/Assets/Animations/Enemy/Boar/BoarDead.anim.meta new file mode 100644 index 0000000..4b4cda7 --- /dev/null +++ b/Assets/Animations/Enemy/Boar/BoarDead.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d837933990b073e45bde01246b54c81e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/Enemy/Boar/Hurt.anim b/Assets/Animations/Enemy/Boar/Hurt.anim new file mode 100644 index 0000000..5d5e202 --- /dev/null +++ b/Assets/Animations/Enemy/Boar/Hurt.anim @@ -0,0 +1,81 @@ +%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: Hurt + 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: -333876248, guid: 84a335ba3efa10941939eaf06dff2f0a, type: 3} + - time: 0.125 + value: {fileID: 1109792539, guid: 84a335ba3efa10941939eaf06dff2f0a, type: 3} + - time: 0.25 + value: {fileID: 569031420, guid: 84a335ba3efa10941939eaf06dff2f0a, type: 3} + - time: 0.375 + value: {fileID: -2029691963, guid: 84a335ba3efa10941939eaf06dff2f0a, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + m_SampleRate: 16 + 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: -333876248, guid: 84a335ba3efa10941939eaf06dff2f0a, type: 3} + - {fileID: 1109792539, guid: 84a335ba3efa10941939eaf06dff2f0a, type: 3} + - {fileID: 569031420, guid: 84a335ba3efa10941939eaf06dff2f0a, type: 3} + - {fileID: -2029691963, guid: 84a335ba3efa10941939eaf06dff2f0a, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.4375 + 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/Animations/Enemy/Boar/Hurt.anim.meta b/Assets/Animations/Enemy/Boar/Hurt.anim.meta new file mode 100644 index 0000000..f981d8b --- /dev/null +++ b/Assets/Animations/Enemy/Boar/Hurt.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 823a133142ad70a4dadcee61fe5189be +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/Enemy/Boar/Idle.anim b/Assets/Animations/Enemy/Boar/Idle.anim new file mode 100644 index 0000000..803ff5e --- /dev/null +++ b/Assets/Animations/Enemy/Boar/Idle.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: Idle + 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: 1806638235, guid: cb8a915b415b9c245a5b3e4483181f27, type: 3} + - time: 0.3125 + value: {fileID: -758860745, guid: cb8a915b415b9c245a5b3e4483181f27, type: 3} + - time: 0.5625 + value: {fileID: -1773422267, guid: cb8a915b415b9c245a5b3e4483181f27, type: 3} + - time: 0.8125 + value: {fileID: -1165950882, guid: cb8a915b415b9c245a5b3e4483181f27, type: 3} + - time: 1 + value: {fileID: -1165950882, guid: cb8a915b415b9c245a5b3e4483181f27, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + m_SampleRate: 16 + 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: 1806638235, guid: cb8a915b415b9c245a5b3e4483181f27, type: 3} + - {fileID: -758860745, guid: cb8a915b415b9c245a5b3e4483181f27, type: 3} + - {fileID: -1773422267, guid: cb8a915b415b9c245a5b3e4483181f27, type: 3} + - {fileID: -1165950882, guid: cb8a915b415b9c245a5b3e4483181f27, type: 3} + - {fileID: -1165950882, guid: cb8a915b415b9c245a5b3e4483181f27, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1.0625 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + 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/Animations/Enemy/Boar/Idle.anim.meta b/Assets/Animations/Enemy/Boar/Idle.anim.meta new file mode 100644 index 0000000..fb6a2d6 --- /dev/null +++ b/Assets/Animations/Enemy/Boar/Idle.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fe4b303bfe502b648a747fd3e261654f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/Enemy/Boar/Run.anim b/Assets/Animations/Enemy/Boar/Run.anim new file mode 100644 index 0000000..cdd2d6d --- /dev/null +++ b/Assets/Animations/Enemy/Boar/Run.anim @@ -0,0 +1,90 @@ +%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: Run + 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: 1602462396, guid: 377388b425544144e9d8401da5a475d2, type: 3} + - time: 0.125 + value: {fileID: 1678620741, guid: 377388b425544144e9d8401da5a475d2, type: 3} + - time: 0.25 + value: {fileID: 1124052654, guid: 377388b425544144e9d8401da5a475d2, type: 3} + - time: 0.375 + value: {fileID: -1033560545, guid: 377388b425544144e9d8401da5a475d2, type: 3} + - time: 0.5 + value: {fileID: -1202262612, guid: 377388b425544144e9d8401da5a475d2, type: 3} + - time: 0.625 + value: {fileID: 744117253, guid: 377388b425544144e9d8401da5a475d2, type: 3} + - time: 0.6875 + value: {fileID: 744117253, guid: 377388b425544144e9d8401da5a475d2, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + m_SampleRate: 16 + 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: 1602462396, guid: 377388b425544144e9d8401da5a475d2, type: 3} + - {fileID: 1678620741, guid: 377388b425544144e9d8401da5a475d2, type: 3} + - {fileID: 1124052654, guid: 377388b425544144e9d8401da5a475d2, type: 3} + - {fileID: -1033560545, guid: 377388b425544144e9d8401da5a475d2, type: 3} + - {fileID: -1202262612, guid: 377388b425544144e9d8401da5a475d2, type: 3} + - {fileID: 744117253, guid: 377388b425544144e9d8401da5a475d2, type: 3} + - {fileID: 744117253, guid: 377388b425544144e9d8401da5a475d2, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.75 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + 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/Animations/Enemy/Boar/Run.anim.meta b/Assets/Animations/Enemy/Boar/Run.anim.meta new file mode 100644 index 0000000..dde003f --- /dev/null +++ b/Assets/Animations/Enemy/Boar/Run.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9fbd099466828d8468a5c126db27c6eb +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/Enemy/Boar/Walk.anim b/Assets/Animations/Enemy/Boar/Walk.anim new file mode 100644 index 0000000..8a452e8 --- /dev/null +++ b/Assets/Animations/Enemy/Boar/Walk.anim @@ -0,0 +1,90 @@ +%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: Walk + 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: -754541238, guid: 20b0f422bbffb394b91bfb4b301d6e91, type: 3} + - time: 0.25 + value: {fileID: 767166811, guid: 20b0f422bbffb394b91bfb4b301d6e91, type: 3} + - time: 0.5 + value: {fileID: 1994239834, guid: 20b0f422bbffb394b91bfb4b301d6e91, type: 3} + - time: 0.75 + value: {fileID: 436770598, guid: 20b0f422bbffb394b91bfb4b301d6e91, type: 3} + - time: 1 + value: {fileID: 375437468, guid: 20b0f422bbffb394b91bfb4b301d6e91, type: 3} + - time: 1.25 + value: {fileID: 1369296399, guid: 20b0f422bbffb394b91bfb4b301d6e91, type: 3} + - time: 1.375 + value: {fileID: 1369296399, guid: 20b0f422bbffb394b91bfb4b301d6e91, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + m_SampleRate: 16 + 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: -754541238, guid: 20b0f422bbffb394b91bfb4b301d6e91, type: 3} + - {fileID: 767166811, guid: 20b0f422bbffb394b91bfb4b301d6e91, type: 3} + - {fileID: 1994239834, guid: 20b0f422bbffb394b91bfb4b301d6e91, type: 3} + - {fileID: 436770598, guid: 20b0f422bbffb394b91bfb4b301d6e91, type: 3} + - {fileID: 375437468, guid: 20b0f422bbffb394b91bfb4b301d6e91, type: 3} + - {fileID: 1369296399, guid: 20b0f422bbffb394b91bfb4b301d6e91, type: 3} + - {fileID: 1369296399, guid: 20b0f422bbffb394b91bfb4b301d6e91, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1.4375 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + 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/Animations/Enemy/Boar/Walk.anim.meta b/Assets/Animations/Enemy/Boar/Walk.anim.meta new file mode 100644 index 0000000..ed43926 --- /dev/null +++ b/Assets/Animations/Enemy/Boar/Walk.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 708c5289140426f4b9cfd8c45816bd61 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art/Legacy-Fantasy - High Forest 2.3/Mob/Boar/Hit-Vanish/Hit-Sheet.png.meta b/Assets/Art/Legacy-Fantasy - High Forest 2.3/Mob/Boar/Hit-Vanish/Hit-Sheet.png.meta index 33009ba..1b24108 100644 --- a/Assets/Art/Legacy-Fantasy - High Forest 2.3/Mob/Boar/Hit-Vanish/Hit-Sheet.png.meta +++ b/Assets/Art/Legacy-Fantasy - High Forest 2.3/Mob/Boar/Hit-Vanish/Hit-Sheet.png.meta @@ -34,7 +34,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 0 aniso: 1 mipBias: 0 wrapU: 1 @@ -43,12 +43,12 @@ TextureImporter: nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 1 + spriteMode: 2 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 16 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -72,7 +72,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -95,7 +95,91 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 - sprites: [] + sprites: + - serializedVersion: 2 + name: Hit-Sheet_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 48 + height: 32 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 6d4dd4b2bf0d3754bae87408aa0aa1e9 + internalID: -333876248 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Hit-Sheet_1 + rect: + serializedVersion: 2 + x: 48 + y: 0 + width: 48 + height: 32 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 7f9d83d064e55a54ab47cf5bc273c739 + internalID: 1109792539 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Hit-Sheet_2 + rect: + serializedVersion: 2 + x: 96 + y: 0 + width: 48 + height: 32 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 0f1819bf95fb2d5418ca53dd8bc2236b + internalID: 569031420 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Hit-Sheet_3 + rect: + serializedVersion: 2 + x: 144 + y: 0 + width: 48 + height: 32 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 9bf4a6babc938434d9ed4645a0c39e5f + internalID: -2029691963 + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] @@ -106,7 +190,11 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - nameFileIdTable: {} + nameFileIdTable: + Hit-Sheet_0: -333876248 + Hit-Sheet_1: 1109792539 + Hit-Sheet_2: 569031420 + Hit-Sheet_3: -2029691963 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/Assets/Art/Legacy-Fantasy - High Forest 2.3/Mob/Boar/Run/Run-Sheet.png.meta b/Assets/Art/Legacy-Fantasy - High Forest 2.3/Mob/Boar/Run/Run-Sheet.png.meta index 9f95666..f9bb8b9 100644 --- a/Assets/Art/Legacy-Fantasy - High Forest 2.3/Mob/Boar/Run/Run-Sheet.png.meta +++ b/Assets/Art/Legacy-Fantasy - High Forest 2.3/Mob/Boar/Run/Run-Sheet.png.meta @@ -34,7 +34,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 0 aniso: 1 mipBias: 0 wrapU: 1 @@ -43,12 +43,12 @@ TextureImporter: nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 1 + spriteMode: 2 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 16 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -72,7 +72,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -95,7 +95,133 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 - sprites: [] + sprites: + - serializedVersion: 2 + name: Run-Sheet_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 48 + height: 32 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 8949bd97994c36d4bae218b927907b16 + internalID: 1602462396 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Run-Sheet_1 + rect: + serializedVersion: 2 + x: 48 + y: 0 + width: 48 + height: 32 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 910428ed4fbdaa5419b2ae0e93290224 + internalID: 1678620741 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Run-Sheet_2 + rect: + serializedVersion: 2 + x: 96 + y: 0 + width: 48 + height: 32 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 4b8e2476665023a45a8286b0dd530abe + internalID: 1124052654 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Run-Sheet_3 + rect: + serializedVersion: 2 + x: 144 + y: 0 + width: 48 + height: 32 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 65844e1e5fbb52f468fc4cbca00592b7 + internalID: -1033560545 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Run-Sheet_4 + rect: + serializedVersion: 2 + x: 192 + y: 0 + width: 48 + height: 32 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: a1ec0159135d2714987b9ff4a1581eeb + internalID: -1202262612 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Run-Sheet_5 + rect: + serializedVersion: 2 + x: 240 + y: 0 + width: 48 + height: 32 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 86e97a21b38be4647b997ed856357d86 + internalID: 744117253 + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] @@ -106,7 +232,13 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - nameFileIdTable: {} + nameFileIdTable: + Run-Sheet_0: 1602462396 + Run-Sheet_1: 1678620741 + Run-Sheet_2: 1124052654 + Run-Sheet_3: -1033560545 + Run-Sheet_4: -1202262612 + Run-Sheet_5: 744117253 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/Assets/Art/Legacy-Fantasy - High Forest 2.3/Mob/Boar/Walk/Walk-Base-Sheet.png.meta b/Assets/Art/Legacy-Fantasy - High Forest 2.3/Mob/Boar/Walk/Walk-Base-Sheet.png.meta index a090b99..60cc1d4 100644 --- a/Assets/Art/Legacy-Fantasy - High Forest 2.3/Mob/Boar/Walk/Walk-Base-Sheet.png.meta +++ b/Assets/Art/Legacy-Fantasy - High Forest 2.3/Mob/Boar/Walk/Walk-Base-Sheet.png.meta @@ -34,7 +34,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 0 aniso: 1 mipBias: 0 wrapU: 1 @@ -43,12 +43,12 @@ TextureImporter: nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 1 + spriteMode: 2 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 16 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -72,7 +72,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -95,7 +95,133 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 - sprites: [] + sprites: + - serializedVersion: 2 + name: Walk-Base-Sheet_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 48 + height: 32 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 53abc8ef488d5d64ca8357a73b521873 + internalID: -754541238 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Walk-Base-Sheet_1 + rect: + serializedVersion: 2 + x: 48 + y: 0 + width: 48 + height: 32 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: e1f735da14ea8d249b2175711ec5eb3e + internalID: 767166811 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Walk-Base-Sheet_2 + rect: + serializedVersion: 2 + x: 96 + y: 0 + width: 48 + height: 32 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: bfb04c1851a8916438c4aab77f72a978 + internalID: 1994239834 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Walk-Base-Sheet_3 + rect: + serializedVersion: 2 + x: 144 + y: 0 + width: 48 + height: 32 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 1ffd71e0504ac034dbb8f6e270a51e9b + internalID: 436770598 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Walk-Base-Sheet_4 + rect: + serializedVersion: 2 + x: 192 + y: 0 + width: 48 + height: 32 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: bc893a7fbf6383b438adb32e7eaf9c01 + internalID: 375437468 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Walk-Base-Sheet_5 + rect: + serializedVersion: 2 + x: 240 + y: 0 + width: 48 + height: 32 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: ea67e80a98c3a9a48bbe9e3e0635e7ec + internalID: 1369296399 + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] @@ -106,7 +232,13 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - nameFileIdTable: {} + nameFileIdTable: + Walk-Base-Sheet_0: -754541238 + Walk-Base-Sheet_1: 767166811 + Walk-Base-Sheet_2: 1994239834 + Walk-Base-Sheet_3: 436770598 + Walk-Base-Sheet_4: 375437468 + Walk-Base-Sheet_5: 1369296399 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 83e0721..43680e3 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -2965,7 +2965,7 @@ CompositeCollider2D: m_UsedByEffector: 0 m_UsedByComposite: 0 m_Offset: {x: 0, y: 0} - m_GeometryType: 0 + m_GeometryType: 1 m_GenerationType: 0 m_EdgeRadius: 0 m_ColliderPaths: @@ -3576,7 +3576,7 @@ Transform: m_GameObject: {fileID: 887481103} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 1.85, z: 0} + m_LocalPosition: {x: -5.12, y: 3.86, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -3678,12 +3678,17 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4ac0f40285681b74c841e22ebbe583d5, type: 3} m_Name: m_EditorClassIdentifier: + manual: 0 bottomOffest: {x: -0.07, y: 0} + leftOffest: {x: 0, y: 0} + rightOffest: {x: 0, y: 0} checkRaduis: 0.06 groundLayer: serializedVersion: 2 m_Bits: 64 isGround: 0 + touchLeftWall: 0 + touchRightWall: 0 --- !u!95 &887481110 Animator: serializedVersion: 5 @@ -4698,7 +4703,7 @@ Tilemap: - {fileID: 1369434452, guid: d4dcc96007437b741bd8f3a3c7e02b45, type: 3} - {fileID: -714309378, guid: d4dcc96007437b741bd8f3a3c7e02b45, type: 3} - {fileID: -1306249692, guid: d4dcc96007437b741bd8f3a3c7e02b45, type: 3} - m_AnimationSpeed: 7.0000005 + m_AnimationSpeed: 7 m_AnimationTimeOffset: 0 m_Flags: 0 - first: {x: 7, y: 0, z: 0} @@ -4709,7 +4714,7 @@ Tilemap: - {fileID: 1961145818, guid: d4dcc96007437b741bd8f3a3c7e02b45, type: 3} - {fileID: 1737103796, guid: d4dcc96007437b741bd8f3a3c7e02b45, type: 3} - {fileID: -23635172, guid: d4dcc96007437b741bd8f3a3c7e02b45, type: 3} - m_AnimationSpeed: 7 + m_AnimationSpeed: 7.0000005 m_AnimationTimeOffset: 0 m_Flags: 0 - first: {x: 5, y: 1, z: 0} @@ -4852,7 +4857,7 @@ Tilemap: - {fileID: 1051226569, guid: d4dcc96007437b741bd8f3a3c7e02b45, type: 3} - {fileID: 1588357252, guid: d4dcc96007437b741bd8f3a3c7e02b45, type: 3} - {fileID: -1843162688, guid: d4dcc96007437b741bd8f3a3c7e02b45, type: 3} - m_AnimationSpeed: 7 + m_AnimationSpeed: 7.0000005 m_AnimationTimeOffset: 0 m_Flags: 0 - first: {x: 6, y: 5, z: 0} @@ -4929,7 +4934,7 @@ Tilemap: - {fileID: 1369434452, guid: d4dcc96007437b741bd8f3a3c7e02b45, type: 3} - {fileID: -714309378, guid: d4dcc96007437b741bd8f3a3c7e02b45, type: 3} - {fileID: -1306249692, guid: d4dcc96007437b741bd8f3a3c7e02b45, type: 3} - m_AnimationSpeed: 7 + m_AnimationSpeed: 7.0000005 m_AnimationTimeOffset: 0 m_Flags: 0 - first: {x: 7, y: 7, z: 0} @@ -4984,7 +4989,7 @@ Tilemap: - {fileID: 1051226569, guid: d4dcc96007437b741bd8f3a3c7e02b45, type: 3} - {fileID: 1588357252, guid: d4dcc96007437b741bd8f3a3c7e02b45, type: 3} - {fileID: -1843162688, guid: d4dcc96007437b741bd8f3a3c7e02b45, type: 3} - m_AnimationSpeed: 7 + m_AnimationSpeed: 7.0000005 m_AnimationTimeOffset: 0 m_Flags: 0 - first: {x: 6, y: 9, z: 0} @@ -4995,7 +5000,7 @@ Tilemap: - {fileID: 1369434452, guid: d4dcc96007437b741bd8f3a3c7e02b45, type: 3} - {fileID: -714309378, guid: d4dcc96007437b741bd8f3a3c7e02b45, type: 3} - {fileID: -1306249692, guid: d4dcc96007437b741bd8f3a3c7e02b45, type: 3} - m_AnimationSpeed: 7 + m_AnimationSpeed: 7.0000005 m_AnimationTimeOffset: 0 m_Flags: 0 - first: {x: 7, y: 9, z: 0} @@ -5050,7 +5055,7 @@ Tilemap: - {fileID: 1051226569, guid: d4dcc96007437b741bd8f3a3c7e02b45, type: 3} - {fileID: 1588357252, guid: d4dcc96007437b741bd8f3a3c7e02b45, type: 3} - {fileID: -1843162688, guid: d4dcc96007437b741bd8f3a3c7e02b45, type: 3} - m_AnimationSpeed: 7.0000005 + m_AnimationSpeed: 7 m_AnimationTimeOffset: 0 m_Flags: 0 - first: {x: 6, y: 11, z: 0} @@ -5072,7 +5077,7 @@ Tilemap: - {fileID: 1961145818, guid: d4dcc96007437b741bd8f3a3c7e02b45, type: 3} - {fileID: 1737103796, guid: d4dcc96007437b741bd8f3a3c7e02b45, type: 3} - {fileID: -23635172, guid: d4dcc96007437b741bd8f3a3c7e02b45, type: 3} - m_AnimationSpeed: 7.0000005 + m_AnimationSpeed: 7 m_AnimationTimeOffset: 0 m_Flags: 0 - first: {x: 5, y: 12, z: 0} @@ -5083,7 +5088,7 @@ Tilemap: - {fileID: 1051226569, guid: d4dcc96007437b741bd8f3a3c7e02b45, type: 3} - {fileID: 1588357252, guid: d4dcc96007437b741bd8f3a3c7e02b45, type: 3} - {fileID: -1843162688, guid: d4dcc96007437b741bd8f3a3c7e02b45, type: 3} - m_AnimationSpeed: 7 + m_AnimationSpeed: 7.0000005 m_AnimationTimeOffset: 0 m_Flags: 0 - first: {x: 6, y: 12, z: 0} @@ -5171,7 +5176,7 @@ Tilemap: - {fileID: 1961145818, guid: d4dcc96007437b741bd8f3a3c7e02b45, type: 3} - {fileID: 1737103796, guid: d4dcc96007437b741bd8f3a3c7e02b45, type: 3} - {fileID: -23635172, guid: d4dcc96007437b741bd8f3a3c7e02b45, type: 3} - m_AnimationSpeed: 7.0000005 + m_AnimationSpeed: 7 m_AnimationTimeOffset: 0 m_Flags: 0 - first: {x: 5, y: 15, z: 0} @@ -6161,8 +6166,11 @@ GameObject: - component: {fileID: 2091678384} - component: {fileID: 2091678385} - component: {fileID: 2091678386} + - component: {fileID: 2091678390} - component: {fileID: 2091678387} - component: {fileID: 2091678388} + - component: {fileID: 2091678389} + - component: {fileID: 2091678391} m_Layer: 8 m_Name: Boar m_TagString: Untagged @@ -6356,16 +6364,40 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c5fa6c925c3402a40ab772e1f1d3afa5, type: 3} m_Name: m_EditorClassIdentifier: - maxHealth: 50 + maxHealth: 20 currentHealth: 0 invulnerableDuration: 0.5 invulnerable: 0 OnTakeDamage: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 2091678389} + m_TargetAssemblyTypeName: Enemy, Assembly-CSharp + m_MethodName: OnTakeDamage + m_Mode: 0 + 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 OnDie: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 2091678389} + m_TargetAssemblyTypeName: Enemy, Assembly-CSharp + m_MethodName: OnDie + 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 &2091678388 MonoBehaviour: m_ObjectHideFlags: 0 @@ -6381,6 +6413,73 @@ MonoBehaviour: damage: 20 attackRange: 0 attackRate: 0 +--- !u!114 &2091678389 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2091678381} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 28a60360e97884d4e92bf7323b25f2db, type: 3} + m_Name: + m_EditorClassIdentifier: + normalSpeed: 100 + chaseSpeed: 250 + currentSpeed: 0 + faceDir: {x: 0, y: 0, z: 0} + hurtForce: 5.5 + attacker: {fileID: 0} + waitTime: 2 + waitTimeCounter: 0 + wait: 0 + isHurt: 0 + isDead: 0 +--- !u!95 &2091678390 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2091678381} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 277b1e15c56d4374d9db875c279a43c7, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!114 &2091678391 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2091678381} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4ac0f40285681b74c841e22ebbe583d5, type: 3} + m_Name: + m_EditorClassIdentifier: + manual: 1 + bottomOffest: {x: -0.86, y: 0} + leftOffest: {x: -1.1, y: 0.61} + rightOffest: {x: 0.79, y: 0.61} + checkRaduis: 0.1 + groundLayer: + serializedVersion: 2 + m_Bits: 64 + isGround: 0 + touchLeftWall: 0 + touchRightWall: 0 --- !u!1 &2123108044 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Enemy.meta b/Assets/Scripts/Enemy.meta new file mode 100644 index 0000000..7621da4 --- /dev/null +++ b/Assets/Scripts/Enemy.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1032089eaa9dde845a606d353e3de05f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Enemy/Boar.cs b/Assets/Scripts/Enemy/Boar.cs new file mode 100644 index 0000000..2e590bc --- /dev/null +++ b/Assets/Scripts/Enemy/Boar.cs @@ -0,0 +1,12 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Boar : Enemy +{ + public override void Move() + { + base.Move(); + anim.SetBool("walk", true); + } +} diff --git a/Assets/Scripts/Enemy/Boar.cs.meta b/Assets/Scripts/Enemy/Boar.cs.meta new file mode 100644 index 0000000..4afff98 --- /dev/null +++ b/Assets/Scripts/Enemy/Boar.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 28a60360e97884d4e92bf7323b25f2db +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Enemy/Enemy.cs b/Assets/Scripts/Enemy/Enemy.cs new file mode 100644 index 0000000..b9af1de --- /dev/null +++ b/Assets/Scripts/Enemy/Enemy.cs @@ -0,0 +1,132 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Enemy : MonoBehaviour +{ + Rigidbody2D rb; + protected Animator anim; + PhysicsCheck physicsCheck; + + [Header("基本参数")] + public float normalSpeed;//正常速度 + public float chaseSpeed;//追击速度 + public float currentSpeed;//当前速度 + public Vector3 faceDir;//面朝方向 + public float hurtForce;//受伤的力 + + public Transform attacker;//攻击者 + + + [Header("计时器")] + public float waitTime; + public float waitTimeCounter; + public bool wait; + + [Header("状态")] + public bool isHurt; + public bool isDead; + + private void Awake() + { + rb = GetComponent(); + anim = GetComponent(); + physicsCheck = GetComponent(); + currentSpeed = normalSpeed; + waitTimeCounter = waitTime; + } + + private void Update() + { + faceDir = new Vector3(-transform.localScale.x,0,0); + if (physicsCheck.touchLeftWall && faceDir.x <0 || physicsCheck.touchRightWall && faceDir.x >0) + { + wait = true; + anim.SetBool("walk", false); + } + TimeCounter(); + } + + private void FixedUpdate() + { + if(!isHurt && !isDead) + { + Move(); + } + + } + + public virtual void Move() + { + rb.velocity = new Vector2(currentSpeed * faceDir.x * Time.deltaTime, rb.velocity.y); + } + + + //计时器 + public void TimeCounter() + { + if(wait) + { + waitTimeCounter -= Time.deltaTime; + if(waitTimeCounter <= 0) + { + waitTimeCounter = waitTime; + wait =false; + transform.localScale = new Vector3(faceDir.x, 1, 1); + //Turn(); + } + } + } + + public void OnTakeDamage(Transform attackTrans) + { + attacker = attackTrans; + if(attackTrans.position.x - transform.position.x > 0) + { + transform.localScale = new Vector3(-1,1,1); + } + if (attackTrans.position.x - transform.position.x < 0) + { + transform.localScale = new Vector3(1, 1, 1); + } + + //受伤击退 + isHurt = true; + anim.SetTrigger("hurt"); + Vector2 dir = new Vector2(transform.position.x - attackTrans.position.x, 0).normalized; + + StartCoroutine(OnHurt(dir)); + + + } + IEnumerator OnHurt( Vector2 dir) + { + rb.AddForce(hurtForce * dir, ForceMode2D.Impulse); + yield return new WaitForSeconds(0.5f); + isHurt = false;; + } + + public void OnDie() + { + anim.SetBool("dead", true); + isDead = true; + Destroy(this.gameObject);//动画失效，暂时直接销毁 + } + + public void DestroyAffterAnimation() + { + Destroy(this.gameObject); + } + + /*public void Turn() + { + if (physicsCheck.touchLeftWall) + { + transform.localScale = new Vector3(-1, 1, 1); + } + else if (physicsCheck.touchRightWall) + { + transform.localScale = new Vector3(1, 1, 1); + } + }*/ +} diff --git a/Assets/Scripts/Enemy/Enemy.cs.meta b/Assets/Scripts/Enemy/Enemy.cs.meta new file mode 100644 index 0000000..ad3b770 --- /dev/null +++ b/Assets/Scripts/Enemy/Enemy.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 34868498e462dd641a7a048955937763 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/General/PhysicsCheck.cs b/Assets/Scripts/General/PhysicsCheck.cs index 254ebff..a57c38e 100644 --- a/Assets/Scripts/General/PhysicsCheck.cs +++ b/Assets/Scripts/General/PhysicsCheck.cs @@ -4,8 +4,14 @@ using UnityEngine; public class PhysicsCheck : MonoBehaviour { + private CapsuleCollider2D coll; + [Header("检测参数")] - public Vector2 bottomOffest; + public bool manual;//手动 + + public Vector2 bottomOffest;//偏移 + public Vector2 leftOffest; + public Vector2 rightOffest; public float checkRaduis; @@ -13,6 +19,20 @@ public class PhysicsCheck : MonoBehaviour [Header("状态")] public bool isGround; + public bool touchLeftWall;//接触左墙 + public bool touchRightWall; + + + private void Awake() + { + coll = GetComponent(); + + if (!manual)//不手动调整的默认边界值 + { + rightOffest = new Vector2((coll.bounds.size.x+ coll.offset.x) / 2, coll.bounds.size.y / 2); + leftOffest = new Vector2(-rightOffest.x, rightOffest.y); + } + } private void Update() { @@ -21,12 +41,19 @@ public class PhysicsCheck : MonoBehaviour public void Check() { + //地面 isGround = Physics2D.OverlapCircle((Vector2)transform.position+bottomOffest, checkRaduis, groundLayer); + + //墙 + touchLeftWall = Physics2D.OverlapCircle((Vector2)transform.position + leftOffest, checkRaduis, groundLayer); + touchRightWall = Physics2D.OverlapCircle((Vector2)transform.position + rightOffest, checkRaduis, groundLayer); } private void OnDrawGizmosSelected() { Gizmos.DrawWireSphere((Vector2)transform.position + bottomOffest, checkRaduis); + Gizmos.DrawWireSphere((Vector2)transform.position + leftOffest, checkRaduis); + Gizmos.DrawWireSphere((Vector2)transform.position + rightOffest, checkRaduis); } } diff --git a/Assets/Scripts/Player/PlayerController.cs b/Assets/Scripts/Player/PlayerController.cs index 70f7bbf..7970eef 100644 --- a/Assets/Scripts/Player/PlayerController.cs +++ b/Assets/Scripts/Player/PlayerController.cs @@ -108,6 +108,10 @@ public class PlayerController : MonoBehaviour //攻击 private void PlayerAttack(InputAction.CallbackContext context) { + if (!physicsCheck.isGround) + { + return; + } playerAnimation.PlayAttack(); isAttack = true; }