Merge branch 'eesast:dev' into dev

sigureling · May 8, 2024 · 8f4723c · 8f4723c
2 parents c1670f9 + 171cf79
commit 8f4723c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/installer/Data/MD5FileData.cs b/installer/Data/MD5FileData.cs
@@ -26,7 +26,7 @@ public class TVersion
     {
         // 代码库版本
         [JsonInclude]
-        public Version LibVersion = new Version(1, 0, 2, 1);
+        public Version LibVersion = new Version(1, 0, 2, 2);
         // 选手代码模板版本
         [JsonInclude]
         public Version TemplateVersion = new Version(1, 0, 0, 3);

diff --git a/installer/ViewModel/DebugViewModel.cs b/installer/ViewModel/DebugViewModel.cs
@@ -370,15 +370,15 @@ public bool LaunchPyAPI(int team, int player)
                 {
                     FileName = "cmd.exe",
                     Arguments = "/c python "
-                        + Downloader.Data.Config.DevPyPath ?? Path.Combine(Downloader.Data.Config.InstallPath, "CAPI", "python", "PyAPI", "main.py")
+                        + (Downloader.Data.Config.DevPyPath ?? Path.Combine(Downloader.Data.Config.InstallPath, "CAPI", "python", "PyAPI", "main.py"))
                         + $" -I {IP} -P {Port} -t {team} -p {player} -o"
                 });
                 if (py is null)
                 {
                     Log.LogError($"未能启动main.py, team:{team}, player: {player}!");
                     return false;
                 }
-                Log.LogError($"main.py启动成功, team:{team}, player: {player}!");
+                Log.LogInfo($"main.py启动成功, team:{team}, player: {player}!");
                 children.Add(py);
                 return true;
             }