暂存

ActionTowerDefense/Assets/Resources/Prefab/Base/Base_Assassin.prefab

@@ -70,7 +70,7 @@ GameObject:
   - component: {fileID: 2437299196472462364}
   - component: {fileID: 2437299196472462355}
   - component: {fileID: 2291517641544057181}
-  m_Layer: 7
+  m_Layer: 12
   m_Name: Base_Assassin
   m_TagString: Demonic
   m_Icon: {fileID: 0}
@@ -133,7 +133,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 2730232521377132808}
-  m_Layer: 7
+  m_Layer: 12
   m_Name: Body
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -169,7 +169,7 @@ GameObject:
   - component: {fileID: 2459340336965010942}
   - component: {fileID: 6496896669866891404}
   - component: {fileID: 5617185463097218335}
-  m_Layer: 7
+  m_Layer: 12
   m_Name: Spine
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -309,14 +309,50 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 2437299196472462364}
     m_Modifications:
+    - target: {fileID: 528089144437316827, guid: d5ff5851068cad54aa3b23c838e7137f, type: 3}
+      propertyPath: m_Layer
+      value: 12
+      objectReference: {fileID: 0}
+    - target: {fileID: 1265702476978558143, guid: d5ff5851068cad54aa3b23c838e7137f, type: 3}
+      propertyPath: m_Layer
+      value: 12
+      objectReference: {fileID: 0}
     - target: {fileID: 1351829392413555710, guid: d5ff5851068cad54aa3b23c838e7137f, type: 3}
       propertyPath: m_Name
       value: Buttons
       objectReference: {fileID: 0}
+    - target: {fileID: 1351829392413555710, guid: d5ff5851068cad54aa3b23c838e7137f, type: 3}
+      propertyPath: m_Layer
+      value: 12
+      objectReference: {fileID: 0}
     - target: {fileID: 1351829392413555710, guid: d5ff5851068cad54aa3b23c838e7137f, type: 3}
       propertyPath: m_IsActive
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 1434017015877506114, guid: d5ff5851068cad54aa3b23c838e7137f, type: 3}
+      propertyPath: m_Layer
+      value: 12
+      objectReference: {fileID: 0}
+    - target: {fileID: 1868725208710492112, guid: d5ff5851068cad54aa3b23c838e7137f, type: 3}
+      propertyPath: m_Layer
+      value: 12
+      objectReference: {fileID: 0}
+    - target: {fileID: 2534707594638011052, guid: d5ff5851068cad54aa3b23c838e7137f, type: 3}
+      propertyPath: m_Layer
+      value: 12
+      objectReference: {fileID: 0}
+    - target: {fileID: 2720328707723941399, guid: d5ff5851068cad54aa3b23c838e7137f, type: 3}
+      propertyPath: m_Layer
+      value: 12
+      objectReference: {fileID: 0}
+    - target: {fileID: 2835046776967294343, guid: d5ff5851068cad54aa3b23c838e7137f, type: 3}
+      propertyPath: m_Layer
+      value: 12
+      objectReference: {fileID: 0}
+    - target: {fileID: 4665200230017718000, guid: d5ff5851068cad54aa3b23c838e7137f, type: 3}
+      propertyPath: m_Layer
+      value: 12
+      objectReference: {fileID: 0}
     - target: {fileID: 8286019101453379408, guid: d5ff5851068cad54aa3b23c838e7137f, type: 3}
       propertyPath: m_RootOrder
       value: 1
@@ -377,6 +413,10 @@ PrefabInstance:
       propertyPath: m_ConstrainProportionsScale
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 8542520545593314213, guid: d5ff5851068cad54aa3b23c838e7137f, type: 3}
+      propertyPath: m_Layer
+      value: 12
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: d5ff5851068cad54aa3b23c838e7137f, type: 3}
 --- !u!4 &2780628981813817915 stripped

ActionTowerDefense/Assets/Resources/Prefab/Base/Base_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}
@@ -43,7 +43,7 @@ GameObject:
   - component: {fileID: 5440846222648032754}
   - component: {fileID: 5440846222648032765}
   - component: {fileID: 5864420353083440438}
-  m_Layer: 7
+  m_Layer: 12
   m_Name: Base_Cook
   m_TagString: Demonic
   m_Icon: {fileID: 0}
