SZAND\msx_2 1 year ago
parent
commit
4295925b41

+ 85 - 55
ActionTowerDefense/Assets/Resources/Prefab/ESpirits_Cook.prefab

@@ -116,7 +116,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &6069085609270885073
 Transform:
   m_ObjectHideFlags: 0
@@ -143,8 +143,8 @@ BoxCollider:
   m_IsTrigger: 1
   m_Enabled: 1
   serializedVersion: 2
-  m_Size: {x: 0, y: 0, z: 1}
-  m_Center: {x: 0, y: 0, z: 0}
+  m_Size: {x: 2.132753, y: 2.3543785, z: 1}
+  m_Center: {x: 0.024625063, y: 1.1450654, z: 0}
 --- !u!114 &3377671071202039733
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -227,7 +227,7 @@ MonoBehaviour:
   activeAniTime: 3.3
   larger: 1.2
   canMove: 0
-  lockEffect: {fileID: 0}
+  lockEffect: {fileID: 2123904437201259524, guid: 24cf2b33715a9e04b9aabcb789c31067, type: 3}
 --- !u!1 &3483054690158852324
 GameObject:
   m_ObjectHideFlags: 0
@@ -380,7 +380,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &6207242290232856985
 Transform:
   m_ObjectHideFlags: 0
@@ -407,8 +407,8 @@ BoxCollider:
   m_IsTrigger: 1
   m_Enabled: 1
   serializedVersion: 2
-  m_Size: {x: 0, y: 0, z: 1}
-  m_Center: {x: 0, y: 0, z: 0}
+  m_Size: {x: 4.4262385, y: 4.7369604, z: 1}
+  m_Center: {x: 0.039123774, y: 0.081486225, z: 0}
 --- !u!114 &4259433079752244006
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -432,7 +432,7 @@ GameObject:
   m_Component:
   - component: {fileID: 5669356131851076493}
   - component: {fileID: 925594141286007562}
-  m_Layer: 12
+  m_Layer: 8
   m_Name: BodyCollider
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -465,8 +465,8 @@ BoxCollider:
   m_IsTrigger: 0
   m_Enabled: 1
   serializedVersion: 2
-  m_Size: {x: 0, y: 0, z: 1}
-  m_Center: {x: 0, y: 0, z: 0}
+  m_Size: {x: 2.1781316, y: 2.2643359, z: 1}
+  m_Center: {x: 0.014367342, y: 1.1206616, z: 0}
 --- !u!1 &4579126894259554924
 GameObject:
   m_ObjectHideFlags: 0
@@ -637,11 +637,11 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 5440846222648032754}
-  - component: {fileID: 5440846222648032767}
   - component: {fileID: 5440846222648032765}
+  - component: {fileID: 6081378874369820973}
   m_Layer: 0
   m_Name: ESpirits_Cook
