ColorlessWorld-2024-4-2/Assets/GameDate/cardDeckList.asset

@@ -15,7 +15,7 @@ MonoBehaviour:
   cardDeckList:
   - 1001
   - 1001
-  - 1001
+  - 2028
   - 1002
   - 1002
   - 1002
@@ -24,5 +24,5 @@ MonoBehaviour:
   - 2015
   - 2001
   - 2008
-  - 1004
-  - 1004
+  - 3001
+  - 3001

ColorlessWorld-2024-4-2/Assets/Plugins/Microsoft.CSharp.dll.meta

@@ -0,0 +1,27 @@
+fileFormatVersion: 2
+guid: a94cf6fef2879da4c91e5ef768aadf4e
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  defineConstraints: []
+  isPreloaded: 0
+  isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
+  platformData:
+  - first:
+      Any: 
+    second:
+      enabled: 1
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 0
+      settings:
+        DefaultValueInitialized: true
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardEntity.cs

@@ -175,9 +175,9 @@ public class CardEntity : MonoBehaviour
         }else if (CardOriginalDataList.Instance.existEffectCardOriginalDataList.TryGetValue(cardId, out cardOriginalData))
         {
             createEffectCard(cardId, cardIndex, needTrueFun);
-        }else if (CardOriginalDataList.Instance.existItemCardOriginalDataList.TryGetValue(cardId, out cardOriginalData))
+        }else if (CardOriginalDataList.Instance.existAbilityCardOriginalDataList.TryGetValue(cardId, out cardOriginalData))
         {
-            createItemCard(cardId, cardIndex, needTrueFun);
+            createAbilityCard(cardId, cardIndex, needTrueFun);
         }
     }
 
@@ -217,21 +217,25 @@ public class CardEntity : MonoBehaviour
         cardType.text = "Чšűż¨";
     }
 
-    public void createItemCard(string cardId, int cardIndex, bool needTrueFun)
+    public void createAbilityCard(string cardId, int cardIndex, bool needTrueFun)
     {
         this.cardId = cardId;
         //Debug.Log(cardId + "-" + CardOriginalDataList.Instance.cardOriginalDataList[cardId]);
-        cardOriginalData = CardOriginalDataList.Instance.existItemCardOriginalDataList[cardId];
+        cardOriginalData = CardOriginalDataList.Instance.existAbilityCardOriginalDataList[cardId];
         settleForStart(SettlementManager.settleTurn);
+        createEffectCardUI(needTrueFun);
+        createCardDescription();
         //createEffectCardUI(needTrueFun);
         //createCardDescription();
         createCardName();
+        createCardImage();
+        
         //createCardCost();
         //createCardImage();
         //createCardImageTest();
         this.cardIndex = cardIndex;
 
-        cardType.text = "Îďơż¨";
+        cardType.text = "ÄÜÁŚż¨";
     }
 
     //ż¨ĹĆЧšűľÄ˝áËă

ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardOriginalDataList.cs

@@ -4,6 +4,8 @@ using System.Collections.Generic;
 using UnityEngine;
 using System.IO;
 using System.Linq;
+using SQLite4Unity3d;
+using static UnityEditor.GenericMenu;
 
 
 public class CardOriginalDataList : Singleton<CardOriginalDataList>
@@ -12,13 +14,13 @@ public class CardOriginalDataList : Singleton<CardOriginalDataList>
 
     public Dictionary<string, CardOriginalData> effectCardOriginalDataList;
 
-    public Dictionary<string, CardOriginalData> itemCardOriginalDataList;
+    public Dictionary<string, CardOriginalData> abilityCardOriginalDataList;
 
     public Dictionary<string, CardOriginalData> existCardOriginalDataList = new Dictionary<string, CardOriginalData>();
 
     public Dictionary<string, CardOriginalData> existEffectCardOriginalDataList = new Dictionary<string, CardOriginalData>();
 
