Cook调整效果，ui大小、一店一串

ActionTowerDefense/Assets/Resources/Prefab/CookEffect.prefab

@@ -14704,7 +14704,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6008376839226252313}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 50, z: 0}
+  m_LocalPosition: {x: 0, y: 1, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:

ActionTowerDefense/Assets/Resources/Prefab/Spirits_Cook.prefab

@@ -9,7 +9,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 6459001683917408033}
-  m_Layer: 12
+  m_Layer: 0
   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: 12
+  m_Layer: 0
   m_Name: AttackTrigger
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -110,7 +110,7 @@ GameObject:
   - component: {fileID: 6069085609270885073}
   - component: {fileID: 5217712517297835056}
   - component: {fileID: 3377671071202039733}
-  m_Layer: 12
+  m_Layer: 0
   m_Name: BeHitTrigger
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -200,7 +200,7 @@ BoxCollider:
   m_GameObject: {fileID: 2885380845639701439}
   m_Material: {fileID: 0}
   m_IsTrigger: 1
-  m_Enabled: 1
+  m_Enabled: 0
   serializedVersion: 2
   m_Size: {x: 8.747494, y: 11.766387, z: 0.1}
   m_Center: {x: -0.09219003, y: 3.3589406, z: 0}
@@ -232,7 +232,7 @@ GameObject:
   - component: {fileID: 5649507295576249902}
   - component: {fileID: 8522714288557735753}
   - component: {fileID: 979388067414062712}
-  m_Layer: 12
+  m_Layer: 0
   m_Name: restMeat
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -367,7 +367,7 @@ GameObject:
   - component: {fileID: 6207242290232856985}
   - component: {fileID: 637278332454425733}
   - component: {fileID: 4259433079752244006}
-  m_Layer: 12
+  m_Layer: 0
   m_Name: BeSearchTrigger
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -460,6 +460,51 @@ BoxCollider:
   serializedVersion: 2
   m_Size: {x: 0, y: 0, z: 1}
   m_Center: {x: 0, y: 0, z: 0}
+--- !u!1 &4579126894259554924
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8922289277778709813}
+  - component: {fileID: 8092833306629620455}
+  m_Layer: 3
+  m_Name: ground
+  m_TagString: Plane
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!4 &8922289277778709813
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4579126894259554924}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 7.64, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 5440846222648032754}
+  m_RootOrder: 4
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!65 &8092833306629620455
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4579126894259554924}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 3.8787084, y: 1, z: 1}
+  m_Center: {x: -1.2794268, y: 0, z: 0}
 --- !u!1 &5041915139224979942
 GameObject:
   m_ObjectHideFlags: 0
@@ -470,7 +515,7 @@ GameObject:
   m_Component:
   - component: {fileID: 901824162977467732}
   - component: {fileID: 2776251058442384869}
-  m_Layer: 12
+  m_Layer: 0
   m_Name: Colliders
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -528,7 +573,7 @@ GameObject:
   - component: {fileID: 5440846222604650428}
   - component: {fileID: 5440846222604650429}
   - component: {fileID: 5440846222604650418}
-  m_Layer: 12
+  m_Layer: 0
   m_Name: Foot
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -587,7 +632,7 @@ GameObject:
   - component: {fileID: 5440846222648032754}
   - component: {fileID: 5440846222648032767}
   - component: {fileID: 5440846222648032765}
-  m_Layer: 12
+  m_Layer: 0
   m_Name: Spirits_Cook
   m_TagString: Demonic
   m_Icon: {fileID: 0}
@@ -610,6 +655,8 @@ Transform:
   - {fileID: 770599430276839403}
   - {fileID: 1709837802563954221}
   - {fileID: 3103190932458336017}
+  - {fileID: 8922289277778709813}
+  - {fileID: 2332805625535433500}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -718,13 +765,13 @@ GameObject:
   - component: {fileID: 1544714013328383648}
   - component: {fileID: 3678245064167135595}
   - component: {fileID: 2659450120544468328}
-  m_Layer: 12
+  m_Layer: 0
   m_Name: dialog
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &1544714013328383648
 RectTransform:
   m_ObjectHideFlags: 0
