SZAND\msx_2 преди 1 година
родител
ревизия
c03ef4e0e1

+ 3 - 0
ActionTowerDefense/Assets/Resources/Prefab/ESpirits_Assassin.prefab

@@ -213,6 +213,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 7475a7d33f657b146a4994b1e02710ad, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  cookNum: 6
+  cooks: []
   mecanim: {fileID: 5617185463097218335}
   meshRenderer: {fileID: 0}
   ani: {fileID: 6496896669866891404}
@@ -317,6 +319,7 @@ MonoBehaviour:
   haveDownRush: 1
   downRushTime: 0.8
   finishRushTime: 0.8
+  isBack: 0
 --- !u!1 &2437299196663985757
 GameObject:
   m_ObjectHideFlags: 0

+ 4 - 1
ActionTowerDefense/Assets/Resources/Prefab/ESpirits_Cook.prefab

@@ -331,6 +331,7 @@ MonoBehaviour:
   - {fileID: 2460330936527559963}
   walkSpeed: 3
   runSpeed: 5
+  intervalTimeSell: 1
   minX: 8.5
   maxX: 20
   value: 20
@@ -806,7 +807,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 7475a7d33f657b146a4994b1e02710ad, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  cookNum: 0
+  cookNum: 10
+  cooks: []
   mecanim: {fileID: 7573527827155227431}
   meshRenderer: {fileID: 0}
   ani: {fileID: 3333436509305836838}
@@ -1189,6 +1191,7 @@ MeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
+  - {fileID: 2100000, guid: c44edd2384bd3a24a8358519e8e593f6, type: 2}
   - {fileID: 2100000, guid: 37c58d20311af0c49b01b31d34f4e779, type: 2}
   - {fileID: 2100000, guid: c44edd2384bd3a24a8358519e8e593f6, type: 2}
   - {fileID: 2100000, guid: 37c58d20311af0c49b01b31d34f4e779, type: 2}

+ 3 - 0
ActionTowerDefense/Assets/Resources/Prefab/ESpirits_Float.prefab

@@ -997,6 +997,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 7475a7d33f657b146a4994b1e02710ad, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  cookNum: 3
+  cooks: []
   mecanim: {fileID: 3354085511906294621}
   meshRenderer: {fileID: 0}
   ani: {fileID: 5978259926173120695}
@@ -1115,3 +1117,4 @@ MonoBehaviour:
   haveDownRush: 0
   downRushTime: 0
   finishRushTime: 0
+  isBack: 0

+ 2 - 0
ActionTowerDefense/Assets/Resources/Prefab/Spirits_Assassin.prefab

@@ -201,6 +201,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: c1bedfb340186164dbac1499b49b879e, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  cookNum: 6
+  cooks: []
   mecanim: {fileID: 5617185463097218335}
   meshRenderer: {fileID: 0}
   ani: {fileID: 6496896669866891404}

+ 4 - 1
ActionTowerDefense/Assets/Resources/Prefab/Spirits_Cook.prefab

@@ -325,12 +325,13 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   text: {fileID: 979388067414062712}
   chuan: 10
-  isEnemy: 0
   isGood: 1
   colliders:
   - {fileID: 4480734502875862885}
   - {fileID: 1322232727721152541}
   - {fileID: 2460330936527559963}
+  walkSpeed: 0
+  runSpeed: 0
   value: 50
   effect: {fileID: 417478504669294145, guid: 07c7a53ff610e0b45898f0f09276d995, type: 3}
   activeAniTime: 3.3
@@ -788,6 +789,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: c1bedfb340186164dbac1499b49b879e, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  cookNum: 10
+  cooks: []
   mecanim: {fileID: 7573527827155227431}
   meshRenderer: {fileID: 0}
   ani: {fileID: 3333436509305836838}

+ 7 - 0
ActionTowerDefense/Assets/Resources/Prefab/Spirits_Float.prefab

@@ -975,6 +975,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: c1bedfb340186164dbac1499b49b879e, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  cookNum: 3
+  cooks: []
   mecanim: {fileID: 3354085511906294621}
   meshRenderer: {fileID: 0}
   ani: {fileID: 5978259926173120695}
@@ -1036,6 +1038,7 @@ MonoBehaviour:
   rope: {fileID: 0}
   hasHpUp: 0
   beLarger: 0
+  canMove: 1
   foot: {fileID: 8639832132450015562}
   extraRiseGravity: -28.8
   extraFallGravity: -14.4
@@ -1056,15 +1059,19 @@ MonoBehaviour:
   maxRotateSpeed: 10
   minRotateSpeed: 4
   floatTime: 5
+  floatState: 0
   outlineMats:
   - {fileID: 2100000, guid: b89f4b5b01e92784ab27611e2b014a10, type: 2}
   - {fileID: 2100000, guid: 0d24ea357a09df448b788aed95b96541, type: 2}
   - {fileID: 2100000, guid: b89f4b5b01e92784ab27611e2b014a10, type: 2}
   id: 0
   costMp: 1
+  totalSummonTime: 0.5
   searchState: 0
   attackDistance: 10
   canFly: 1
+  flyHeight: 0
+  flyUpSpeed: 10
   sortingOrder: 2000
   playerID: 0
   hasEffect: 0

+ 15 - 1
ActionTowerDefense/Assets/Scripts/Spirits/ESpirits_Cook.cs

@@ -19,6 +19,10 @@ public class ESpirits_Cook : MonoBehaviour
     public float walkSpeed;         //走路速度
     public float runSpeed;          //冲刺速度
 
+    private float intervalTimePast;
+    public float intervalTimeSell;  //卖串的间隔时间
+    private bool isInterval = false;        //开始计算间隔时间
+
     public float minX;              //厨子卖串的最小地址站
     public float maxX;              //厨子卖串的最大地址站
 
@@ -93,12 +97,13 @@ public class ESpirits_Cook : MonoBehaviour
         //路过发串
         if (state == cookState.sell && !die && (other.gameObject.layer == 7 || other.gameObject.layer == 8 || other.gameObject.layer == 6))
         {
-            if (chuan > 0)
+            if (!isInterval && chuan > 0)
             {
                 GameObject ga = other.transform.parent.parent.parent.gameObject;
                 Character ca = ga.GetComponent<Character>();
                 if (!ca.cooks.Exists(T => T == gameObject))
                 {
+                    isInterval = true;
                     chuan -= 1;
                     text.text = chuan.ToString();
                     ani.Play("attack_march", 0, 0);
@@ -290,5 +295,14 @@ public class ESpirits_Cook : MonoBehaviour
             col.enabled = false;
             ene.ChangeState(CharacterState.Die);
         }
+        if (isInterval)
+        {
+            intervalTimePast += Time.deltaTime;
+            if (intervalTimePast >= intervalTimeSell)
+            {
+                intervalTimePast = 0;
+                isInterval = false;
+            }
+        }
     }
 }