From 34ac0c5ab3af52be6d79e9b795cff07e068206a0 Mon Sep 17 00:00:00 2001
From: DLmaster361 <DLmaster_361@163.com>
Date: Sun, 18 May 2025 13:54:14 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=B8=BB=E5=8A=A8=E5=85=B3=E9=97=AD?=
 =?UTF-8?q?=E5=89=A9=E4=BD=99=E7=90=86=E6=99=BA=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/MAA.py | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/app/models/MAA.py b/app/models/MAA.py
index f946a61..8d77088 100644
--- a/app/models/MAA.py
+++ b/app/models/MAA.py
@@ -1397,7 +1397,9 @@ class MaaManager(QObject):
                     ] = "True"  # 备选关卡
                     data["Configurations"]["Default"][
                         "Fight.UseRemainingSanityStage"
-                    ] = "True"  # 使用剩余理智
+                    ] = (
+                        "True" if user_data["Info"]["GameId_Remain"] != "-" else "False"
+                    )  # 使用剩余理智
                     data["Configurations"]["Default"][
                         "Fight.UseExpiringMedicine"
                     ] = "True"  # 无限吃48小时内过期的理智药
@@ -1495,7 +1497,9 @@ class MaaManager(QObject):
                     ] = "True"  # 备选关卡
                     data["Configurations"]["Default"][
                         "Fight.UseRemainingSanityStage"
-                    ] = "True"  # 使用剩余理智
+                    ] = (
+                        "True" if user_data["Info"]["GameId_Remain"] != "-" else "False"
+                    )  # 使用剩余理智
 
                     # 基建模式
                     if (
@@ -1596,6 +1600,15 @@ class MaaManager(QObject):
             data["Configurations"]["Default"][
                 "Start.OpenEmulatorAfterLaunch"
             ] = "False"  # 启动MAA后自动开启模拟器
+            data["Global"][
+                "VersionUpdate.ScheduledUpdateCheck"
+            ] = "False"  # 定时检查更新
+            data["Global"][
+                "VersionUpdate.AutoDownloadUpdatePackage"
+            ] = "False"  # 自动下载更新包
+            data["Global"][
+                "VersionUpdate.AutoInstallUpdatePackage"
+            ] = "False"  # 自动安装更新包
 
             if Config.get(Config.function_IfSilence):
                 data["Global"][
@@ -1604,15 +1617,6 @@ class MaaManager(QObject):
 
             if "全局" in mode:
 
-                data["Global"][
-                    "VersionUpdate.ScheduledUpdateCheck"
-                ] = "False"  # 定时检查更新
-                data["Global"][
-                    "VersionUpdate.AutoDownloadUpdatePackage"
-                ] = "False"  # 自动下载更新包
-                data["Global"][
-                    "VersionUpdate.AutoInstallUpdatePackage"
-                ] = "False"  # 自动安装更新包
                 data["Configurations"]["Default"][
                     "TaskQueue.WakeUp.IsChecked"
                 ] = "False"  # 开始唤醒

From 0b06b499e42c19f9cc192bd2a8706cd568d53a89 Mon Sep 17 00:00:00 2001
From: DLmaster361 <DLmaster_361@163.com>
Date: Sun, 18 May 2025 23:35:35 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix(models):=20=E4=BF=AE=E5=A4=8D=E9=9B=B7?=
 =?UTF-8?q?=E7=94=B5ADB=E7=AB=AF=E5=8F=A3=E5=8F=B7=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/MAA.py      | 2 +-
 resources/version.json | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/models/MAA.py b/app/models/MAA.py
index 6c0ba9c..e7b1e3c 100644
--- a/app/models/MAA.py
+++ b/app/models/MAA.py
@@ -906,7 +906,7 @@ class MaaManager(QObject):
 
         if "-" in self.ADB_address:
             ADB_ip = f"{self.ADB_address.split("-")[0]}-"
-            ADB_port = self.ADB_address.split("-")[1]
+            ADB_port = int(self.ADB_address.split("-")[1])
 
         elif ":" in self.ADB_address:
             ADB_ip = f"{self.ADB_address.split(':')[0]}:"
diff --git a/resources/version.json b/resources/version.json
index 071b9bc..f1dea9d 100644
--- a/resources/version.json
+++ b/resources/version.json
@@ -4,6 +4,9 @@
         "4.3.8.3": {
             "新增功能": [
                 "用户仪表盘支持直接控制用户状态"
+            ],
+            "修复bug": [
+                "修复雷电ADB端口号相关问题"          
             ]
         },
         "4.3.8.2": {