@@ -110,7 +110,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}
@@ -312,14 +312,50 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 5440846222648032754}
     m_Modifications:
+    - target: {fileID: 528089144437316827, guid: d5ff5851068cad54aa3b23c838e7137f, type: 3}
+      propertyPath: m_Layer
+      value: 12
+      objectReference: {fileID: 0}
+    - target: {fileID: 1265702476978558143, guid: d5ff5851068cad54aa3b23c838e7137f, type: 3}
+      propertyPath: m_Layer
+      value: 12
+      objectReference: {fileID: 0}
     - target: {fileID: 1351829392413555710, guid: d5ff5851068cad54aa3b23c838e7137f, type: 3}
       propertyPath: m_Name
       value: Buttons
       objectReference: {fileID: 0}
+    - target: {fileID: 1351829392413555710, guid: d5ff5851068cad54aa3b23c838e7137f, type: 3}
+      propertyPath: m_Layer
+      value: 12
+      objectReference: {fileID: 0}
     - target: {fileID: 1351829392413555710, guid: d5ff5851068cad54aa3b23c838e7137f, type: 3}
       propertyPath: m_IsActive
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 1434017015877506114, guid: d5ff5851068cad54aa3b23c838e7137f, type: 3}
+      propertyPath: m_Layer
+      value: 12
+      objectReference: {fileID: 0}
+    - target: {fileID: 1868725208710492112, guid: d5ff5851068cad54aa3b23c838e7137f, type: 3}
+      propertyPath: m_Layer
+      value: 12
+      objectReference: {fileID: 0}
+    - target: {fileID: 2534707594638011052, guid: d5ff5851068cad54aa3b23c838e7137f, type: 3}
+      propertyPath: m_Layer
+      value: 12
+      objectReference: {fileID: 0}
+    - target: {fileID: 2720328707723941399, guid: d5ff5851068cad54aa3b23c838e7137f, type: 3}
+      propertyPath: m_Layer
+      value: 12
+      objectReference: {fileID: 0}
+    - target: {fileID: 2835046776967294343, guid: d5ff5851068cad54aa3b23c838e7137f, type: 3}
+      propertyPath: m_Layer
+      value: 12
+      objectReference: {fileID: 0}
+    - target: {fileID: 4665200230017718000, guid: d5ff5851068cad54aa3b23c838e7137f, type: 3}
+      propertyPath: m_Layer
+      value: 12
+      objectReference: {fileID: 0}
     - target: {fileID: 8286019101453379408, guid: d5ff5851068cad54aa3b23c838e7137f, type: 3}
       propertyPath: m_RootOrder
       value: 1
@@ -380,6 +416,10 @@ PrefabInstance:
       propertyPath: m_ConstrainProportionsScale
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 8542520545593314213, guid: d5ff5851068cad54aa3b23c838e7137f, type: 3}
+      propertyPath: m_Layer
+      value: 12
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: d5ff5851068cad54aa3b23c838e7137f, type: 3}
 --- !u!1 &176063741872051216 stripped

ActionTowerDefense/Assets/Resources/Prefab/Base/Base_Float.prefab

@@ -13,7 +13,7 @@ GameObject:
   - component: {fileID: 5313599660676682037}
   - component: {fileID: 5978259926173120695}
   - component: {fileID: 3354085511906294621}
-  m_Layer: 7
+  m_Layer: 12
   m_Name: Spine
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -157,7 +157,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 5769591908339262981}
-  m_Layer: 7
+  m_Layer: 12
   m_Name: Body
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -250,7 +250,7 @@ GameObject:
   - component: {fileID: 8639832132491289354}
   - component: {fileID: 8639832132491289349}
   - component: {fileID: 5178655773445046822}
-  m_Layer: 7
+  m_Layer: 12
   m_Name: Base_Float
   m_TagString: Demonic
   m_Icon: {fileID: 0}
@@ -311,14 +311,50 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 8639832132491289354}
     m_Modifications:
+    - target: {fileID: 528089144437316827, guid: d5ff5851068cad54aa3b23c838e7137f, type: 3}
+      propertyPath: m_Layer
+      value: 12
+      objectReference: {fileID: 0}
+    - target: {fileID: 1265702476978558143, guid: d5ff5851068cad54aa3b23c838e7137f, type: 3}
+      propertyPath: m_Layer
+      value: 12
+      objectReference: {fileID: 0}
     - target: {fileID: 1351829392413555710, guid: d5ff5851068cad54aa3b23c838e7137f, type: 3}
       propertyPath: m_Name
       value: Buttons
       objectReference: {fileID: 0}
+    - target: {fileID: 1351829392413555710, guid: d5ff5851068cad54aa3b23c838e7137f, type: 3}
+      propertyPath: m_Layer
+      value: 12
+      objectReference: {fileID: 0}
     - target: {fileID: 1351829392413555710, guid: d5ff5851068cad54aa3b23c838e7137f, type: 3}
       propertyPath: m_IsActive
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 1434017015877506114, guid: d5ff5851068cad54aa3b23c838e7137f, type: 3}
+      propertyPath: m_Layer
+      value: 12
+      objectReference: {fileID: 0}
+    - target: {fileID: 1868725208710492112, guid: d5ff5851068cad54aa3b23c838e7137f, type: 3}
+      propertyPath: m_Layer
+      value: 12
+      objectReference: {fileID: 0}
+    - target: {fileID: 2534707594638011052, guid: d5ff5851068cad54aa3b23c838e7137f, type: 3}
+      propertyPath: m_Layer
+      value: 12
+      objectReference: {fileID: 0}
+    - target: {fileID: 2720328707723941399, guid: d5ff5851068cad54aa3b23c838e7137f, type: 3}
+      propertyPath: m_Layer
+      value: 12
+      objectReference: {fileID: 0}
+    - target: {fileID: 2835046776967294343, guid: d5ff5851068cad54aa3b23c838e7137f, type: 3}
+      propertyPath: m_Layer
+      value: 12
+      objectReference: {fileID: 0}
+    - target: {fileID: 4665200230017718000, guid: d5ff5851068cad54aa3b23c838e7137f, type: 3}
+      propertyPath: m_Layer
+      value: 12
+      objectReference: {fileID: 0}
     - target: {fileID: 8286019101453379408, guid: d5ff5851068cad54aa3b23c838e7137f, type: 3}
       propertyPath: m_RootOrder
       value: 1
@@ -379,6 +415,10 @@ PrefabInstance:
       propertyPath: m_ConstrainProportionsScale
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 8542520545593314213, guid: d5ff5851068cad54aa3b23c838e7137f, type: 3}
+      propertyPath: m_Layer
+      value: 12
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: d5ff5851068cad54aa3b23c838e7137f, type: 3}
 --- !u!1 &1327431238306345008 stripped

ActionTowerDefense/Assets/Resources/Prefab/Base/Base_Invisible.prefab

@@ -70,7 +70,7 @@ GameObject:
   - component: {fileID: 2437299196472462364}
   - component: {fileID: 2472120008162019348}
   - component: {fileID: 7707673782831041915}
-  m_Layer: 7
+  m_Layer: 12
   m_Name: Base_Invisible
   m_TagString: Demonic
   m_Icon: {fileID: 0}
@@ -122,8 +122,8 @@ BoxCollider:
   m_IsTrigger: 0
   m_Enabled: 1
   serializedVersion: 2
-  m_Size: {x: 3.674779, y: 5.445916, z: 1}
-  m_Center: {x: 0, y: 0.92171407, z: 0}
+  m_Size: {x: 5.3848886, y: 6.1150904, z: 1}
+  m_Center: {x: 2.4164586, y: 0.587127, z: 0}
 --- !u!1001 &4885845469829599855
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -131,14 +131,50 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 2437299196472462364}
     m_Modifications:
+    - target: {fileID: 528089144437316827, guid: d5ff5851068cad54aa3b23c838e7137f, type: 3}
+      propertyPath: m_Layer
+      value: 12
+      objectReference: {fileID: 0}
+    - target: {fileID: 1265702476978558143, guid: d5ff5851068cad54aa3b23c838e7137f, type: 3}
+      propertyPath: m_Layer
+      value: 12
+      objectReference: {fileID: 0}
     - target: {fileID: 1351829392413555710, guid: d5ff5851068cad54aa3b23c838e7137f, type: 3}
       propertyPath: m_Name
       value: Buttons
       objectReference: {fileID: 0}
