浏览代码

子弹最大飞行距离改为最大飞行时间,使魔和敌人皮肤设置

wulifu 1 年之前
父节点
当前提交
c8b785394c

+ 1 - 1
ActionTowerDefense/Assets/Resources/Prefab/Demonic_Arrow.prefab

@@ -315,7 +315,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   skeletonDataAsset: {fileID: 11400000, guid: 65ebe61da49f5804bbc02a3d8883b7f2, type: 2}
-  initialSkinName: 
+  initialSkinName: summon
   fixPrefabOverrideViaMeshFilter: 2
   initialFlipX: 0
   initialFlipY: 0

+ 1 - 1
ActionTowerDefense/Assets/Resources/Prefab/Demonic_Giant.prefab

@@ -777,7 +777,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   skeletonDataAsset: {fileID: 11400000, guid: 9d5bf202f4ac772459b753df918eb193, type: 2}
-  initialSkinName: 
+  initialSkinName: summon
   fixPrefabOverrideViaMeshFilter: 2
   initialFlipX: 0
   initialFlipY: 0

+ 1 - 1
ActionTowerDefense/Assets/Resources/Prefab/Demonic_Sword.prefab

@@ -673,7 +673,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   skeletonDataAsset: {fileID: 11400000, guid: edf91fbef4dfae64a857379c927b47da, type: 2}
-  initialSkinName: 
+  initialSkinName: summon
   fixPrefabOverrideViaMeshFilter: 2
   initialFlipX: 0
   initialFlipY: 0

+ 1 - 1
ActionTowerDefense/Assets/Resources/Prefab/Enemy_Arrow.prefab

@@ -315,7 +315,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   skeletonDataAsset: {fileID: 11400000, guid: 65ebe61da49f5804bbc02a3d8883b7f2, type: 2}
-  initialSkinName: 
+  initialSkinName: enermy
   fixPrefabOverrideViaMeshFilter: 2
   initialFlipX: 0
   initialFlipY: 0

+ 5 - 3
ActionTowerDefense/Assets/Resources/Prefab/Enemy_Giant.prefab

@@ -96,6 +96,7 @@ MonoBehaviour:
   damage: 0
   force: {x: 0, y: 0, z: 0}
   changeHurt: 0
+  hurtTime: 0
 --- !u!1 &2460330936527559963
 GameObject:
   m_ObjectHideFlags: 0
@@ -443,11 +444,13 @@ MonoBehaviour:
     attackDir: {x: -1, y: 0, z: 0}
     force: 1000
     changeHurt: 1
+    hurtTime: 0
   attack2Infos:
   - damage: 30
     attackDir: {x: -1, y: 0, z: 0}
     force: 1000
     changeHurt: 0
+    hurtTime: 0
   attackTriggers:
   - {fileID: 7729941002223262554}
   attackType: 0
@@ -463,12 +466,11 @@ MonoBehaviour:
   searchTrigger: {fileID: 2932762729738363159}
   targetTypes: 010000000200000003000000
   canHitFly: 0
+  hurtKeepTime: 0
   foot: {fileID: 5440846222604650418}
   extraRiseGravity: -28.8
   extraFallGravity: -14.4
   moveSpeed: 5
-  hurtKeepTime: 0
-  totalHurtKeepTime: 0.5
   id: 0
   jumpSpeed: 10
   searchState: 0
@@ -778,7 +780,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   skeletonDataAsset: {fileID: 11400000, guid: 9d5bf202f4ac772459b753df918eb193, type: 2}
-  initialSkinName: 
+  initialSkinName: enermy
   fixPrefabOverrideViaMeshFilter: 2
   initialFlipX: 0
   initialFlipY: 0

+ 5 - 3
ActionTowerDefense/Assets/Resources/Prefab/Enemy_Sword.prefab

@@ -170,6 +170,7 @@ MonoBehaviour:
   damage: 0
   force: {x: 0, y: 0, z: 0}
   changeHurt: 0
+  hurtTime: 0
 --- !u!1 &2437299196472462361
 GameObject:
   m_ObjectHideFlags: 0
@@ -238,11 +239,13 @@ MonoBehaviour:
     attackDir: {x: -1, y: 0, z: 0}
     force: 50
     changeHurt: 1
+    hurtTime: 0
   attack2Infos:
   - damage: 30
     attackDir: {x: -1, y: 0, z: 0}
     force: 50
     changeHurt: 0
+    hurtTime: 0
   attackTriggers:
   - {fileID: 2280520615464243483}
   attackType: 0
@@ -258,12 +261,11 @@ MonoBehaviour:
   searchTrigger: {fileID: 428784489592146076}
   targetTypes: 010000000300000002000000
   canHitFly: 0
+  hurtKeepTime: 0
   foot: {fileID: 2437299196663985756}
   extraRiseGravity: -28.8
   extraFallGravity: -14.4
   moveSpeed: 5
-  hurtKeepTime: 0
-  totalHurtKeepTime: 0.5
   id: 0
   jumpSpeed: 9
   searchState: 0
@@ -910,7 +912,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   skeletonDataAsset: {fileID: 11400000, guid: edf91fbef4dfae64a857379c927b47da, type: 2}
-  initialSkinName: 
+  initialSkinName: enermy
   fixPrefabOverrideViaMeshFilter: 2
   initialFlipX: 0
   initialFlipY: 0

+ 10 - 6
ActionTowerDefense/Assets/Resources/Prefab/Player.prefab

@@ -592,19 +592,23 @@ MonoBehaviour:
   - damage: 300
     attackDir: {x: -1, y: 0, z: 0}
     force: 1000
-    changeHurt: 1
+    changeHurt: 0
+    hurtTime: 0
   - damage: 300
     attackDir: {x: -1, y: 0, z: 0}
     force: 1000
-    changeHurt: 1
+    changeHurt: 0
+    hurtTime: 0
   - damage: 300
     attackDir: {x: -1, y: 0, z: 0}
     force: 1000
-    changeHurt: 1
+    changeHurt: 0
+    hurtTime: 0
   - damage: 300
     attackDir: {x: -1, y: 0, z: 0}
     force: 1000
-    changeHurt: 1
+    changeHurt: 0
+    hurtTime: 0
   attack2Infos: []
   attackTriggers:
   - {fileID: 1267495056}
@@ -625,12 +629,11 @@ MonoBehaviour:
   searchTrigger: {fileID: 2246792914537570827}
   targetTypes: 0400000005000000
   canHitFly: 1
+  hurtKeepTime: 0
   foot: {fileID: 3571941039716665623}
   extraRiseGravity: -28.8
   extraFallGravity: -14.4
   moveSpeed: 20
-  hurtKeepTime: 0
-  totalHurtKeepTime: 0.5
   demonicPrefabs:
   - {fileID: 8639832132491289359, guid: 4c2987691cdb47040b3a55ff928803c3, type: 3}
   - {fileID: 5440846222648032759, guid: 05825e721b2832f478f66e78daed901f, type: 3}
@@ -1326,6 +1329,7 @@ MonoBehaviour:
   damage: 0
   force: {x: 0, y: 0, z: 0}
   changeHurt: 0
+  hurtTime: 0
 --- !u!1 &9046555753133816952
 GameObject:
   m_ObjectHideFlags: 0

+ 0 - 16
ActionTowerDefense/Assets/Scenes/SampleScene.unity

@@ -1156,22 +1156,6 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 0}
     m_Modifications:
-    - target: {fileID: 3571941038519084336, guid: 5b538f610930dd743a096c582e2810f4, type: 3}
-      propertyPath: attack1Infos.Array.data[0].changeHurt
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3571941038519084336, guid: 5b538f610930dd743a096c582e2810f4, type: 3}
-      propertyPath: attack1Infos.Array.data[1].changeHurt
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3571941038519084336, guid: 5b538f610930dd743a096c582e2810f4, type: 3}
-      propertyPath: attack1Infos.Array.data[2].changeHurt
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3571941038519084336, guid: 5b538f610930dd743a096c582e2810f4, type: 3}
-      propertyPath: attack1Infos.Array.data[3].changeHurt
-      value: 0
-      objectReference: {fileID: 0}
     - target: {fileID: 3571941038519084344, guid: 5b538f610930dd743a096c582e2810f4, type: 3}
       propertyPath: m_Name
       value: Player

+ 5 - 4
ActionTowerDefense/Assets/Scripts/Bullet.cs

@@ -21,8 +21,8 @@ public class Bullet : MonoBehaviour
     public BulletType bulletType;
     public bool isGetTarget = false;
     public float speed;
-    public float maxDistance;
-    Vector3 startPos;
+    public float maxFlyTime = 2f;
+    public float flyTime;
     public bool isTrack;
     public Character trackTarget;
 
@@ -34,7 +34,8 @@ public class Bullet : MonoBehaviour
 
     private void FixedUpdate()
     {
-        if ((transform.position - startPos).magnitude >= maxDistance)
+        flyTime += Time.deltaTime;
+        if (flyTime >= maxFlyTime)
         {
             isGetTarget = true;
             gameObject.SetActive(false);
@@ -50,7 +51,6 @@ public class Bullet : MonoBehaviour
 
     public void BeShoot(Character own, Vector3 shootPos, Vector3 dir, int dmg, float fc, bool hurt, float time, bool track = false, Character target = null)
     {
-        startPos = shootPos;
         transform.position = shootPos;
         transform.right = -dir;
         gameObject.SetActive(true);
@@ -63,6 +63,7 @@ public class Bullet : MonoBehaviour
         rb.velocity = dir * speed;
         isTrack = track;
         trackTarget = target;
+        flyTime = 0;
     }
 
     private void OnTriggerEnter(Collider other)