厨师大招bug修复

ActionTowerDefense/Assets/Resources/Prefab/ESpirits_Cook.prefab

@@ -325,7 +325,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   text: {fileID: 979388067414062712}
   chuan: 10
-  intervalTimeSell: 1
+  intervalTimeSell: 2
   minX: 8.5
   maxX: 20
   value: 20
@@ -853,7 +853,6 @@ MonoBehaviour:
   attackTarget: {fileID: 0}
   shootTrack: 0
   invincibleTime: 0
-  totalInvincibleTime: 0
   targetCharacter: {fileID: 0}
   beTargetCharacter: []
   searchTrigger: {fileID: 2932762729738363159}
@@ -871,6 +870,7 @@ MonoBehaviour:
   hasFloatTimes: 0
   criticalChance: 0
   criticalMultiplier: 0
+  cookEffect: {fileID: 0}
   canMove: 0
   foot: {fileID: 5440846222604650418}
   extraRiseGravity: -28.8
@@ -880,11 +880,8 @@ MonoBehaviour:
   totalBeRepelValue: 30
   weakTime: 0
   totalWeakTime: 0
-  weakUpSpeed: 10
   decelerationRatio: 1
-  minHurtKeepTime: 0.2
-  hurtKeepTime: 0
-  hurtChangeVelocity: 1
+  weakHitRate: 2
   comaTime: 5
   pastComaTime: 0
   isCaughtByCook: 0

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

@@ -138,7 +138,7 @@ ParticleSystem:
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
-  moveWithTransform: 1
+  moveWithTransform: 0
   moveWithCustomTransform: {fileID: 0}
   scalingMode: 1
   randomSeed: 0
@@ -9914,7 +9914,7 @@ ParticleSystem:
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
-  moveWithTransform: 1
+  moveWithTransform: 0
   moveWithCustomTransform: {fileID: 0}
   scalingMode: 1
   randomSeed: 0

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

@@ -11,6 +11,7 @@ GameObject:
   - component: {fileID: 8799591427491289958}
   - component: {fileID: 8366373742365865240}
   - component: {fileID: 7228707364840706683}
+  - component: {fileID: 9128107806917823098}
   m_Layer: 12
   m_Name: Particle System
   m_TagString: Untagged
@@ -56,7 +57,7 @@ ParticleSystem:
   startDelay:
     serializedVersion: 2
     minMaxState: 0
-    scalar: 0
+    scalar: 1
     minScalar: 0
     maxCurve:
       serializedVersion: 2
@@ -3740,7 +3741,7 @@ ParticleSystem:
     m_Bounce:
       serializedVersion: 2
       minMaxState: 0
-      scalar: 1
+      scalar: 0
       minScalar: 1
       maxCurve:
         serializedVersion: 2
@@ -3858,7 +3859,7 @@ ParticleSystem:
   TriggerModule:
     enabled: 0
     serializedVersion: 2
-    inside: 1
+    inside: 0
     outside: 0
     enter: 0
     exit: 0
@@ -4875,6 +4876,18 @@ 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
@@ -4905,6 +4918,7 @@ Transform:
   m_Children:
   - {fileID: 8799591427491289958}
   - {fileID: 373118178179337039}
+  - {fileID: 8406709651575132567}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -4919,6 +4933,7 @@ GameObject:
   - component: {fileID: 373118178179337039}
   - component: {fileID: 4008180574111224898}
   - component: {fileID: 909316265798399308}
+  - component: {fileID: 4733725822632215198}
   m_Layer: 12
   m_Name: Particle System (1)
   m_TagString: Untagged
@@ -8657,7 +8672,7 @@ ParticleSystem:
     m_Bounce:
       serializedVersion: 2
       minMaxState: 0
-      scalar: 1
+      scalar: 0
       minScalar: 1
       maxCurve:
         serializedVersion: 2
@@ -8775,7 +8790,7 @@ ParticleSystem:
   TriggerModule:
     enabled: 0
     serializedVersion: 2
-    inside: 1
+    inside: 0
     outside: 0
     enter: 0
     exit: 0
