SZAND\msx_2 5 hónapja
szülő
commit
d29c7130a9

+ 32 - 32
ActionTowerDefense/Assets/Resources/Prefab/MySoldier/Demonic_Arrow.prefab

@@ -106,38 +106,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 1d04dd6e35d71724689001e450625c39, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  haveNewSpecialStates: 0
-  attackInfo:
-    attackValue: 0
-    damage: 0
-    attackDir: {x: 0, y: 0, z: 0}
-    attackEffect: 
-    floatState:
-      time: 0
-      upTime: {x: 0, y: 0}
-      backSpeed: {x: 0, y: 0}
-      rotateSpeed: {x: 0, y: 0}
-      height: {x: 0, y: 0}
-    blowUp:
-      dir: {x: 0, y: 0, z: 0}
-      force: 0
-      time: 0
-    shotDown:
-      dir: {x: 0, y: 0, z: 0}
-      force: 0
-      time: 0
-    weak:
-      time: 0
-    armor:
-      rate: 0
-    vulnerable:
-      rate: 0
-      time: 0
-    changeDamage:
-      rate: 0
-    sustainedInjury:
-      damage: 0
-  attackFrom: {fileID: 0}
   curSpecialStates: -1
   attributeTime: 0
   floatingState: 0
@@ -169,6 +137,37 @@ MonoBehaviour:
   isFreeze: 0
   canFreeze: 0
   curCharacterState: 0
+  attackInfoData:
+    attackValue: 0
+    damage: 0
+    attackDir: {x: 0, y: 0, z: 0}
+    attackEffect: 
+    floatState:
+      time: 0
+      upTime: {x: 0, y: 0}
+      backSpeed: {x: 0, y: 0}
+      rotateSpeed: {x: 0, y: 0}
+      height: {x: 0, y: 0}
+    blowUp:
+      dir: {x: 0, y: 0, z: 0}
+      force: 0
+      time: 0
+    shotDown:
+      dir: {x: 0, y: 0, z: 0}
+      force: 0
+      time: 0
+    weak:
+      time: 0
+    armor:
+      rate: 0
+    vulnerable:
+      rate: 0
+      time: 0
+    changeDamage:
+      rate: 0
+    sustainedInjury:
+      damage: 0
+  attackFromData: {fileID: 0}
   hitStunTime: 0
   canHitStun: 0
 --- !u!1 &1637528673901708253
@@ -1235,6 +1234,7 @@ MonoBehaviour:
   sustainedInjury_IntervalTime: 0
   sustainedInjury_damage: 0
   heavyDamage: 0
+  soldierType: 1
   player: {fileID: 0}
   playerID: 0
   id: 0

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

@@ -620,6 +620,7 @@ MonoBehaviour:
   sustainedInjury_IntervalTime: 0
   sustainedInjury_damage: 0
   heavyDamage: 0
+  soldierType: 2
   player: {fileID: 0}
   playerID: 0
   id: 0

+ 2 - 1
ActionTowerDefense/Assets/Scripts/Characters/Demonic.cs

@@ -7,11 +7,12 @@ using UnityEngine;
 public class Demonic : MoveCharacter
 {
     [Header("友方单位属性")]
+    public SoldierType soldierType;      //当前士兵属于什么兵种
     public PlayerController player;      //召唤师
     public int playerID;
     public int id;
     public float costMp = 10;
-    public bool isBack = false;         //往反方向走
+    public bool isBack = false;          //往反方向走
     public int baseSortingOrder;
     public float runSpeed;
     public float summonTime;

+ 1 - 0
ActionTowerDefense/Assets/Scripts/GameManager.cs

@@ -15,6 +15,7 @@ public class GameManager : MonoBehaviour
     public UIHP p1uiMP;
     public GameObject[] demonicNum;
     public TextMeshProUGUI text;
+    public SoldierType[] curSoldiers;   //本局游戏选择的三个士兵
 
     private JSONNode Loader(string fileName)
     {