opt

Pik-4 · Dec 22, 2024 · afaeda4 · afaeda4
1 parent 8efad31
commit afaeda4
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 18 deletions.
diff --git a/HsMod/Main.cs b/HsMod/Main.cs
@@ -1,6 +1,5 @@
 using BepInEx;
 using System;
-using System.Diagnostics;
 using System.Linq;
 using UnityEngine;
 using static HsMod.PluginConfig;
@@ -159,6 +158,13 @@ private void Start()
 
         private void Update()
         {
+            // todo: check game status
+            if ((autoQuitTimer.Value > 0) && (ConfigValue.Get().RunningTime >= (autoQuitTimer.Value + 1145)))
+            {
+                Utils.MyLogger(BepInEx.Logging.LogLevel.Warning, "Force Auto Quit...");
+                Utils.Quit();
+            }
+
             if (Input.GetKeyUp(KeyCode.F4))
             {
                 int allPatchNum = 0;

diff --git a/HsMod/Patcher.cs b/HsMod/Patcher.cs
@@ -5,7 +5,6 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Linq;
 using System.Reflection;
 using System.Reflection.Emit;
@@ -53,7 +52,7 @@ public static void LoadPatch(Type loadType)
                 Utils.MyLogger(BepInEx.Logging.LogLevel.Error, $"{loadType.Name} => {ex.Message} \n{ex.InnerException}");
                 Utils.MyLogger(BepInEx.Logging.LogLevel.Error, "HsMod patch failed!");
                 System.Threading.Thread.Sleep(11451);
-                Application.Quit(114514);
+                Utils.Quit(114514);
             }
         }
 
@@ -518,7 +517,7 @@ public static bool PatchError()
             {
                 if (isAutoExit.Value)
                 {
-                    Application.Quit();
+                    Utils.Quit();
                     return false;
                 }
                 else return true;
@@ -1761,7 +1760,7 @@ public static void PatchEndGameScreenShow(ref TAG_PLAYSTATE playState, ref Spell
                             }
                             else
                             {
-                                switch (GameState.Get().GetFriendlySidePlayer().GetHero().GetRealTimePlayerLeaderboardPlace())
+                                switch (GameState.Get()?.GetFriendlySidePlayer()?.GetHero()?.GetRealTimePlayerLeaderboardPlace())
                                 {
                                     case 1: finalResult = "第一名"; break;
                                     case 2: finalResult = "第二名"; break;
@@ -1792,7 +1791,8 @@ public static void PatchEndGameScreenShow(ref TAG_PLAYSTATE playState, ref Spell
                                 gameRank = BaconLobbyMgr.Get()?.GetBattlegroundsActiveGameModeRating().ToString();
                             }
                             finalResult = $"{String.Join("<br />", DateTime.Now.ToString().Split(' '))},{finalResult},{gameRank},{gameType},{Utils.CacheLastOpponentFullName},";
-                            finalResult += $"High:{Utils.CacheLastOpponentAccountID.High}+Low:{Utils.CacheLastOpponentAccountID.Low}";
+                            //finalResult += $"High:{Utils.CacheLastOpponentAccountID.High}+Low:{Utils.CacheLastOpponentAccountID.Low}";
+                            finalResult += $"Opponent: {Utils.CacheLastOpponentAccountID.Low}, MyPlayer: {BnetPresenceMgr.Get()?.GetMyPlayer()?.GetBestName()?.ToString()}";
                             if (isAutoReportEnable.Value)
                             {
                                 finalResult += " => 已举报";
@@ -1812,15 +1812,7 @@ public static void PatchEndGameScreenShow(ref TAG_PLAYSTATE playState, ref Spell
                 if (autoQuitTimer.Value > 0 && ConfigValue.Get().RunningTime >= autoQuitTimer.Value)
                 {
                     Utils.MyLogger(BepInEx.Logging.LogLevel.Warning, "定时重启！即将退出游戏...");
-                    try
-                    {
-                        Application.Quit();
-                    }
-                    finally
-                    {
-                        System.Threading.Thread.Sleep(11451);
-                        Process.GetCurrentProcess().Kill();
-                    }
+                    Utils.Quit();
                 }
             }
 

diff --git a/HsMod/Utils.cs b/HsMod/Utils.cs
@@ -3,6 +3,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Reflection;
@@ -1041,6 +1042,19 @@ public static void OnHsLoginCompleted()
             }
         }
 
+        public static void Quit(int exitCode = 0)
+        {
+            try
+            {
+                UnityEngine.Application.Quit(exitCode);
+            }
+            finally
+            {
+                System.Threading.Thread.Sleep(11451);
+                Process.GetCurrentProcess().Kill();
+            }
+        }
+
         public static class LeakInfo
         {
             public static void Mercenaries()

diff --git a/HsMod/WebApi.cs b/HsMod/WebApi.cs
@@ -13,10 +13,11 @@ public class WebApi
 
         public static async Task<string> RunShellCommandAsync(string command)
         {
-            if (!isWebshellEnable.Value) {
+            if (!isWebshellEnable.Value)
+            {
                 return string.Empty;
             }
-            
+
             var processInfo = new ProcessStartInfo
             {
                 CreateNoWindow = true,

diff --git a/HsMod/WebPage.cs b/HsMod/WebPage.cs
@@ -20,7 +20,7 @@ private static string GenerateBtn()
             btn += @"<a href=""/lettuce""><button class=""btn_li"">佣兵关卡</button><br/></a><br />";
             btn += @"<a href=""/mercenaries""><button class=""btn_li"">佣兵收藏</button><br/></a><br />";
             if (System.IO.File.Exists(CommandConfig.hsMatchLogPath)) btn += @"<a href=""/matchlog""><button class=""btn_li"">炉石对局</button><br/></a><br />";
-            btn += @"<a href=""/config/index.html""><button class=""btn_li"">配置修改</button><br/></a><br />";
+            if (Directory.Exists(Path.Combine(PluginConfig.HsModWebSite, "config", "index.html"))) btn += @"<a href=""/config/index.html""><button class=""btn_li"">配置修改</button><br/></a><br />";
             btn += @"<a href=""/about""><button class=""btn_li"">关&emsp;&emsp;于</button><br/></a><br />";
             return btn;
         }