@@ -9792,3 +9807,73 @@ 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
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8406709651575132567}
+  - component: {fileID: 627859542480821703}
+  - component: {fileID: 5146643849835875139}
+  m_Layer: 0
+  m_Name: range
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &8406709651575132567
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8830340756041430554}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: -2.7815924, y: -4.5063877, z: -0.580529}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 882894729606411301}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!65 &627859542480821703
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8830340756041430554}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_Enabled: 1
+  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
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8830340756041430554}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 87a276a31e854a6408c877f8055d843f, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 

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

@@ -147,7 +147,7 @@ MonoBehaviour:
   value: 20
   larger: 1.2
   owner: {fileID: 0}
-  lastTime: 5
+  lastTime: 3
   cookeffect: {fileID: 417478504669294145, guid: 07c7a53ff610e0b45898f0f09276d995, type: 3}
 --- !u!1001 &4967821215384643547
 PrefabInstance:

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

@@ -318,7 +318,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2885380845639701439}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: ae4045519d0e38e48a91f50e3593ed41, type: 3}
   m_Name: 
@@ -770,6 +770,7 @@ Transform:
   - {fileID: 8922289277778709813}
   - {fileID: 2332805625535433500}
   - {fileID: 4787598481067778054}
+  - {fileID: 7708229159683865768}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -822,7 +823,6 @@ MonoBehaviour:
   attackTarget: {fileID: 0}
   shootTrack: 0
   invincibleTime: 0
-  totalInvincibleTime: 0
   targetCharacter: {fileID: 0}
   beTargetCharacter: []
   searchTrigger: {fileID: 2932762729738363159}
@@ -840,6 +840,7 @@ MonoBehaviour:
   hasFloatTimes: 0
   criticalChance: 0
   criticalMultiplier: 0
+  cookEffect: {fileID: 0}
   canMove: 0
   foot: {fileID: 5440846222604650418}
   extraRiseGravity: -28.8
@@ -849,11 +850,8 @@ MonoBehaviour:
   totalBeRepelValue: 100
   weakTime: 0
   totalWeakTime: 3
-  weakUpSpeed: 10
   decelerationRatio: 1
-  minHurtKeepTime: 0.2
-  hurtKeepTime: 0
-  hurtChangeVelocity: 1
+  weakHitRate: 2
   comaTime: 5
   pastComaTime: 0
   isCaughtByCook: 0
@@ -1471,6 +1469,14 @@ PrefabInstance:
       propertyPath: m_Name
       value: TranCookUltimate
       objectReference: {fileID: 0}
+    - target: {fileID: 4119800954199137642, guid: ec2b0f2494c993b47b700be0384a7d84, type: 3}
+      propertyPath: stopAction
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6238492018599546919, guid: ec2b0f2494c993b47b700be0384a7d84, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 6311393983886559837, guid: ec2b0f2494c993b47b700be0384a7d84, type: 3}
       propertyPath: m_RootOrder
       value: 6
@@ -1522,3 +1528,95 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 6311393983886559837, guid: ec2b0f2494c993b47b700be0384a7d84, type: 3}
   m_PrefabInstance: {fileID: 1578058741337959003}
   m_PrefabAsset: {fileID: 0}
+--- !u!1001 &7402103045636655245
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 5440846222648032754}
+    m_Modifications:
+    - target: {fileID: 882894729606411301, guid: d26ff3d697c558f49a8b4c4ba7bffd00, type: 3}
+      propertyPath: m_RootOrder
+      value: 7
+      objectReference: {fileID: 0}
+    - target: {fileID: 882894729606411301, guid: d26ff3d697c558f49a8b4c4ba7bffd00, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 1.1915922
+      objectReference: {fileID: 0}
+    - target: {fileID: 882894729606411301, guid: d26ff3d697c558f49a8b4c4ba7bffd00, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 6.6063876
+      objectReference: {fileID: 0}
+    - target: {fileID: 882894729606411301, guid: d26ff3d697c558f49a8b4c4ba7bffd00, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0.580529
+      objectReference: {fileID: 0}
+    - target: {fileID: 882894729606411301, guid: d26ff3d697c558f49a8b4c4ba7bffd00, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 882894729606411301, guid: d26ff3d697c558f49a8b4c4ba7bffd00, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 882894729606411301, guid: d26ff3d697c558f49a8b4c4ba7bffd00, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 882894729606411301, guid: d26ff3d697c558f49a8b4c4ba7bffd00, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 882894729606411301, guid: d26ff3d697c558f49a8b4c4ba7bffd00, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 882894729606411301, guid: d26ff3d697c558f49a8b4c4ba7bffd00, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 882894729606411301, guid: d26ff3d697c558f49a8b4c4ba7bffd00, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 909316265798399308, guid: d26ff3d697c558f49a8b4c4ba7bffd00, type: 3}
+      propertyPath: m_SortingOrder
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 4008180574111224898, guid: d26ff3d697c558f49a8b4c4ba7bffd00, type: 3}
+      propertyPath: startDelay.scalar
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4008180574111224898, guid: d26ff3d697c558f49a8b4c4ba7bffd00, type: 3}
+      propertyPath: CollisionModule.enabled
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7228707364840706683, guid: d26ff3d697c558f49a8b4c4ba7bffd00, type: 3}
+      propertyPath: m_SortingOrder
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 7346667483044277328, guid: d26ff3d697c558f49a8b4c4ba7bffd00, type: 3}
+      propertyPath: m_Name
+      value: CookSmoke
+      objectReference: {fileID: 0}
+    - target: {fileID: 8366373742365865240, guid: d26ff3d697c558f49a8b4c4ba7bffd00, type: 3}
+      propertyPath: startDelay.scalar
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8366373742365865240, guid: d26ff3d697c558f49a8b4c4ba7bffd00, type: 3}
+      propertyPath: CollisionModule.enabled
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8406709651575132567, guid: d26ff3d697c558f49a8b4c4ba7bffd00, type: 3}
+      propertyPath: m_RootOrder
+      value: 2
+      objectReference: {fileID: 0}
+    m_RemovedComponents:
+    - {fileID: 4733725822632215198, guid: d26ff3d697c558f49a8b4c4ba7bffd00, type: 3}
+    - {fileID: 9128107806917823098, guid: d26ff3d697c558f49a8b4c4ba7bffd00, type: 3}
+  m_SourcePrefab: {fileID: 100100000, guid: d26ff3d697c558f49a8b4c4ba7bffd00, type: 3}
+--- !u!4 &7708229159683865768 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 882894729606411301, guid: d26ff3d697c558f49a8b4c4ba7bffd00, type: 3}
+  m_PrefabInstance: {fileID: 7402103045636655245}
+  m_PrefabAsset: {fileID: 0}

ActionTowerDefense/Assets/Scripts/Character.cs

@@ -327,11 +327,11 @@ public class Character : MonoBehaviour
         meshRenderer.sortingOrder = order;
     }
 
-    public GameObject cookEffect;
+    public GameObject cookEffect = null;
 
     public void HpUp(float value, float larger)
     {
-        cookEffect.SetActive(true);
+        cookEffect.transform.GetChild(0).gameObject.SetActive(true);
         int add = 0;
         switch (hptp)
         {

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

@@ -0,0 +1,14 @@
+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/CookEffect.cs.meta → ActionTowerDefense/Assets/Scripts/Spirits/Base_Spirits/CookSmokeEffect.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 79ebc0406d2515f4ba77cd9aab8dd531
+guid: 87a276a31e854a6408c877f8055d843f
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

ActionTowerDefense/Assets/Scripts/Spirits/CookEffect.cs

@@ -1,23 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class CookEffect : MonoBehaviour
-{
-    public float value;
-    public float larger;
-    public GameObject cookeffect;
-
-    private void OnTriggerEnter(Collider other)
-    {
-        if (other.gameObject.layer == 6 || other.gameObject.layer == 7 || other.gameObject.layer == 8)
-        {
-            MoveCharacter mc = other.GetComponent<MoveCharacter>();
-            if (mc.cookEffect == null)
-            {
-                mc.cookEffect = Instantiate(cookeffect, mc.transform.position, new Quaternion(0, 0, 0, 0), mc.transform);
-            }
-            mc.HpUp(value, larger);
-        }
-    }
-}