-  m_TagString: Demonic
+  m_TagString: Enemy
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -667,7 +667,23 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &5440846222648032767
+--- !u!54 &5440846222648032765
+Rigidbody:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5440846222648032759}
+  serializedVersion: 2
+  m_Mass: 50
+  m_Drag: 0.1
+  m_AngularDrag: 0.05
+  m_UseGravity: 1
+  m_IsKinematic: 0
+  m_Interpolate: 0
+  m_Constraints: 120
+  m_CollisionDetection: 0
+--- !u!114 &6081378874369820973
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -676,7 +692,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 5440846222648032759}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: c1bedfb340186164dbac1499b49b879e, type: 3}
+  m_Script: {fileID: 11500000, guid: 7475a7d33f657b146a4994b1e02710ad, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   mecanim: {fileID: 7573527827155227431}
@@ -689,28 +705,39 @@ MonoBehaviour:
   uiHp: {fileID: 0}
   state: 0
   attackTime: 0
-  totalAttack1Time: 0
-  totalAttack2Time: 0
-  isNonAttack: 1
+  totalAttack1Time: 1.25
+  totalAttack2Time: 1.8
+  isNonAttack: 0
   hptp: 0
   isDie: 0
-  totalHp: 2000
+  totalHp: 1000
   hp: 0
-  attack1Infos: []
-  attack2Infos: []
-  attackTriggers: []
+  attack1Infos:
+  - damage: 200
+    attackDir: {x: 0, y: 1, z: 0}
+    force: 100
+    changeHurt: 1
+    repelValue: 10
+  attack2Infos:
+  - damage: 50
+    attackDir: {x: -1, y: 0, z: 0}
+    force: 100
+    changeHurt: 0
+    repelValue: 10
+  attackTriggers:
+  - {fileID: 7729941002223262554}
   attackType: 0
   bulletPrefab: {fileID: 0}
   shootPos: []
   dieKeepTime: 0
-  totalDieKeepTime: 1.34
+  totalDieKeepTime: 3
   attackTarget: {fileID: 0}
   shootTrack: 0
   invincibleTime: 0
   totalInvincibleTime: 0
   targetCharacter: {fileID: 0}
   searchTrigger: {fileID: 2932762729738363159}
-  targetTypes: 
+  targetTypes: 010000000300000002000000
   canHitFly: 0
   linked: 0
   joint: {fileID: 0}
@@ -719,18 +746,18 @@ MonoBehaviour:
   beLarger: 0
   canMove: 1
   foot: {fileID: 5440846222604650418}
-  extraRiseGravity: 0
-  extraFallGravity: 0
-  moveSpeed: 0
+  extraRiseGravity: -28.8
+  extraFallGravity: -14.4
+  moveSpeed: 15
   beRepelValue: 0
-  totalBeRepelValue: 0
+  totalBeRepelValue: 30
   weakTime: 0
   totalWeakTime: 0
-  weakUpSpeed: 0
-  decelerationRatio: 0
-  minHurtKeepTime: 0
+  weakUpSpeed: 10
+  decelerationRatio: 1
+  minHurtKeepTime: 0.2
   hurtKeepTime: 0
-  hurtChangeVelocity: 0
+  hurtChangeVelocity: 1
   maxTime: 1.5
   minTime: 0.1
   maxHeight: 9
@@ -742,34 +769,37 @@ MonoBehaviour:
   outlineMats:
   - {fileID: 2100000, guid: 30969c92738eb7d4da3885e08f1ec2f0, type: 2}
   - {fileID: 2100000, guid: 98fc94309ab120b4c83b2cebb9226222, type: 2}
-  - {fileID: 2100000, guid: 30969c92738eb7d4da3885e08f1ec2f0, type: 2}
   id: 0
-  costMp: 1
-  totalSummonTime: 0.5
+  jumpSpeed: 9
   searchState: 0
-  attackDistance: 0
+  attackDistance: 1.5
   canFly: 0
   flyHeight: 0
   flyUpSpeed: 10
-  sortingOrder: 10000
-  playerID: 0
-  hasEffect: 0
---- !u!54 &5440846222648032765
-Rigidbody:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5440846222648032759}
-  serializedVersion: 2
-  m_Mass: 50
-  m_Drag: 0.1
-  m_AngularDrag: 0.05
-  m_UseGravity: 1
-  m_IsKinematic: 0
-  m_Interpolate: 0
-  m_Constraints: 120
-  m_CollisionDetection: 0
+  attackRatio: 0
+  maxMoveSpeed: 15
+  minMoveSpeed: 15
+  dropSoul: 3
+  soulPrefab: {fileID: 1723151111827507807, guid: e2b65aa482f2f1447a4074208d72b778, type: 3}
+  soulStartSpeed: 30
+  dropSoulAngle: 0
+  noOnSearchState: 0
+  isFindingPlayer: 0
+  isFindPlayer: 0
+  hateDistance: 10
+  distance: 0
+  rushEndPos: {x: 0, y: 0, z: 0}
+  aimEffect: {fileID: 6373916053725309541, guid: 3839706ae501f6f4494a5b38dd4e936e, type: 3}
+  aimDistance: 20
+  rushTime: 0.8
+  rushSpeed: 30
+  time: 0
+  readyCD: 1.5
+  dashEffect: {fileID: 2254593709981819441, guid: 3839706ae501f6f4494a5b38dd4e936e, type: 3}
+  targetDir: {x: 0, y: 0, z: 0}
+  haveDownRush: 0
+  downRushTime: 0.8
+  finishRushTime: 0.8
 --- !u!1 &6026815487321357762
 GameObject:
   m_ObjectHideFlags: 0
@@ -864,7 +894,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &770599430276839403
 Transform:
   m_ObjectHideFlags: 0

+ 2 - 1
ActionTowerDefense/Assets/Scripts/Enemy.cs

@@ -403,7 +403,7 @@ public class Enemy : MoveCharacter
                 break;
             case CharacterState.ReadyToRush:
                 time += Time.deltaTime;
-                ReadyToDash(rushEndPos + Vector3.up, transform.position + Vector3.up);
+                
                 if (time >= readyCD)
                 {
                     time = 0;
@@ -511,6 +511,7 @@ public class Enemy : MoveCharacter
             case CharacterState.ReadyToDownRush:
                 rb.constraints = 
                     RigidbodyConstraints.FreezePositionZ|RigidbodyConstraints.FreezeRotation;
+                ReadyToDash(rushEndPos + Vector3.up, transform.position + Vector3.up);
                 break;
             case CharacterState.DownRush:
                 

+ 13 - 2
ActionTowerDefense/Assets/Scripts/Spirits/ESpirits_Cook.cs

@@ -18,6 +18,9 @@ public class ESpirits_Cook : MonoBehaviour
     public float walkSpeed;         //走路速度
     public float runSpeed;          //冲刺速度
 
+    public float minX;              //厨子卖串的最小地址站
+    public float maxX;              //厨子卖串的最大地址站
+
     public float value;             //加血程度百分比
     public GameObject effect;       //加血效果
 
@@ -36,7 +39,6 @@ public class ESpirits_Cook : MonoBehaviour
     private int count;              //顾客数量
 
     public float larger;            //顾客变大的程度
-
     public bool canMove = false;    //厨师可移动
 
     private GameObject player1;
@@ -94,7 +96,7 @@ public class ESpirits_Cook : MonoBehaviour
                     if (chuan == 0)
                     {
                         toCatch = true;
-                        ChangeState(cookState.run);
+                        ChangeState(cookState.walk);
                     }
                 }
             }
@@ -136,6 +138,7 @@ public class ESpirits_Cook : MonoBehaviour
             //发现目标
             case cookState.find:
                 break;
+
             //冲刺中
             case cookState.run:
                 canMove = true;
@@ -181,6 +184,14 @@ public class ESpirits_Cook : MonoBehaviour
     {
         switch (cs)
         {
+            case cookState.walk:
+
+                break;
+            case cookState.find:
+                break;
+            case cookState.back:
+                break;
+
             case cookState.cook:
 
                 break;

+ 11 - 0
ActionTowerDefense/Assets/Scripts/Spirits/ESpirits_Cook.cs.meta

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