-    public Dictionary<string, CardOriginalData> existItemCardOriginalDataList = new Dictionary<string, CardOriginalData>();
+    public Dictionary<string, CardOriginalData> existAbilityCardOriginalDataList = new Dictionary<string, CardOriginalData>();
 
     public Dictionary<string, CardOriginalData> commCardOriginalDataList=new Dictionary<string, CardOriginalData>();
 
@@ -26,21 +28,24 @@ public class CardOriginalDataList : Singleton<CardOriginalDataList>
 
     public Dictionary<string, CardOriginalData> legendaryCardOriginalDataList = new Dictionary<string, CardOriginalData>();
 
+    public SQLiteConnection Connection;
     private void OnEnable()
     {
+        Connection = new SQLiteConnection(Application.streamingAssetsPath + "/TestDatabase.db", SQLiteOpenFlags.ReadWrite | SQLiteOpenFlags.Create);
         cardOriginalDataList = ReadExcelForDyeingCard("card_data_5.csv");
         effectCardOriginalDataList = ReadExcelForEffectCard("card_data_effect_4.csv");
-        itemCardOriginalDataList = ReadExcelForItemCard("card_data_item_4.csv");
+        abilityCardOriginalDataList = ReadExcelForAbilityCard("card_data_ab_1.csv");
         //categorizeCardsByRarity();
         existCardOriginalDataList = cardOriginalDataList;
         existEffectCardOriginalDataList= effectCardOriginalDataList;
-        existItemCardOriginalDataList= itemCardOriginalDataList;
+        existAbilityCardOriginalDataList= abilityCardOriginalDataList;
 
 
     }
     private void Start()
     {
         DontDestroyOnLoad(this.gameObject);
+        
     }
     public HashSet<string> GetCardRewards(int count)
     {
@@ -175,7 +180,7 @@ public class CardOriginalDataList : Singleton<CardOriginalDataList>
         return cardOriginalDataList;
     }
 
-    Dictionary<string, CardOriginalData> ReadExcelForItemCard(string fileName)
+    Dictionary<string, CardOriginalData> ReadExcelForAbilityCard(string fileName)
     {
         string filePath = Path.Combine(Application.streamingAssetsPath, fileName);
         Dictionary<string, CardOriginalData> cardOriginalDataList = new Dictionary<string, CardOriginalData>();
@@ -195,7 +200,7 @@ public class CardOriginalDataList : Singleton<CardOriginalDataList>
                 // ÓöººÅ·Ö¸ôÿÐÐÊý¾Ý
                 string[] values = line.Split(',');
                 CardOriginalData cardOriginalData = new CardOriginalData();
-                loadDatafromCsvForItemCard(values, cardOriginalData);
+                loadDatafromCsvForAbilityCard(values, cardOriginalData);
                 cardOriginalDataList.Add(cardOriginalData.CardId, cardOriginalData);
             }
         }
@@ -305,41 +310,56 @@ public class CardOriginalDataList : Singleton<CardOriginalDataList>
         return cardOriginalData;
     }
 