+    - target: {fileID: 1351829392413555710, guid: d5ff5851068cad54aa3b23c838e7137f, type: 3}
+      propertyPath: m_Layer
+      value: 12
+      objectReference: {fileID: 0}
     - target: {fileID: 1351829392413555710, guid: d5ff5851068cad54aa3b23c838e7137f, type: 3}
       propertyPath: m_IsActive
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 1434017015877506114, guid: d5ff5851068cad54aa3b23c838e7137f, type: 3}
+      propertyPath: m_Layer
+      value: 12
+      objectReference: {fileID: 0}
+    - target: {fileID: 1868725208710492112, guid: d5ff5851068cad54aa3b23c838e7137f, type: 3}
+      propertyPath: m_Layer
+      value: 12
+      objectReference: {fileID: 0}
+    - target: {fileID: 2534707594638011052, guid: d5ff5851068cad54aa3b23c838e7137f, type: 3}
+      propertyPath: m_Layer
+      value: 12
+      objectReference: {fileID: 0}
+    - target: {fileID: 2720328707723941399, guid: d5ff5851068cad54aa3b23c838e7137f, type: 3}
+      propertyPath: m_Layer
+      value: 12
+      objectReference: {fileID: 0}
+    - target: {fileID: 2835046776967294343, guid: d5ff5851068cad54aa3b23c838e7137f, type: 3}
+      propertyPath: m_Layer
+      value: 12
+      objectReference: {fileID: 0}
+    - target: {fileID: 4665200230017718000, guid: d5ff5851068cad54aa3b23c838e7137f, type: 3}
+      propertyPath: m_Layer
+      value: 12
+      objectReference: {fileID: 0}
     - target: {fileID: 8286019101453379408, guid: d5ff5851068cad54aa3b23c838e7137f, type: 3}
       propertyPath: m_RootOrder
       value: 1
@@ -157,11 +193,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8286019101453379408, guid: d5ff5851068cad54aa3b23c838e7137f, type: 3}
       propertyPath: m_LocalPosition.x
-      value: 1.73
+      value: 2.93
       objectReference: {fileID: 0}
     - target: {fileID: 8286019101453379408, guid: d5ff5851068cad54aa3b23c838e7137f, type: 3}
       propertyPath: m_LocalPosition.y
-      value: 0.67
+      value: -0.78
       objectReference: {fileID: 0}
     - target: {fileID: 8286019101453379408, guid: d5ff5851068cad54aa3b23c838e7137f, type: 3}
       propertyPath: m_LocalPosition.z
@@ -199,6 +235,10 @@ PrefabInstance:
       propertyPath: m_ConstrainProportionsScale
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 8542520545593314213, guid: d5ff5851068cad54aa3b23c838e7137f, type: 3}
+      propertyPath: m_Layer
+      value: 12
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: d5ff5851068cad54aa3b23c838e7137f, type: 3}
 --- !u!4 &3545415827725481279 stripped
@@ -218,6 +258,18 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 2437299196472462364}
     m_Modifications:
+    - target: {fileID: 79848569989908378, guid: 7a1ed32670b9b2e4e9b10e0632c36180, type: 3}
+      propertyPath: m_Layer
+      value: 12
+      objectReference: {fileID: 0}
+    - target: {fileID: 800443680523389510, guid: 7a1ed32670b9b2e4e9b10e0632c36180, type: 3}
+      propertyPath: m_Layer
+      value: 12
+      objectReference: {fileID: 0}
+    - target: {fileID: 1599962617482703164, guid: 7a1ed32670b9b2e4e9b10e0632c36180, type: 3}
+      propertyPath: m_Layer
+      value: 12
+      objectReference: {fileID: 0}
     - target: {fileID: 1728146240354057056, guid: 7a1ed32670b9b2e4e9b10e0632c36180, type: 3}
       propertyPath: m_LocalPosition.x
       value: 0
@@ -250,6 +302,18 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: -54.046
       objectReference: {fileID: 0}
