Merge branch 'master' of http://bttc123.synology.me:3002/bttc123/ActionTowerDefense

ActionTowerDefense/Assets/Resources/Prefab/FloatEffectRange.prefab

@@ -57,7 +57,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 417478504669294145}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: e4ee37ae96a7315419ecbfe1bb3c43e9, type: 3}
   m_Name: 

ActionTowerDefense/Assets/Resources/Prefab/Spirits_Cook.prefab

@@ -9,7 +9,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 6459001683917408033}
-  m_Layer: 7
+  m_Layer: 12
   m_Name: Body
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -44,7 +44,7 @@ GameObject:
   - component: {fileID: 8927539278125731317}
   - component: {fileID: 77275286589392561}
   - component: {fileID: 7729941002223262554}
-  m_Layer: 0
+  m_Layer: 12
   m_Name: AttackTrigger
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -97,6 +97,8 @@ MonoBehaviour:
   force: {x: 0, y: 0, z: 0}
   changeHurt: 0
   repelValue: 0
+  spiritsAttackEffect: {fileID: 0}
+  offsetY: 1
 --- !u!1 &2460330936527559963
 GameObject:
   m_ObjectHideFlags: 0
@@ -108,7 +110,7 @@ GameObject:
   - component: {fileID: 6069085609270885073}
   - component: {fileID: 5217712517297835056}
   - component: {fileID: 3377671071202039733}
-  m_Layer: 7
+  m_Layer: 12
   m_Name: BeHitTrigger
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -167,7 +169,7 @@ GameObject:
   - component: {fileID: 1709837802563954221}
   - component: {fileID: 5459908402034348056}
   - component: {fileID: 6880746539854057010}
-  m_Layer: 0
+  m_Layer: 12
   m_Name: EffectTrigger
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -200,7 +202,7 @@ BoxCollider:
   m_IsTrigger: 1
   m_Enabled: 1
   serializedVersion: 2
-  m_Size: {x: 8.747494, y: 11.766387, z: 0}
+  m_Size: {x: 8.747494, y: 11.766387, z: 0.1}
   m_Center: {x: -0.09219003, y: 3.3589406, z: 0}
 --- !u!114 &6880746539854057010
 MonoBehaviour:
@@ -226,7 +228,7 @@ GameObject:
   - component: {fileID: 6207242290232856985}
   - component: {fileID: 637278332454425733}
   - component: {fileID: 4259433079752244006}
-  m_Layer: 0
+  m_Layer: 12
   m_Name: BeSearchTrigger
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -284,7 +286,7 @@ GameObject:
   m_Component:
   - component: {fileID: 5669356131851076493}
   - component: {fileID: 925594141286007562}
-  m_Layer: 7
+  m_Layer: 12
   m_Name: BodyCollider
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -329,7 +331,7 @@ GameObject:
   m_Component:
   - component: {fileID: 901824162977467732}
   - component: {fileID: 2776251058442384869}
-  m_Layer: 7
+  m_Layer: 12
   m_Name: Colliders
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -387,7 +389,7 @@ GameObject:
   - component: {fileID: 5440846222604650428}
   - component: {fileID: 5440846222604650429}
   - component: {fileID: 5440846222604650418}
-  m_Layer: 0
+  m_Layer: 12
   m_Name: Foot
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -446,7 +448,7 @@ GameObject:
   - component: {fileID: 5440846222648032754}
   - component: {fileID: 5440846222648032767}
   - component: {fileID: 5440846222648032765}
-  m_Layer: 7
+  m_Layer: 12
   m_Name: Spirits_Cook
   m_TagString: Demonic
   m_Icon: {fileID: 0}
@@ -514,14 +516,14 @@ MonoBehaviour:
   totalInvincibleTime: 0
   targetCharacter: {fileID: 0}
   searchTrigger: {fileID: 2932762729738363159}
-  targetTypes: 0400000005000000
+  targetTypes: 
   canHitFly: 0
   linked: 0
   joint: {fileID: 0}
   rope: {fileID: 0}
   foot: {fileID: 5440846222604650418}
-  extraRiseGravity: -28.8
-  extraFallGravity: -14.4
+  extraRiseGravity: 0
+  extraFallGravity: 0
   moveSpeed: 0
   beRepelValue: 0
   totalBeRepelValue: 0
@@ -575,7 +577,7 @@ GameObject:
   - component: {fileID: 770599430276839403}
   - component: {fileID: 2932762729738363159}
   - component: {fileID: 826799689842861252}
-  m_Layer: 0
+  m_Layer: 12
   m_Name: SearchTrigger
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -637,7 +639,7 @@ GameObject:
   - component: {fileID: 2385850797131186543}
   - component: {fileID: 5461569872495115226}
   - component: {fileID: 478072938412589135}
-  m_Layer: 8
+  m_Layer: 12
   m_Name: HP
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -744,7 +746,7 @@ GameObject:
   - component: {fileID: 9134347361501008817}
   - component: {fileID: 3333436509305836838}
   - component: {fileID: 7573527827155227431}
-  m_Layer: 7
+  m_Layer: 12
   m_Name: Spine
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -890,7 +892,7 @@ GameObject:
   - component: {fileID: 7669562854251313917}
   - component: {fileID: 1285053876064302063}
   - component: {fileID: 891910447640254832}
-  m_Layer: 8
+  m_Layer: 12
   m_Name: Progress
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -967,7 +969,7 @@ GameObject:
   - component: {fileID: 3837615663371647561}
   - component: {fileID: 5872138694498903774}
   - component: {fileID: 7461681167498147446}
-  m_Layer: 8
+  m_Layer: 12
   m_Name: UI
   m_TagString: Untagged
   m_Icon: {fileID: 0}

ActionTowerDefense/Assets/Scripts/Demonic.cs

@@ -11,6 +11,7 @@ public class Demonic : MoveCharacter
     public SearchState searchState;
     public float attackDistance;
     public bool canFly = false;
+    public bool isNonAttack = false;  //²»¹¥»÷¡¢²»±»¹¥»÷
     public int sortingOrder = 0;
 
     public int playerID;
@@ -28,8 +29,11 @@ public class Demonic : MoveCharacter
 
     public override void FixedUpdate()
     {
-        OnSearchState();
-        OnState();
+        if (!isNonAttack)
+        {
+            OnSearchState();
+            OnState();
+        }
     }
 
     public bool SearchTarget()

ActionTowerDefense/Assets/Scripts/Spirits/Spirits_Cook.cs

@@ -8,8 +8,10 @@ public class Spirits_Cook : MonoBehaviour
 
     private void OnTriggerEnter(Collider other)
     {
+        print(other.gameObject.layer);
         if (other.gameObject.layer == 7 || other.gameObject.layer == 8)
         {
+            print(1);
             GameObject ga = other.transform.parent.parent.parent.gameObject;
             ga.GetComponent<Character>().HpUp(value);
         }