diff --git a/ColorlessWorld-2024-4-2/Assets/GameDate/PlayerState.asset b/ColorlessWorld-2024-4-2/Assets/GameDate/PlayerState.asset index 7655bb39..55604da2 100644 --- a/ColorlessWorld-2024-4-2/Assets/GameDate/PlayerState.asset +++ b/ColorlessWorld-2024-4-2/Assets/GameDate/PlayerState.asset @@ -26,5 +26,5 @@ MonoBehaviour: canColorCount: 20 castRange: 2 money: 806 - forgingPoint: 240 + forgingPoint: 50 priceMultiplier: 1 diff --git a/ColorlessWorld-2024-4-2/Assets/GameDate/cardDeckList.asset b/ColorlessWorld-2024-4-2/Assets/GameDate/cardDeckList.asset index c8a7a561..380661d4 100644 --- a/ColorlessWorld-2024-4-2/Assets/GameDate/cardDeckList.asset +++ b/ColorlessWorld-2024-4-2/Assets/GameDate/cardDeckList.asset @@ -13,11 +13,16 @@ MonoBehaviour: m_Name: cardDeckList m_EditorClassIdentifier: cardDeckList: - - 1005 - - 1005 - - 1005 - - 1005 - - 1005 - - 2001 - - 2001 + - 1001 + - 1001 + - 2028 + - 1002 + - 1002 + - 1002 + - 1003 + - 2008 + - 2015 - 2001 + - 2008 + - 3001 + - 3001 diff --git a/ColorlessWorld-2024-4-2/Assets/Plugins/Microsoft.CSharp.dll.meta b/ColorlessWorld-2024-4-2/Assets/Plugins/Microsoft.CSharp.dll.meta new file mode 100644 index 00000000..17bba4e5 --- /dev/null +++ b/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: diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardEntity.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardEntity.cs index 0178fbdb..eaf912ff 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardEntity.cs +++ b/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 = "能力卡"; } //卡牌效果的结算 diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardOriginalDataList.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardOriginalDataList.cs index f93f060d..00159dbe 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardOriginalDataList.cs +++ b/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 @@ -12,13 +14,13 @@ public class CardOriginalDataList : Singleton public Dictionary effectCardOriginalDataList; - public Dictionary itemCardOriginalDataList; + public Dictionary abilityCardOriginalDataList; public Dictionary existCardOriginalDataList = new Dictionary(); public Dictionary existEffectCardOriginalDataList = new Dictionary(); - public Dictionary existItemCardOriginalDataList = new Dictionary(); + public Dictionary existAbilityCardOriginalDataList = new Dictionary(); public Dictionary commCardOriginalDataList=new Dictionary(); @@ -26,21 +28,24 @@ public class CardOriginalDataList : Singleton public Dictionary legendaryCardOriginalDataList = new Dictionary(); + 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 GetCardRewards(int count) { @@ -175,7 +180,7 @@ public class CardOriginalDataList : Singleton return cardOriginalDataList; } - Dictionary ReadExcelForItemCard(string fileName) + Dictionary ReadExcelForAbilityCard(string fileName) { string filePath = Path.Combine(Application.streamingAssetsPath, fileName); Dictionary cardOriginalDataList = new Dictionary(); @@ -195,7 +200,7 @@ public class CardOriginalDataList : Singleton // 用逗号分隔每行数据 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 return cardOriginalData; } - private CardOriginalData loadDatafromCsvForItemCard(string[] values, CardOriginalData cardOriginalData) + private CardOriginalData loadDatafromCsvForAbilityCard(string[] values, CardOriginalData cardOriginalData) { cardOriginalData.cardImageMark = new HashSet(); //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>(); - cardOriginalData.TrueFunctionVal = new Dictionary(); - cardOriginalData.testTrueFunctionVal = new Dictionary(); - cardOriginalData.originFunctionVal = new HashSet();*/ - 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>(); + cardOriginalData.commonFunctionVal = new Dictionary(); cardOriginalData.TrueFunctionVal = new Dictionary(); + cardOriginalData.conditionFunctionVal = new Dictionary(); cardOriginalData.originFunctionVal = new HashSet(); - cardOriginalData.TrueFunctionVal = new Dictionary(); - cardOriginalData.IsDisposable=true; - - //getDictionaryFromString(values, cardOriginalData); - for (int i = 0; i < function.Length; i++) + cardOriginalData.denyFunction = new HashSet(); + cardOriginalData.CardType = Name.CardType.ability; + cardOriginalData.ImgPath = values[10]; + cardOriginalData.CastingRange = int.Parse(values[11]); + //cardOriginalData.testTrueFunctionVal = new Dictionary(); + 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; } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/CardFunction.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/CardFunction.cs index 21b4498e..aec49a9e 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/CardFunction.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/CardFunction.cs @@ -199,10 +199,10 @@ public static class CardFunction - public static readonly HashSet BuffList = new() { bleed, vulnerable, downSpeed, ember, deathMark, tempCastRange, calm , agile - ,weak,bleedDamage,immunity,thorn,Invisible}; + public static readonly HashSet BuffList = new() { bleed, vulnerable, downSpeed, ember, calm , agile + ,weak,bleedDamage,immunity,thorn,Invisible,disable}; - public static readonly HashSet ActList = new() { damagexy, cardDamage, cardShield, repel, recoverHp, step,costRestore + public static readonly HashSet ActList = new() { damagexy, cardDamage, cardShield, step,costRestore ,drawCard,drawDyeingCard,drawEffectCard}; } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Name.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Name.cs index 86382fe8..b72f4750 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Name.cs +++ b/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("造成" + Usermanager.Instance.DamageCalculation(int.Parse(values[0])) + "点伤害" + values[1] + "次"); @@ -449,19 +449,28 @@ public static class Name case CardFunction.ember: basicval = data.Ember; break; + case CardFunction.disable: + basicval = data.disable; + break; case CardFunction.costRestore: basicval = data.costRestore; break; case CardFunction.drawCard: basicval = data.DrawCard; break; + case CardFunction.drawDyeingCard: + basicval = data.DrawDyeingCard; + break; + case CardFunction.drawEffectCard: + basicval = data.DrawEffectCard; + break; case CardFunction.step: basicval = data.Step; break; 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; @@ -529,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 diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/manager/BuffDataManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/manager/BuffDataManager.cs index 650d1789..b36279f0 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/manager/BuffDataManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/manager/BuffDataManager.cs @@ -150,6 +150,14 @@ public class BuffDataManager : Singleton 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 " "; diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/manager/DestructionManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/manager/DestructionManager.cs index 4849feaa..9a445fe8 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/manager/DestructionManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/manager/DestructionManager.cs @@ -18,7 +18,7 @@ public class DestructionManager : Singleton } 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()); diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/manager/SettlementManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/manager/SettlementManager.cs index c50f22a4..154be9f4 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/manager/SettlementManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/manager/SettlementManager.cs @@ -152,7 +152,7 @@ public class SettlementManager : Singleton 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 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 break; case CardFunction.damagexyForBlueNode: List blueListA = new List(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 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; diff --git a/ColorlessWorld-2024-4-2/Assets/StreamingAssets/TestDatabase.db b/ColorlessWorld-2024-4-2/Assets/StreamingAssets/TestDatabase.db index 8dab5163..df741721 100644 Binary files a/ColorlessWorld-2024-4-2/Assets/StreamingAssets/TestDatabase.db and b/ColorlessWorld-2024-4-2/Assets/StreamingAssets/TestDatabase.db differ diff --git a/ColorlessWorld-2024-4-2/Assets/StreamingAssets/card_data_ab_1.csv b/ColorlessWorld-2024-4-2/Assets/StreamingAssets/card_data_ab_1.csv new file mode 100644 index 00000000..1fee9501 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/StreamingAssets/card_data_ab_1.csv @@ -0,0 +1,5 @@ +锘縄D,娑堣楃被鍨,娑堣楁暟鍊,鍩虹鍔熻兘,鏁板,鏉′欢,棰濆鍔熻兘,鏁板,鍚﹀畾鍔熻兘,鍦板潡鏍囪,鍥剧墖璺緞,鏂芥硶鑼冨洿,绋鏈夊害,娑堣,鍚嶅瓧,鍗＄墝鎻忚堪 +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 diff --git a/ColorlessWorld-2024-4-2/Assets/StreamingAssets/card_data_ab_1.csv.meta b/ColorlessWorld-2024-4-2/Assets/StreamingAssets/card_data_ab_1.csv.meta new file mode 100644 index 00000000..84d1f9b3 --- /dev/null +++ b/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: diff --git a/ColorlessWorld-2024-4-2/Assets/StreamingAssets/card_data_effect_4.csv b/ColorlessWorld-2024-4-2/Assets/StreamingAssets/card_data_effect_4.csv index c2d8aaf5..9a739a71 100644 --- a/ColorlessWorld-2024-4-2/Assets/StreamingAssets/card_data_effect_4.csv +++ b/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 diff --git a/ColorlessWorld-2024-4-2/ProjectSettings/ProjectSettings.asset b/ColorlessWorld-2024-4-2/ProjectSettings/ProjectSettings.asset index f5508774..a19a9233 100644 --- a/ColorlessWorld-2024-4-2/ProjectSettings/ProjectSettings.asset +++ b/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: diff --git a/ColorlessWorld-2024-4-2/obj/Debug/Assembly-CSharp-Editor.csproj.AssemblyReference.cache b/ColorlessWorld-2024-4-2/obj/Debug/Assembly-CSharp-Editor.csproj.AssemblyReference.cache index 4edc3e1a..55624e61 100644 Binary files a/ColorlessWorld-2024-4-2/obj/Debug/Assembly-CSharp-Editor.csproj.AssemblyReference.cache and b/ColorlessWorld-2024-4-2/obj/Debug/Assembly-CSharp-Editor.csproj.AssemblyReference.cache differ