使魔血量不对的问题修复，以及使魔创建时的AttackTrigger会产生碰撞的问题修复

ActionTowerDefense/Assets/Resources/PhysicsMaterial/Soul.physicMaterial

@@ -0,0 +1,14 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!134 &13400000
+PhysicMaterial:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Soul
+  dynamicFriction: 1
+  staticFriction: 1
+  bounciness: 0
+  frictionCombine: 3
+  bounceCombine: 0

ActionTowerDefense/Assets/Resources/PhysicsMaterial/Soul.physicMaterial.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 4c155add39c5f9e4e87a906b605d36f3
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 13400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ActionTowerDefense/Assets/Resources/Prefab/Demonic_Giant.prefab

@@ -50,7 +50,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &8927539278125731317
 Transform:
   m_ObjectHideFlags: 0

ActionTowerDefense/Assets/Resources/Prefab/Demonic_Sword.prefab

@@ -515,7 +515,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &3277761006413294872
 Transform:
   m_ObjectHideFlags: 0

ActionTowerDefense/Assets/Resources/Prefab/soul.prefab

@@ -9859,7 +9859,7 @@ BoxCollider:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1723151111827507807}
-  m_Material: {fileID: 0}
+  m_Material: {fileID: 13400000, guid: 4c155add39c5f9e4e87a906b605d36f3, type: 2}
   m_IsTrigger: 0
   m_Enabled: 1
   serializedVersion: 2

ActionTowerDefense/Assets/Scenes/SampleScene.unity

@@ -747,7 +747,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!114 &1714821085
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -789,6 +789,79 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   created: 
+--- !u!1001 &1757208089
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 3719607727864895532, guid: b64733a605bec024db1408835380cd8a, type: 3}
+      propertyPath: hp
+      value: 10000000
+      objectReference: {fileID: 0}
+    - target: {fileID: 3719607727864895532, guid: b64733a605bec024db1408835380cd8a, type: 3}
+      propertyPath: state
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3719607727864895532, guid: b64733a605bec024db1408835380cd8a, type: 3}
+      propertyPath: totalHp
+      value: 10000000
+      objectReference: {fileID: 0}
+    - target: {fileID: 5440846222648032754, guid: b64733a605bec024db1408835380cd8a, type: 3}
+      propertyPath: m_RootOrder
+      value: 8
+      objectReference: {fileID: 0}
+    - target: {fileID: 5440846222648032754, guid: b64733a605bec024db1408835380cd8a, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 100
+      objectReference: {fileID: 0}
+    - target: {fileID: 5440846222648032754, guid: b64733a605bec024db1408835380cd8a, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5440846222648032754, guid: b64733a605bec024db1408835380cd8a, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5440846222648032754, guid: b64733a605bec024db1408835380cd8a, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5440846222648032754, guid: b64733a605bec024db1408835380cd8a, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5440846222648032754, guid: b64733a605bec024db1408835380cd8a, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5440846222648032754, guid: b64733a605bec024db1408835380cd8a, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5440846222648032754, guid: b64733a605bec024db1408835380cd8a, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5440846222648032754, guid: b64733a605bec024db1408835380cd8a, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5440846222648032754, guid: b64733a605bec024db1408835380cd8a, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5440846222648032759, guid: b64733a605bec024db1408835380cd8a, type: 3}
+      propertyPath: m_Name
+      value: Enemy_Giant
+      objectReference: {fileID: 0}
+    - target: {fileID: 8447137249705371152, guid: b64733a605bec024db1408835380cd8a, type: 3}
+      propertyPath: m_Mesh
+      value: 
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: b64733a605bec024db1408835380cd8a, type: 3}
 --- !u!1 &2045679344
 GameObject:
   m_ObjectHideFlags: 0

ActionTowerDefense/Assets/Scripts/AttackTrigger.cs

@@ -37,6 +37,7 @@ public class AttackTrigger : MonoBehaviour
                 trigedObjs.Add(hitTrigger);
                 if (Util.CheckCanHit(owner.tag, hitTrigger.owner.tag) && !hitTrigger.owner.isDie)
                 {
+                    print("BeHit");
                     hitTrigger.BeHit(damage, force, changeHurt, hurtTime, repelValue);
                 }
             }

ActionTowerDefense/Assets/Scripts/Character.cs

@@ -99,6 +99,14 @@ public class Character : MonoBehaviour
         OnState();
     }
 
+    private void OnEnable()
+    {
+        for (int i = 0; i < attackTriggers.Count; i++)
+        {
+            attackTriggers[i].gameObject.SetActive(false);
+        }
+    }
+
     public void Turn()
     {
         bodyTrans.localScale = new Vector3(-bodyTrans.localScale.x, bodyTrans.localScale.y, bodyTrans.localScale.z);

ActionTowerDefense/Assets/Scripts/MoveCharacter.cs

@@ -19,6 +19,7 @@ public class MoveCharacter : Character
 
     public override void BeHit(int damage, Vector3 force, bool changeHurt, float hurtTime, float repelValue)
     {
+        print("MoveCharacterBeHit");
         if (invincibleTime > 0)
         {
             return;
@@ -33,6 +34,7 @@ public class MoveCharacter : Character
         }
         else if (changeHurt && state == CharacterState.Weak)
         {
+            print("ChangeHurt");
             rb.AddForce(force);
             hurtKeepTime = hurtTime;
             ChangeState(CharacterState.Hurt);
@@ -42,6 +44,7 @@ public class MoveCharacter : Character
         beRepelValue -= repelValue;
         if (changeHurt && beRepelValue <= 0)
         {
+            print("ChangeWeak");
             ChangeState(CharacterState.Weak);
         }
     }

ActionTowerDefense/Assets/Scripts/PlayerController.cs

@@ -1019,7 +1019,6 @@ public class PlayerController : MoveCharacter
                 demonic.Turn();
             }
         }
-        demonic.totalHp = 100;
         demonic.Init();
         demonic.SetSortingOrder(id * 1000 + demonicDic[id].Count);
         demonic.Attack1();