厨师！英灵技能！end！

ActionTowerDefense/Assets/Resources/Animation/CookSmokeCol.controller

@@ -0,0 +1,72 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1107 &-7589260682316005279
+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: 4187153954192262508}
+    m_Position: {x: 300, y: 90, z: 0}
+  m_ChildStateMachines: []
+  m_AnyStateTransitions: []
+  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: 800, y: 120, z: 0}
+  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
+  m_DefaultState: {fileID: 4187153954192262508}
+--- !u!91 &9100000
+AnimatorController:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: CookSmokeCol
+  serializedVersion: 5
+  m_AnimatorParameters: []
+  m_AnimatorLayers:
+  - serializedVersion: 5
+    m_Name: Base Layer
+    m_StateMachine: {fileID: -7589260682316005279}
+    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!1102 &4187153954192262508
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: CookSmokeCollider
+  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: d409c4b6c8c07574d895bb0c7d606d5c, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 

ActionTowerDefense/Assets/Resources/Animation/CookSmokeCol.controller.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c2ab281e988c6014d86f13e8dfd4ce08
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 9100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ActionTowerDefense/Assets/Resources/Animation/CookSmokeCollider.anim

@@ -0,0 +1,215 @@
+%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: CookSmokeCollider
+  serializedVersion: 7
+  m_Legacy: 0
+  m_Compressed: 0
+  m_UseHighQualityCurve: 1
+  m_RotationCurves: []
+  m_CompressedRotationCurves: []
+  m_EulerCurves: []
+  m_PositionCurves: []
+  m_ScaleCurves: []
+  m_FloatCurves:
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 1
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 9.083333
+        value: 14.443617
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_Size.y
+    path: 
+    classID: 65
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 1
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 9.083333
+        value: 6.7218084
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_Center.y
+    path: 
+    classID: 65
+    script: {fileID: 0}
+  m_PPtrCurves: []
+  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: 2368279999
+      script: {fileID: 0}
+      typeID: 65
+      customType: 0
+      isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 0
+      attribute: 1394318531
+      script: {fileID: 0}
+      typeID: 65
+      customType: 0
+      isPPtrCurve: 0
+    pptrCurveMapping: []
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 9.083333
+    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:
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 1
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 9.083333
+        value: 14.443617
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_Size.y
+    path: 
+    classID: 65
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 1
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 9.083333
+        value: 6.7218084
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_Center.y
+    path: 
+    classID: 65
+    script: {fileID: 0}
+  m_EulerEditorCurves: []
+  m_HasGenericRootTransform: 0
+  m_HasMotionFloatCurves: 0
+  m_Events: []

ActionTowerDefense/Assets/Resources/Animation/CookSmokeCollider.anim.meta

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

ActionTowerDefense/Assets/Resources/Prefab/FX/CookSmoke.prefab

@@ -11,7 +11,6 @@ GameObject:
   - component: {fileID: 8799591427491289958}
   - component: {fileID: 8366373742365865240}
   - component: {fileID: 7228707364840706683}
-  - component: {fileID: 9128107806917823098}
   m_Layer: 12
   m_Name: Particle System
   m_TagString: Untagged
@@ -4876,18 +4875,6 @@ ParticleSystemRenderer:
   m_MeshWeighting2: 1
   m_MeshWeighting3: 1
   m_MaskInteraction: 0
---- !u!114 &9128107806917823098
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2600348889229899073}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 87a276a31e854a6408c877f8055d843f, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1 &7346667483044277328
 GameObject:
   m_ObjectHideFlags: 0
@@ -4933,7 +4920,6 @@ GameObject:
   - component: {fileID: 373118178179337039}
   - component: {fileID: 4008180574111224898}
   - component: {fileID: 909316265798399308}
-  - component: {fileID: 4733725822632215198}
   m_Layer: 12
   m_Name: Particle System (1)
   m_TagString: Untagged
@@ -9807,18 +9793,6 @@ ParticleSystemRenderer:
   m_MeshWeighting2: 1
   m_MeshWeighting3: 1
   m_MaskInteraction: 0
---- !u!114 &4733725822632215198
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8396989363696877440}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 87a276a31e854a6408c877f8055d843f, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1 &8830340756041430554
 GameObject:
   m_ObjectHideFlags: 0
@@ -9829,7 +9803,7 @@ GameObject:
   m_Component:
   - component: {fileID: 8406709651575132567}
   - component: {fileID: 627859542480821703}
-  - component: {fileID: 5146643849835875139}
+  - component: {fileID: 3142485048627165112}
   m_Layer: 0
   m_Name: range
   m_TagString: Untagged
@@ -9865,7 +9839,7 @@ BoxCollider:
   serializedVersion: 2
   m_Size: {x: 3.0238008, y: 14.443617, z: 10}
   m_Center: {x: 0.74231386, y: 6.7218084, z: 0}
---- !u!114 &5146643849835875139
+--- !u!114 &3142485048627165112
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -9874,6 +9848,9 @@ MonoBehaviour:
   m_GameObject: {fileID: 8830340756041430554}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 87a276a31e854a6408c877f8055d843f, type: 3}
+  m_Script: {fileID: 11500000, guid: ae4045519d0e38e48a91f50e3593ed41, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  attributeUpEffect: {fileID: 417478504669294145, guid: a83cb6764be48844ba942faf6d3db5c2, type: 3}
+  reductionDegree: 1
+  reductionTime: 2

ActionTowerDefense/Assets/Resources/Prefab/MySpirit/Spirits_Cook.prefab

@@ -265,72 +265,6 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   owner: {fileID: 0}
---- !u!1 &2885380845639701439
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1709837802563954221}
-  - component: {fileID: 5459908402034348056}
-  - component: {fileID: 6880746539854057010}
-  m_Layer: 0
-  m_Name: EffectTrigger
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &1709837802563954221
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2885380845639701439}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 5440846222648032754}
-  m_RootOrder: 2
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!65 &5459908402034348056
-BoxCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2885380845639701439}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 1
-  m_Enabled: 0
-  serializedVersion: 2
-  m_Size: {x: 8.747494, y: 11.766387, z: 20}
-  m_Center: {x: -0.09219003, y: 3.3589406, z: 0}
---- !u!114 &6880746539854057010
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2885380845639701439}
-  m_Enabled: 0
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: ae4045519d0e38e48a91f50e3593ed41, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  text: {fileID: 979388067414062712}
-  value: 20
-  effect: {fileID: 417478504669294145, guid: 07c7a53ff610e0b45898f0f09276d995, type: 3}
-  activeAniTime: 1.3
-  larger: 1.2
-  customers: []
-  target: {fileID: 0}
-  searchtrigger: {fileID: 2932762729738363159}
 --- !u!1 &3483054690158852324
 GameObject:
   m_ObjectHideFlags: 0
@@ -600,7 +534,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 5440846222648032754}
-  m_RootOrder: 4
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!65 &8092833306629620455
 BoxCollider:
@@ -765,7 +699,6 @@ Transform:
   m_Children:
   - {fileID: 6459001683917408033}
   - {fileID: 770599430276839403}
-  - {fileID: 1709837802563954221}
   - {fileID: 3103190932458336017}
   - {fileID: 8922289277778709813}
   - {fileID: 2332805625535433500}
@@ -897,6 +830,9 @@ MonoBehaviour:
   invisibleTime: 0
   velocityAddition: 0
   easyToGetHit: 0.2
+  isDamageReduction: 0
+  reductionDegree: 0
+  reductionEffect: {fileID: 0}
   player: {fileID: 0}
   id: 0
   costMp: 1
@@ -915,9 +851,6 @@ MonoBehaviour:
   soulCollector: {fileID: 0}
   isBack: 0
   runSpeed: 4
-  attributeUpEffect: {fileID: 0}
-  hasUp: 0
-  isFirst: 1
 --- !u!54 &5440846222648032765
 Rigidbody:
   m_ObjectHideFlags: 0
@@ -1061,7 +994,7 @@ MonoBehaviour:
   isEnemy: 0
   trigObjList: []
   eCook: {fileID: 0}
-  dCook: {fileID: 6880746539854057010}
+  dCook: {fileID: 0}
   needToChange: 0
   maxLen: 0
   minLen: 0
@@ -1333,7 +1266,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 5440846222648032754}
-  m_RootOrder: 5
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!65 &4017189360880258370
 BoxCollider:
@@ -1382,7 +1315,7 @@ RectTransform:
   - {fileID: 1104288316767999960}
   - {fileID: 1544714013328383648}
   m_Father: {fileID: 5440846222648032754}
-  m_RootOrder: 3
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -1479,7 +1412,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6311393983886559837, guid: ec2b0f2494c993b47b700be0384a7d84, type: 3}
       propertyPath: m_RootOrder
-      value: 6
+      value: 5
       objectReference: {fileID: 0}
     - target: {fileID: 6311393983886559837, guid: ec2b0f2494c993b47b700be0384a7d84, type: 3}
       propertyPath: m_LocalPosition.x
@@ -1537,7 +1470,7 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 882894729606411301, guid: d26ff3d697c558f49a8b4c4ba7bffd00, type: 3}
       propertyPath: m_RootOrder
-      value: 7
+      value: 6
       objectReference: {fileID: 0}
     - target: {fileID: 882894729606411301, guid: d26ff3d697c558f49a8b4c4ba7bffd00, type: 3}
       propertyPath: m_LocalPosition.x
@@ -1615,6 +1548,31 @@ PrefabInstance:
     - {fileID: 4733725822632215198, guid: d26ff3d697c558f49a8b4c4ba7bffd00, type: 3}
     - {fileID: 9128107806917823098, guid: d26ff3d697c558f49a8b4c4ba7bffd00, type: 3}
   m_SourcePrefab: {fileID: 100100000, guid: d26ff3d697c558f49a8b4c4ba7bffd00, type: 3}
+--- !u!1 &2031723359074680471 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 8830340756041430554, guid: d26ff3d697c558f49a8b4c4ba7bffd00, type: 3}
+  m_PrefabInstance: {fileID: 7402103045636655245}
+  m_PrefabAsset: {fileID: 0}
+--- !u!95 &1935850126738216375
+Animator:
+  serializedVersion: 4
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2031723359074680471}
+  m_Enabled: 1
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 9100000, guid: c2ab281e988c6014d86f13e8dfd4ce08, 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_KeepAnimatorControllerStateOnDisable: 0
 --- !u!4 &7708229159683865768 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 882894729606411301, guid: d26ff3d697c558f49a8b4c4ba7bffd00, type: 3}

ActionTowerDefense/Assets/Scripts/Demonic.cs

@@ -715,45 +715,4 @@ public class Demonic : MoveCharacter
         base.Attack2();
         attackTarget = targetCharacter;
     }
-
-    private List<AttackInfo> origAttackInfos = new List<AttackInfo>();
-    private float origAttackTime;
-    private int count;
-    public GameObject attributeUpEffect;
-    private GameObject curUpEffect;
-    public bool hasUp = false;
-    public bool isFirst = true;
-
-    public void AttackAttributesUp(float upDamageDegree, float upAttackSpeedDegree, float conTime)  //ÌáÉý¹¥»÷ºÍ¹¥ËÙ
-    {
-        if (isFirst)
-        {
-            isFirst = false;
-            curUpEffect = Instantiate(attributeUpEffect, transform.position, new Quaternion(0, 0, 0, 0), transform);
-        }
-        curUpEffect.SetActive(true);
-        count = attack2Infos.Count;
-        for (int i = 0; i < count; i++)
-        {
-            AttackInfo a = attack2Infos[i];
-            origAttackInfos.Add(a);
-            int d = a.damage;
-            a.damage = (int)(d * (1 + upDamageDegree));
-            attack2Infos[i] = a;
-        }
-        origAttackTime = totalAttack2Time;
-        totalAttack2Time = totalAttack2Time / (1 + upAttackSpeedDegree);
-        Invoke("AttackAttributesBack", conTime);
-    }
-
-    public void AttackAttributesBack()
-    {
-        curUpEffect.SetActive(false);
-        for (int i = 0; i < count; i++)
-        {
-            attack2Infos[i] = origAttackInfos[i];
-        }
-        totalAttack2Time = origAttackTime;
-        hasUp = false;
-    }
 }

ActionTowerDefense/Assets/Scripts/MoveCharacter.cs

@@ -361,7 +361,28 @@ public class MoveCharacter : Character
     }
 
     public float easyToGetHit = 0.2f;
-    
+    public bool isDamageReduction;
+    public float reductionDegree;
+    public GameObject reductionEffect;
+
+    //伤害减免状态开启（减免程度，减免时长）
+    public void DamageReductionStateOn(float degree, float onTime, GameObject effect)
+    {
+        if (reductionEffect == null)
+        {
+            reductionEffect = Instantiate(effect, transform.position, new Quaternion(0, 0, 0, 0), transform);
+        }
+        reductionEffect.SetActive(true);
+        isDamageReduction = true;
+        reductionDegree = degree;
+        Invoke("DamageReductionStateOff", onTime);
+    }
+
+    private void DamageReductionStateOff()
+    {
+        isDamageReduction = false;
+        reductionEffect.SetActive(false);
+    }
 
     public override void BeHit(int damage, Vector3 force, bool changeHurt, float repelValue)
     {
@@ -376,10 +397,18 @@ public class MoveCharacter : Character
                 return;
             }
 
+            //漂浮易伤
             if (isFloat)
             {
                 damage = (int)((1 + easyToGetHit) * damage);
             }
+
+            //伤害减免
+            if (isDamageReduction)
+            {
+                damage = (int)((1 - reductionDegree) * damage);
+            }
+
             hp -= damage;
             uiHp.Show(hp, totalHp);
             if (hp <= 0)

ActionTowerDefense/Assets/Scripts/SearchTrigger.cs

@@ -81,8 +81,7 @@ public class SearchTrigger : MonoBehaviour
         {
             if (isCook)
             {
-                if ((isEnemy && eCook.customers.Exists(T => T == trigObjList[i].owner)) ||
-                    (!isEnemy && dCook.customers.Exists(T => T == trigObjList[i].owner)))
+                if ((isEnemy && eCook.customers.Exists(T => T == trigObjList[i].owner)))
                 {
                     continue;
                 }

ActionTowerDefense/Assets/Scripts/Spirits/Base_Spirits/CookSmokeEffect.cs

@@ -1,14 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class CookSmokeEffect : MonoBehaviour
-{
-    private void OnTriggerEnter(Collider other)
-    {
-        if (other.gameObject.layer == 6 || other.gameObject.layer == 7)
-        {
-            print(1);
-        }
-    }
-}

ActionTowerDefense/Assets/Scripts/Spirits/Base_Spirits/CookSmokeEffect.cs.meta

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

ActionTowerDefense/Assets/Scripts/Spirits/Spirits_Cook.cs

@@ -5,44 +5,18 @@ using TMPro;
 
 public class Spirits_Cook : MonoBehaviour
 {
-    public TextMeshProUGUI text;        //剩余串的数量文本
-    private GameObject dia;             //文本框
+    public GameObject attributeUpEffect;
+    public float reductionDegree;
+    public float reductionTime;
 
-    private Transform cook;             //厨子
-
-    public float value;                 //加血程度百分比
-    public GameObject effect;           //加血效果
-
-    private Demonic dem;                //厨子的demonic脚本
-
-    private float activeTime;           //厨子已出现的时长
-    public float activeAniTime;         //厨子出现动画的时长
-    private bool isAct = false;         //厨子已经完整出现
-
-    public float larger;                //顾客变大的程度
-    public List<Character> customers;   //所有顾客
-
-    public Character target;
-    public SearchTrigger searchtrigger;
-
-    private void Start()
-    {
-        cook = transform.parent;
-        dem = cook.GetComponent<Demonic>();
-        dia = text.transform.parent.gameObject;
-        dia.SetActive(false);
-        dem.isNonAttack = true;
-    }
-
-    private void Update()
+    private void OnTriggerEnter(Collider other)
     {
-        if (!isAct)
+        if (other.gameObject.layer == 6 || other.gameObject.layer == 7)
         {
-            activeTime += Time.deltaTime;
-            if (activeTime >= activeAniTime)
+            MoveCharacter mc = other.GetComponentInParent<MoveCharacter>();
+            if (!mc.isDamageReduction)
             {
-                dia.SetActive(true);
-                isAct = true;
+                mc.DamageReductionStateOn(reductionDegree, reductionTime, attributeUpEffect);
             }
         }
     }