From 038cb9d0b208aa747b2f0d5d18a0220557ee6915 Mon Sep 17 00:00:00 2001 From: 45 <980269297@qq.com> Date: Tue, 21 Jan 2025 19:28:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8Fbug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Assets/GameDate/cardDeckList.asset | 12 +++++------- .../Assets/Scenes/SampleScene.unity | 4 ---- .../Scripts/ForgingPoint/ForgintPointManager.cs | 2 +- .../Assets/Scripts/Tool/getNodeTools.cs | 2 +- .../Assets/StreamingAssets/card_data_4.csv | 2 +- 5 files changed, 8 insertions(+), 14 deletions(-) diff --git a/ColorlessWorld-2024-4-2/Assets/GameDate/cardDeckList.asset b/ColorlessWorld-2024-4-2/Assets/GameDate/cardDeckList.asset index 051e7887..ee68cf74 100644 --- a/ColorlessWorld-2024-4-2/Assets/GameDate/cardDeckList.asset +++ b/ColorlessWorld-2024-4-2/Assets/GameDate/cardDeckList.asset @@ -14,13 +14,11 @@ MonoBehaviour: m_EditorClassIdentifier: cardDeckList: - 1001 - - 2002 - - 2001 - - 2001 - - 2002 - - 2002 - - 2002 - 1004 - 1004 - 1004 - - 1004 \ No newline at end of file + - 1004 + - 1001 + - 1001 + - 1001 + - 1001 diff --git a/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity b/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity index c8862286..b2797c31 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity +++ b/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity @@ -42552,10 +42552,6 @@ MonoBehaviour: type: 3} locationX: 2 locationY: 3 - - enemyPrefab: {fileID: 1253231568001379261, guid: cd51de58fa2114447b96f63a1bf19b5c, - type: 3} - locationX: 3 - locationY: 3 mapUnityFather: {fileID: 471426433} playerNameText: {fileID: 742474145} playerMoneyText: {fileID: 506890230} diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/ForgingPoint/ForgintPointManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/ForgingPoint/ForgintPointManager.cs index b43eda70..3b625716 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/ForgingPoint/ForgintPointManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/ForgingPoint/ForgintPointManager.cs @@ -328,7 +328,7 @@ public class ForgintPointManager : Singleton for (int j = 0; j < cardTypeHeaderButton[i].cardId.Count;j++) { var slot = Instantiate(cardViewSlot, cardGenerateFatherList[i]); - var card = PlayerStatsManager.Instance.CreateCardWithIDForLook(cardTypeHeaderButton[i].cardId[i], slot.transform); + var card = PlayerStatsManager.Instance.CreateCardWithIDForLook(cardTypeHeaderButton[i].cardId[j], slot.transform); card.transform.localScale = new Vector3(1.7f, 1.7f, 1.7f); card.transform.localPosition = new Vector3(0, 0, 0); cardObject.Add(slot); diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/getNodeTools.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/getNodeTools.cs index 5cb419ac..3b42ee3c 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/getNodeTools.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/getNodeTools.cs @@ -160,7 +160,7 @@ public class getNodeTools } catch (Exception e) { - mapUnity = null; + // mapUnity = null; } return mapUnity; } diff --git a/ColorlessWorld-2024-4-2/Assets/StreamingAssets/card_data_4.csv b/ColorlessWorld-2024-4-2/Assets/StreamingAssets/card_data_4.csv index b653938a..6050aae1 100644 --- a/ColorlessWorld-2024-4-2/Assets/StreamingAssets/card_data_4.csv +++ b/ColorlessWorld-2024-4-2/Assets/StreamingAssets/card_data_4.csv @@ -1,5 +1,5 @@ ID,费用类型,费用,施法范围,作用范围,条件,功能,数值,地块标记,地块颜色,图片路径,名称 -1001,1,1,2,3_1,none,52,5,0_0;1_-1;2_0,white;white;white,CardIcon/1010,射击 +1001,1,1,2,3_1,none,52,5,0_0;1_-1;2_0,red;blue;green,CardIcon/1010,射击 1002,1,1,2,3_1,none,52,4,0_0;-1_1;-1_-1,white;white;white,CardIcon/1010,屏障 1003,1,1,2,3_1,none,,,0_0;1_0;2_0;3_0;4_0,white;white;white;white;white,CardIcon/1010,喷射 1004,1,0,2,3_1,none,1,5,0_0;1_0;2_0,green;green;green,CardIcon/1010,射击