From c80a64a79bc508531091ea39f8d6e3fb82b228d2 Mon Sep 17 00:00:00 2001
From: fuyn <fuynshile@outlook.com>
Date: Sun, 15 Oct 2023 21:57:54 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=20=E6=94=BE=E5=87=BA=E6=9D=A5=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 arknights_mower/utils/simulator.py |  2 +-
 ui/src/components/MaaWeeklyNew.vue |  4 ++--
 ui/src/components/ServerJang.vue   | 15 +++++++++------
 ui/src/pages/Settings.vue          |  2 +-
 ui/src/pages/depot.vue             |  2 +-
 5 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/arknights_mower/utils/simulator.py b/arknights_mower/utils/simulator.py
index 057489583..43b9af355 100644
--- a/arknights_mower/utils/simulator.py
+++ b/arknights_mower/utils/simulator.py
@@ -33,7 +33,7 @@ def restart_simulator(data, stop=True, start=True):
             cmd = "waydroid session stop"
         if stop:
             exec_cmd(cmd, data["simulator_folder"])
-            logger.info(f"开始关闭{simulator_type}模拟器，等待2秒钟")
+            logger.info(f"关闭{simulator_type}模拟器")
             time.sleep(2)
         if simulator_type == Simulator_Type.Nox.value:
             cmd = cmd.replace(" -quit", "")
diff --git a/ui/src/components/MaaWeeklyNew.vue b/ui/src/components/MaaWeeklyNew.vue
index 49be8a944..43fef583c 100644
--- a/ui/src/components/MaaWeeklyNew.vue
+++ b/ui/src/components/MaaWeeklyNew.vue
@@ -26,7 +26,7 @@ const showstage = (stage) => {
     '1-7': '1-7',
     Annihilation: '剿灭',
     'LS-6': '经验书',
-    'CE-6': '龙门',
+    'CE-6': '龙门币',
     'AP-5': '红票',
     'SK-6': '碳条',
     'CA-5': '技能书',
@@ -162,7 +162,7 @@ function create_tag(label) {
               :key="index"
               :class="{ today: currentDay === index }"
             >
-              {{ day }}{{ currentDay === index + 1 ? ' (今天)' : '' }}
+              {{ day }}{{ currentDay === (index + 1) % 7 ? ' (今天)' : '' }}
             </th>
           </tr>
           <tr>
diff --git a/ui/src/components/ServerJang.vue b/ui/src/components/ServerJang.vue
index 71e2bc2e5..60f8df57a 100644
--- a/ui/src/components/ServerJang.vue
+++ b/ui/src/components/ServerJang.vue
@@ -3,7 +3,7 @@ import { ref, inject } from 'vue'
 import { useConfigStore } from '@/stores/config'
 import { storeToRefs } from 'pinia'
 
-const store = useConfigStore();
+const store = useConfigStore()
 const axios = inject('axios')
 const mobile = inject('mobile')
 
@@ -13,11 +13,9 @@ const { server_push_enable, sendKey } = storeToRefs(store)
 
 async function test_push() {
   testPushResult.value = '正在发送……'
-  const response = await axios.get(`${import.meta.env.VITE_HTTP_URL}/test-serverJang-push`);
+  const response = await axios.get(`${import.meta.env.VITE_HTTP_URL}/test-serverJang-push`)
   testPushResult.value = response.data
 }
-
-
 </script>
 
 <template>
@@ -37,8 +35,13 @@ async function test_push() {
     </template>
 
     <template #default>
-      <n-form v-if="server_push_enable" :label-placement="mobile ? 'top' : 'left'" :show-feedback="false" label-width="96"
-        label-align="left">
+      <n-form
+        v-if="server_push_enable"
+        :label-placement="mobile ? 'top' : 'left'"
+        :show-feedback="false"
+        label-width="96"
+        label-align="left"
+      >
         <n-form-item label="SENDKEY">
           <n-input v-model:value="sendKey" show-password-on="click" type="password" />
         </n-form-item>
diff --git a/ui/src/pages/Settings.vue b/ui/src/pages/Settings.vue
index 2281b6b3e..1ecfe26e9 100644
--- a/ui/src/pages/Settings.vue
+++ b/ui/src/pages/Settings.vue
@@ -312,7 +312,7 @@ function render_label(option) {
 
         <div><Recruit /></div>
         <div><maa-weekly /></div>
-        <!--div><maa-weekly-new /></div-->
+        <div><maa-weekly-new /></div>
         <div><maa-long-tasks /></div>
       </div>
     </div>
diff --git a/ui/src/pages/depot.vue b/ui/src/pages/depot.vue
index 76d88fc4a..651e826be 100644
--- a/ui/src/pages/depot.vue
+++ b/ui/src/pages/depot.vue
@@ -121,7 +121,7 @@ const tireCategories = [
     '五水研磨石',
     'RMA70-24',
     '环烃预制体',
-'固化纤维板',
+    '固化纤维板'
   ],
   [
     '固源岩组',

From 3de2fc4e5644f8b3ba8dced85655c55c1970af7f Mon Sep 17 00:00:00 2001
From: fuyn <fuynshile@outlook.com>
Date: Sun, 15 Oct 2023 22:00:16 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=20=E5=8F=96=E6=B6=88=E6=96=B0=E5=91=A8=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E8=A1=A8=E7=9A=84=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/src/components/MaaWeeklyNew.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ui/src/components/MaaWeeklyNew.vue b/ui/src/components/MaaWeeklyNew.vue
index 43fef583c..0bf33342a 100644
--- a/ui/src/components/MaaWeeklyNew.vue
+++ b/ui/src/components/MaaWeeklyNew.vue
@@ -152,6 +152,7 @@ function create_tag(label) {
         <li><b>不刷理智</b>：留空表示不刷理智。</li>
       </ul>
     </help-text>
+    觉得不好看/有建议的 at群管理 带上建议或者自行提交代码
     <div class="tasktable">
       <table size="small" :single-column="true" :single-line="true">
         <thead>