WGL 2 meses atrás
pai
commit
07c3bc0e6b

+ 12 - 3
ActionTowerDefense/Assets/Resources/Prefab/MySoldier/Demonic_Sword.prefab

@@ -320,7 +320,7 @@ MonoBehaviour:
   attackMarchId: 0
   summonTime:
   - 0.2
-  - 0.3
+  - 0.2
   - 0.7
   attackMethod_summon:
   - attackName: attack_summon1
@@ -387,14 +387,14 @@ MonoBehaviour:
     shootTrack: 0
     shootAlwaysTrack: 0
     skill: {fileID: 0}
-  - attackName: attack_summon2
+  - attackName: attack_summon1
     attackType: 0
     attackInfo:
       attackValue: 100
       damage: 5
       attackDir: {x: 0, y: 0, z: 0}
       effect: {fileID: 0}
-      attackEffect: 01000000
+      attackEffect: 
       attackMethod_Type: 0
       floatState:
         time: 0
@@ -691,6 +691,15 @@ MonoBehaviour:
       endKeyName: attack_off
       endKeyTime: 0.53333336
     totalTime: 1
+  - aniName: attack_summon4
+    keys:
+    - attackType: 0
+      startKeyName: attack_on
+      startKeyTime: 0.43333337
+      endType: 1
+      endKeyName: attack_off
+      endKeyTime: 0.53333336
+    totalTime: 1
   - aniName: attack_summon05
     keys:
     - attackType: 0

+ 16 - 15
ActionTowerDefense/Assets/Resources/Prefab/Player.prefab

@@ -5673,8 +5673,6 @@ MonoBehaviour:
   meshRenderer: {fileID: 0}
   ani: {fileID: 6197716555580445942}
   totalDieKeepTime: 1.3333334
-  totalAttack_summonTime: 0.5
-  totalAttack_marchTime: 0.5
   showInjuryNum: 1
   injuryNumText: {fileID: 6467251191553420251, guid: 4a700717bc3a50f45bd603f36382651f, type: 3}
   injuryNumTextSummon: {fileID: 0}
@@ -5761,6 +5759,18 @@ MonoBehaviour:
   soulCollector: {fileID: 3739918129319493242}
   skeletonMecanim: {fileID: 6843453365888964567}
   wallTrigger: {fileID: 6725358484711746229}
+  totalSummonTime: 1.233
+  summonTime: 1.233
+  onlySummonTime: 1
+  restSummonTime: 0
+  cacheDir: 0
+  cacheRush: 0
+  cacheSummonTime: 0
+  cacheSummonId: 0
+  nowAttackSummonID: 0
+  AttackSummonChangeTotalTime: 0.5
+  AttackSummonChangeTime: 0
+  lastSoldier: 0
   mp: 0
   totalMp: 450
   totalMp_2Players: 450
@@ -5799,18 +5809,6 @@ MonoBehaviour:
   totalCacheJumpTime: 0.2
   flySpeed: 8
   playerMaxFlyHeight: 0
-  totalSummonTime: 1.233
-  summonTime: 1.233
-  onlySummonTime: 1
-  restSummonTime: 0
-  cacheDir: 0
-  cacheRush: 0
-  cacheSummonTime: 0
-  cacheSummonId: 0
-  nowAttackSummonID: 0
-  AttackSummonChangeTotalTime: 1
-  AttackSummonChangeTime: 0
-  lastSoldier: 0
   demonicNums: []
   cannotConductFXs: []
   demonicPrefabs:
@@ -5946,7 +5944,10 @@ MonoBehaviour:
   attackInterval: 0
   addAttackEffect: {fileID: 0}
   isAttackTriggerOn: 0
+  targetTypes: 
   attackSummonId: 0
+  attackMarchId: 0
+  summonTime: []
   attackMethod_summon: []
   attackMethod_march: []
   curAttackMethod:
@@ -6005,7 +6006,6 @@ MonoBehaviour:
     maxAttackDis: 0
     minAttackDis: 0
     searchMode: 0
-    targetTypes: 
     canHitFly: 0
     armorPiercing: 0
     bulletPrefab: {fileID: 0}
@@ -6275,6 +6275,7 @@ MeshRenderer:
   m_Materials:
   - {fileID: 2100000, guid: 1b17f7962e0b9be49bb10e99c6bd95a6, type: 2}
   - {fileID: 2100000, guid: 0c319badfe2307a48b8810d891649565, type: 2}
+  - {fileID: 2100000, guid: 1b17f7962e0b9be49bb10e99c6bd95a6, type: 2}
   - {fileID: 2100000, guid: 8f08601a75fbb72488593cad9f89acca, type: 2}
   - {fileID: 2100000, guid: 0c319badfe2307a48b8810d891649565, type: 2}
   m_StaticBatchInfo: