wgl пре 6 месеци
родитељ
комит
819cc1a411

+ 1 - 3
ActionTowerDefense/Assets/Resources/Prefab/Player.prefab

@@ -868,7 +868,7 @@ MonoBehaviour:
   cannotConductFXs: []
   demonicPrefabs:
   - {fileID: 8639832132491289359, guid: 4c2987691cdb47040b3a55ff928803c3, type: 3}
-  - {fileID: 5440846222648032759, guid: 905d467f290a285449f4676696ef1fae, type: 3}
+  - {fileID: 5440846222648032759, guid: 05825e721b2832f478f66e78daed901f, type: 3}
   - {fileID: 2437299196472462361, guid: a429663f5ce3055459229a7eddc06c58, type: 3}
   - {fileID: 8639832132491289359, guid: 44821b04b647bf84eb8b3ff69cf72c27, type: 3}
   - {fileID: 2437299196472462361, guid: 097d9d3ad9d15304f84fa472858a40aa, type: 3}
@@ -888,7 +888,6 @@ MonoBehaviour:
   totalCacheAttackTime: 0.1
   reviveTime: 0
   totalReviveTime: 5
-  chooseYinYang: {fileID: 7738856773524738012, guid: 905d467f290a285449f4676696ef1fae, type: 3}
   curSoulTower: {fileID: 0}
   totalCacheSummonTime: 0.2
   canConductTime:
@@ -1395,7 +1394,6 @@ MeshRenderer:
   m_Materials:
   - {fileID: 2100000, guid: 1b17f7962e0b9be49bb10e99c6bd95a6, type: 2}
   - {fileID: 2100000, guid: 0c319badfe2307a48b8810d891649565, type: 2}
-  - {fileID: 2100000, guid: 1b17f7962e0b9be49bb10e99c6bd95a6, type: 2}
   - {fileID: 2100000, guid: 8f08601a75fbb72488593cad9f89acca, type: 2}
   - {fileID: 2100000, guid: 0c319badfe2307a48b8810d891649565, type: 2}
   m_StaticBatchInfo:

+ 2 - 19
ActionTowerDefense/Assets/Scripts/Characters/PlayerController.cs

@@ -115,9 +115,6 @@ public class PlayerController : MoveCharacter
     public float reviveTime;        //¸´»îʱ¼ä
     public float totalReviveTime;
 
-    [Header("°ËØÔ")]
-    public ChooseYinYang chooseYinYang;
-
     [Header("Ëø»êËþ")]
     public GameObject curSoulTower;
 
@@ -1663,14 +1660,7 @@ public class PlayerController : MoveCharacter
             return;
         }
         GameObject prefab;
-        if (id == 1)
-        {
-            prefab = chooseYinYang.SelectPrefab(playerId);
-        }
-        else
-        {
-            prefab = demonicPrefabs[id];
-        }
+        prefab = demonicPrefabs[id];
 
         if (!CheckCanSummon(id))
         {
@@ -1761,14 +1751,7 @@ public class PlayerController : MoveCharacter
     public bool CheckCanSummon(int id)
     {
         GameObject prefab;
-        if (id == 1)
-        {
-            prefab = chooseYinYang.SelectPrefab(playerId);
-        }
-        else
-        {
-            prefab = demonicPrefabs[id];
-        }
+        prefab = demonicPrefabs[id];
 
         float costMp = prefab.GetComponent<Demonic>().costMp;
         if (id < 3)