From 2823cbf6cc90abec37c5a10c5bf320d34a28bbe2 Mon Sep 17 00:00:00 2001
From: milimoe <mili@wrss.org>
Date: Tue, 27 Feb 2024 21:41:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=8D=E5=B0=84DLL?=
 =?UTF-8?q?=E7=9A=84=E6=A0=B9=E7=9B=AE=E5=BD=95=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Api/Utility/TextReader.cs       | 10 +++++-----
 Docs/FunGame.Core.xml           |  9 ---------
 Library/Constant/ConstantSet.cs |  8 ++++----
 Library/Constant/FunGameInfo.cs |  2 +-
 4 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/Api/Utility/TextReader.cs b/Api/Utility/TextReader.cs
index 98af1f0..5521d04 100644
--- a/Api/Utility/TextReader.cs
+++ b/Api/Utility/TextReader.cs
@@ -27,7 +27,7 @@ namespace Milimoe.FunGame.Core.Api.Utility
         /// <param name="FileName">文件名，缺省为FunGame.ini</param>
         public static void WriteINI(string Section, string Key, string Value, string FileName = DefaultFileName)
         {
-            WritePrivateProfileString(Section, Key, Value, Environment.CurrentDirectory.ToString() + @"\" + FileName);
+            WritePrivateProfileString(Section, Key, Value, AppDomain.CurrentDomain.BaseDirectory + FileName);
         }
 
         /// <summary>
@@ -40,7 +40,7 @@ namespace Milimoe.FunGame.Core.Api.Utility
         public static string ReadINI(string Section, string Key, string FileName = DefaultFileName)
         {
             char[] val = new char[General.StreamByteSize];
-            _ = GetPrivateProfileString(Section, Key, "", val, General.StreamByteSize, Environment.CurrentDirectory.ToString() + @"\" + FileName);
+            _ = GetPrivateProfileString(Section, Key, "", val, General.StreamByteSize, AppDomain.CurrentDomain.BaseDirectory + FileName);
             string? read = new(val);
             return read != null ? read.Trim('\0') : "";
         }
@@ -50,7 +50,7 @@ namespace Milimoe.FunGame.Core.Api.Utility
         /// </summary>
         /// <param name="FileName">文件名，缺省为FunGame.ini</param>
         /// <returns>是否存在</returns>
-        public static bool ExistINIFile(string FileName = DefaultFileName) => File.Exists($@"{Environment.CurrentDirectory}\{FileName}");
+        public static bool ExistINIFile(string FileName = DefaultFileName) => File.Exists($@"{AppDomain.CurrentDomain.BaseDirectory}{FileName}");
 
         /// <summary>
         /// 初始化ini模板文件
@@ -136,7 +136,7 @@ namespace Milimoe.FunGame.Core.Api.Utility
         public static string ReadTXT(string filename, string path = "")
         {
             if (path.Trim() != "") path = Path.Combine(path, filename);
-            else path = $@"{Environment.CurrentDirectory}\{filename}";
+            else path = $@"{AppDomain.CurrentDomain.BaseDirectory}{filename}";
             if (File.Exists(path))
             {
                 string s = "";
@@ -168,7 +168,7 @@ namespace Milimoe.FunGame.Core.Api.Utility
                 if (!Directory.Exists(path)) Directory.CreateDirectory(path);
                 path = Path.Combine(path, filename);
             }
-            else path = $@"{Environment.CurrentDirectory}\{filename}";
+            else path = $@"{AppDomain.CurrentDomain.BaseDirectory}{filename}";
             // 写入内容
             StreamWriter writer = File.Exists(path) ? new(path, true, General.DefaultEncoding) : new(path, false, General.DefaultEncoding);
             writer.WriteLine(message);
diff --git a/Docs/FunGame.Core.xml b/Docs/FunGame.Core.xml
index d6dd065..1638394 100644
--- a/Docs/FunGame.Core.xml
+++ b/Docs/FunGame.Core.xml
@@ -2747,14 +2747,5 @@
             <param name="action"></param>
             <returns></returns>
         </member>
-        <member name="M:Milimoe.FunGame.Core.Service.TaskExtension.WithCancellation(System.Threading.Tasks.Task,System.Threading.CancellationToken)">
-            <summary>
-            用于取消任务
-            </summary>
-            <param name="task"></param>
-            <param name="cancellationToken"></param>
-            <returns></returns>
-            <exception cref="T:System.OperationCanceledException"></exception>
-        </member>
     </members>
 </doc>
diff --git a/Library/Constant/ConstantSet.cs b/Library/Constant/ConstantSet.cs
index c5a85ac..ebf0ef1 100644
--- a/Library/Constant/ConstantSet.cs
+++ b/Library/Constant/ConstantSet.cs
@@ -213,10 +213,10 @@ namespace Milimoe.FunGame.Core.Library.Constant
     public class ReflectionSet
     {
         public const string FUNGAME_IMPL = "FunGame.Implement";
-        public static string EXEFolderPath { get; } = Environment.CurrentDirectory.ToString() + "\\"; // 程序目录
-        public static string PluginFolderPath { get; } = Environment.CurrentDirectory.ToString() + "\\plugins\\"; // 插件目录
-        public static string GameModeFolderPath { get; } = Environment.CurrentDirectory.ToString() + "\\gamemods\\"; // 游戏模组目录
-        public static string GameMapFolderPath { get; } = Environment.CurrentDirectory.ToString() + "\\maps\\"; // 游戏地图目录
+        public static string EXEFolderPath { get; } = AppDomain.CurrentDomain.BaseDirectory; // 程序目录
+        public static string PluginFolderPath { get; } = AppDomain.CurrentDomain.BaseDirectory + @"plugins\"; // 插件目录
+        public static string GameModeFolderPath { get; } = AppDomain.CurrentDomain.BaseDirectory + @"gamemods\"; // 游戏模组目录
+        public static string GameMapFolderPath { get; } = AppDomain.CurrentDomain.BaseDirectory + @"maps\"; // 游戏地图目录
     }
 
     public class FormSet
diff --git a/Library/Constant/FunGameInfo.cs b/Library/Constant/FunGameInfo.cs
index 4fb463a..8f7e75a 100644
--- a/Library/Constant/FunGameInfo.cs
+++ b/Library/Constant/FunGameInfo.cs
@@ -39,7 +39,7 @@
                 FunGame.FunGame_Server => FunGame_Server,
                 _ => ""
             };
-            return type + " [ 版本: " + FunGame_Version + FunGame_VersionPatch + " ]\n" + (type.Equals(FunGame_Desktop) ? @"©" : "(C)") + "2023 Milimoe. 保留所有权利\n";
+            return type + " [版本: " + FunGame_Version + FunGame_VersionPatch + "]\n" + (type.Equals(FunGame_Desktop) ? @"©" : "(C)") + "2023 Milimoe. 保留所有权利\n";
         }
     }
 }