任务：搭建基本的系统

1.替换动画源图片为攻击加长版
（*：新建动画“被击飞”并完成状态机逻辑
（*：删除旧动画源图片素材减小项目体积
*：修复攻击动画卡手问题
*：修复被击飞后朝向影响击飞结果的Bug

2.编写佛教小怪逻辑
（1.继承自NormalEnemy（*：与原备注不同，因为后期我发现用NormalEnemy更加合适更加简单）
（2.与普通小怪一样，默认状态会巡逻
（3.当玩家进入感知范围，触发Seek
（4.当玩家创到怪物，触发Atk
（*：改变自身状态为ATK
（*：关闭自身碰撞体，因为要贴在玩家身上
（*：将自身位置和玩家位置同步，但是需要一个附身offset二维向量，因为玩家的图片不在游戏物体的中心
（*：通知玩家，你被爱欲品附身了
（5.当怪物收到伤害，触发Seek
（*：我决定后期根据具体地形完善爱欲品的Seek函数
（6.编写完全挣脱事件
（*：触发死亡事件
（*：死亡后给予随机方向的击飞和旋转
（*：添加public变量breakFreeCount，代表挣脱需要触发多少次方向变换
（*：添加public变量breakFreeCountLeft，代表现在还需要方向变换多少次才能挣脱
（7.添加挣脱行为事件，从player传来，减一点Left并且判断是否完全挣脱，若是则执行完全挣脱事件
3.整理脚本分层，添加摘要和注释

下班，明天写玩家挣脱逻辑和被抓逻辑
🥱🥱🥱🥱🥱🥱🥱🥱🥱🥱🥱🥱🥱🥱🥱🥱🥱🥱

Assets/Scenes/test.unity

@@ -552,7 +552,7 @@ SpriteRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
-  m_Sprite: {fileID: 21300000, guid: 0d221bcfe27e6014494bbdb02977f469, type: 3}
+  m_Sprite: {fileID: 21300000, guid: bcb018ee6b241104bb739e08529e965b, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0
@@ -571,7 +571,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 326335321}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -6.292, y: 0.431, z: 0}
+  m_LocalPosition: {x: 9.45, y: 0.153, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 321454206}
@@ -615,18 +615,18 @@ BoxCollider2D:
   m_IsTrigger: 0
   m_UsedByEffector: 0
   m_UsedByComposite: 0
-  m_Offset: {x: -0.3, y: 0}
+  m_Offset: {x: -0.12, y: 0.26}
   m_SpriteTilingProperty:
     border: {x: 0, y: 0, z: 0, w: 0}
     pivot: {x: 0.5, y: 0.5}
-    oldSize: {x: 1.92, y: 1.28}
+    oldSize: {x: 2.368, y: 2.016}
     newSize: {x: 1, y: 1}
     adaptiveTilingThreshold: 0.5
     drawMode: 0
     adaptiveTiling: 0
   m_AutoTiling: 0
   serializedVersion: 2
-  m_Size: {x: 0.48, y: 1}
+  m_Size: {x: 0.39, y: 1}
   m_EdgeRadius: 0
 --- !u!114 &326335326
 MonoBehaviour:
@@ -736,7 +736,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   speed: 10
   jumpForce: 20
-  hammerCD: 1
+  hammerCD: 0.3
   sickleCD: 0
   sicklePrefab: {fileID: 8280362330273855463, guid: 2e2fb120ae20d5e4faaad5a2a2fcca30, type: 3}
   HP: 10
@@ -878,7 +878,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 519420028}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -5.522, y: 1.231, z: -10}
+  m_LocalPosition: {x: 10.219999, y: 0.953, z: -10}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 189736997}
@@ -919,6 +919,315 @@ MonoBehaviour:
   m_CameraActivatedEvent:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1 &659041640
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 659041644}
+  - component: {fileID: 659041643}
+  - component: {fileID: 659041642}
+  - component: {fileID: 659041641}
+  - component: {fileID: 659041645}
+  - component: {fileID: 659041646}
+  - component: {fileID: 659041647}
+  m_Layer: 0
+  m_Name: "\u7231\u6B32\u54C1"
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!61 &659041641
+BoxCollider2D:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 659041640}
+  m_Enabled: 1
+  m_Density: 1
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_UsedByEffector: 0
+  m_UsedByComposite: 0
+  m_Offset: {x: -1.52, y: 0}
+  m_SpriteTilingProperty:
+    border: {x: 0, y: 0, z: 0, w: 0}
+    pivot: {x: 0.5, y: 0.5}
+    oldSize: {x: 0.768, y: 0.74}
+    newSize: {x: 1, y: 1}
+    adaptiveTilingThreshold: 0.5
+    drawMode: 0
+    adaptiveTiling: 0
+  m_AutoTiling: 0
+  serializedVersion: 2
+  m_Size: {x: 2.27, y: 0.74}
+  m_EdgeRadius: 0
+--- !u!61 &659041642
+BoxCollider2D:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 659041640}
+  m_Enabled: 1
+  m_Density: 1
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_UsedByEffector: 0
+  m_UsedByComposite: 0
+  m_Offset: {x: 0, y: 0}
+  m_SpriteTilingProperty:
+    border: {x: 0, y: 0, z: 0, w: 0}
+    pivot: {x: 0.5, y: 0.5}
+    oldSize: {x: 0.768, y: 0.74}
+    newSize: {x: 1, y: 1}
+    adaptiveTilingThreshold: 0.5
+    drawMode: 0
+    adaptiveTiling: 0
+  m_AutoTiling: 0
+  serializedVersion: 2
+  m_Size: {x: 0.768, y: 0.74}
+  m_EdgeRadius: 0
+--- !u!212 &659041643
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 659041640}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 0
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_Sprite: {fileID: 21300000, guid: 4b64b4c73bfa00a4a9552c672359f9fc, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 1, y: 1}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0
+--- !u!4 &659041644
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 659041640}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 11.457179, y: 0.283, z: 0}
+  m_LocalScale: {x: -1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 6
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!50 &659041645
+Rigidbody2D:
+  serializedVersion: 4
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 659041640}
+  m_BodyType: 0
+  m_Simulated: 1
+  m_UseFullKinematicContacts: 0
+  m_UseAutoMass: 0
+  m_Mass: 1
+  m_LinearDrag: 0
+  m_AngularDrag: 0.05
+  m_GravityScale: 1
+  m_Material: {fileID: 0}
+  m_Interpolate: 0
+  m_SleepingMode: 1
+  m_CollisionDetection: 0
+  m_Constraints: 0
+--- !u!114 &659041646
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 659041640}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -333801856, guid: aa0b1eebb5db27a419fa4564bbe5c9c5, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  updateType: 0
+  isSpeedBased: 0
+  hasOnStart: 0
+  hasOnPlay: 0
+  hasOnUpdate: 0
+  hasOnStepComplete: 0
+  hasOnComplete: 0
+  hasOnTweenCreated: 0
+  hasOnRewind: 0
+  onStart:
+    m_PersistentCalls:
+      m_Calls: []
+  onPlay:
+    m_PersistentCalls:
+      m_Calls: []
+  onUpdate:
+    m_PersistentCalls:
+      m_Calls: []
+  onStepComplete:
+    m_PersistentCalls:
+      m_Calls: []
+  onComplete:
+    m_PersistentCalls:
+      m_Calls: []
+  onTweenCreated:
+    m_PersistentCalls:
+      m_Calls: []
+  onRewind:
+    m_PersistentCalls:
+      m_Calls: []
+  delay: 0
+  duration: 5
+  easeType: 1
+  easeCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0
+      outWeight: 0
+    - serializedVersion: 3
+      time: 1
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0
+      outWeight: 0
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  loops: -1
+  id: 
+  loopType: 0
+  orientType: 1
+  lookAtTransform: {fileID: 0}
+  lookAtPosition: {x: 0, y: 0, z: 0}
+  lookAhead: 0
+  autoPlay: 1
+  autoKill: 1
+  relative: 0
+  isLocal: 0
+  isClosedPath: 1
+  pathResolution: 10
+  pathMode: 3
+  lockRotation: 0
+  assignForwardAndUp: 0
+  forwardDirection: {x: 0, y: 0, z: 1}
+  upDirection: {x: 0, y: 1, z: 0}
+  tweenRigidbody: 0
+  wps:
+  - {x: 15.16288, y: 0.30334127, z: 0}
+  fullWps: []
+  path:
+    wpLengths:
+    - 0
+    - 3.7057567
+    - 3.7057567
+    wps:
+    - {x: 11.457179, y: 0.283, z: 0}
+    - {x: 15.16288, y: 0.30334127, z: 0}
+    - {x: 11.457179, y: 0.283, z: 0}
+    type: 0
+    subdivisionsXSegment: 10
+    subdivisions: 30
+    controlPoints: []
+    length: 7.4115133
+    isFinalized: 1
+    timesTable:
+    - 0
+    - 0.5
+    - 1
+    lengthsTable: []
+  inspectorMode: 0
+  pathType: 0
+  handlesType: 0
+  livePreview: 1
+  handlesDrawMode: 0
+  perspectiveHandleSize: 0.5
+  showIndexes: 1
+  showWpLength: 0
+  pathColor: {r: 1, g: 1, b: 1, a: 0.5}
+  lastSrcPosition: {x: 11.457179, y: 0.283, z: 0}
+  lastSrcRotation: {x: 0, y: 0, z: 0, w: 1}
+  wpsDropdown: 0
+  dropToFloorOffset: 0
+--- !u!114 &659041647
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 659041640}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f210b45e49a9b004da5dff2a3e6278d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  HP: 3
+  ATK: 1
+  speed: 1
+  coin: 0
+  HPLeft: 0
+  state: 0
+  hitToflyParameter: {x: 3, y: 3}
+  deadRotationRangeMax: 500
+  deadRotationRangeMin: 500
+  inPath: 1
+  catchOffset: {x: 0, y: 0, z: 0}
+  breakFreeCount: 1
+  breakFreeCountLeft: 0
 --- !u!1 &839378814
 GameObject:
   m_ObjectHideFlags: 0
@@ -1118,7 +1427,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1160673894}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -5.522, y: 1.231, z: -10}
+  m_LocalPosition: {x: 10.219999, y: 0.953, z: -10}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 1225561446}

Assets/Scripts/AiYuPin.cs

@@ -0,0 +1,169 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using Sirenix.OdinInspector;
+
+/// <summary>
+/// 爱欲品类，继承自三关都有的那个小怪类
+/// </summary>
+public class AiYuPin : NormalEnemy
+{
+    //   _____       _     _ _      
+    //  |  __ \     | |   | (_)     
+    //  | |__) |   _| |__ | |_  ___ 
+    //  |  ___/ | | | '_ \| | |/ __|
+    //  | |   | |_| | |_) | | | (__ 
+    //  |_|    \__,_|_.__/|_|_|\___|
+
+    /// <summary>
+    /// 爱欲品抓住玩家后贴在玩家身上时的位置偏移量
+    /// </summary>
+    [FoldoutGroup("爱欲品")][Header("爬到玩家身上的时候的位置偏移量")]
+    public Vector3 catchOffset;
+    /// <summary>
+    /// 玩家挣脱爱欲品需要多少次方向转换操作
+    /// </summary>
+    [Header("玩家挣脱爱欲品需要多少次方向转换操作")][FoldoutGroup("爱欲品")]
+    public int breakFreeCount;
+    /// <summary>
+    /// 玩家挣脱爱欲品还需要多少次方向转换操作
+    /// </summary>
+    [Header("玩家挣脱爱欲品还需要多少次方向转换操作")][FoldoutGroup("爱欲品")][ReadOnly]
+    public int breakFreeCountLeft;
+
+    //   _____      _            _       
+    //  |  __ \    (_)          | |      
+    //  | |__) | __ ___   ____ _| |_ ___ 
+    //  |  ___/ '__| \ \ / / _` | __/ _ \
+    //  | |   | |  | |\ V / (_| | ||  __/
+    //  |_|   |_|  |_| \_/ \__,_|\__\___|
+
+    /// <summary>
+    /// 爱欲品发动Seek后追击的目标
+    /// </summary>
+    //虽说是目标，但爱欲品只会抓玩家吧。直接初始化成玩家了
+    protected Transform target;
+
+    //    _____      _ _ ____             _    
+    //   / ____|    | | |  _ \           | |   
+    //  | |     __ _| | | |_) | __ _  ___| | __
+    //  | |    / _` | | |  _ < / _` |/ __| |/ /
+    //  | |___| (_| | | | |_) | (_| | (__|   < 
+    //   \_____\__,_|_|_|____/ \__,_|\___|_|\_\
+    void Update(){
+        //如果在Seek状态，则Seek
+        if(state == State.seek) Seek(target);
+    }
+
+    //   _   _                            _ 
+    //  | \ | |                          | |
+    //  |  \| | ___  _ __ _ __ ___   __ _| |
+    //  | . ` |/ _ \| '__| '_ ` _ \ / _` | |
+    //  | |\  | (_) | |  | | | | | | (_| | |
+    //  |_| \_|\___/|_|  |_| |_| |_|\__,_|_| 
+    protected override void Init()
+    {
+        //初始化基础属性
+        base.Init();
+        //初始化爱欲品属性
+        breakFreeCountLeft = breakFreeCount;//初始化挣脱需要的操作次数
+        target = FindObjectOfType<MyPlayer>().transform;//初始化追踪目标为玩家
+    }
+
+    /// <summary>
+    /// 控制爱欲品追踪传入的Transform，每帧调用一次
+    /// </summary>
+    /// <param name="target">要追踪的目标的transform组件</param>
+    protected void Seek(Transform target){
+        //！！！注意，需要修改。此时会给予爱欲品向上的速度，但Seek只需要左右的速度
+        Vector3 moveDir = (target.transform.position - transform.position).normalized;
+        //给刚体添加位移
+        m_rigidbody.position += (Vector2)moveDir * speed * Time.deltaTime;
+        //将面部朝向与速度同步
+        transform.rotation = Quaternion.
+            Euler
+                (transform.rotation.x, 
+                ((target.position.x - transform.position.x > 0) ? 0:-180),
+                transform.rotation.z);
+    }
+
+    //   ______               _   
+    //  |  ____|             | |  
+    //  | |____   _____ _ __ | |_ 
+    //  |  __\ \ / / _ \ '_ \| __|
+    //  | |___\ V /  __/ | | | |_ 
+    //  |______\_/ \___|_| |_|\__|
+
+    /// <summary>
+    /// 当爱欲品发现玩家
+    /// </summary>
+    protected override void OnFindThePlayer(Transform target){
+        //如果没死
+        if(state != State.dead)
+        {
+            //标记自身状态
+            state = State.seek;
+            //赋予自身目标以玩家Transform
+            this.target = target;
+            //关闭巡逻动画
+            doTweenPath.DOPause();
+        }
+    }
+
+    /// <summary>
+    /// 当爱欲品抓住玩家
+    /// </summary>
+    protected override void OnTouchThePlayer(MyPlayer player)
+    {
+        //改变自身状态为ATK
+        state = State.atk;
+        //关闭自身碰撞体，因为要贴在玩家身上
+        GetComponent<BoxCollider2D>().enabled = false;
+        //将自身位置和玩家位置同步，但是需要一个附身offset二维向量
+        //因为玩家的图片不在游戏物体的中心
+        transform.position = target.position + catchOffset;
+        //通知玩家，你被爱欲品附身了
+        player.BeCatchedByAiYuPin(this);
+        //暂时清空重力系数
+        m_rigidbody.gravityScale = 0;
+    }
+
+    /// <summary>
+    /// 当爱欲品被攻击了
+    /// </summary>
+    /// <param name="hitMethod">攻击方式</param>
+    /// <param name="hitDir">攻击来袭方向</param>
+    public override void OnBeHit(MyPlayer.AtkMethod hitMethod, int hitDir){
+        //爱欲品会额外触发发现玩家事件
+        target = FindObjectOfType<MyPlayer>().transform;//将目标指向玩家
+        OnFindThePlayer(target);//触发发现玩家事件
+        //执行被击飞、死亡检查等事宜
+        base.OnBeHit(hitMethod, hitDir);
+    }
+
+    //原先会触发自动返回记录起点，但是不能，所以重写空的重新着地事件
+    protected override void OnRetouchedTheGround(){}
+
+    /// <summary>
+    /// 完全挣脱的时候触发
+    /// </summary>
+    protected void OnBreakFreeCompletely(){
+        //恢复一下抓到玩家的时候消除的重力系数
+        m_rigidbody.gravityScale = 1;
+        //随机一个死亡面部朝向
+        deadDir = (Random.Range(-1f,1f) > 0) ? 1: -1;
+        //触发死亡事件
+        OnDead();
+        //给一个击飞
+        BeHitToFly((Random.Range(-1f,1f) > 0) ? 1: -1);
+    }
+
+    /// <summary>
+    /// 玩家尝试挣脱的时候触发这个
+    /// </summary>
+    [ContextMenu("挣脱")]
+    protected void OnBreakFree(){
+        if(--breakFreeCountLeft <= 0) OnBreakFreeCompletely();
+    }
+
+}

Assets/Scripts/AiYuPin.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: f210b45e49a9b004da5dff2a3e6278d8
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Enemy.cs

@@ -5,7 +5,7 @@ using Sirenix.OdinInspector;
 
 
 /// <summary>
-/// 敌人的基类，一般怪物都继承其而来
+/// 敌人的基类，包含一些基本的功能和事件的虚函数
 /// </summary>
 public class Enemy : MonoBehaviour
 {
@@ -90,7 +90,7 @@ public class Enemy : MonoBehaviour
     /// <summary>
     /// 当怪物发现玩家的时候Call这个
     /// </summary>
-    protected void OnFindThePlayer(){}
+    protected virtual void OnFindThePlayer(Transform target){}
     /// <summary>
     /// 当怪物着地的时候触发一次
     /// </summary>
@@ -125,18 +125,13 @@ public class Enemy : MonoBehaviour
              (transform.position.x - 
               sickle.transform.position.x > 0) ? -1 : 1);
               Destroy(sickle.gameObject);}
-        // //如果被锤子锤到，和上面一样（由于用碰撞体会存在很多问题，锤子的判定写在锤子类中，用触发器来实现）
-        // else if(other.collider.gameObject.TryGetComponent<Hammer>(out Hammer hammer))
-        //     {OnBeHit(MyPlayer.AtkMethod.锤子, 
-        //      (transform.position.x - 
-        //       hammer.transform.position.x > 0) ? -1 : 1);}
         else if(other.gameObject.tag == "地面")
             {OnRetouchedTheGround();}
     }
     protected void OnTriggerEnter2D(Collider2D other)
     {
         if(other.gameObject.TryGetComponent<MyPlayer>(out MyPlayer player))
-            {OnFindThePlayer();}//如果监视范围出现玩家，则Call事件
+            {OnFindThePlayer(other.transform);}//如果监视范围出现玩家，则Call事件
     }
 
 

Assets/Scripts/MyPlayer.cs

@@ -183,6 +183,7 @@ public class MyPlayer : MonoBehaviour
     /// <param name="dir">被击方向</param>
     public void BeHitToFly(int dir)
     {
+        m_rigidbody.velocity = Vector2.zero;
         m_rigidbody.velocity += new Vector2(
             -1 * dir * hitToflyParameter.x,
             hitToflyParameter.y
@@ -209,6 +210,8 @@ public class MyPlayer : MonoBehaviour
         m_Animator.SetBool("isAttacking",isAttacking);
         //记录着地
         m_Animator.SetBool("isLanding",isLanding);
+        //被击飞动画触发
+        m_Animator.SetBool("isBeHitting",!inControl);
     }
     //碰撞检测代码
     //    _____      _ _ _     _             
@@ -245,8 +248,7 @@ public class MyPlayer : MonoBehaviour
             inputDir = (context.ReadValue<float>() > 0) ? 1 : -1;
         else inputDir = 0;
 
-        if(faceDir * inputDir < 0)
+        if(faceDir * inputDir < 0){
-        {
             TurnAround();
         }
     }
@@ -318,8 +320,6 @@ public class MyPlayer : MonoBehaviour
     /// <param name="dir">攻击来源的方向，-1左，1右</param>
     public void OnBeHit(float atk, int dir)
     {
-        Debug.Log("我被攻击了！受到的攻击力是：" + atk +
-                  "攻击方向来自" +  ((dir == 1) ? "右边" : "左边"));
         BeHitToFly(dir);
         inControl = false;
         HPLeft -= atk;
@@ -330,6 +330,14 @@ public class MyPlayer : MonoBehaviour
     /// </summary>
     public void StopAttacking(){isAttacking = false;}
 
+    /// <summary>
+    /// 当玩家被爱欲品抓住后触发这个事件
+    /// </summary>
+    /// <param name="aiYuPin">这个爱欲品的爱欲品组件</param>
+    public void BeCatchedByAiYuPin(AiYuPin aiYuPin){
+
+    }
+
 
     //   _______          _  _____ _               
     //  |__   __|        | |/ ____| |              

Assets/Scripts/NormalEnemy.cs

@@ -45,7 +45,7 @@ public class NormalEnemy : Enemy
     /// <summary>
     /// 现在正在执行的动画，在受击中断的时候用
     /// </summary>
-    private Tween tweenNow;
+    protected Tween tweenNow;
 
     //    _____      _ _ ____             _    
     //   / ____|    | | |  _ \           | |   
@@ -61,7 +61,7 @@ public class NormalEnemy : Enemy
     //  | . ` |/ _ \| '__| '_ ` _ \ / _` | |
     //  | |\  | (_) | |  | | | | | | (_| | |
     //  |_| \_|\___/|_|  |_| |_| |_|\__,_|_|   
-    protected void Init(){
+    protected virtual void Init(){
         //生命值初始化为满
         HPLeft = HP;
         //Get插件

Assets/Sprites/早期临时混乱/1关boss.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: b8b57f76f2603f74e9538916f1a1f4ad
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  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
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 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: 1
+  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
+  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
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Sprites/早期临时混乱/1关怪.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: eda962ce2ce60d944b6ea0d5b018d675
+guid: 4b64b4c73bfa00a4a9552c672359f9fc
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

Assets/Sprites/早期临时混乱/2关怪.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 6ab25cc35002c7e49a620e5c373a83c8
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  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
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 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: 1
+  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
+  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
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Sprites/早期临时混乱/3关怪.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: de4ec80e5d0cca6488cb449907a26438
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  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
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 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: 1
+  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
+  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
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/动画/AC/Player.controller

@@ -1,5 +1,30 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1101 &-8944186334331625140
+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: isBeHitting
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: -1583730504211193444}
+  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: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!1101 &-8446496490227672240
 AnimatorStateTransition:
   m_ObjectHideFlags: 1
@@ -25,6 +50,33 @@ AnimatorStateTransition:
   m_InterruptionSource: 0
   m_OrderedInterruption: 1
   m_CanTransitionToSelf: 1
+--- !u!1102 &-6062018812019289139
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: "\u88AB\u51FB\u98DE"
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions:
+  - {fileID: -8944186334331625140}
+  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: 850257dd864ec0b43bb55458ef1acfb8, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
 --- !u!1102 &-4928358884535203626
 AnimatorState:
   serializedVersion: 6
@@ -52,6 +104,31 @@ AnimatorState:
   m_MirrorParameter: 
   m_CycleOffsetParameter: 
   m_TimeParameter: 
+--- !u!1101 &-4244742946253361688
+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: isBeHitting
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: -6062018812019289139}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0
+  m_TransitionOffset: 0
+  m_ExitTime: 0.74999994
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 0
 --- !u!1101 &-3042985106059425338
 AnimatorStateTransition:
   m_ObjectHideFlags: 1
@@ -66,7 +143,7 @@ AnimatorStateTransition:
   m_Mute: 0
   m_IsExit: 0
   serializedVersion: 3
-  m_TransitionDuration: 0.25
+  m_TransitionDuration: 0
   m_TransitionOffset: 0
   m_ExitTime: 0.75
   m_HasExitTime: 1
@@ -168,6 +245,12 @@ AnimatorController:
     m_DefaultInt: 0
     m_DefaultBool: 0
     m_Controller: {fileID: 0}
+  - m_Name: isBeHitting
+    m_Type: 4
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 0}
   m_AnimatorLayers:
   - serializedVersion: 5
     m_Name: Base Layer
@@ -307,13 +390,17 @@ AnimatorStateMachine:
   - serializedVersion: 1
     m_State: {fileID: 634860784232356001}
     m_Position: {x: 20, y: 160, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: -6062018812019289139}
+    m_Position: {x: -160, y: 370, z: 0}
   m_ChildStateMachines: []
   m_AnyStateTransitions:
   - {fileID: 8855304824937711920}
+  - {fileID: -4244742946253361688}
   m_EntryTransitions: []
   m_StateMachineTransitions: {}
   m_StateMachineBehaviours: []
-  m_AnyStatePosition: {x: 50, y: 20, z: 0}
+  m_AnyStatePosition: {x: -240, y: 230, z: 0}
   m_EntryPosition: {x: 200, y: 490, z: 0}
   m_ExitPosition: {x: 800, y: 120, z: 0}
   m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}

Assets/动画/AM/Player/下落.anim

@@ -20,13 +20,13 @@ AnimationClip:
   m_PPtrCurves:
   - curve:
     - time: 0
-      value: {fileID: 21300000, guid: 838b062e6d7cd5b4bb21954af7d6370e, type: 3}
+      value: {fileID: 21300000, guid: 8a3897de1b002964bb1412a654bfa453, type: 3}
-    - time: 0.1
+    - time: 0.13333334
-      value: {fileID: 21300000, guid: 12794dd06d1058645bfee8aa3db86dbc, type: 3}
+      value: {fileID: 21300000, guid: 0f086399ca738c7408cf54a90cba4494, type: 3}
-    - time: 0.2
+    - time: 0.23333333
-      value: {fileID: 21300000, guid: def23cde0ee7e71419c4d09fdb065633, type: 3}
+      value: {fileID: 21300000, guid: 8b448575a7626e24b9cb57c825dfaf60, type: 3}
-    - time: 0.3
+    - time: 0.35
-      value: {fileID: 21300000, guid: dede92ffb0e1c084a85834b97baf5083, type: 3}
+      value: {fileID: 21300000, guid: 191aca1ff7141ac4daf2aff5f4fc4fad, type: 3}
     attribute: m_Sprite
     path: 
     classID: 212
@@ -46,16 +46,16 @@ AnimationClip:
       customType: 23
       isPPtrCurve: 1
     pptrCurveMapping:
-    - {fileID: 21300000, guid: 838b062e6d7cd5b4bb21954af7d6370e, type: 3}
+    - {fileID: 21300000, guid: 8a3897de1b002964bb1412a654bfa453, type: 3}
-    - {fileID: 21300000, guid: 12794dd06d1058645bfee8aa3db86dbc, type: 3}
+    - {fileID: 21300000, guid: 0f086399ca738c7408cf54a90cba4494, type: 3}
-    - {fileID: 21300000, guid: def23cde0ee7e71419c4d09fdb065633, type: 3}
+    - {fileID: 21300000, guid: 8b448575a7626e24b9cb57c825dfaf60, type: 3}
-    - {fileID: 21300000, guid: dede92ffb0e1c084a85834b97baf5083, type: 3}
+    - {fileID: 21300000, guid: 191aca1ff7141ac4daf2aff5f4fc4fad, type: 3}
   m_AnimationClipSettings:
     serializedVersion: 2
     m_AdditiveReferencePoseClip: {fileID: 0}
     m_AdditiveReferencePoseTime: 0
     m_StartTime: 0
-    m_StopTime: 0.3166667
+    m_StopTime: 0.36666667
     m_OrientationOffsetY: 0
     m_Level: 0
     m_CycleOffset: 0

Assets/动画/AM/Player/待机.anim

@@ -20,17 +20,19 @@ AnimationClip:
   m_PPtrCurves:
   - curve:
     - time: 0
-      value: {fileID: 21300000, guid: 0d221bcfe27e6014494bbdb02977f469, type: 3}
+      value: {fileID: 21300000, guid: bcb018ee6b241104bb739e08529e965b, type: 3}
-    - time: 0.21666667
+    - time: 0.13333334
-      value: {fileID: 21300000, guid: be4a5eab51eb4cf439b0521637f8cccb, type: 3}
+      value: {fileID: 21300000, guid: 91758e4567209724ca1d0f8e81f6e2d1, type: 3}
-    - time: 0.38333333
+    - time: 0.3
-      value: {fileID: 21300000, guid: ec9af35a86ab8b644807a17a89ef0b8a, type: 3}
+      value: {fileID: 21300000, guid: a1a38279978845e41aeed8e4c1932993, type: 3}
-    - time: 0.6
+    - time: 0.45
-      value: {fileID: 21300000, guid: 3a7d6bdfad5694f488dd57ca86aa2afd, type: 3}
+      value: {fileID: 21300000, guid: 4767616ba73d68e43af45a12f5f86b0a, type: 3}
-    - time: 0.76666665
+    - time: 0.55
-      value: {fileID: 21300000, guid: 912769fe0a67b1f479a48ea3126c26f6, type: 3}
+      value: {fileID: 21300000, guid: 6840eba456839e644b32aa1dcf52364b, type: 3}
-    - time: 0.98333335
+    - time: 0.71666664
-      value: {fileID: 21300000, guid: 145dda7464689474e893ca9464755f8a, type: 3}
+      value: {fileID: 21300000, guid: c548b04973589c44eae3e1f2e3a124b5, type: 3}
+    - time: 0.85
+      value: {fileID: 21300000, guid: 0da3e383163f609489cbdcce10f23536, type: 3}
     attribute: m_Sprite
     path: 
     classID: 212
@@ -50,18 +52,19 @@ AnimationClip:
       customType: 23
       isPPtrCurve: 1
     pptrCurveMapping:
-    - {fileID: 21300000, guid: 0d221bcfe27e6014494bbdb02977f469, type: 3}
+    - {fileID: 21300000, guid: bcb018ee6b241104bb739e08529e965b, type: 3}
-    - {fileID: 21300000, guid: be4a5eab51eb4cf439b0521637f8cccb, type: 3}
+    - {fileID: 21300000, guid: 91758e4567209724ca1d0f8e81f6e2d1, type: 3}
-    - {fileID: 21300000, guid: ec9af35a86ab8b644807a17a89ef0b8a, type: 3}
+    - {fileID: 21300000, guid: a1a38279978845e41aeed8e4c1932993, type: 3}
-    - {fileID: 21300000, guid: 3a7d6bdfad5694f488dd57ca86aa2afd, type: 3}
+    - {fileID: 21300000, guid: 4767616ba73d68e43af45a12f5f86b0a, type: 3}
-    - {fileID: 21300000, guid: 912769fe0a67b1f479a48ea3126c26f6, type: 3}
+    - {fileID: 21300000, guid: 6840eba456839e644b32aa1dcf52364b, type: 3}
-    - {fileID: 21300000, guid: 145dda7464689474e893ca9464755f8a, type: 3}
+    - {fileID: 21300000, guid: c548b04973589c44eae3e1f2e3a124b5, type: 3}
+    - {fileID: 21300000, guid: 0da3e383163f609489cbdcce10f23536, type: 3}
   m_AnimationClipSettings:
     serializedVersion: 2
     m_AdditiveReferencePoseClip: {fileID: 0}
     m_AdditiveReferencePoseTime: 0
     m_StartTime: 0
-    m_StopTime: 1
+    m_StopTime: 0.8666667
     m_OrientationOffsetY: 0
     m_Level: 0
     m_CycleOffset: 0

Assets/动画/AM/Player/被击飞.anim

@@ -0,0 +1,74 @@
+%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: "\u88AB\u51FB\u98DE"
+  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:
+  - curve:
+    - time: 0
+      value: {fileID: 21300000, guid: 397aa7bae64ce9d429503cae79ec75b8, type: 3}
+    - time: 0.13333334
+      value: {fileID: 21300000, guid: 7242b54bb9cccd74e9f4f8f25cf910cf, type: 3}
+    - time: 0.25
+      value: {fileID: 21300000, guid: ebebf5c3f75cbf848950e3e50eed740d, type: 3}
+    attribute: m_Sprite
+    path: 
+    classID: 212
+    script: {fileID: 0}
+  m_SampleRate: 60
+  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
+    pptrCurveMapping:
+    - {fileID: 21300000, guid: 397aa7bae64ce9d429503cae79ec75b8, type: 3}
+    - {fileID: 21300000, guid: 7242b54bb9cccd74e9f4f8f25cf910cf, type: 3}
+    - {fileID: 21300000, guid: ebebf5c3f75cbf848950e3e50eed740d, type: 3}
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 0.26666668
+    m_OrientationOffsetY: 0
+    m_Level: 0
+    m_CycleOffset: 0
+    m_HasAdditiveReferencePose: 0
+    m_LoopTime: 1
+    m_LoopBlend: 1
+    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: []

Assets/动画/AM/Player/被击飞.anim.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 850257dd864ec0b43bb55458ef1acfb8
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/动画/AM/Player/走路.anim

@@ -20,13 +20,13 @@ AnimationClip:
   m_PPtrCurves:
   - curve:
     - time: 0
-      value: {fileID: 21300000, guid: 6c0b4448f88252348b38dafc19caecd8, type: 3}
+      value: {fileID: 21300000, guid: f8bedcbbfb4ef38479830bce190aa634, type: 3}
-    - time: 0.13333334
+    - time: 0.083333336
-      value: {fileID: 21300000, guid: 493b27eed95dac141886af3aeaa25bb1, type: 3}
+      value: {fileID: 21300000, guid: ef397fde3398fb14d86deafc736496d4, type: 3}
+    - time: 0.16666667
+      value: {fileID: 21300000, guid: e5ec172ec9e31d244933d79ac2411e59, type: 3}
     - time: 0.25
-      value: {fileID: 21300000, guid: 67e77b4c02d202542827d1191bf4d2a0, type: 3}
+      value: {fileID: 21300000, guid: 78759cb6af39b6349b05c517ce001135, type: 3}
-    - time: 0.38333333
-      value: {fileID: 21300000, guid: d5d91823669305e48b53ea2e379dda8c, type: 3}
     attribute: m_Sprite
     path: 
     classID: 212
@@ -46,16 +46,16 @@ AnimationClip:
       customType: 23
       isPPtrCurve: 1
     pptrCurveMapping:
-    - {fileID: 21300000, guid: 6c0b4448f88252348b38dafc19caecd8, type: 3}
+    - {fileID: 21300000, guid: f8bedcbbfb4ef38479830bce190aa634, type: 3}
-    - {fileID: 21300000, guid: 493b27eed95dac141886af3aeaa25bb1, type: 3}
+    - {fileID: 21300000, guid: ef397fde3398fb14d86deafc736496d4, type: 3}
-    - {fileID: 21300000, guid: 67e77b4c02d202542827d1191bf4d2a0, type: 3}
+    - {fileID: 21300000, guid: e5ec172ec9e31d244933d79ac2411e59, type: 3}
-    - {fileID: 21300000, guid: d5d91823669305e48b53ea2e379dda8c, type: 3}
+    - {fileID: 21300000, guid: 78759cb6af39b6349b05c517ce001135, type: 3}
   m_AnimationClipSettings:
     serializedVersion: 2
     m_AdditiveReferencePoseClip: {fileID: 0}
     m_AdditiveReferencePoseTime: 0
     m_StartTime: 0
-    m_StopTime: 0.4
+    m_StopTime: 0.26666668
     m_OrientationOffsetY: 0
     m_Level: 0
     m_CycleOffset: 0

Assets/动画/AM/Player/起跳.anim

@@ -20,13 +20,13 @@ AnimationClip:
   m_PPtrCurves:
   - curve:
     - time: 0
-      value: {fileID: 21300000, guid: 7f43a2463faa9af47b5189fe21896e48, type: 3}
+      value: {fileID: 21300000, guid: e4d3697939c71ab41a6bf4fc94a1341f, type: 3}
-    - time: 0.11666667
+    - time: 0.15
-      value: {fileID: 21300000, guid: 0c3ef57af2f1bc54cb8c7f8b4f6cbf1b, type: 3}
+      value: {fileID: 21300000, guid: f682ef5dbc08d6c4fa8a67c903ce03ed, type: 3}
-    - time: 0.2
+    - time: 0.35
-      value: {fileID: 21300000, guid: d4f89487d1fbdd34a9b3b66225693c78, type: 3}
+      value: {fileID: 21300000, guid: bdf1a0489bb5a3147a8419bb8778b329, type: 3}
-    - time: 0.31666666
+    - time: 0.5
-      value: {fileID: 21300000, guid: f2463ebeb7cb31447a04b099aca68c0f, type: 3}
+      value: {fileID: 21300000, guid: 97a8a53c228933b41a15b8e7f535d88f, type: 3}
     attribute: m_Sprite
     path: 
     classID: 212
@@ -46,16 +46,16 @@ AnimationClip:
       customType: 23
       isPPtrCurve: 1
     pptrCurveMapping:
-    - {fileID: 21300000, guid: 7f43a2463faa9af47b5189fe21896e48, type: 3}
+    - {fileID: 21300000, guid: e4d3697939c71ab41a6bf4fc94a1341f, type: 3}
-    - {fileID: 21300000, guid: 0c3ef57af2f1bc54cb8c7f8b4f6cbf1b, type: 3}
+    - {fileID: 21300000, guid: f682ef5dbc08d6c4fa8a67c903ce03ed, type: 3}
-    - {fileID: 21300000, guid: d4f89487d1fbdd34a9b3b66225693c78, type: 3}
+    - {fileID: 21300000, guid: bdf1a0489bb5a3147a8419bb8778b329, type: 3}
-    - {fileID: 21300000, guid: f2463ebeb7cb31447a04b099aca68c0f, type: 3}
+    - {fileID: 21300000, guid: 97a8a53c228933b41a15b8e7f535d88f, type: 3}
   m_AnimationClipSettings:
     serializedVersion: 2
     m_AdditiveReferencePoseClip: {fileID: 0}
     m_AdditiveReferencePoseTime: 0
     m_StartTime: 0
-    m_StopTime: 0.33333334
+    m_StopTime: 0.51666665
     m_OrientationOffsetY: 0
     m_Level: 0
     m_CycleOffset: 0

Assets/动画/AM/Player/锤子攻击.anim

@@ -55,7 +55,7 @@ AnimationClip:
     m_AdditiveReferencePoseClip: {fileID: 0}
     m_AdditiveReferencePoseTime: 0
     m_StartTime: 0
-    m_StopTime: 0.4
+    m_StopTime: 0.25
     m_OrientationOffsetY: 0
     m_Level: 0
     m_CycleOffset: 0
@@ -75,7 +75,7 @@ AnimationClip:
   m_HasGenericRootTransform: 0
   m_HasMotionFloatCurves: 0
   m_Events:
-  - time: 0.4
+  - time: 0.23333333
     functionName: StopAttacking
     data: 
     objectReferenceParameter: {fileID: 11500000, guid: f563a3b3d1fe31d45bae72dd7ca265fd, type: 3}

Assets/动画/Source/Player/下落新.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 05f8a23aa702c8a47b2947a3e1f64d03
+guid: b8a62eea65a4c23469570a85f5856881
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Assets/动画/Source/Player/下落新/下跳1.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 838b062e6d7cd5b4bb21954af7d6370e
+guid: 8a3897de1b002964bb1412a654bfa453
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

Assets/动画/Source/Player/下落新/下跳2.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 12794dd06d1058645bfee8aa3db86dbc
+guid: 0f086399ca738c7408cf54a90cba4494
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

Assets/动画/Source/Player/下落新/下跳3.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: def23cde0ee7e71419c4d09fdb065633
+guid: 8b448575a7626e24b9cb57c825dfaf60
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

Assets/动画/Source/Player/下落新/下跳4.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: dede92ffb0e1c084a85834b97baf5083
+guid: 191aca1ff7141ac4daf2aff5f4fc4fad
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

Assets/动画/Source/Player/待机新.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: d12a9382969b3bb46bc20e82a94a991c
+guid: cffca201def9a9846abb8846069d6b31
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Assets/动画/Source/Player/待机新/待机1.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 0d221bcfe27e6014494bbdb02977f469
+guid: bcb018ee6b241104bb739e08529e965b
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

Assets/动画/Source/Player/待机新/待机2.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: be4a5eab51eb4cf439b0521637f8cccb
+guid: 91758e4567209724ca1d0f8e81f6e2d1
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

Assets/动画/Source/Player/待机新/待机3.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: ec9af35a86ab8b644807a17a89ef0b8a
+guid: a1a38279978845e41aeed8e4c1932993
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

Assets/动画/Source/Player/待机新/待机4.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 3a7d6bdfad5694f488dd57ca86aa2afd
+guid: 4767616ba73d68e43af45a12f5f86b0a
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

Assets/动画/Source/Player/待机新/待机5.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 912769fe0a67b1f479a48ea3126c26f6
+guid: 6840eba456839e644b32aa1dcf52364b
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

Assets/动画/Source/Player/待机新/待机6.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 145dda7464689474e893ca9464755f8a
+guid: c548b04973589c44eae3e1f2e3a124b5
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

Assets/动画/Source/Player/待机新/待机7.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: d9a1cd65402032140b12d5fcc9ce2f6a
+guid: 0da3e383163f609489cbdcce10f23536
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

Assets/动画/Source/Player/被击飞.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 23f908477d8882142b6f45f8e46f4c82
+guid: 96936a2b57f74f84eabb2ee7389b8ac7
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Assets/动画/Source/Player/被击飞/受击1.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: ec4aea154c30b094f9d519e7b811d935
+guid: 397aa7bae64ce9d429503cae79ec75b8
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

Assets/动画/Source/Player/被击飞/受击2.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 9442360e02eda384cac3c3cc3f8c1df1
+guid: 7242b54bb9cccd74e9f4f8f25cf910cf
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

Assets/动画/Source/Player/被击飞/受击3.png.meta

@@ -0,0 +1,132 @@
+fileFormatVersion: 2
+guid: ebebf5c3f75cbf848950e3e50eed740d
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  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
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 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: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 250
+  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
+  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: iPhone
+    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: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/动画/Source/Player/走路新.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: d8feeb05d860cf14ca12545e4d09b63f
+guid: 89c0f56445920394994c1308d97e88bf
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Assets/动画/Source/Player/走路新/走1.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 6c0b4448f88252348b38dafc19caecd8
+guid: f8bedcbbfb4ef38479830bce190aa634
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

Assets/动画/Source/Player/走路新/走2.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 493b27eed95dac141886af3aeaa25bb1
+guid: ef397fde3398fb14d86deafc736496d4
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

Assets/动画/Source/Player/走路新/走3.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 67e77b4c02d202542827d1191bf4d2a0
+guid: e5ec172ec9e31d244933d79ac2411e59
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

Assets/动画/Source/Player/走路新/走4.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: d5d91823669305e48b53ea2e379dda8c
+guid: 78759cb6af39b6349b05c517ce001135
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

Assets/动画/Source/Player/起跳.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 03ff8c7688d7a7640ba48b769fb83ac4
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/动画/Source/Player/起跳新.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: dfb5cf7b79e38e1408d972a43f5455b7
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/动画/Source/Player/起跳新/上跳1.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 7f43a2463faa9af47b5189fe21896e48
+guid: e4d3697939c71ab41a6bf4fc94a1341f
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

Assets/动画/Source/Player/起跳新/上跳2.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 0c3ef57af2f1bc54cb8c7f8b4f6cbf1b
+guid: f682ef5dbc08d6c4fa8a67c903ce03ed
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

Assets/动画/Source/Player/起跳新/上跳3.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: d4f89487d1fbdd34a9b3b66225693c78
+guid: bdf1a0489bb5a3147a8419bb8778b329
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

Assets/动画/Source/Player/起跳新/上跳4.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: f2463ebeb7cb31447a04b099aca68c0f
+guid: 97a8a53c228933b41a15b8e7f535d88f
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

Assets/动画/Source/Player/锤子攻击.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 0dec613d5ccc8c84ea42553be3be69c4
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: