0407更新

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

@@ -21,7 +21,7 @@ MonoBehaviour:
   - 1002
   - 1003
   - 2008
-  - 2032
+  - 2015
   - 2001
   - 2008
   - 1004

ColorlessWorld-2024-4-2/Assets/Plugins.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 32764108c6e136a4aad77c77c50786a8
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ColorlessWorld-2024-4-2/Assets/Plugins/sqlite3.dll.meta

@@ -0,0 +1,27 @@
+fileFormatVersion: 2
+guid: c612298d928decf458114984f830d9eb
+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/CardResourcesManager.cs

@@ -1,3 +1,4 @@
+using SQLite4Unity3d;
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
@@ -37,9 +38,11 @@ public class CardResourcesManager : Singleton <CardResourcesManager>
     [Header("·ÅÖÃÎïÆ·")]
     public GameObject tree;
 
+    public SQLiteConnection Connection;
     private void Start()
     {
         DontDestroyOnLoad(this.gameObject);
+        Connection = new SQLiteConnection(Application.streamingAssetsPath + "/TestDatabase.db", SQLiteOpenFlags.ReadWrite | SQLiteOpenFlags.Create);
     }
 
     public GameObject addChildToConditon(string input,GameObject father)
@@ -231,21 +234,22 @@ public class CardResourcesManager : Singleton <CardResourcesManager>
         }
     }
 
-    public static Dictionary<string, string> getFunAndValForSwage(int cost, string originFun)
+    public  Dictionary<string, string> getFunAndValForSwage(int cost, string originFun)
     {
         Dictionary<string, string> result = new Dictionary<string, string>();
         HashSet<string> pool = new HashSet<string>();
-        if (CardFunction.ActList.Contains(originFun))
+        CardForgeRule datas = Connection.Table<CardForgeRule>().FirstOrDefault(_ => _.Id == cost.ToString());
+        if (CardFunction.BuffList.Contains(originFun)) 
         {
-            pool = MathTool.GetRandomElements(CardFunction.ActList, 3);
+            pool = MathTool.GetRandomElements(CardFunction.BuffList, 3);
         }
-        else if (CardFunction.BuffList.Contains(originFun))
+        else
         {
-            pool = MathTool.GetRandomElements(CardFunction.BuffList, 3);
+            pool = MathTool.GetRandomElements(CardFunction.ActList, 3);
         }
         foreach (string fun in pool)
         {
-            result.Add(fun, Name.getValForSwage(cost,fun));
+            result.Add(fun, Name.getValForSwage(cost,fun,datas));
         }
         foreach (KeyValuePair<string,string> kvp in result)
         {

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

@@ -130,6 +130,7 @@ public class SoulMaker : Enemy
             EnemyNode enemynodeA = currentEnemy.GetComponent<EnemyNode>();
             enemynodeA.positionX = currentMapUnity.locationX;
             enemynodeA.positionY = currentMapUnity.locationY;
+            enemynodeA.EnemyState.RandomHp();
             enemynodeA.StartPosition();
             allCanUseNode.Remove(currentMapUnity);
             yield return null;

ColorlessWorld-2024-4-2/Assets/Scripts/ForgingPoint/ForgintPointManager.cs

@@ -686,7 +686,7 @@ public class ForgintPointManager : Singleton<ForgintPointManager>
         }
         else
         {
-            Dictionary<string, string> effectVal = CardResourcesManager.getFunAndValForSwage(cardOriginalData.Cost, linkID);
+            Dictionary<string, string> effectVal = CardResourcesManager.Instance.getFunAndValForSwage(cardOriginalData.Cost, linkID);
            
             List <string > sbList = new List <string >();
             List <KeyValuePair<string, string>> kvpList = new List <KeyValuePair<string, string>>();

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

@@ -303,6 +303,7 @@ public class MapManager : Singleton<MapManager>
                 EnemyNode enemynode = currentEnemy.GetComponent<EnemyNode>();
                 enemynode.positionX = currentMapUnity.locationX;
                 enemynode.positionY = currentMapUnity.locationY;
+                enemynode.EnemyState.RandomHp();
                 enemynode.StartPosition();
                 allCanUseNode.Remove(currentMapUnity);
                 yield return null;

ColorlessWorld-2024-4-2/Assets/Scripts/SQLITE.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: edd5aba6b01c1944f93847867e16cb80
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ColorlessWorld-2024-4-2/Assets/Scripts/SQLITE/CardForgeRule.cs

@@ -0,0 +1,33 @@
+using SQLite4Unity3d;
+using System;
+
+public class CardForgeRule
+{
+    public string Id { get; set; }
+    public string Shield { get; set; }
+    public string Step { get; set; }
+    public string DrawCard { get; set; }
+    public string Ember { get; set; }
+
+    public string Agile { get; set; }
+    public string DrawDyeingCard { get; set; }
+    public string DrawEffectCard { get; set; }
+    public string DrawAbilityCard { get; set; }
+    public string calm { get; set; }
+
+    public string costRestore { get; set; }
+    public string Invisible { get; set; }
+    public string immunity { get; set; }
+    public string thorn { get; set; }
+    public string cardDamage { get; set; }
+
+    public string damagex { get; set; }
+    public string damagey { get; set; }
+    public string disable { get; set; }
+    public string vulnerable { get; set; }
+    public string weak { get; set; }
+
+    public string bleed { get; set; }
+    public string bleeddamage { get; set; }
+
+}

ColorlessWorld-2024-4-2/Assets/Scripts/SQLITE/CardForgeRule.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 02be1ac68bef0224abcb7bdda2473c41
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ColorlessWorld-2024-4-2/Assets/Scripts/SQLITE/DatabaseCreator.cs

@@ -0,0 +1,17 @@
+using SQLite4Unity3d;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class DatabaseCreator : MonoBehaviour
+{
+
+    public SQLiteConnection Connection;
+    // Start is called before the first frame update
+    void Start()
+    {
+        Connection = new SQLiteConnection(Application.streamingAssetsPath + "/TestDatabase.db", SQLiteOpenFlags.ReadWrite | SQLiteOpenFlags.Create);
+        Connection.CreateTable<TestTable>();
+    }
+
+}

ColorlessWorld-2024-4-2/Assets/Scripts/SQLITE/DatabaseCreator.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 55ad63df944aa07459e3d369ea7965c0
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ColorlessWorld-2024-4-2/Assets/Scripts/SQLITE/SQLite.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 741a1970cbf25e14fa604bf5c5cee1f8
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ColorlessWorld-2024-4-2/Assets/Scripts/SQLITE/TestTable.cs

@@ -0,0 +1,16 @@
+using SQLite4Unity3d;
+
+public class TestTable
+{
+    [PrimaryKey, AutoIncrement] //设置主键 自动增长
+    public int Id { get; set; }//Id作为主键
+    public string Name { get; set; }
+    public int Age { get; set; }
+    public float Height { get; set; }
+    public float Weight { get; set; }
+
+    public override string ToString()
+    {
+        return string.Format("[Person: Id={0}, Name={1},  Age={2}, Height={3}]，Weight={4}]", Id, Name, Age, Height, Weight);
+    }
+}

ColorlessWorld-2024-4-2/Assets/Scripts/SQLITE/TestTable.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 3a6b9d6eaf2473047b5fe443351e77bf
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -39,7 +39,7 @@ public static class CardFunction
     //큼삽
     public const string ember = "16";
     //츌쌥
-    public const string enhanceShield = "17";
+    public const string agile = "17";
     //퓻미
     public const string firm = "18";
     //弄�
@@ -199,9 +199,10 @@ public static class CardFunction
 
 
 
-    public static readonly HashSet<string> BuffList = new() { bleed, vulnerable, downSpeed, ember, deathMark, tempCastRange, calm , enhanceShield
+    public static readonly HashSet<string> BuffList = new() { bleed, vulnerable, downSpeed, ember, deathMark, tempCastRange, calm , agile
     ,weak,bleedDamage,immunity,thorn,Invisible};
 
-    public static readonly HashSet<string> ActList = new() { damagexy, cardDamage, cardShield, repel, recoverHp, step, reduceCost,costRestore};
+    public static readonly HashSet<string> ActList = new() { damagexy, cardDamage, cardShield, repel, recoverHp, step, reduceCost,costRestore
+    ,drawCard,drawDyeingCard,drawEffectCard};
 
 }

ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Data_SO/EnemyState_SO.cs

@@ -73,9 +73,10 @@ public class EnemyState_SO : ScriptableObject
         }
     }
 
-    public void copyAbnormalCondition()
+    public void RandomHp()
     {
-
+        maxHP = MathTool.RandomTarget((int)maxHP, 0.05f);
+        currentHP=maxHP;
     }
     public EnemyState_SO()
     {

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

@@ -1,3 +1,4 @@
+using CartoonFXPack.Utility;
 using System;
 using System.Buffers.Text;
 using System.Collections;
@@ -354,6 +355,40 @@ public class MathTool
         double offset = (random.NextDouble() * 2 - 1) * deviation;
         return (int)Math.Round(target + offset);
     }
+
+    public static string GetRandomNumberFromRange(string range)
+    {
+        try
+        {
+            // 分割字符串并去除空格
+            var parts = range.Split(new[] { '~' }, StringSplitOptions.RemoveEmptyEntries)
+                             .Select(p => p.Trim())
+                             .ToArray();
+
+            if (parts.Length != 2)
+                throw new ArgumentException("输入格式应为'min~max'");
+
+            // 解析数字
+            if (!int.TryParse(parts[0], out int min) ||
+                !int.TryParse(parts[1], out int max))
+                throw new FormatException("包含非数字字符");
+
+            // 处理逆向范围
+            if (min > max)
+                (min, max) = (max, min);
+
+            // 生成随机数（含两端）
+            int result = random.Next(min, max + 1);
+
+            return result.ToString();
+        }
+        catch (Exception ex)
+        {
+            // 可选：记录错误日志
+            Console.WriteLine($"错误: {ex.Message}");
+            return "0"; // 返回安全默认值
+        }
+    }
 }
 
 

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

@@ -247,7 +247,7 @@ public static class Name
             case CardFunction.downSpeed:
                 sb.Append("ťńľĂ" + kvp.Value + "˛ăźőËŮ");
                 break;
-            case CardFunction.enhanceShield:
+            case CardFunction.agile:
                 sb.Append("ťńľĂ" + kvp.Value + "˛ăĂô˝Ý");
                 break;
             case CardFunction.immunity:
@@ -425,76 +425,63 @@ public static class Name
         }
     }
 
-    public static string getValForSwage(int cost, string fun)
+    public static string getValForSwage(int cost, string fun, CardForgeRule data)
     {
         string result = "";
-        int basicval = 1;
+        string basicval = "";
         switch (fun)
         {
             case CardFunction.cardDamage:
-                basicval = 5;
+                basicval = MathTool.GetRandomNumberFromRange(data.cardDamage);
                 break;
             case CardFunction.cardShield:
-                basicval = 5;
-                break;
-            case CardFunction.posion:
-                basicval = 3;
-                break;
-            case CardFunction.fireSeed:
-                basicval = 3;
+                basicval = MathTool.GetRandomNumberFromRange(data.Shield);
                 break;
             case CardFunction.vulnerable:
-                basicval = 1;
+                basicval = data.vulnerable;
                 break;
             case CardFunction.weak:
-                basicval = 1;
+                basicval = data.weak;
                 break;
             case CardFunction.bleed:
-                basicval = 2;
+                basicval = data.bleed;
                 break;
             case CardFunction.ember:
-                basicval = 2;
-                break;
-            case CardFunction.upSpeed:
-                basicval = 1;
-                break;
-            case CardFunction.recoverHp:
-                basicval = 3;
+                basicval = data.Ember;
                 break;
             case CardFunction.costRestore:
-                basicval = 1;
+                basicval = data.costRestore;
                 break;
             case CardFunction.drawCard:
-                basicval = 1;
+                basicval = data.DrawCard;
                 break;
             case CardFunction.step:
-                basicval = 1;
-                break;
-            case CardFunction.deathMark:
-                basicval = 1;
+                basicval = data.Step;
                 break;
             case CardFunction.damagexy:
-                basicval = 3;
+                string damagex = MathTool.GetRandomNumberFromRange(data.damagex);
+                string damagey=data.damagey;
+                basicval = damagex + "-" + damagey;
                 break;
             case CardFunction.bleedDamage:
-                basicval = 2;
+                basicval = data.bleed;
                 break;
             case CardFunction.thorn:
-                basicval = 2;
+                basicval = data.thorn;
                 break;
             case CardFunction.Invisible:
-                basicval = 1;
+                basicval = data.Invisible;
                 break;
         }
-        int trueval= basicval*cost;
-        if (fun.Equals(CardFunction.damagexy))
+        result=basicval;
+/*        if (fun.Equals(CardFunction.damagexy))
         {
             result = trueval.ToString()+"-"+(cost+1).ToString();
         }
         else
         {
             result=trueval.ToString();
-        }
+        }*/
 
         return result;
     }

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

@@ -982,7 +982,7 @@ public class SettlementManager : Singleton<SettlementManager>
                     }
                     break;
                 case CardFunction.ember:
-                case CardFunction.enhanceShield:
+                case CardFunction.agile:
                 case CardFunction.firm:
                 case CardFunction.extraDrawCardsNum:
                 case CardFunction.banDrawCard:

ColorlessWorld-2024-4-2/Assets/StreamingAssets/TestDatabase.db.meta

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

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

@@ -10,7 +10,7 @@
 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,100,yellow>4,53,5-3,1,0_0,EffectCardIcon/左右开弓,1,3,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
 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