+    - target: {fileID: 6775899337404721144, guid: 7a1ed32670b9b2e4e9b10e0632c36180, type: 3}
+      propertyPath: m_Layer
+      value: 12
+      objectReference: {fileID: 0}
+    - target: {fileID: 6957758371108743249, guid: 7a1ed32670b9b2e4e9b10e0632c36180, type: 3}
+      propertyPath: ShapeModule.type
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6957758371108743249, guid: 7a1ed32670b9b2e4e9b10e0632c36180, type: 3}
+      propertyPath: ShapeModule.radiusThickness
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 7473170563405908937, guid: 7a1ed32670b9b2e4e9b10e0632c36180, type: 3}
       propertyPath: m_RootOrder
       value: 0
@@ -300,7 +364,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7473170563405908938, guid: 7a1ed32670b9b2e4e9b10e0632c36180, type: 3}
       propertyPath: m_Layer
-      value: 7
+      value: 12
+      objectReference: {fileID: 0}
+    - target: {fileID: 8530665648963853532, guid: 7a1ed32670b9b2e4e9b10e0632c36180, type: 3}
+      propertyPath: m_Layer
+      value: 12
+      objectReference: {fileID: 0}
+    - target: {fileID: 8861624521426297746, guid: 7a1ed32670b9b2e4e9b10e0632c36180, type: 3}
+      propertyPath: m_Layer
+      value: 12
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 7a1ed32670b9b2e4e9b10e0632c36180, type: 3}

ActionTowerDefense/Assets/Scenes/SampleScene.unity

@@ -15889,8 +15889,6 @@ MonoBehaviour:
   isChoosing: {fileID: 21300000, guid: 7c5e1ab1829cae74080d0472e6cfbd7d, type: 3}
   isSelected: {fileID: 21300000, guid: e40889a5e19f152448a2de0798f6b6a6, type: 3}
   keepTime: 2
-  curCheckSpirit: {fileID: 0}
-  isCurCheckSpiritChange: 0
 --- !u!4 &970449925
 Transform:
   m_ObjectHideFlags: 0
@@ -16122,7 +16120,7 @@ AudioSource:
   m_Enabled: 1
   serializedVersion: 4
   OutputAudioMixerGroup: {fileID: 0}
-  m_audioClip: {fileID: 8300000, guid: 5cc780f17d1addc488ab6b860b775ee3, type: 3}
+  m_audioClip: {fileID: 8300000, guid: 0fad13ed28ec81843b2169eb24a884f3, type: 3}
   m_PlayOnAwake: 1
   m_Volume: 1
   m_Pitch: 1
@@ -29616,22 +29614,22 @@ MonoBehaviour:
   - spiritPrefab: {fileID: 8639832132491289359, guid: 4af781eb437434d48b6ad6d3816771e8, type: 3}
     type: 0
     quality: 0
-    corpse: 0
+    corpse: 20
     introduction: {fileID: 0}
   - spiritPrefab: {fileID: 5440846222648032759, guid: 60377cb19b4e5e2479fc1a15ec044a7d, type: 3}
     type: 2
     quality: 0
-    corpse: 0
+    corpse: 20
     introduction: {fileID: 0}
   - spiritPrefab: {fileID: 2437299196472462361, guid: 379837406bb87e445bf55a9b3ec14e6c, type: 3}
     type: 1
     quality: 0
-    corpse: 0
+    corpse: 20
     introduction: {fileID: 0}
   - spiritPrefab: {fileID: 2437299196472462361, guid: 8489325390fb140489cba3dec98fd048, type: 3}
     type: 3
     quality: 0
-    corpse: 0
+    corpse: 20
     introduction: {fileID: 0}
   times: 6
   qualityBackgrounds:

ActionTowerDefense/Assets/Scripts/PlayerController.cs

@@ -440,9 +440,22 @@ public class PlayerController : MoveCharacter
 
     void OnSummon0Up()
     {
-        if (SpiritSystem.isXbtnDown)
+        switch (playerId)
         {
-            SpiritSystem.isXbtnDown = false;
+            case 0:
+                if (SpiritSystem.isXbtnDown1)
+                {
+                    SpiritSystem.isXbtnDown1 = false;
+                }
+                break;
+            case 1:
+                if (SpiritSystem.isXbtnDown2)
+                {
+                    SpiritSystem.isXbtnDown2 = false;
+                }
+                break;
+            default:
+                break;
         }
     }
 
@@ -543,7 +556,17 @@ public class PlayerController : MoveCharacter
             }
             else
             {
-                SpiritSystem.isXbtnDown = true;
+                switch (playerId)
+                {
+                    case 0:
+                        SpiritSystem.isXbtnDown1 = true;
+                        break;
+                    case 1:
+                        SpiritSystem.isXbtnDown2 = true;
+                        break;
+                    default:
+                        break;
+                }
             }
             return true;
         }
@@ -568,7 +591,17 @@ public class PlayerController : MoveCharacter
             }
             else
             {
-                SpiritSystem.isBbtnDown = true;
+                switch (playerId)
+                {
+                    case 0:
+                        SpiritSystem.isBbtnDown1 = true;
+                        break;
+                    case 1:
+                        SpiritSystem.isBbtnDown2 = true;
+                        break;
+                    default:
+                        break;
+                }
             }
             return true;
         }

ActionTowerDefense/Assets/Scripts/Spirits/Base_Spirits.cs

@@ -12,6 +12,11 @@ public class Base_Spirits : MonoBehaviour
 
     private GameObject spirit;
 
+    public int needCorpse;
+
+    private PlayerController pc;
+    private int id;
+
     private void Start()
     {
         Xhold = buttons.transform.GetChild(1).GetComponent<SpriteRenderer>().material;
@@ -26,38 +31,87 @@ public class Base_Spirits : MonoBehaviour
 
     private void OnTriggerEnter(Collider other)
     {
-        if (other.gameObject.layer == 6)
+        if (other.gameObject.layer == 6 && aa == 0)
         {
-            PlayerController pc = other.GetComponentInParent<PlayerController>();
+            pc = other.GetComponentInParent<PlayerController>();
+            id = pc.playerId;
+            switch (id)
+            {
+                case 0:
+                    SpiritSystem.ChangeCheckSpirit(buttons, 0);
+                    break;
+                case 1:
+                    SpiritSystem.ChangeCheckSpirit(buttons, 1);
+                    break;
+                default:
+                    break;
+            }
             pc.isBaseBtnOut = true;
             buttons.SetActive(true);
-            aa = 0;
-            XHoldEffect(aa);
         }
     }
 
+    private void OnDisable()
+    {
+        buttons.SetActive(false);
+        aa = 0;
+        XHoldEffect(aa);
+    }
+
     private void OnTriggerExit(Collider other)
     {
         if (other.gameObject.layer == 6)
         {
-            PlayerController pc = other.GetComponentInParent<PlayerController>();
             pc.isBaseBtnOut = false;
             buttons.SetActive(false);
             aa = 0;
             XHoldEffect(aa);
+            switch (id)
+            {
+                case 0:
+                    if (SpiritSystem.curCheckSpirit1 == buttons)
+                    {
+                        SpiritSystem.curCheckSpirit1 = null;
+                    }
+                    break;
+                case 1:
+                    if (SpiritSystem.curCheckSpirit2 == buttons)
+                    {
+                        SpiritSystem.curCheckSpirit2 = null;
+                    }
+                    break;
+                default:
+                    break;
+            }
         }
     }
 
     private void Update()
     {
-        if (SpiritSystem.isXbtnDown)
+        if (id == 0 && SpiritSystem.isXbtnDown1 || id == 1 && SpiritSystem.isXbtnDown2)
         {
             aa += speed * Time.deltaTime;
             XHoldEffect(aa);
             if (aa >= 1)
             {
-                print(1);
-                spirit.SetActive(false);
+                if (Corpse.allCorpsesNum >= needCorpse)
+                {
+                    switch (id)
+                    {
+                        case 0:
+                            SpiritSystem.isGainNewSpirit1 = true;
+                            break;
+                        case 1:
+                            SpiritSystem.isGainNewSpirit2 = true;
+                            break;
+                        default:
+                            break;
+                    }
+                }
+                else
+                {
+                    Corpse.isLackCorpse = true;
+                }
             }
         }
         else

ActionTowerDefense/Assets/Scripts/Spirits/Corpse.cs

@@ -8,12 +8,24 @@ public class Corpse : MonoBehaviour
     static public int allCorpsesNum;
     public TextMeshProUGUI text;    //ÒÑÓÐʬÌåÊýÁ¿ÏÔʾ
     static public bool isChange = false;
+    static public bool isLackCorpse = false;
 
     private void TextChange()
     {
         text.text = allCorpsesNum.ToString();
     }
 
+    private void CorpseLack()
+    {
+        text.color = Color.red;
+        Invoke("ColorReturn", 0.3f);
+    }
+
+    private void ColorReturn()
+    {
+        text.color = Color.white;
+    }
+
     private void Update()
     {
         if (isChange)
@@ -21,6 +33,11 @@ public class Corpse : MonoBehaviour
             isChange = false;
             TextChange();
         }
+        if (isLackCorpse)
+        {
+            isLackCorpse = false;
+            CorpseLack();
+        }
     }
 
 }

ActionTowerDefense/Assets/Scripts/Spirits/SpiritOutDoor.cs

@@ -26,7 +26,7 @@ public class SpiritOutDoor : MonoBehaviour
         public spiritType type;
         public spiritQuality quality;
         public int corpse;
-        public GameObject introduction;
+        public Sprite introduction;
     }
 
     public BackDoor doorController;
@@ -56,6 +56,7 @@ public class SpiritOutDoor : MonoBehaviour
         dir = (int)(2 * (Random.Range(0, 2) - 0.5f));
         Vector3 force = new Vector3(Random.Range(minForceX, maxForceX) * dir, Random.Range(minForceY, maxForceY), 0);
         g.GetComponent<Rigidbody>().velocity = force;
+        g.GetComponentInChildren<Base_Spirits>().needCorpse = spirits[id].corpse;
     }
 
     private void OnTriggerEnter(Collider other)

ActionTowerDefense/Assets/Scripts/Spirits/SpiritSystem.cs

@@ -67,12 +67,16 @@ public class SpiritSystem : MonoBehaviour
     static public bool isEndtran2 = false;
 
     //是否按下按钮
-    static public bool isXbtnDown = false;
-    static public bool isBbtnDown = false;
+    static public bool isXbtnDown1 = false;
+    static public bool isXbtnDown2 = false;
+    static public bool isBbtnDown1 = false;
+    static public bool isBbtnDown2 = false;
+    static public bool isGainNewSpirit1 = false;
+    static public bool isGainNewSpirit2 = false;
 
     //当前查看的英灵
-    public GameObject curCheckSpirit;
-    public bool isCurCheckSpiritChange = false;
+    static public GameObject curCheckSpirit1;
+    static public GameObject curCheckSpirit2;
 
     private void Start()
     {
@@ -81,6 +85,44 @@ public class SpiritSystem : MonoBehaviour
         XbtnKeepTime = keepTime;
     }
 
+    static public void ChangeCheckSpirit(GameObject newSpirit, int id)
+    {
+        switch (id)
+        {
+            case 0:
+                if (curCheckSpirit1 != null)
+                {
+                    curCheckSpirit1.SetActive(false);
+                }
+                curCheckSpirit1 = newSpirit;
+                break;
+            case 1:
+                if (curCheckSpirit2 != null)
+                {
+                    curCheckSpirit2.SetActive(false);
+                }
+                curCheckSpirit2 = newSpirit;
+                break;
+            default:
+                break;
+        }
+    }
+
+    private void GainNewSpirit(int id)
+    {
+        switch (id)
+        {
+            case 0:
+                curCheckSpirit1.SetActive(false);
+                break;
+            case 1:
+                curCheckSpirit2.SetActive(false);
+                break;
+            default:
+                break;
+        }
+    }
+
     private void ChangeSpirit(int id)
     {
         switch (id)
@@ -251,5 +293,16 @@ public class SpiritSystem : MonoBehaviour
             isEndtran2 = false;
             EndTransfigurate(1);
         }
+
+        if (isGainNewSpirit1)
+        {
+            isGainNewSpirit1 = false;
+            GainNewSpirit(0);
+        }
+        if (isGainNewSpirit2)
+        {
+            isGainNewSpirit2 = false;
+            GainNewSpirit(1);
+        }
     }
 }

ActionTowerDefense/Assets/music/bgm.mp3.meta

@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 0fad13ed28ec81843b2169eb24a884f3
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: