敌人卡牌生成修改0811

ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyCard.cs

@@ -9,6 +9,11 @@ public class EnemyCard
     public string[] nodesColor;
     public Sprite cardSprite;
     public bool isKnow =false ;//是否打出过
+    public void createGemImageByToolX()
+    {
+        MapUnity currentNode = CardPictureManager.Instance.ToolX[4].Y[4];
+        cardSprite = CardManager.createGemImage(nodesMark, nodesColor, currentNode);
+    }
     public void CardSettle(MapUnity targetNode)
     {
         Debug.Log("打出一张");

ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyManager.cs

@@ -13,21 +13,27 @@ public class EnemyManager : Singleton<EnemyManager>
                 EnemyCard enemyCard = new EnemyCard();
                 enemyCard.nodesMark = new string[3] { "1_0", "2_0", "0_0" };
                 enemyCard.nodesColor = new string[3] { Name.Color.Black, Name.Color.Black, Name.Color.Black };
+                enemyCard.createGemImageByToolX();
                 EnemyCard enemyCard_2 = new EnemyCard();
                 enemyCard_2.nodesMark = new string[3] { "1_0", "2_0", "0_0" };
                 enemyCard_2.nodesColor = new string[3] { Name.Color.Black, Name.Color.Black, Name.Color.Black };
+                enemyCard_2.createGemImageByToolX();
                 EnemyCard enemyCard_3 = new EnemyCard();
                 enemyCard_3.nodesMark = new string[1] { "0_0"};
                 enemyCard_3.nodesColor = new string[1] { Name.NodeItem.Bomb};
+                enemyCard_3.createGemImageByToolX();
                 EnemyCard enemyCard_4 = new EnemyCard();
                 enemyCard_4.nodesMark = new string[3] { "1_0", "2_0", "0_0" };
                 enemyCard_4.nodesColor = new string[3] { Name.Color.Black, Name.Color.Black, Name.Color.Black };
+                enemyCard_4.createGemImageByToolX();
                 EnemyCard enemyCard_5 = new EnemyCard();
                 enemyCard_5.nodesMark = new string[3] { "1_0", "2_0", "0_0" };
                 enemyCard_5.nodesColor = new string[3] { Name.Color.Black, Name.Color.Black, Name.Color.Black };
+                enemyCard_5.createGemImageByToolX();
                 EnemyCard enemyCard_6 = new EnemyCard();
                 enemyCard_6.nodesMark = new string[1] { "0_0" };
                 enemyCard_6.nodesColor = new string[1] { Name.NodeItem.Bomb };
+                enemyCard_6.createGemImageByToolX();
                 GameManager.Instance.enemy.deck.Clear();
                 GameManager.Instance.enemy.deck.AddRange(new List<EnemyCard> { enemyCard, enemyCard_2, enemyCard_3,enemyCard_4, enemyCard_5, enemyCard_6 });
                 loadBlastJesterWeaponNode();
@@ -36,21 +42,27 @@ public class EnemyManager : Singleton<EnemyManager>
                 EnemyCard enemyCardA = new EnemyCard();
                 enemyCardA.nodesMark = new string[2] { "1_0", "0_0" };
                 enemyCardA.nodesColor = new string[2] { Name.Color.Holy, Name.Color.Holy };
+                enemyCardA.createGemImageByToolX();
                 EnemyCard enemyCardB = new EnemyCard();
                 enemyCardB.nodesMark = new string[2] { "1_0", "0_0" };
                 enemyCardB.nodesColor = new string[2] { Name.Color.Holy, Name.Color.Holy };
+                enemyCardB.createGemImageByToolX();
                 EnemyCard enemyCardC = new EnemyCard();
                 enemyCardC.nodesMark = new string[1] { "0_0" };
                 enemyCardC.nodesColor = new string[1] { Name.NodeItem.Believer };
+                enemyCardC.createGemImageByToolX();
                 EnemyCard enemyCardD = new EnemyCard();
                 enemyCardD.nodesMark = new string[2] { "1_0", "0_0" };
                 enemyCardD.nodesColor = new string[2] { Name.Color.Holy, Name.Color.Holy };
+                enemyCardD.createGemImageByToolX();
                 EnemyCard enemyCardE = new EnemyCard();
                 enemyCardE.nodesMark = new string[2] { "1_0",  "0_0" };
                 enemyCardE.nodesColor = new string[2] {  Name.Color.Holy, Name.Color.Holy };
+                enemyCardE.createGemImageByToolX();
                 EnemyCard enemyCardF = new EnemyCard();
                 enemyCardF.nodesMark = new string[1] { "0_0" };
                 enemyCardF.nodesColor = new string[1] { Name.NodeItem.Believer };
+                enemyCardF.createGemImageByToolX();
                 GameManager.Instance.enemy.deck.Clear();
                 GameManager.Instance.enemy.deck.AddRange(new List<EnemyCard> { enemyCardA, enemyCardB, enemyCardC, enemyCardD, enemyCardE, enemyCardF });
                 loadPontiffWeaponNode();
@@ -59,21 +71,27 @@ public class EnemyManager : Singleton<EnemyManager>
                 EnemyCard enemyCard1 = new EnemyCard();
                 enemyCard1.nodesMark = new string[6] { "1_0", "-1_0", "0_-1", "0_1", "-1_1", "-1_-1" };
                 enemyCard1.nodesColor = new string[6] { Name.Color.Red, Name.Color.Red, Name.Color.Yellow, Name.Color.Yellow, Name.Color.Blue, Name.Color.Blue };
+                enemyCard1.createGemImageByToolX();
                 EnemyCard enemyCard2 = new EnemyCard();
                 enemyCard2.nodesMark = new string[3] { "1_0", "0_0", "-1_0" };
                 enemyCard2.nodesColor = new string[3] { Name.Color.Red, Name.Color.Blue, Name.Color.Yellow };
+                enemyCard2.createGemImageByToolX();
                 EnemyCard enemyCard3 = new EnemyCard();
                 enemyCard3.nodesMark = new string[3] { "1_0", "0_0", "-1_0" };
                 enemyCard3.nodesColor = new string[3] { Name.Color.Red, Name.Color.Blue, Name.Color.Yellow };
+                enemyCard3.createGemImageByToolX();
                 EnemyCard enemyCard4 = new EnemyCard();
                 enemyCard4.nodesMark = new string[6] { "1_0", "-1_0", "0_-1", "0_1", "-1_1", "-1_-1" };
                 enemyCard4.nodesColor = new string[6] { Name.Color.Red, Name.Color.Red, Name.Color.Yellow, Name.Color.Yellow, Name.Color.Blue, Name.Color.Blue };
+                enemyCard4.createGemImageByToolX();
                 EnemyCard enemyCard5 = new EnemyCard();
                 enemyCard5.nodesMark = new string[3] { "1_0", "0_0", "-1_0" };
                 enemyCard5.nodesColor = new string[3] { Name.Color.Red, Name.Color.Blue, Name.Color.Yellow };
+                enemyCard5.createGemImageByToolX();
                 EnemyCard enemyCard6 = new EnemyCard();
                 enemyCard6.nodesMark = new string[3] { "1_0", "0_0", "-1_0" };
                 enemyCard6.nodesColor = new string[3] { Name.Color.Red, Name.Color.Blue, Name.Color.Yellow };
+                enemyCard6.createGemImageByToolX();
                 GameManager.Instance.enemy.deck.Clear();
                 GameManager.Instance.enemy.deck.AddRange(new List<EnemyCard> { enemyCard1, enemyCard2, enemyCard3, enemyCard4, enemyCard5, enemyCard6 });
                 loadCompulsiveArcanistWeaponNode();
@@ -82,21 +100,27 @@ public class EnemyManager : Singleton<EnemyManager>
                 EnemyCard enemyCardA1 = new EnemyCard();
                 enemyCardA1.nodesMark = new string[3] { "1_0", "0_0","-1_0" };
                 enemyCardA1.nodesColor = new string[3] { Name.Color.Black, Name.NodeItem.Cultist, Name.Color.Black };
+                enemyCardA1.createGemImageByToolX();
                 EnemyCard enemyCardA2 = new EnemyCard();
                 enemyCardA2.nodesMark = new string[3] { "1_0", "0_0", "-1_0" };
                 enemyCardA2.nodesColor = new string[3] { Name.Color.Black, Name.Color.Curse, Name.Color.Black };
+                enemyCardA2.createGemImageByToolX();
                 EnemyCard enemyCardA3 = new EnemyCard();
                 enemyCardA3.nodesMark = new string[1] { "0_0" };
                 enemyCardA3.nodesColor = new string[1] { Name.NodeItem.Cultist };
+                enemyCardA3.createGemImageByToolX();
                 EnemyCard enemyCardA4 = new EnemyCard();
                 enemyCardA4.nodesMark = new string[3] { "1_0", "0_0", "-1_0" };
                 enemyCardA4.nodesColor = new string[3] { Name.Color.Black, Name.NodeItem.Cultist, Name.Color.Black };
+                enemyCardA4.createGemImageByToolX();
                 EnemyCard enemyCardA5 = new EnemyCard();
                 enemyCardA5.nodesMark = new string[3] { "1_0", "0_0", "-1_0" };
                 enemyCardA5.nodesColor = new string[3] { Name.Color.Black, Name.Color.Curse, Name.Color.Black };
+                enemyCardA5.createGemImageByToolX();
                 EnemyCard enemyCardA6 = new EnemyCard();
                 enemyCardA6.nodesMark = new string[1] { "0_0" };
                 enemyCardA6.nodesColor = new string[1] { Name.NodeItem.Cultist };
+                enemyCardA6.createGemImageByToolX();
                 GameManager.Instance.enemy.deck.Clear();
                 GameManager.Instance.enemy.deck.AddRange(new List<EnemyCard> { enemyCardA1, enemyCardA2, enemyCardA3, enemyCardA4, enemyCardA5, enemyCardA6 });
                 loadCultHierophantWeaponNode();

ColorlessWorld-2024-4-2/Assets/Scripts/GameManager.cs

@@ -149,7 +149,7 @@ public class GameManager : Singleton<GameManager>
         yield return new WaitUntil(() => complete == true);
         yield return null;
         //Éú³ÉµÐÈË¿¨ÅÆ
-        EnemyCard enemyCard = new EnemyCard();
+       /* EnemyCard enemyCard = new EnemyCard();
         enemyCard.nodesMark = new string[5] { "0_1", "0_-1", "-1_1", "-1_-1", "0_0" };
         enemyCard.nodesColor = new string[5] { "black", "black", "black", "black", "black" };
         enemyCard.cardSprite = CardManager.Instance.createGemImageByToolX(enemyCard.nodesMark, enemyCard.nodesColor);
@@ -181,10 +181,11 @@ public class GameManager : Singleton<GameManager>
         enemy.deck.Add(enemyCard_4);
         enemy.deck.Add(enemyCard_5);
         enemy.deck.Add(enemyCard_6);
-        //生成敌人卡牌预览
+        */
-        enemy.RefreshCardDeckUI();
         //¼ÓÔصÐÈË
         EnemyManager.Instance.loadEnemy(Name.EnemyName.BlastJester);
+        //生成敌人卡牌预览
+        enemy.RefreshCardDeckUI();
     }
     public void GenerateEnmptyMapList()
     {