From 6f876b3e290be8d7494c87eecb6c3e15e237d7c9 Mon Sep 17 00:00:00 2001 From: 45 <980269297@qq.com> Date: Mon, 11 Aug 2025 13:36:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=8C=E4=BA=BA=E5=8D=A1=E7=89=8C=E7=94=9F?= =?UTF-8?q?=E6=88=90=E4=BF=AE=E6=94=B90811?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Assets/Scripts/Enemy/EnemyCard.cs | 5 ++++ .../Assets/Scripts/Enemy/EnemyManager.cs | 24 +++++++++++++++++++ .../Assets/Scripts/GameManager.cs | 7 +++--- 3 files changed, 33 insertions(+), 3 deletions(-) diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyCard.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyCard.cs index 7cfc8527..b6f2343f 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyCard.cs +++ b/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("打出一张"); diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyManager.cs index 70f28ca1..18170504 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyManager.cs @@ -13,21 +13,27 @@ public class EnemyManager : Singleton 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_2, enemyCard_3,enemyCard_4, enemyCard_5, enemyCard_6 }); loadBlastJesterWeaponNode(); @@ -36,21 +42,27 @@ public class EnemyManager : Singleton 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 { enemyCardA, enemyCardB, enemyCardC, enemyCardD, enemyCardE, enemyCardF }); loadPontiffWeaponNode(); @@ -59,21 +71,27 @@ public class EnemyManager : Singleton 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 { enemyCard1, enemyCard2, enemyCard3, enemyCard4, enemyCard5, enemyCard6 }); loadCompulsiveArcanistWeaponNode(); @@ -82,21 +100,27 @@ public class EnemyManager : Singleton 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 { enemyCardA1, enemyCardA2, enemyCardA3, enemyCardA4, enemyCardA5, enemyCardA6 }); loadCultHierophantWeaponNode(); diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/GameManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/GameManager.cs index 3268c97f..5f9a7943 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/GameManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/GameManager.cs @@ -149,7 +149,7 @@ public class GameManager : Singleton 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 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() { -- 2.30.2