-    private CardOriginalData loadDatafromCsvForItemCard(string[] values, CardOriginalData cardOriginalData)
+    private CardOriginalData loadDatafromCsvForAbilityCard(string[] values, CardOriginalData cardOriginalData)
     {
         cardOriginalData.cardImageMark = new HashSet<CoordinateColorPair>();
         //CardOriginalData cardOriginalData = CardOriginalData.Instance;
         cardOriginalData.CardId = values[0];
-        //cardOriginalData.ChineseName = values[1];
-       // cardOriginalData.Description = values[12];
+        cardOriginalData.ChineseName = values[14];
+        cardOriginalData.Description = values[15];
         cardOriginalData.costType = values[1];
         cardOriginalData.Cost = int.Parse(values[2]);
-        //cardOriginalData.Rarity = int.Parse(values[3]);
-        //cardOriginalData.CastingRange = int.Parse(values[2]);
+        cardOriginalData.Rarity = int.Parse(values[12]);
         //cardOriginalData.EffectRange = values[3];
-        //cardOriginalData.IsDisposable = int.Parse(values[6]) == 1;
-        cardOriginalData.nodesMark = values[5].Split(";");
+        cardOriginalData.IsDisposable = true;
+        cardOriginalData.nodesMark = values[9].Split(";");
         //cardOriginalData.nodesColor = values[8].Split(";");
-        /*cardOriginalData.conditionAndFunctionVal = new Dictionary<string, Tuple<string, string>>();
-        cardOriginalData.TrueFunctionVal = new Dictionary<string, string>();
-        cardOriginalData.testTrueFunctionVal = new Dictionary<string, string>();
-        cardOriginalData.originFunctionVal = new HashSet<string>();*/
-        cardOriginalData.CardType = Name.CardType.effect;
-        cardOriginalData.ImgPath = values[6];
-        cardOriginalData.CastingRange = int.Parse(values[7]);
-        string[] function = values[3].Split(";");                                                                           
-        string[] functionVal = values[4].Split(";");
+        cardOriginalData.conditionAndFunctionVal = new Dictionary<string, Tuple<string, string>>();
+        cardOriginalData.commonFunctionVal = new Dictionary<string, string>();
         cardOriginalData.TrueFunctionVal = new Dictionary<string, string>();
+        cardOriginalData.conditionFunctionVal = new Dictionary<string, string>();
         cardOriginalData.originFunctionVal = new HashSet<string>();
-        cardOriginalData.TrueFunctionVal = new Dictionary<string, string>();
-        cardOriginalData.IsDisposable=true;
-
-        //getDictionaryFromString(values, cardOriginalData);
-        for (int i = 0; i < function.Length; i++)
+        cardOriginalData.denyFunction = new HashSet<string>();
+        cardOriginalData.CardType = Name.CardType.ability;
+        cardOriginalData.ImgPath = values[10];
+        cardOriginalData.CastingRange = int.Parse(values[11]);
+        //cardOriginalData.testTrueFunctionVal = new Dictionary<string, string>();
+        cardOriginalData.condition = values[5].Split(";");
+        string[] conditionFunction = values[6].Split(";");
+        string[] conditionFunctionVal = values[7].Split(";");
+        string[] denyFunction = values[8].Split(";");
+        string[] commonFunction = values[3].Split(";");
+        string[] commonFunctionVal = values[4].Split(";");
+        for (int i = 0; i < denyFunction.Length; i++)
+        {
+            cardOriginalData.denyFunction.Add(denyFunction[i]);
+        }
+        for (int i = 0; i < conditionFunction.Length; i++)
+        {
+            cardOriginalData.conditionFunctionVal.Add(conditionFunction[i], conditionFunctionVal[i]);
+        }
+        for (int i = 0; i < commonFunction.Length; i++)
         {
-            cardOriginalData.originFunctionVal.Add(function[i]);
-            cardOriginalData.TrueFunctionVal.Add(function[i], functionVal[i]);
+            cardOriginalData.commonFunctionVal.Add(commonFunction[i], commonFunctionVal[i]);
+            //Debug.Log("TrueFunctionValÊÇ" + commonFunction[i] + "+" + commonFunctionVal[i]);
         }
+        //getDictionaryFromString(values, cardOriginalData);
+        /* for (int i = 0; i < function.Length; i++)
+         {
+             cardOriginalData.originFunctionVal.Add(function[i]);
+             cardOriginalData.TrueFunctionVal.Add(function[i], functionVal[i]);
+             cardOriginalData.testTrueFunctionVal.Add(function[i], functionVal[i]);
+         }*/
         return cardOriginalData;
     }
 

ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Name.cs

@@ -129,8 +129,8 @@ public static class Name
             }
             getSingleDescription(sb, kvp);
         }
-        if (cardEntity.tempIsDisposable||cardOriginalData
-            .IsDisposable)
+        if ((cardEntity.tempIsDisposable||cardOriginalData
+            .IsDisposable)&&cardOriginalData.CardType!=Name.CardType.ability)
         {
             sb.Append(",消耗");
         }
@@ -405,7 +405,7 @@ public static class Name
                 sb.Append("对红色地块造成" + kvp.Value + "点伤害");
                 break;
             case CardFunction.damagexy:
-                string[] values = kvp.Value.Split("-");
+                string[] values = kvp.Value.Split("&");
                 if (Usermanager.Instance != null)
                 {
                     sb.Append("<link=\"" + kvp.Key + "\">造成" + Usermanager.Instance.DamageCalculation(int.Parse(values[0])) + "点伤害" + values[1] + "次</link>");
@@ -470,7 +470,7 @@ public static class Name
             case CardFunction.damagexy:
                 string damagex = MathTool.GetRandomNumberFromRange(data.damagex);
                 string damagey=data.damagey;
-                basicval = damagex + "-" + damagey;
+                basicval = damagex + "&" + damagey;
                 break;
             case CardFunction.bleedDamage:
                 basicval = data.bleed;
@@ -538,7 +538,7 @@ public static class Name
     {
         public const string dyeing = "dyeing";
         public const string effect = "effect";
-        public const string item = "item";
+        public const string ability = "ability";
     }
 
     public static class NodeColor 

ColorlessWorld-2024-4-2/Assets/Scripts/manager/BuffDataManager.cs

@@ -150,6 +150,14 @@ public class BuffDataManager : Singleton<BuffDataManager>
                 return "若站在污染地块上，攻击同时偷取4点锻造点";
             case AbnormalCondition.Buff_ContaminatusImmortalis:
                 return "周围有污染地块时，攻击护盾造成双倍伤害";
+            case AbnormalCondition.bleed4TurnCost:
+                return "回合内触发4次流血，获得1点能量";
+            case AbnormalCondition.bleed3TurnCost:
+                return "回合内触发3次流血，获得1点能量";
+            case AbnormalCondition.bleedDamage:
+                return "增加流血伤害";
+            case AbnormalCondition.firm:
+                return "护盾在你回合开始时不会消失";
 
         }
         return " ";

ColorlessWorld-2024-4-2/Assets/Scripts/manager/DestructionManager.cs

@@ -18,7 +18,7 @@ public class DestructionManager : Singleton<DestructionManager>
         }
         else
         {
-            if (LegacyManager.Instance.isUseful(Name.Legacy.LegacyNode_PortableReactor))
+            if (LegacyManager.Instance.isUseful(Name.Legacy.LegacyNode_PortableReactor)&&!cardOriginalData.CardType.Equals(Name.CardType.ability))
             {
                 StartCoroutine(TurnMaster.Instance.drawCards(1));
                 yield return StartCoroutine(TurnMaster.Instance.MoveCards());

ColorlessWorld-2024-4-2/Assets/Scripts/manager/SettlementManager.cs

@@ -152,7 +152,7 @@ public class SettlementManager : Singleton<SettlementManager>
             MapUnity endNode = null;
             endNode = getNodeTools.getNodeWithCube(trueCubeList[i].Item1, trueCubeList[i].Item2, trueCubeList[i].Item3);
          
-            if (endNode != null)
+            if (endNode != null&& cardOriginalData.nodesColor!=null)
             {
                 // endNode.switchColor(Name.stringColorToint(cardOriginalData.nodesColor[i]));
                 if (endNode.whoColour != Name.stringColorToint(cardOriginalData.nodesColor[i]) && endNode.whoColour != 6)
@@ -801,7 +801,7 @@ public class SettlementManager : Singleton<SettlementManager>
                     damageWork(int.Parse(kvp.Value), influencePreviewPool, pierceNum);
                     break;
                 case CardFunction.damagexy:
-                    string[] values = kvp.Value.Split("-");
+                    string[] values = kvp.Value.Split("&");
                     int damageVal=int.Parse(values[0]);
                     int damageCount = int.Parse(values[1]);
                     for (int i = 0; i < damageCount; i++)
@@ -819,7 +819,7 @@ public class SettlementManager : Singleton<SettlementManager>
                     break;
                 case CardFunction.damagexyForBlueNode:
                     List<MapUnity> blueListA = new List<MapUnity>(getNodeTools.getNodesWithColor(Name.Color.Blue));
-                    string[] valuesA = kvp.Value.Split("-");
+                    string[] valuesA = kvp.Value.Split("&");
                     int damageValA = int.Parse(valuesA[0]);
                     int damageCountA = int.Parse(valuesA[1]);
                     for (int i = 0; i < damageCountA; i++)
@@ -1123,13 +1123,13 @@ public class SettlementManager : Singleton<SettlementManager>
                     Usermanager .Instance .expectDamage = Usermanager.Instance.DamageCalculation(int.Parse(kvp.Value));
                     break;
                 case CardFunction.damagexy:
-                    string[] values = kvp.Value.Split("-");
+                    string[] values = kvp.Value.Split("&");
                     int damageVal = int.Parse(values[0]);
                     int damageCount = int.Parse(values[1]);
                     // damageWork(int.Parse(kvp.Value), influencePreviewPool, pierceNum);
                     for (int i = 0; i < damageCount; i++)
                     {
-                        Usermanager.Instance.expectDamage+= Usermanager.Instance.DamageCalculation(int.Parse(kvp.Value));
+                        Usermanager.Instance.expectDamage+= Usermanager.Instance.DamageCalculation(damageVal);
                     }
                     //Usermanager.Instance.expectDamage = Usermanager.Instance.DamageCalculation(int.Parse(kvp.Value));
                     break;

ColorlessWorld-2024-4-2/Assets/StreamingAssets/card_data_ab_1.csv

@@ -0,0 +1,5 @@
+ID,消耗类型,消耗数值,基础功能,数值,条件,额外功能,数值,否定功能,地块标记,图片路径,施法范围,稀有度,消耗,名字,卡牌描述
+3001,1,2,75,1,red>12,76,1,75,0_0,EffectCardIcon/赋能,0,2,1,赋能,3次流血
+3002,1,1,57,4,blue>9,57,2,none,0_0,EffectCardIcon/割裂,0,2,0,割裂,none
+3003,1,1,82,1,none,none,none,none,0_0,EffectCardIcon/消失,0,3,1,消失,none
+3004,1,2,18,1,red>9,33,1,none,0_0,EffectCardIcon/盾垒,0,2,1,盾垒,none

ColorlessWorld-2024-4-2/Assets/StreamingAssets/card_data_ab_1.csv.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 87fe0a897f95d3f408f0c8fa7a70a055
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ColorlessWorld-2024-4-2/Assets/StreamingAssets/card_data_effect_4.csv

@@ -5,23 +5,20 @@
 2004,1,3,71;70,1;2,red>10,70,1,70,0_0,EffectCardIcon/血盾,0,3,0,血盾,下1回合无法获得护盾
 2005,1,1,79;80,1;1,yellow>11,33,1,none,0_0,EffectCardIcon/等价代换,0,2,0,等价代换,none
 2006,1,2,54,9,red>9,55,3,none,0_0,EffectCardIcon/血山,0,2,0,血山,none
-2007,1,2,75,1,red>12,76,1,75,0_0,EffectCardIcon/赋能,0,2,1,赋能,3次流血
 2008,1,1,56;13,2;1,yellow>4,none,none,13,0_0,EffectCardIcon/炼金小包,0,1,0,炼金小包,不会丢弃牌
 2009,1,0,11;93,1;1,none,none,none,none,0_0,EffectCardIcon/玫瑰茶,0,1,1,玫瑰茶,none
 2012,1,1,40;93,-1;2,none,none,none,none,0_0,EffectCardIcon/冷静,0,1,0,冷静,none
-2014,1,1,57,4,blue>9,57,2,none,0_0,EffectCardIcon/割裂,0,2,0,割裂,none
-2015,1,2,1,15,yellow>4,53,5-3,1,0_0,EffectCardIcon/左右开弓,1,3,0,左右开弓,none
-2016,1,1,82,1,none,none,none,none,0_0,EffectCardIcon/消失,0,3,1,消失,none
+2015,1,2,1,15,yellow>4,53,5&3,1,0_0,EffectCardIcon/左右开弓,1,3,0,左右开弓,none
 2017,1,1,83,3,yellow>4,93,1,none,0_0,EffectCardIcon/死亡印记,1,3,0,死亡印记,none
 2018,1,1,84;85,1;1,yellow>5,33,1,none,0_0,EffectCardIcon/暗影步,1,2,0,暗影步,none
-2019,1,3,94,10,red>12,95,5-2,94,0_0,EffectCardIcon/影舞步,1,2,0,影舞步,none
+2019,1,3,94,10,red>12,95,5&2,94,0_0,EffectCardIcon/影舞步,1,2,0,影舞步,none
 2021,1,1,90,1,blue>7,89,1,none,0_0,EffectCardIcon/血怒,0,3,1,血怒,none
 2022,1,3,68,1,red>5,69,1,68,0_0,EffectCardIcon/抽血,1,3,0,抽血,none
 2023,1,1,52,2,yellow>5,52,3,52,0_0,EffectCardIcon/踢击,1,1,0,踢击,none
 2024,1,1,52,1,red>10,52,2,52,0_1;1_0;0_-1;-1_0;-1_1;-1_-1,EffectCardIcon/展翅,0,1,0,展翅,击退2格
 2026,1,1,40,2,blue>5,16,1,none,0_0,EffectCardIcon/疾跑,0,2,0,疾跑,none
 2027,1,2,5;58,2;2,blue>10,5;58,3;3,5;58,0_0,EffectCardIcon/穷追猛砍,1,2,0,穷追猛砍,none
-2028,1,1,53,6-2,aroundblue=4,53,6-4,53,0_1;1_0;0_-1;-1_0;-1_1;-1_-1,EffectCardIcon/剑刃风暴,1,3,0,剑刃风暴,none
+2028,1,1,53,6&2,aroundblue=4,53,6&4,53,0_1;1_0;0_-1;-1_0;-1_1;-1_-1,EffectCardIcon/剑刃风暴,1,3,0,剑刃风暴,none
 2029,1,1,59,1,blue>11,60,1,59,0_0,EffectCardIcon/暴风吸入,0,2,1,暴风吸入,随机留下一半
 2030,1,1,60,1,yellow>10,61,1,60,0_0,EffectCardIcon/汲取,0,2,0,汲取,none
 2031,1,0,12,1,red>9,91,1,91,0_0,EffectCardIcon/再来一杯,0,2,0,再来一杯,none
@@ -29,5 +26,4 @@
 2034,1,1,63,1,red>12,93,1,none,0_0,EffectCardIcon/盾击,1,2,0,盾击,none
 2035,1,1,1;64,7;8,blue>9,64,10,64,0_0,EffectCardIcon/撕扯,1,1,0,撕扯,获得10点护盾
 2036,1,1,65;66,5;1,yellow>10,67,1,66,0_0,EffectCardIcon/血蛭,1,3,1,血蛭,翻三倍
-2037,1,2,18,1,red>9,33,1,none,0_0,EffectCardIcon/盾垒,0,2,1,盾垒,none
 2039,1,0,65;11,5;2,red>19,11,3,11,0_0,EffectCardIcon/战吼,0,3,1,战吼,none

ColorlessWorld-2024-4-2/ProjectSettings/ProjectSettings.asset

@@ -915,7 +915,7 @@ PlayerSettings:
   embeddedLinuxEnableGamepadInput: 1
   hmiLogStartupTiming: 0
   hmiCpuConfiguration: 
-  apiCompatibilityLevel: 6
+  apiCompatibilityLevel: 3
   activeInputHandler: 2
   windowsGamepadBackendHint: 0
   cloudProjectId: