From 0b0c9edbdf5a06951b4701dd8f2152ab4fd466f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9B=AA=E8=A7=81=E7=92=83?=
 <75160294+snowly233@users.noreply.github.com>
Date: Sat, 13 May 2023 19:30:44 +0800
Subject: [PATCH 01/22] Update Honkai_Star_Rail.py

---
 Honkai_Star_Rail.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Honkai_Star_Rail.py b/Honkai_Star_Rail.py
index b3a671b1..4b1d51ee 100644
--- a/Honkai_Star_Rail.py
+++ b/Honkai_Star_Rail.py
@@ -14,7 +14,7 @@
 def main():
     if not read_json_file(CONFIG_FILE_NAME, False).get('start'):
         title = "请选择代理地址："
-        options = ['https://github.moeyy.xyz/', 'https://ghproxy.com/', '']
+        options = ['https://github.moeyy.xyz/', 'https://ghproxy.com/', '不使用代理']
         option, index = pick(options, title, indicator='=>', default_index=0)
         modify_json_file(CONFIG_FILE_NAME, "github_proxy", option)
         title = "你游戏里开启了自动战斗吗？："

From 9c9096dd3095da77c3f2d4474d7ec5e11a7472e4 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Sat, 13 May 2023 11:31:01 +0000
Subject: [PATCH 02/22] =?UTF-8?q?:wrench:=20=E8=87=AA=E5=8A=A8=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E8=B5=84=E6=BA=90=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 star_list.json | 6 +++---
 version.json   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/star_list.json b/star_list.json
index 8124187b..a44be015 100644
--- a/star_list.json
+++ b/star_list.json
@@ -1,7 +1,7 @@
 [
   {
     "path": "Honkai_Star_Rail.py",
-    "hash": "992274baf946c5e97890c276f4b3ce76"
+    "hash": "8d40d81d18041e6b9420411df7c3c8b7"
   },
   {
     "path": "get_width.py",
@@ -21,7 +21,7 @@
   },
   {
     "path": "version.json",
-    "hash": "e05d77b5ba4f9c26b70b23d80e92a252"
+    "hash": "9219515a165027bd47981aba99377a50"
   },
   {
     "path": "requirements.txt",
@@ -37,7 +37,7 @@
   },
   {
     "path": "star_list.json",
-    "hash": "334c550bf810cabc525a6e7c75f217fc"
+    "hash": "53bf3ef1a1d5596eafac09f9b667839e"
   },
   {
     "path": "LICENSE",
diff --git a/version.json b/version.json
index ffb83398..d02c76c2 100644
--- a/version.json
+++ b/version.json
@@ -1 +1 @@
-{"version": "20230513171242"}
\ No newline at end of file
+{"version": "20230513193059"}
\ No newline at end of file

From cd7312db2603981fdc9fa0af518343b76aba47a3 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Sat, 13 May 2023 11:34:38 +0000
Subject: [PATCH 03/22] =?UTF-8?q?:wrench:=20=E8=87=AA=E5=8A=A8=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E8=B5=84=E6=BA=90=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config.json    | 2 +-
 star_list.json | 8 ++++----
 version.json   | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/config.json b/config.json
index 36d07b80..c177cf0a 100644
--- a/config.json
+++ b/config.json
@@ -9,4 +9,4 @@
   "start": false,
   "temp_version": "0",
   "star_version": "0"
-}
+}
\ No newline at end of file
diff --git a/star_list.json b/star_list.json
index a44be015..eab47345 100644
--- a/star_list.json
+++ b/star_list.json
@@ -17,11 +17,11 @@
   },
   {
     "path": "config.json",
-    "hash": "82b37571423989ac4271d4a0be0eb0f0"
+    "hash": "eb27234b6d768391b68fe69c7d66fb76"
   },
   {
     "path": "version.json",
-    "hash": "9219515a165027bd47981aba99377a50"
+    "hash": "5b6df4d70779adbe929153427a29dff5"
   },
   {
     "path": "requirements.txt",
@@ -37,7 +37,7 @@
   },
   {
     "path": "star_list.json",
-    "hash": "53bf3ef1a1d5596eafac09f9b667839e"
+    "hash": "b19aa6038fede6fd98f934e1aab2f134"
   },
   {
     "path": "LICENSE",
@@ -49,7 +49,7 @@
   },
   {
     "path": "tool/update_file.py",
-    "hash": "dd1aa6f9876cfaf980c7111bbc3961c9"
+    "hash": "31a956ff950d22d26ff582314adc4dff"
   },
   {
     "path": "tool/config.py",
diff --git a/version.json b/version.json
index d02c76c2..0d0f0754 100644
--- a/version.json
+++ b/version.json
@@ -1 +1 @@
-{"version": "20230513193059"}
\ No newline at end of file
+{"version": "20230513193437"}
\ No newline at end of file

From ffb827042f300c69e7e6c79cb32a19dac3b0b55b Mon Sep 17 00:00:00 2001
From: Hengyu <h3ngyu@gmail.com>
Date: Sat, 13 May 2023 19:53:19 +0800
Subject: [PATCH 04/22] =?UTF-8?q?Add:=20=E9=BC=A0=E6=A0=87=E6=BB=9A?=
 =?UTF-8?q?=E5=8A=A8=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tool/calculated.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/tool/calculated.py b/tool/calculated.py
index 28b47641..c0653c6b 100644
--- a/tool/calculated.py
+++ b/tool/calculated.py
@@ -171,6 +171,8 @@ def auto_map(self, map, old=True):
                     time.sleep(1)
                 else:
                     raise Exception(f"map数据错误, fighting参数异常:{map_filename}", map)
+            elif key == "scroll":
+                self.scroll(value)
             else:
                 raise Exception(f"map数据错误,未匹配对应操作:{map_filename}", map)
 
@@ -189,3 +191,13 @@ def Mouse_move(self, x):
         if last != 0:
             win32api.mouse_event(win32con.MOUSEEVENTF_MOVE, last, 0)  # 进行视角移动
         time.sleep(0.5)
+       
+    def scroll(self, clicks: float):
+        """
+        说明：
+            控制鼠标滚轮滚动
+        参数：
+            :param clicks 滚动单位，正数为向上滚动
+        """
+        pyautogui.scroll(clicks)
+        time.sleep(.5)

From 2c205db1312d3e3fb40063d0112cc2cb01839e64 Mon Sep 17 00:00:00 2001
From: Night-stars-1 <99261160+Night-stars-1@users.noreply.github.com>
Date: Sat, 13 May 2023 20:15:11 +0800
Subject: [PATCH 05/22] Update calculated.py

---
 tool/calculated.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tool/calculated.py b/tool/calculated.py
index c0653c6b..9b8d19ee 100644
--- a/tool/calculated.py
+++ b/tool/calculated.py
@@ -200,4 +200,4 @@ def scroll(self, clicks: float):
             :param clicks 滚动单位，正数为向上滚动
         """
         pyautogui.scroll(clicks)
-        time.sleep(.5)
+        time.sleep(0.5)

From dc99b371170ee3608e7bcba2c905bbcc1ee5f7dd Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Sat, 13 May 2023 12:15:47 +0000
Subject: [PATCH 06/22] =?UTF-8?q?:wrench:=20=E8=87=AA=E5=8A=A8=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E8=B5=84=E6=BA=90=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 star_list.json | 8 ++++----
 version.json   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/star_list.json b/star_list.json
index eab47345..6c0ff638 100644
--- a/star_list.json
+++ b/star_list.json
@@ -17,11 +17,11 @@
   },
   {
     "path": "config.json",
-    "hash": "eb27234b6d768391b68fe69c7d66fb76"
+    "hash": "82b37571423989ac4271d4a0be0eb0f0"
   },
   {
     "path": "version.json",
-    "hash": "5b6df4d70779adbe929153427a29dff5"
+    "hash": "c24628afe420ef86ae29b5d8646f0f05"
   },
   {
     "path": "requirements.txt",
@@ -37,7 +37,7 @@
   },
   {
     "path": "star_list.json",
-    "hash": "b19aa6038fede6fd98f934e1aab2f134"
+    "hash": "4addf99d449046bb338e8bc54234403a"
   },
   {
     "path": "LICENSE",
@@ -65,7 +65,7 @@
   },
   {
     "path": "tool/calculated.py",
-    "hash": "0a1a02505b27d72ba3c51a47ebee3bd7"
+    "hash": "39ba13f64b8d89ed88b02b4eb8e666cc"
   },
   {
     "path": "tool/record_v7.2.py",
diff --git a/version.json b/version.json
index 0d0f0754..25592348 100644
--- a/version.json
+++ b/version.json
@@ -1 +1 @@
-{"version": "20230513193437"}
\ No newline at end of file
+{"version": "20230513201546"}
\ No newline at end of file

From 690df91dfd552da53946b74ad36c6e2b5c2e3560 Mon Sep 17 00:00:00 2001
From: Night-stars-1 <99261160+Night-stars-1@users.noreply.github.com>
Date: Sat, 13 May 2023 21:03:06 +0800
Subject: [PATCH 07/22] Update Honkai_Star_Rail.py

---
 Honkai_Star_Rail.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Honkai_Star_Rail.py b/Honkai_Star_Rail.py
index 4b1d51ee..b3a671b1 100644
--- a/Honkai_Star_Rail.py
+++ b/Honkai_Star_Rail.py
@@ -14,7 +14,7 @@
 def main():
     if not read_json_file(CONFIG_FILE_NAME, False).get('start'):
         title = "请选择代理地址："
-        options = ['https://github.moeyy.xyz/', 'https://ghproxy.com/', '不使用代理']
+        options = ['https://github.moeyy.xyz/', 'https://ghproxy.com/', '']
         option, index = pick(options, title, indicator='=>', default_index=0)
         modify_json_file(CONFIG_FILE_NAME, "github_proxy", option)
         title = "你游戏里开启了自动战斗吗？："

From 99bb4546e354159d6d1819d08b2cb3e6fba5fe86 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Sat, 13 May 2023 13:03:20 +0000
Subject: [PATCH 08/22] =?UTF-8?q?:wrench:=20=E8=87=AA=E5=8A=A8=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E8=B5=84=E6=BA=90=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 star_list.json | 6 +++---
 version.json   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/star_list.json b/star_list.json
index 6c0ff638..175be866 100644
--- a/star_list.json
+++ b/star_list.json
@@ -1,7 +1,7 @@
 [
   {
     "path": "Honkai_Star_Rail.py",
-    "hash": "8d40d81d18041e6b9420411df7c3c8b7"
+    "hash": "992274baf946c5e97890c276f4b3ce76"
   },
   {
     "path": "get_width.py",
@@ -21,7 +21,7 @@
   },
   {
     "path": "version.json",
-    "hash": "c24628afe420ef86ae29b5d8646f0f05"
+    "hash": "c3049631370b973afdf188175b2ebf63"
   },
   {
     "path": "requirements.txt",
@@ -37,7 +37,7 @@
   },
   {
     "path": "star_list.json",
-    "hash": "4addf99d449046bb338e8bc54234403a"
+    "hash": "5361dc0367704cbbbf3cc42462da7b46"
   },
   {
     "path": "LICENSE",
diff --git a/version.json b/version.json
index 25592348..de6ee973 100644
--- a/version.json
+++ b/version.json
@@ -1 +1 @@
-{"version": "20230513201546"}
\ No newline at end of file
+{"version": "20230513210319"}
\ No newline at end of file

From 0714d50adea73c370317de0190d5c300fe5ee732 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9B=AA=E8=A7=81=E7=92=83?=
 <75160294+snowly233@users.noreply.github.com>
Date: Sat, 13 May 2023 22:25:15 +0800
Subject: [PATCH 09/22] Update Honkai_Star_Rail.py

---
 Honkai_Star_Rail.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Honkai_Star_Rail.py b/Honkai_Star_Rail.py
index b3a671b1..4616fea7 100644
--- a/Honkai_Star_Rail.py
+++ b/Honkai_Star_Rail.py
@@ -13,11 +13,11 @@
 
 def main():
     if not read_json_file(CONFIG_FILE_NAME, False).get('start'):
-        title = "请选择代理地址："
+        title = "请选择代理地址：（不使用代理选第三条空选项）"
         options = ['https://github.moeyy.xyz/', 'https://ghproxy.com/', '']
         option, index = pick(options, title, indicator='=>', default_index=0)
         modify_json_file(CONFIG_FILE_NAME, "github_proxy", option)
-        title = "你游戏里开启了自动战斗吗？："
+        title = "你游戏里开启了连续自动战斗吗？："
         options = ['没打开', '打开了', '这是什么']
         option, index = pick(options, title, indicator='=>', default_index=0)
         modify_json_file(CONFIG_FILE_NAME, "auto_battle_persistence", index)

From fb00f1d616259ce8c3a0aeca0b02bc4d5e1c1822 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Sat, 13 May 2023 14:25:28 +0000
Subject: [PATCH 10/22] =?UTF-8?q?:wrench:=20=E8=87=AA=E5=8A=A8=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E8=B5=84=E6=BA=90=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 star_list.json | 6 +++---
 version.json   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/star_list.json b/star_list.json
index 175be866..543b5b19 100644
--- a/star_list.json
+++ b/star_list.json
@@ -1,7 +1,7 @@
 [
   {
     "path": "Honkai_Star_Rail.py",
-    "hash": "992274baf946c5e97890c276f4b3ce76"
+    "hash": "1d03f5b63572dbb686cb956be1255f32"
   },
   {
     "path": "get_width.py",
@@ -21,7 +21,7 @@
   },
   {
     "path": "version.json",
-    "hash": "c3049631370b973afdf188175b2ebf63"
+    "hash": "689f87233e661212c34e71576685c17c"
   },
   {
     "path": "requirements.txt",
@@ -37,7 +37,7 @@
   },
   {
     "path": "star_list.json",
-    "hash": "5361dc0367704cbbbf3cc42462da7b46"
+    "hash": "a0960583c31b3409e87aea807ed868c2"
   },
   {
     "path": "LICENSE",
diff --git a/version.json b/version.json
index de6ee973..842d7b81 100644
--- a/version.json
+++ b/version.json
@@ -1 +1 @@
-{"version": "20230513210319"}
\ No newline at end of file
+{"version": "20230513222527"}
\ No newline at end of file

From ec93004245386d650321b9ab697b0941c2d4d467 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Sat, 13 May 2023 15:54:23 +0000
Subject: [PATCH 11/22] =?UTF-8?q?:wrench:=20=E8=87=AA=E5=8A=A8=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E8=B5=84=E6=BA=90=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 star_list.json | 8 ++++----
 version.json   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/star_list.json b/star_list.json
index 543b5b19..003dfc1e 100644
--- a/star_list.json
+++ b/star_list.json
@@ -1,7 +1,7 @@
 [
   {
     "path": "Honkai_Star_Rail.py",
-    "hash": "1d03f5b63572dbb686cb956be1255f32"
+    "hash": "dc935616e172eea0d08c0cd9c04d0261"
   },
   {
     "path": "get_width.py",
@@ -21,7 +21,7 @@
   },
   {
     "path": "version.json",
-    "hash": "689f87233e661212c34e71576685c17c"
+    "hash": "a55d11c23e67af316da2dcf598bdce56"
   },
   {
     "path": "requirements.txt",
@@ -37,7 +37,7 @@
   },
   {
     "path": "star_list.json",
-    "hash": "a0960583c31b3409e87aea807ed868c2"
+    "hash": "0e15e3bd0fab48bf47a72150b7758899"
   },
   {
     "path": "LICENSE",
@@ -49,7 +49,7 @@
   },
   {
     "path": "tool/update_file.py",
-    "hash": "31a956ff950d22d26ff582314adc4dff"
+    "hash": "8d0950887897a0f7af5a09b55755ce11"
   },
   {
     "path": "tool/config.py",
diff --git a/version.json b/version.json
index 842d7b81..372ad6fd 100644
--- a/version.json
+++ b/version.json
@@ -1 +1 @@
-{"version": "20230513222527"}
\ No newline at end of file
+{"version": "20230513235422"}
\ No newline at end of file

From c512f77f8a036fb92842808475576750386db2a3 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Sat, 13 May 2023 16:02:43 +0000
Subject: [PATCH 12/22] =?UTF-8?q?:wrench:=20=E8=87=AA=E5=8A=A8=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E8=B5=84=E6=BA=90=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 star_list.json | 8 ++++----
 version.json   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/star_list.json b/star_list.json
index 003dfc1e..aa8a35a1 100644
--- a/star_list.json
+++ b/star_list.json
@@ -21,7 +21,7 @@
   },
   {
     "path": "version.json",
-    "hash": "a55d11c23e67af316da2dcf598bdce56"
+    "hash": "21d43937e92056a20d93ccb74f2c8176"
   },
   {
     "path": "requirements.txt",
@@ -37,7 +37,7 @@
   },
   {
     "path": "star_list.json",
-    "hash": "0e15e3bd0fab48bf47a72150b7758899"
+    "hash": "1332c4263dcbe048b5ffe2ed03e62119"
   },
   {
     "path": "LICENSE",
@@ -53,7 +53,7 @@
   },
   {
     "path": "tool/config.py",
-    "hash": "58bd4f4c77c5fdc41cde710b0d0b86a3"
+    "hash": "06a6568a9597bb3a1a15911875100e39"
   },
   {
     "path": "tool/requests.py",
@@ -73,7 +73,7 @@
   },
   {
     "path": "tool/map.py",
-    "hash": "7388c4727b05162949b38644bd03438f"
+    "hash": "bedf31154bf0d28d924682e84a6f0d3a"
   },
   {
     "path": "tool/log.py",
diff --git a/version.json b/version.json
index 372ad6fd..d81e940a 100644
--- a/version.json
+++ b/version.json
@@ -1 +1 @@
-{"version": "20230513235422"}
\ No newline at end of file
+{"version": "20230514000242"}
\ No newline at end of file

From 0cc1ef7c0bda841b2985797737bf26e8d0d19b41 Mon Sep 17 00:00:00 2001
From: Night-stars-1 <99261160+Night-stars-1@users.noreply.github.com>
Date: Sun, 14 May 2023 00:03:41 +0800
Subject: [PATCH 13/22] Update config.json

---
 config.json | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/config.json b/config.json
index c177cf0a..2f08527f 100644
--- a/config.json
+++ b/config.json
@@ -8,5 +8,6 @@
   "map_version": "0",
   "start": false,
   "temp_version": "0",
-  "star_version": "0"
-}
\ No newline at end of file
+  "star_version": "0",
+  "open_map": "m"
+}

From e540b4d3c195abf04baed6628da41a1595d7e497 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Sat, 13 May 2023 16:03:55 +0000
Subject: [PATCH 14/22] =?UTF-8?q?:wrench:=20=E8=87=AA=E5=8A=A8=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E8=B5=84=E6=BA=90=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config.json    | 2 +-
 star_list.json | 6 +++---
 version.json   | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/config.json b/config.json
index 2f08527f..885cec57 100644
--- a/config.json
+++ b/config.json
@@ -10,4 +10,4 @@
   "temp_version": "0",
   "star_version": "0",
   "open_map": "m"
-}
+}
\ No newline at end of file
diff --git a/star_list.json b/star_list.json
index aa8a35a1..bfbc983e 100644
--- a/star_list.json
+++ b/star_list.json
@@ -17,11 +17,11 @@
   },
   {
     "path": "config.json",
-    "hash": "82b37571423989ac4271d4a0be0eb0f0"
+    "hash": "ff34a49e0620d2fe4c846e983df147ac"
   },
   {
     "path": "version.json",
-    "hash": "21d43937e92056a20d93ccb74f2c8176"
+    "hash": "217d2c3e86269ec1f211bdbef9c11a52"
   },
   {
     "path": "requirements.txt",
@@ -37,7 +37,7 @@
   },
   {
     "path": "star_list.json",
-    "hash": "1332c4263dcbe048b5ffe2ed03e62119"
+    "hash": "5b825a9bd4e58e3eb7afb0fcc184a488"
   },
   {
     "path": "LICENSE",
diff --git a/version.json b/version.json
index d81e940a..f71213d4 100644
--- a/version.json
+++ b/version.json
@@ -1 +1 @@
-{"version": "20230514000242"}
\ No newline at end of file
+{"version": "20230514000354"}
\ No newline at end of file

From 03734231e9a7786d5a1453360d73417693ed1ff3 Mon Sep 17 00:00:00 2001
From: Night-stars-1 <99261160+Night-stars-1@users.noreply.github.com>
Date: Sun, 14 May 2023 00:05:22 +0800
Subject: [PATCH 15/22] Update log.py

---
 tool/log.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tool/log.py b/tool/log.py
index 1db5b213..168b76a4 100644
--- a/tool/log.py
+++ b/tool/log.py
@@ -17,7 +17,7 @@
 except:
     from requests import post
 
-VER = "2.9"
+VER = "3.0"
 log = logger
 dir_log = "logs"
 path_log = os.path.join(dir_log, '日志文件.log')

From 8c6b03c9ef6f8876bdcc2f1ec5b58db87315f655 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Sat, 13 May 2023 16:05:35 +0000
Subject: [PATCH 16/22] =?UTF-8?q?:wrench:=20=E8=87=AA=E5=8A=A8=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E8=B5=84=E6=BA=90=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 star_list.json | 8 ++++----
 version.json   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/star_list.json b/star_list.json
index bfbc983e..d2b88128 100644
--- a/star_list.json
+++ b/star_list.json
@@ -17,11 +17,11 @@
   },
   {
     "path": "config.json",
-    "hash": "ff34a49e0620d2fe4c846e983df147ac"
+    "hash": "a0331a392206f53e4771721e87cc6dd5"
   },
   {
     "path": "version.json",
-    "hash": "217d2c3e86269ec1f211bdbef9c11a52"
+    "hash": "b338c36cec7ce548dd83f6d6cb75791d"
   },
   {
     "path": "requirements.txt",
@@ -37,7 +37,7 @@
   },
   {
     "path": "star_list.json",
-    "hash": "5b825a9bd4e58e3eb7afb0fcc184a488"
+    "hash": "bdbfd39173266a3adecca6a6c624f3e5"
   },
   {
     "path": "LICENSE",
@@ -77,6 +77,6 @@
   },
   {
     "path": "tool/log.py",
-    "hash": "3a0bef8c39b6771430c1a432e23f1ec6"
+    "hash": "5d1898e31c4d2c2638cd890d958609e6"
   }
 ]
\ No newline at end of file
diff --git a/version.json b/version.json
index f71213d4..e058e5a9 100644
--- a/version.json
+++ b/version.json
@@ -1 +1 @@
-{"version": "20230514000354"}
\ No newline at end of file
+{"version": "20230514000533"}
\ No newline at end of file

From ca532ee690f159033be5abc5365ef9c0db410056 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Sat, 13 May 2023 16:09:11 +0000
Subject: [PATCH 17/22] =?UTF-8?q?:wrench:=20=E8=87=AA=E5=8A=A8=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E8=B5=84=E6=BA=90=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 star_list.json | 4 ++--
 version.json   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/star_list.json b/star_list.json
index d2b88128..918f7dc1 100644
--- a/star_list.json
+++ b/star_list.json
@@ -21,7 +21,7 @@
   },
   {
     "path": "version.json",
-    "hash": "b338c36cec7ce548dd83f6d6cb75791d"
+    "hash": "ec34e58b6df02c04ad9168c06c59c96b"
   },
   {
     "path": "requirements.txt",
@@ -37,7 +37,7 @@
   },
   {
     "path": "star_list.json",
-    "hash": "bdbfd39173266a3adecca6a6c624f3e5"
+    "hash": "bba93d5e21d45323306ccb9b7d8ffda1"
   },
   {
     "path": "LICENSE",
diff --git a/version.json b/version.json
index e058e5a9..688a9da8 100644
--- a/version.json
+++ b/version.json
@@ -1 +1 @@
-{"version": "20230514000533"}
\ No newline at end of file
+{"version": "20230514000910"}
\ No newline at end of file

From c4958592d2ede2c8f77d2e8959fa4b6cacaf336c Mon Sep 17 00:00:00 2001
From: Night-stars-1 <99261160+Night-stars-1@users.noreply.github.com>
Date: Sun, 14 May 2023 00:41:48 +0800
Subject: [PATCH 18/22] Delete log.py

---
 tool/log.py | 45 ---------------------------------------------
 1 file changed, 45 deletions(-)
 delete mode 100644 tool/log.py

diff --git a/tool/log.py b/tool/log.py
deleted file mode 100644
index 168b76a4..00000000
--- a/tool/log.py
+++ /dev/null
@@ -1,45 +0,0 @@
-'''
-Author: Night-stars-1 nujj1042633805@gmail.com
-Date: 2023-05-12 23:22:54
-LastEditors: Night-stars-1 nujj1042633805@gmail.com
-LastEditTime: 2023-05-13 01:00:33
-FilePath: \Honkai-Star-Rail-beta-2.4h:\Download\Zip\Honkai-Star-Rail-beta-2.7\tool\log.py
-Description: 
-
-Copyright (c) 2023 by ${git_name_email}, All Rights Reserved. 
-'''
-import os
-import sys
-from loguru import logger
-
-try:
-    from .requests import post
-except:
-    from requests import post
-
-VER = "3.0"
-log = logger
-dir_log = "logs"
-path_log = os.path.join(dir_log, '日志文件.log')
-logger.remove()
-logger.add(sys.stdout, level='INFO', colorize=True,
-            format="<cyan>{module}</cyan>.<cyan>{function}</cyan>"
-                    ":<cyan>{line}</cyan> - "+f"<cyan>{VER}</cyan> - "
-                    "<level>{message}</level>"
-            )
-logger.add(path_log,
-            format="{time:HH:mm:ss} - "
-                    "{level}\t| "
-                    "{module}.{function}:{line} - "+f"<cyan>{VER}</cyan> - "+" {message}",
-            rotation='0:00', enqueue=True, serialize=False, encoding="utf-8", retention="10 days")
-
-def webhook_and_log(message):
-    log.info(message)
-    from tool.config import read_json_file # Circular import
-    url = read_json_file("config.json", False).get("webhook_url")
-    if url == "" or url == None:
-        return
-    try:
-        post(url, json={"content": message})
-    except Exception as e:
-        log.error(f"Webhook发送失败: {e}")

From bdf82f60e5e2a7c4d80f4c09197c37162f9edf78 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Sat, 13 May 2023 16:42:13 +0000
Subject: [PATCH 19/22] =?UTF-8?q?:wrench:=20=E8=87=AA=E5=8A=A8=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E8=B5=84=E6=BA=90=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 star_list.json | 24 ++++++++++++------------
 version.json   |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/star_list.json b/star_list.json
index 918f7dc1..666a15fe 100644
--- a/star_list.json
+++ b/star_list.json
@@ -1,7 +1,7 @@
 [
   {
     "path": "Honkai_Star_Rail.py",
-    "hash": "dc935616e172eea0d08c0cd9c04d0261"
+    "hash": "933c15106ad869b4951880870a0cd107"
   },
   {
     "path": "get_width.py",
@@ -21,7 +21,7 @@
   },
   {
     "path": "version.json",
-    "hash": "ec34e58b6df02c04ad9168c06c59c96b"
+    "hash": "f0fbd123c07092fac3ce4047a7cc5720"
   },
   {
     "path": "requirements.txt",
@@ -37,7 +37,7 @@
   },
   {
     "path": "star_list.json",
-    "hash": "bba93d5e21d45323306ccb9b7d8ffda1"
+    "hash": "ff227bec73c414f77105470a178a70fd"
   },
   {
     "path": "LICENSE",
@@ -48,35 +48,35 @@
     "hash": "8716411a9d3626e0c30234c871c0d2a5"
   },
   {
-    "path": "tool/update_file.py",
+    "path": "tools/update_file.py",
     "hash": "8d0950887897a0f7af5a09b55755ce11"
   },
   {
-    "path": "tool/config.py",
+    "path": "tools/config.py",
     "hash": "06a6568a9597bb3a1a15911875100e39"
   },
   {
-    "path": "tool/requests.py",
+    "path": "tools/requests.py",
     "hash": "8b3e24396a1f8be5251e13aac7bae960"
   },
   {
-    "path": "tool/exceptions.py",
+    "path": "tools/exceptions.py",
     "hash": "a0e5847b4e5fe94a87041932434ea38c"
   },
   {
-    "path": "tool/calculated.py",
+    "path": "tools/calculated.py",
     "hash": "39ba13f64b8d89ed88b02b4eb8e666cc"
   },
   {
-    "path": "tool/record_v7.2.py",
+    "path": "tools/record_v7.2.py",
     "hash": "0269fe20d8c756d90838003a39aa919c"
   },
   {
-    "path": "tool/map.py",
+    "path": "tools/map.py",
     "hash": "bedf31154bf0d28d924682e84a6f0d3a"
   },
   {
-    "path": "tool/log.py",
-    "hash": "5d1898e31c4d2c2638cd890d958609e6"
+    "path": "tools/log.py",
+    "hash": "e40c74b6bf6fd7a23dbf521ddf094b81"
   }
 ]
\ No newline at end of file
diff --git a/version.json b/version.json
index 688a9da8..7be2f4b6 100644
--- a/version.json
+++ b/version.json
@@ -1 +1 @@
-{"version": "20230514000910"}
\ No newline at end of file
+{"version": "20230514004212"}
\ No newline at end of file

From 396a3dcb5fa69c0a219fc38559791aa9ea888353 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Sat, 13 May 2023 17:24:10 +0000
Subject: [PATCH 20/22] =?UTF-8?q?:wrench:=20=E8=87=AA=E5=8A=A8=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E8=B5=84=E6=BA=90=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 star_list.json | 14 +++++++-------
 version.json   |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/star_list.json b/star_list.json
index 666a15fe..237e3a24 100644
--- a/star_list.json
+++ b/star_list.json
@@ -1,11 +1,11 @@
 [
   {
     "path": "Honkai_Star_Rail.py",
-    "hash": "933c15106ad869b4951880870a0cd107"
+    "hash": "7e1b16d01120edd2b6483e2538ecdd70"
   },
   {
     "path": "get_width.py",
-    "hash": "aeb49fba2f76501a786a6a840b7273c9"
+    "hash": "c653de12e2bf694dea8e8249651188ce"
   },
   {
     "path": "README_CHT.md",
@@ -21,7 +21,7 @@
   },
   {
     "path": "version.json",
-    "hash": "f0fbd123c07092fac3ce4047a7cc5720"
+    "hash": "b5a358b308f8349d8637abaeae228cca"
   },
   {
     "path": "requirements.txt",
@@ -33,11 +33,11 @@
   },
   {
     "path": "test.py",
-    "hash": "26b374a8bd370d4f07696460c8c617ec"
+    "hash": "c4b536ba0b12ee44b9c3af22a68aa9b8"
   },
   {
     "path": "star_list.json",
-    "hash": "ff227bec73c414f77105470a178a70fd"
+    "hash": "b701b05d1a4ac8c485b163a0ea98221b"
   },
   {
     "path": "LICENSE",
@@ -49,7 +49,7 @@
   },
   {
     "path": "tools/update_file.py",
-    "hash": "8d0950887897a0f7af5a09b55755ce11"
+    "hash": "bb59ff44c2d4972fd094152045846be0"
   },
   {
     "path": "tools/config.py",
@@ -77,6 +77,6 @@
   },
   {
     "path": "tools/log.py",
-    "hash": "e40c74b6bf6fd7a23dbf521ddf094b81"
+    "hash": "3b7b01b2c7f069ded77fcd5cb14ef796"
   }
 ]
\ No newline at end of file
diff --git a/version.json b/version.json
index 7be2f4b6..d44d3fbf 100644
--- a/version.json
+++ b/version.json
@@ -1 +1 @@
-{"version": "20230514004212"}
\ No newline at end of file
+{"version": "20230514012409"}
\ No newline at end of file

From efee567bae608e5dbf6b389e4365a8dd4a57e5b2 Mon Sep 17 00:00:00 2001
From: Night-stars-1 <99261160+Night-stars-1@users.noreply.github.com>
Date: Sun, 14 May 2023 01:25:38 +0800
Subject: [PATCH 21/22] Update update_file.py

---
 tools/update_file.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/update_file.py b/tools/update_file.py
index 815bd8de..1c1a3572 100644
--- a/tools/update_file.py
+++ b/tools/update_file.py
@@ -44,7 +44,7 @@ async def unzip(zip, zip_path: Path):
     with ZipFile(zip, 'r') as zf:
         for member in tq(zf.infolist(), desc='解压中'):
             if member.filename.startswith(zip_path):
-                zf.extract(member+"1", tmp_dir)
+                zf.extract(member, tmp_dir)
                 log.debug(f'[资源文件更新]正在提取{member.filename}')
 
 async def remove_file(folder_path: Path,keep_folder: Optional[List[str]] = [],keep_file: Optional[List[str]] = []) -> None:

From 136fe4c7f8d0749eeda232a4c9d4b0b6df85ed6a Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Sat, 13 May 2023 17:25:51 +0000
Subject: [PATCH 22/22] =?UTF-8?q?:wrench:=20=E8=87=AA=E5=8A=A8=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E8=B5=84=E6=BA=90=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 star_list.json | 6 +++---
 version.json   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/star_list.json b/star_list.json
index 237e3a24..61edeb06 100644
--- a/star_list.json
+++ b/star_list.json
@@ -21,7 +21,7 @@
   },
   {
     "path": "version.json",
-    "hash": "b5a358b308f8349d8637abaeae228cca"
+    "hash": "87bd7f4c0b003bf997f0a292b26dfba3"
   },
   {
     "path": "requirements.txt",
@@ -37,7 +37,7 @@
   },
   {
     "path": "star_list.json",
-    "hash": "b701b05d1a4ac8c485b163a0ea98221b"
+    "hash": "d3e662352cd848f572c0b61d076ac2f5"
   },
   {
     "path": "LICENSE",
@@ -49,7 +49,7 @@
   },
   {
     "path": "tools/update_file.py",
-    "hash": "bb59ff44c2d4972fd094152045846be0"
+    "hash": "fbc43760df7d7b2d96d62d793d523ce1"
   },
   {
     "path": "tools/config.py",
diff --git a/version.json b/version.json
index d44d3fbf..22b70c00 100644
--- a/version.json
+++ b/version.json
@@ -1 +1 @@
-{"version": "20230514012409"}
\ No newline at end of file
+{"version": "20230514012550"}
\ No newline at end of file