@@ -734,8 +781,8 @@ RectTransform:
   m_GameObject: {fileID: 6026815487321357762}
   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_LocalScale: {x: 2, y: 2, z: 2}
+  m_ConstrainProportionsScale: 1
   m_Children:
   - {fileID: 5649507295576249902}
   m_Father: {fileID: 3103190932458336017}
@@ -743,7 +790,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 302, y: 377}
+  m_AnchoredPosition: {x: 361, y: 421}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3678245064167135595
@@ -795,7 +842,7 @@ GameObject:
   - component: {fileID: 770599430276839403}
   - component: {fileID: 2932762729738363159}
   - component: {fileID: 826799689842861252}
-  m_Layer: 12
+  m_Layer: 0
   m_Name: SearchTrigger
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -857,7 +904,7 @@ GameObject:
   - component: {fileID: 9134347361501008817}
   - component: {fileID: 3333436509305836838}
   - component: {fileID: 7573527827155227431}
-  m_Layer: 12
+  m_Layer: 0
   m_Name: Spine
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -992,6 +1039,51 @@ MonoBehaviour:
     layerMixModes: 01000000
     layerBlendModes: 01000000
   updateTiming: 1
+--- !u!1 &7219392564388260375
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2332805625535433500}
+  - component: {fileID: 4017189360880258370}
+  m_Layer: 3
+  m_Name: ground (1)
+  m_TagString: Plane
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!4 &2332805625535433500
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7219392564388260375}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 1.96, y: 7.08, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 5440846222648032754}
+  m_RootOrder: 5
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!65 &4017189360880258370
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7219392564388260375}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 3.8787084, y: 1, z: 1}
+  m_Center: {x: -1.2794268, y: 0, z: 0}
 --- !u!1 &8560672494665079236
 GameObject:
   m_ObjectHideFlags: 0
@@ -1004,7 +1096,7 @@ GameObject:
   - component: {fileID: 3837615663371647561}
   - component: {fileID: 5872138694498903774}
   - component: {fileID: 7461681167498147446}
-  m_Layer: 12
+  m_Layer: 0
   m_Name: UI
   m_TagString: Untagged
   m_Icon: {fileID: 0}

ActionTowerDefense/Assets/Scripts/Spirits/Spirits_Cook.cs

@@ -2,6 +2,7 @@ using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 using TMPro;
+using System;
 
 public class Spirits_Cook : MonoBehaviour
 {
@@ -19,8 +20,10 @@ public class Spirits_Cook : MonoBehaviour
     private bool isAct = false;
     public int chuan;
     private bool goAway = false;
+    private GameObject[] customers;
+    private int count;
 
-    private void Start()
+    private void OnEnable()
     {
         cook = transform.parent;
         dem = cook.GetComponent<Demonic>();
@@ -29,18 +32,30 @@ public class Spirits_Cook : MonoBehaviour
         col.enabled = false;
         dia = text.transform.parent.gameObject;
         dia.SetActive(false);
+        customers = new GameObject[chuan];
     }
 
     private void OnTriggerEnter(Collider other)
     {
-        if (other.gameObject.layer == 6)
-        {
-            print(1);
-        }
-        if (!once && other.gameObject.layer == 7 || other.gameObject.layer == 8)
+        if (!once && other.gameObject.layer == 7 || other.gameObject.layer == 8 || other.gameObject.layer == 6)
         {
             GameObject ga = other.transform.parent.parent.parent.gameObject;
             Character ca = ga.GetComponent<Character>();
+            if (Array.IndexOf(customers, ga) == -1)
+            {
+                chuan -= 1;
+                text.text = chuan.ToString();
+                ani.Play("attack_march", 0, 0);
+                ca.HpUp(value);
+                customers[count] = ga;
+                count += 1;
+                Instantiate(effect, ga.transform.position, new Quaternion(0, 0, 0, 0), ga.transform);
+                if (chuan == 0)
+                {
+                    goAway = true;
+                }
+            }
+            /*×ܹ²ÄÃÒ»´®
             if (!ca.hasHpUp)
             {
                 chuan -= 1;
@@ -54,6 +69,7 @@ public class Spirits_Cook : MonoBehaviour
                     goAway = true;
                 }
             }
+            */
         }
     }