Merge pull request #5 from wenen-creator/dev

v1.2.1-release
wenen-creator · Sep 7, 2024 · 7909490 · 7909490
2 parents 5aa5448 + 5a65f23
commit 7909490
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 13 deletions.
diff --git a/Plugins/System.Data.SQLite.dll b/Plugins/System.Data.SQLite.dll
diff --git a/Plugins/sqlite3.dll b/Plugins/sqlite3.dll
diff --git a/Plugins/System.Data.SQLite.dll.meta → Plugins/sqlite3.dll.meta b/Plugins/System.Data.SQLite.dll.meta → Plugins/sqlite3.dll.meta
diff --git a/System/Assist/Info/DataArchiveConstData.cs b/System/Assist/Info/DataArchiveConstData.cs
@@ -14,6 +14,8 @@ public static partial class DataArchiveConstData
         private static string AUTHOR { get; set; } = "温文";
         public static string USER_KEY { get; set; } = "Wenen";
         public const string Prefix_ArchiveIDKey = "ArchiveID";
+        private const string ArchiveExtensionName = "bin";
+        private const string SaveAllGroupKeyFileName = "group";
         private static string _ArchiveRootDirectoryPath;
 
         private static string ArchiveRootDirectoryPath
@@ -22,7 +24,7 @@ private static string ArchiveRootDirectoryPath
             {
                 if (string.IsNullOrEmpty(_ArchiveRootDirectoryPath))
                 {
-                    _ArchiveRootDirectoryPath = Path.Combine(AppPersistentDataPath, "Archive2024");
+                    _ArchiveRootDirectoryPath = Path.Combine(AppPersistentDataPath, "tmp");
                 }
 
                 return _ArchiveRootDirectoryPath;
@@ -51,7 +53,12 @@ public static string GetUserCertainArchiveSystemDirectoryPath(string MoudleName)
 
         public static string GetAndCombineDataFilePath(string path, string groupKey)
         {
-            string groupFilePath = Path.Combine(path, string.Format("{0}.{1}", groupKey, "archive"));
+            string fileName = groupKey;
+            if (string.IsNullOrEmpty(ArchiveExtensionName) == false)
+            {
+                fileName = string.Format("{0}.{1}",fileName, ArchiveExtensionName);
+            }
+            string groupFilePath = Path.Combine(path, fileName);
             return groupFilePath;
         }
 
@@ -74,7 +81,7 @@ public static string GetArchiveSystemInfoDirectoryPath(string ModuleName, int ar
 
         public static string GetArchiveGroupKeysFilePath(string ModuleName, int archiveID)
         {
-            return Path.Combine(GetArchiveDirectoryPath(ModuleName, archiveID), "groups.key");
+            return Path.Combine(GetArchiveDirectoryPath(ModuleName, archiveID), SaveAllGroupKeyFileName);
         }
 
         public static string GetGroupKeyInPlayerPrefs(string groupKey)

diff --git a/System/DataArchiveOperation/SQLDataArchiveOperation.cs b/System/DataArchiveOperation/SQLDataArchiveOperation.cs
@@ -6,11 +6,9 @@
 //-------------------------------------------------
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Data;
 using System.IO;
-using System.Text;
 using System.Threading.Tasks;
 using FlexiArchiveSystem.ArchiveOperation.IO;
 using FlexiArchiveSystem.Assist;
@@ -453,7 +451,7 @@ public async Task DisposeAsync()
 
         private string GetAndCombineDataFilePath()
         {
-            string databasePath = DataArchiveConstData.GetAndCombineDataFilePath(Path, "database");
+            string databasePath = DataArchiveConstData.GetAndCombineDataFilePath(Path, _archiveID.ToString());
             return databasePath;
         }
     }