风车手里剑忍者；三只精英怪代替出怪表刺客；盔甲武士闪白

ActionTowerDefense/Assets/Resources/Prefab/windmill_shuriken.prefab

@@ -1,5 +1,151 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &149281251555105255
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7503139293998960448}
+  - component: {fileID: 4556949082052621437}
+  - component: {fileID: 4354685328140236406}
+  m_Layer: 14
+  m_Name: AttackTrigger
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!4 &7503139293998960448
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 149281251555105255}
+  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: 7473170563405908937}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &4556949082052621437
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 149281251555105255}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5eaed0a6b9d6fc6409bef80cf41a0a8e, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  canBreakWall: 0
+  wallBrealNum: 10
+  isShoot: 0
+  isSingleAttack: 0
+  isDoT: 1
+  owner: {fileID: 0}
+  cantSingleAttack: 0
+  trigedObjs: []
+  trigedTime: []
+  attackMethod:
+    attackName: 
+    attackType: 0
+    attackInfo:
+      attackValue: 0
+      damage: 0
+      attackDir: {x: 0, y: 0, z: 0}
+      criticalChance: 0
+      criticalStrikeEffect: 0
+      lifesteal: 0
+      attackOnEffect: {fileID: 0}
+      attackOnEffectPos: {fileID: 0}
+      hitEffect: {fileID: 0}
+      attackEffect: 
+      attackMethod_Type: 0
+      floatState:
+        time: 0
+        upTime: {x: 0, y: 0}
+        backSpeed: {x: 0, y: 0}
+        rotateSpeed: {x: 0, y: 0}
+        height: {x: 0, y: 0}
+        ControlOrder: 0
+      blowUp:
+        directionType: 0
+        dir: {x: 0, y: 0, z: 0}
+        dirRandom: {x: 0, y: 0, z: 0}
+        force: 0
+        time: 0
+        haveLandingDamage: 0
+        landingDamageRate: 0
+        jumpNum: 0
+        ControlOrder: 0
+      shotDown:
+        directionType: 0
+        dir: {x: 0, y: 0, z: 0}
+        dirRandom: {x: 0, y: 0, z: 0}
+        force: 0
+        time: 0
+        haveLandingDamage: 0
+        landingDamageRate: 0
+        minLandingDamage: 0
+        ControlOrder: 0
+      weak:
+        time: 0
+        ControlOrder: 0
+      armorPiercing:
+        rate: 0
+      vulnerable:
+        rate: 0
+        time: 0
+      stackingWounds:
+        damage: 0
+        time: 0
+      changeDamage:
+        rate: 0
+      sustainedInjury:
+        damage: 0
+    attackTrigger: {fileID: 0}
+    needToChange: 0
+    attackDistance: 0
+    maxAttackDis: 0
+    minAttackDis: 0
+    searchMode: 0
+    canHitFly: 0
+    bulletPrefab: {fileID: 0}
+    shootPos: []
+    maxUpAngle: 0
+    maxDownAngle: 0
+    shootTrack: 0
+    shootAlwaysTrack: 0
+    skill: {fileID: 0}
+    additionalEffects: 0
+  force: {x: 0, y: 0, z: 0}
+  changeHurt: 0
+  repelValue: 0
+  offsetY: 1
+  hitRate: 1
+  interval: 0.5
+  isCreatedByDemonicSummon: 0
+--- !u!65 &4354685328140236406
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 149281251555105255}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 1, y: 1, z: 20}
+  m_Center: {x: 0, y: 0, z: 0}
 --- !u!1 &3502471531863202414
 GameObject:
   m_ObjectHideFlags: 0
@@ -395,6 +541,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 7885428177189875250}
+  - {fileID: 7503139293998960448}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -431,7 +578,7 @@ MonoBehaviour:
     attackInfo:
       attackValue: 0
       damage: 0
-      attackDir: {x: 0, y: 0, z: 0}
+      attackDir: {x: -1, y: 0, z: 0}
       criticalChance: 0
       criticalStrikeEffect: 0
       lifesteal: 0
@@ -504,6 +651,7 @@ MonoBehaviour:
   backDuration: 1
   stopDuration: 2
   BoomerangWeaponController: {fileID: 0}
+  attackTrigger: {fileID: 4556949082052621437}
   isGetTarget: 0
   speed: 30
   maxFlyTime: 3.5

ActionTowerDefense/Assets/Resources/Spine/ESpirits_Sumrai/ESpirits_Sumrai_Material.mat

@@ -8,7 +8,7 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: ESpirits_Sumrai_Material
-  m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3}
+  m_Shader: {fileID: 4800000, guid: 45495790b394f894a967dbf44489b57b, type: 3}
   m_ValidKeywords: []
   m_InvalidKeywords:
   - _USE8NEIGHBOURHOOD_ON
@@ -29,6 +29,7 @@ Material:
     m_Floats:
     - _Cutoff: 0.1
     - _Fill: 0
+    - _FillPhase: 0
     - _OutlineMipLevel: 0
     - _OutlineOpaqueAlpha: 1
     - _OutlineReferenceTexWidth: 1024
@@ -41,5 +42,6 @@ Material:
     - _Use8Neighbourhood: 1
     - _UseScreenSpaceOutlineWidth: 0
     m_Colors:
+    - _FillColor: {r: 1, g: 1, b: 1, a: 1}
     - _OutlineColor: {r: 1, g: 1, b: 0, a: 1}
   m_BuildTextureStacks: []

ActionTowerDefense/Assets/Scripts/Bullet.cs

@@ -33,6 +33,8 @@ public class Bullet : MonoBehaviour
     [LabelText("停留时间")] public float stopDuration;
     [ShowIf("@bulletType == BulletType.Boomerang")]
     [DisplayOnly] public BoomerangWeaponController BoomerangWeaponController;
+    [ShowIf("@bulletType == BulletType.Boomerang")]
+    public AttackTrigger attackTrigger;
     private Vector3 originalPos;
 
     public bool isGetTarget = false;
@@ -107,12 +109,18 @@ public class Bullet : MonoBehaviour
                 float addTime = backDuration + stopDuration;
                 if (flyTime >= addTime)
                 {
+                    if (attackTrigger.gameObject.activeSelf)
+                    {
+                        trigedObjs.Clear();
+                        attackTrigger.gameObject.SetActive(false);
+                    }
                     transform.position = Vector3.Lerp(originalPos, BoomerangWeaponController.transform.position, (flyTime - addTime) /(maxFlyTime - addTime));
                 }
                 else if(flyTime >= backDuration)
                 {
                     rb.velocity = Vector3.zero;
                     originalPos = transform.position;
+                    attackTrigger.gameObject.SetActive(true);
                 }
                 else
                 {
@@ -166,7 +174,12 @@ public class Bullet : MonoBehaviour
         {
             this.attackMethod = attackMethod;
         }
-        
+        if (attackTrigger)
+        {
+            attackTrigger.owner = owner;
+            attackTrigger.attackMethod = attackMethod;
+            attackTrigger.gameObject.SetActive(false);
+        }
     }
 
     private void GetEffectPos(Collider other)

ActionTowerDefense/Assets/Scripts/Characters/AttackTrigger.cs

@@ -33,7 +33,11 @@ public class AttackTrigger : MonoBehaviour
 
     private void Awake()
     {
-        owner = GetComponentInParent<Character>();
+        Character character = GetComponentInParent<Character>();
+        if (character)
+        {
+            owner = character;
+        }
     }
 
     public virtual void Update()
@@ -48,7 +52,6 @@ public class AttackTrigger : MonoBehaviour
         Character hitOwner = hitTrigger.owner;
         if (hitOwner == null || hitOwner.isDie) return;
         if (isSingleAttack && cantSingleAttack) return;
-
         AttackController attackController = owner.attackController;
         if (!TryGetTargetTypeFromTag(hitOwner.tag, out TargetType otherTargetType)) return;
 

ActionTowerDefense/Assets/Scripts/Skills/BoomerangWeaponController.cs

@@ -62,7 +62,7 @@ public class BoomerangWeaponController : SpecialSkills
             }
             angle = angle / 180 * Mathf.PI;
             dir = new Vector3(Mathf.Cos(angle), Mathf.Sin(angle), 0);
-            bullet.BeShoot(owner, transform.position, dir, true, target: owner.targetCharacter);
+            bullet.BeShoot(owner, transform.position, dir, true, target: owner.targetCharacter, attackMethod: owner.attackController.attackMethod_march[0]);
         }
         isOut = true;
     }

ActionTowerDefense/GenerateDatas/json/cfgcreateenemy1.json

@@ -679,10 +679,10 @@
     "WaveTime": 0,
     "BuildingID": "",
     "BuildingHP": 0,
-    "EnemyName": "风筝忍者",
+    "EnemyName": "盔甲武士",
     "Position": [
       56,
-      8
+      1
     ],
     "StartTime": 0,
     "EndTime": 10,
@@ -779,10 +779,10 @@
     "WaveTime": 0,
     "BuildingID": "",
     "BuildingHP": 0,
-    "EnemyName": "风筝忍者",
+    "EnemyName": "盔甲武士",
     "Position": [
       56,
-      8
+      1
     ],
     "StartTime": 0,
     "EndTime": 10,

ActionTowerDefense/GenerateDatas/json/cfgcreateenemy2.json

@@ -679,7 +679,7 @@
     "WaveTime": 0,
     "BuildingID": "",
     "BuildingHP": 0,
-    "EnemyName": "刺客",
+    "EnemyName": "盔甲武士",
     "Position": [
       56,
       1
@@ -779,7 +779,7 @@
     "WaveTime": 0,
     "BuildingID": "",
     "BuildingHP": 0,
-    "EnemyName": "刺客",
+    "EnemyName": "盔甲武士",
     "Position": [
       56,
       1

ActionTowerDefense/GenerateDatas/json/cfgcreateenemy3.json

@@ -719,7 +719,7 @@
     "WaveTime": 0,
     "BuildingID": "",
     "BuildingHP": 0,
-    "EnemyName": "刺客",
+    "EnemyName": "风车手里剑忍者",
     "Position": [
       56,
       1
@@ -819,7 +819,7 @@
     "WaveTime": 0,
     "BuildingID": "",
     "BuildingHP": 0,
-    "EnemyName": "刺客",
+    "EnemyName": "风车手里剑忍者",
     "Position": [
       56,
       1

ActionTowerDefense/GenerateDatas/json/cfgcreateenemy4.json

@@ -579,7 +579,7 @@
     "WaveTime": 0,
     "BuildingID": "",
     "BuildingHP": 0,
-    "EnemyName": "刺客",
+    "EnemyName": "风车手里剑忍者",
     "Position": [
       56,
       1
@@ -679,7 +679,7 @@
     "WaveTime": 0,
     "BuildingID": "",
     "BuildingHP": 0,
-    "EnemyName": "刺客",
+    "EnemyName": "风车手里剑忍者",
     "Position": [
       56,
       1

ActionTowerDefense/GenerateDatas/json/cfgenemy.json

@@ -352,10 +352,9 @@
       0
     ],
     "HP": 500,
-    "AttackSummon": 50,
+    "AttackSummon": 0,
     "AttackMarch": [
-      30,
-      100
+      10
     ],
     "MinMoveSpeed": 6,
     "MaxMoveSpeed": 8