From c0c5fef5c59ad21e2939d64ad4b3de2aba8ca32e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 12 Jul 2023 09:22:41 +0000 Subject: [PATCH 01/28] =?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 ddecf0ec..bca783b7 100644 --- a/star_list.json +++ b/star_list.json @@ -29,7 +29,7 @@ }, { "path": "README.md", - "hash": "76c71cca70febc6fadd0391415171d5c" + "hash": "128cc342a20ff51f35219d18e602c21a" }, { "path": "model/label_cn.txt", @@ -69,7 +69,7 @@ }, { "path": "utils/cv_tools.py", - "hash": "490029e70aca7363c8e26ae4ee1d1df6" + "hash": "9d0fa27540022bbf5e04059a66c49f73" }, { "path": "utils/log.py", @@ -97,11 +97,11 @@ }, { "path": "utils/map.py", - "hash": "eacb997f3d03d6b8fe12d2240eb77a98" + "hash": "6e9ab4714dba4abe377a885a5c57d6de" }, { "path": "utils/calculated.py", - "hash": "784b5904e60fc93fea5b8705aa2645f9" + "hash": "fcff5aa1cc6b8c40b91fe24b928c8e96" }, { "path": "utils/update_file.py", diff --git a/version.json b/version.json index d53e236d..ba677767 100644 --- a/version.json +++ b/version.json @@ -1 +1 @@ -{"version": "20230708202615"} \ No newline at end of file +{"version": "20230712172229"} \ No newline at end of file From c40a039551ac5d73f63a9ada0034b20619fb587b Mon Sep 17 00:00:00 2001 From: Skywind Date: Sat, 15 Jul 2023 11:21:15 +0800 Subject: [PATCH 02/28] fix: take screenshot on multiscreen --- utils/calculated.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/utils/calculated.py b/utils/calculated.py index e360a1d1..90795d08 100644 --- a/utils/calculated.py +++ b/utils/calculated.py @@ -210,7 +210,9 @@ def take_screenshot(self,points=(0,0,0,0)): left, top, right, bottom = self.window.left, self.window.top, self.window.right, self.window.bottom else: left, top, right, bottom = self.window.left+left_border, self.window.top+up_border, self.window.right-left_border, self.window.bottom-left_border - game_img = ImageGrab.grab((left, top, right, bottom)) + # log.info(f"{left}, {top}, {right}, {bottom}") + game_img = ImageGrab.grab((left, top, right, bottom), all_screens=True) + # game_img.save(f"logs/image/image_grab_{int(time.time())}.png", "PNG") game_width, game_length = game_img.size if points != (0,0,0,0): #points = (points[0], points[1]+5, points[2], points[3]+5) From 9f5c8de7393fc0244029dd18f0749d0411d2f722 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sat, 15 Jul 2023 07:52:53 +0000 Subject: [PATCH 03/28] =?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 | 2 +- version.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/star_list.json b/star_list.json index bca783b7..64d69951 100644 --- a/star_list.json +++ b/star_list.json @@ -101,7 +101,7 @@ }, { "path": "utils/calculated.py", - "hash": "fcff5aa1cc6b8c40b91fe24b928c8e96" + "hash": "5107b4ad016249721b655742290f9f27" }, { "path": "utils/update_file.py", diff --git a/version.json b/version.json index ba677767..6f5ccdc0 100644 --- a/version.json +++ b/version.json @@ -1 +1 @@ -{"version": "20230712172229"} \ No newline at end of file +{"version": "20230715155236"} \ No newline at end of file From 77997b073092150da85eafa56cc70af48ab2d65d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sat, 15 Jul 2023 15:01:41 +0000 Subject: [PATCH 04/28] =?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 64d69951..d4fb290b 100644 --- a/star_list.json +++ b/star_list.json @@ -21,7 +21,7 @@ }, { "path": "get_width.py", - "hash": "0f32aae400f9f50117bb2dee7eb0f4c7" + "hash": "d3a4eb39449bfef273fd86514a483497" }, { "path": "README_CHT.md", @@ -73,7 +73,7 @@ }, { "path": "utils/log.py", - "hash": "86fba4f616fb3a8d03cf63a88fd60fff" + "hash": "2db96be2c3297b0dc6f37c961871dc42" }, { "path": "utils/simulated_universe.py", @@ -97,11 +97,11 @@ }, { "path": "utils/map.py", - "hash": "6e9ab4714dba4abe377a885a5c57d6de" + "hash": "cf793f73d18309e8b311c274d4da765e" }, { "path": "utils/calculated.py", - "hash": "5107b4ad016249721b655742290f9f27" + "hash": "ffd85a2e3db0768fb6e46e03f473d6f4" }, { "path": "utils/update_file.py", diff --git a/version.json b/version.json index 6f5ccdc0..92955a8d 100644 --- a/version.json +++ b/version.json @@ -1 +1 @@ -{"version": "20230715155236"} \ No newline at end of file +{"version": "20230715230128"} \ No newline at end of file From 51907a1e0c01d51b5603b92a0d02900115ac79e7 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sun, 16 Jul 2023 11:38:56 +0000 Subject: [PATCH 05/28] =?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 | 2 +- version.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/star_list.json b/star_list.json index d4fb290b..1ab4de5c 100644 --- a/star_list.json +++ b/star_list.json @@ -101,7 +101,7 @@ }, { "path": "utils/calculated.py", - "hash": "ffd85a2e3db0768fb6e46e03f473d6f4" + "hash": "aac6102ad1725cb6ae440eeaa5b77295" }, { "path": "utils/update_file.py", diff --git a/version.json b/version.json index 92955a8d..4d74de1c 100644 --- a/version.json +++ b/version.json @@ -1 +1 @@ -{"version": "20230715230128"} \ No newline at end of file +{"version": "20230716193844"} \ No newline at end of file From 50aa68d06bbf0905ef716ebd4b894d1942002fc5 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 17 Jul 2023 16:09:58 +0000 Subject: [PATCH 06/28] =?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 1ab4de5c..9a7f7bd5 100644 --- a/star_list.json +++ b/star_list.json @@ -5,7 +5,7 @@ }, { "path": "Honkai_Star_Rail.py", - "hash": "7243fd192691e7f657f821ea40e4dfb2" + "hash": "cadcd06283b68160c99ca71a791482f9" }, { "path": "README_EN.md", @@ -73,7 +73,7 @@ }, { "path": "utils/log.py", - "hash": "2db96be2c3297b0dc6f37c961871dc42" + "hash": "76b71a9efcb79996420e23449e73df14" }, { "path": "utils/simulated_universe.py", @@ -105,7 +105,7 @@ }, { "path": "utils/update_file.py", - "hash": "f9cd94b36f2e542a14c6e05968e3c96f" + "hash": "1e8cff5d1fd83e8e979a6a9e6d198949" }, { "path": "utils/exceptions.py", diff --git a/version.json b/version.json index 4d74de1c..74c1ce2b 100644 --- a/version.json +++ b/version.json @@ -1 +1 @@ -{"version": "20230716193844"} \ No newline at end of file +{"version": "20230718000947"} \ No newline at end of file From eb58b5e8f7483c9b7c011c3323c692382344b008 Mon Sep 17 00:00:00 2001 From: Night-stars-1 <99261160+Night-stars-1@users.noreply.github.com> Date: Tue, 18 Jul 2023 14:22:29 +0800 Subject: [PATCH 07/28] Update update_file.py --- utils/update_file.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/update_file.py b/utils/update_file.py index 9e9b0a10..848be497 100644 --- a/utils/update_file.py +++ b/utils/update_file.py @@ -225,7 +225,7 @@ async def update_file(self, elif rm_all: modify_json_file(CONFIG_FILE_NAME, f"{type}_version", "0") - is_latest, remote_version, local_version = await self.is_latest(type, raw_proxy, version) + is_latest, remote_version, local_version = await self.is_latest(type, version) if not is_latest: if name == _("脚本"): await self.copy_files(Path(), Path() / "StarRailAssistant_backup", ["utils", "temp", "map", "config.json", "get_width.py", "Honkai_Star_Rail.py", "gui.py"]) @@ -346,4 +346,4 @@ def update_file_main(self, check_file_status = asyncio.run(self.update_file(True,skip_verify,type,version,url_zip,unzip_path,keep_folder,keep_file,zip_path,name,delete_file)) elif check_file_status == "download_error": check_file_status = asyncio.run(self.update_file(False,skip_verify,type,version,url_zip,unzip_path,keep_folder,keep_file,zip_path,name,delete_file)) - \ No newline at end of file + From dea2937dced15af9f21b8f4e31e1643516f75eb8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 18 Jul 2023 06:22:54 +0000 Subject: [PATCH 08/28] =?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 | 2 +- version.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/star_list.json b/star_list.json index 9a7f7bd5..13c748d7 100644 --- a/star_list.json +++ b/star_list.json @@ -105,7 +105,7 @@ }, { "path": "utils/update_file.py", - "hash": "1e8cff5d1fd83e8e979a6a9e6d198949" + "hash": "cc2e4b8ac68e37a47a88234759dcadb0" }, { "path": "utils/exceptions.py", diff --git a/version.json b/version.json index 74c1ce2b..3e564a13 100644 --- a/version.json +++ b/version.json @@ -1 +1 @@ -{"version": "20230718000947"} \ No newline at end of file +{"version": "20230718142243"} \ No newline at end of file From 71bd969b87a91418c360ef74da112b2e77c5a32b Mon Sep 17 00:00:00 2001 From: Night-stars-1 <99261160+Night-stars-1@users.noreply.github.com> Date: Tue, 18 Jul 2023 16:32:00 +0800 Subject: [PATCH 09/28] =?UTF-8?q?fix:=20=E8=BF=9B=E5=85=A5=E5=9C=B0?= =?UTF-8?q?=E5=9B=BE=E8=B6=85=E6=97=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- utils/calculated.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/utils/calculated.py b/utils/calculated.py index 924bca0c..90a7b622 100644 --- a/utils/calculated.py +++ b/utils/calculated.py @@ -416,7 +416,7 @@ def fighting(self): time.sleep(0.1) if self.has_red((4, 7, 10, 19)): while True: - result = self.get_pix_rgb(pos=(1336, 58)) + result = self.get_pix_rgb(pos=(1422, 59)) log.debug(f"进入战斗取色: {result}") if self.compare_lists([0, 0, 222], result) and self.compare_lists(result, [0, 0, 255]): self.Click() @@ -429,7 +429,7 @@ def fighting(self): self.wait_fight_end() return True time.sleep(0.2) - result = self.get_pix_rgb(pos=(1336, 58)) + result = self.get_pix_rgb(pos=(1422, 59)) log.debug(f"进入战斗取色: {result}") if not (self.compare_lists([0, 0, 225], result) and self.compare_lists(result, [0, 0, 255])): self.wait_fight_end() # 无论是否识别到敌人都判断是否结束战斗，反正怪物袭击 @@ -864,7 +864,7 @@ def wait_join(self): return endtime ''' endtime = time.time() - start_time - result = self.get_pix_rgb(pos=(1336, 58)) + result = self.get_pix_rgb(pos=(1422, 59)) log.debug(result) if self.compare_lists([0, 0, 222], result): log.info(_("已进入地图")) From 8c13ec423ffd7a41f0af3d3edc5625c01b65f58d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 18 Jul 2023 08:32:27 +0000 Subject: [PATCH 10/28] =?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 | 2 +- version.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/star_list.json b/star_list.json index 13c748d7..79c393f2 100644 --- a/star_list.json +++ b/star_list.json @@ -101,7 +101,7 @@ }, { "path": "utils/calculated.py", - "hash": "aac6102ad1725cb6ae440eeaa5b77295" + "hash": "0a5da4de26586f8b4d68a349331bcb8f" }, { "path": "utils/update_file.py", diff --git a/version.json b/version.json index 3e564a13..4208f1e9 100644 --- a/version.json +++ b/version.json @@ -1 +1 @@ -{"version": "20230718142243"} \ No newline at end of file +{"version": "20230718163215"} \ No newline at end of file From cbc0de488b43cb2387d623b572867a294324015c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 18 Jul 2023 12:28:01 +0000 Subject: [PATCH 11/28] =?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 | 16 ++++++++-------- version.json | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/star_list.json b/star_list.json index 79c393f2..199b1094 100644 --- a/star_list.json +++ b/star_list.json @@ -5,7 +5,7 @@ }, { "path": "Honkai_Star_Rail.py", - "hash": "cadcd06283b68160c99ca71a791482f9" + "hash": "9c708822aa3cba2ac1254ce57dd13f8a" }, { "path": "README_EN.md", @@ -17,11 +17,11 @@ }, { "path": "gui.py", - "hash": "64aceead68d47ade3bf556e6048b8666" + "hash": "b3559d90dc3d5e25d7fb775222a6f3e9" }, { "path": "get_width.py", - "hash": "d3a4eb39449bfef273fd86514a483497" + "hash": "61565cea390d9c40255924732e732f15" }, { "path": "README_CHT.md", @@ -61,7 +61,7 @@ }, { "path": "utils/requests.py", - "hash": "2960805b0eee0488f5ee70217f8b2964" + "hash": "27952d3e76aca6502a540c69dbf58a2a" }, { "path": "utils/cv_tracker.py", @@ -89,7 +89,7 @@ }, { "path": "utils/config.py", - "hash": "a7ac7df25837d7c7af92438fe0ca3a54" + "hash": "b2c3c06ed2d5d83075d3d4d4a1b3ea56" }, { "path": "utils/adb.py", @@ -97,15 +97,15 @@ }, { "path": "utils/map.py", - "hash": "cf793f73d18309e8b311c274d4da765e" + "hash": "6560e0dbd058429f51ba17814a7577aa" }, { "path": "utils/calculated.py", - "hash": "0a5da4de26586f8b4d68a349331bcb8f" + "hash": "d7284bc87dedfc6166a844e337cd8348" }, { "path": "utils/update_file.py", - "hash": "cc2e4b8ac68e37a47a88234759dcadb0" + "hash": "1bcf2389fd810095defc49d9662895cd" }, { "path": "utils/exceptions.py", diff --git a/version.json b/version.json index 4208f1e9..cf02ce30 100644 --- a/version.json +++ b/version.json @@ -1 +1 @@ -{"version": "20230718163215"} \ No newline at end of file +{"version": "20230718202750"} \ No newline at end of file From abedbb9fcab7fd301f835920039ac642b3603edd Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 19 Jul 2023 09:06:48 +0000 Subject: [PATCH 12/28] =?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 | 20 ++++++++++++++------ version.json | 2 +- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/star_list.json b/star_list.json index 199b1094..c0cdc2ba 100644 --- a/star_list.json +++ b/star_list.json @@ -5,7 +5,7 @@ }, { "path": "Honkai_Star_Rail.py", - "hash": "9c708822aa3cba2ac1254ce57dd13f8a" + "hash": "205200bf7c570768f39bf30deb91cebe" }, { "path": "README_EN.md", @@ -65,11 +65,15 @@ }, { "path": "utils/cv_tracker.py", - "hash": "bc3ca6ab9bb7a135959303cfc2097fda" + "hash": "2826aef66cb9699d3585efa0407caa10" }, { "path": "utils/cv_tools.py", - "hash": "9d0fa27540022bbf5e04059a66c49f73" + "hash": "30562220bf4127ed62abd9f3fa71ae5a" + }, + { + "path": "utils/get_angle.py", + "hash": "2dc46330cef1b3720658f62c619b54ac" }, { "path": "utils/log.py", @@ -89,7 +93,7 @@ }, { "path": "utils/config.py", - "hash": "b2c3c06ed2d5d83075d3d4d4a1b3ea56" + "hash": "9a1a041a7d41e21997a0ea99d46200cb" }, { "path": "utils/adb.py", @@ -97,11 +101,11 @@ }, { "path": "utils/map.py", - "hash": "6560e0dbd058429f51ba17814a7577aa" + "hash": "ef2eeadf10e8e57614bc7347573f9d93" }, { "path": "utils/calculated.py", - "hash": "d7284bc87dedfc6166a844e337cd8348" + "hash": "2ab077de87ed166292305209579db084" }, { "path": "utils/update_file.py", @@ -111,6 +115,10 @@ "path": "utils/exceptions.py", "hash": "2fe9316ec5635fe87cfdf70d1c870a32" }, + { + "path": "utils/route_helper.py", + "hash": "cca50ef52d7075c186e12badeb0a35d0" + }, { "path": "whl/Polygon3-3.0.9.1-cp310-cp310-win_amd64.whl", "hash": "0c19795eb68713cde783a434ea636ba9" diff --git a/version.json b/version.json index cf02ce30..df86e097 100644 --- a/version.json +++ b/version.json @@ -1 +1 @@ -{"version": "20230718202750"} \ No newline at end of file +{"version": "20230719170636"} \ No newline at end of file From a3e163bd60c7b2a54544246add76115436638cc1 Mon Sep 17 00:00:00 2001 From: Night-stars-1 <99261160+Night-stars-1@users.noreply.github.com> Date: Wed, 19 Jul 2023 17:57:49 +0800 Subject: [PATCH 13/28] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=88=9D?= =?UTF-8?q?=E5=A7=8B=E5=8C=96=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- utils/config.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/utils/config.py b/utils/config.py index 1069e99a..b1ff9761 100644 --- a/utils/config.py +++ b/utils/config.py @@ -47,7 +47,10 @@ def read_json_file(filename: str, path=False) -> dict: else: return data else: - return {} + if path: + return {}, filename + else: + return {} def modify_json_file(filename: str, key, value): From 47f4cc430ef99499abf0fa9666853cd46eab2165 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 19 Jul 2023 09:58:21 +0000 Subject: [PATCH 14/28] =?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 | 140 ++++++++++++++++++++++++------------------------- version.json | 2 +- 2 files changed, 71 insertions(+), 71 deletions(-) diff --git a/star_list.json b/star_list.json index c0cdc2ba..7a69910b 100644 --- a/star_list.json +++ b/star_list.json @@ -1,11 +1,7 @@ [ { - "path": "requirements.txt", - "hash": "168bf19887a7da79ae637d9d7d7d3593" - }, - { - "path": "Honkai_Star_Rail.py", - "hash": "205200bf7c570768f39bf30deb91cebe" + "path": "get_width.py", + "hash": "61565cea390d9c40255924732e732f15" }, { "path": "README_EN.md", @@ -16,139 +12,143 @@ "hash": "2027d7dba3a3e12565621b101a2dc1cb" }, { - "path": "gui.py", - "hash": "b3559d90dc3d5e25d7fb775222a6f3e9" - }, - { - "path": "get_width.py", - "hash": "61565cea390d9c40255924732e732f15" + "path": "requirements.txt", + "hash": "168bf19887a7da79ae637d9d7d7d3593" }, { - "path": "README_CHT.md", - "hash": "03fe99bddfc640bb2d83f4a29857147d" + "path": "gui.py", + "hash": "b3559d90dc3d5e25d7fb775222a6f3e9" }, { "path": "README.md", "hash": "128cc342a20ff51f35219d18e602c21a" }, { - "path": "model/label_cn.txt", - "hash": "e3f7c9400f4379e05cadbbc8a43dda45" + "path": "README_CHT.md", + "hash": "03fe99bddfc640bb2d83f4a29857147d" }, { - "path": "model/cnocr/1.2/ppocr/ch_PP-OCRv3_det_infer.onnx", - "hash": "5732f8c84bd4cc0dab35094e7260f080" + "path": "Honkai_Star_Rail.py", + "hash": "205200bf7c570768f39bf30deb91cebe" }, { - "path": "model/cnocr/1.2/ppocr/en_PP-OCRv3_det_infer.onnx", - "hash": "72708a3ac241e25fefbc606832dc7529" + "path": "locale/EN/LC_MESSAGES/sra.mo", + "hash": "4c9ed87ca1d8f72de21590de507c9d32" }, { - "path": "model/cnstd/2.2/ppocr/en_PP-OCRv3_rec_infer.onnx", - "hash": "003da6ca16cae88c5270882fc5e7417b" + "path": "locale/zh_CN/LC_MESSAGES/sra.mo", + "hash": "0a0ccfe2f4f2da8626fda930bd84ef9c" }, { - "path": "model/cnstd/2.2/ppocr/en_number_mobile_v2.0_rec_infer.onnx", - "hash": "442ea7b4dabdbaec95af17a6d17c3503" + "path": "locale/zh_TC/LC_MESSAGES/sra.mo", + "hash": "ef66f8b317d24e3eb326e739cb9b00ee" }, { - "path": "model/cnstd/2.2/densenet_lite_134-fc/cnocr-v2.2-densenet_lite_134-fc-epoch=034-complete_match_epoch=0.8376-model.onnx", - "hash": "332265c72378b39e83ced6b4e42954c4" + "path": "whl/cnstd-1.2.2-py3-none-any.whl", + "hash": "2e700dd1d42f71c71b739bd6afa67a8a" }, { - "path": "model/cnstd/2.2/densenet_lite_114-fc/cnocr-v2.2-densenet_lite_114-fc-epoch=037-complete_match_epoch=0.7859-model.onnx", - "hash": "d661b811419ff7dde7eb8543690cdd2b" + "path": "whl/Polygon3-3.0.9.1-cp310-cp310-win_amd64.whl", + "hash": "0c19795eb68713cde783a434ea636ba9" }, { - "path": "utils/requests.py", - "hash": "27952d3e76aca6502a540c69dbf58a2a" + "path": "whl/httpx_socks-0.7.7-py3-none-any.whl", + "hash": "9c9fcdf730445180029471858d8e8c27" }, { - "path": "utils/cv_tracker.py", - "hash": "2826aef66cb9699d3585efa0407caa10" + "path": "whl/cnocr-2.2.2.3-py3-none-any.whl", + "hash": "fff249a0f8c75f5bc4f0f97c95880bd8" }, { - "path": "utils/cv_tools.py", - "hash": "30562220bf4127ed62abd9f3fa71ae5a" + "path": "whl/Polygon3-3.0.9-cp311-cp311-win_amd64.whl", + "hash": "43a2cab179598fdaaa21da76cdaaaafc" }, { - "path": "utils/get_angle.py", - "hash": "2dc46330cef1b3720658f62c619b54ac" + "path": "utils/exceptions.py", + "hash": "2fe9316ec5635fe87cfdf70d1c870a32" }, { - "path": "utils/log.py", - "hash": "76b71a9efcb79996420e23449e73df14" + "path": "utils/calculated.py", + "hash": "2ab077de87ed166292305209579db084" }, { - "path": "utils/simulated_universe.py", - "hash": "1f66356054e142c4aa11a65b3680b465" + "path": "utils/adb.py", + "hash": "20961effe5eb9e7c6eb71252bf1749db" }, { "path": "utils/commission.py", "hash": "741433251d5d1de1eab82a21cac4ab81" }, { - "path": "utils/record_v7.2.py", - "hash": "2acb4a974b3cc2814be54e97ad784c23" - }, - { - "path": "utils/config.py", - "hash": "9a1a041a7d41e21997a0ea99d46200cb" + "path": "utils/route_helper.py", + "hash": "cca50ef52d7075c186e12badeb0a35d0" }, { - "path": "utils/adb.py", - "hash": "20961effe5eb9e7c6eb71252bf1749db" + "path": "utils/cv_tracker.py", + "hash": "2826aef66cb9699d3585efa0407caa10" }, { "path": "utils/map.py", "hash": "ef2eeadf10e8e57614bc7347573f9d93" }, { - "path": "utils/calculated.py", - "hash": "2ab077de87ed166292305209579db084" + "path": "utils/requests.py", + "hash": "27952d3e76aca6502a540c69dbf58a2a" + }, + { + "path": "utils/record_v7.2.py", + "hash": "2acb4a974b3cc2814be54e97ad784c23" }, { "path": "utils/update_file.py", "hash": "1bcf2389fd810095defc49d9662895cd" }, { - "path": "utils/exceptions.py", - "hash": "2fe9316ec5635fe87cfdf70d1c870a32" + "path": "utils/simulated_universe.py", + "hash": "1f66356054e142c4aa11a65b3680b465" }, { - "path": "utils/route_helper.py", - "hash": "cca50ef52d7075c186e12badeb0a35d0" + "path": "utils/log.py", + "hash": "76b71a9efcb79996420e23449e73df14" }, { - "path": "whl/Polygon3-3.0.9.1-cp310-cp310-win_amd64.whl", - "hash": "0c19795eb68713cde783a434ea636ba9" + "path": "utils/cv_tools.py", + "hash": "30562220bf4127ed62abd9f3fa71ae5a" }, { - "path": "whl/httpx_socks-0.7.7-py3-none-any.whl", - "hash": "9c9fcdf730445180029471858d8e8c27" + "path": "utils/get_angle.py", + "hash": "2dc46330cef1b3720658f62c619b54ac" }, { - "path": "whl/Polygon3-3.0.9-cp311-cp311-win_amd64.whl", - "hash": "43a2cab179598fdaaa21da76cdaaaafc" + "path": "utils/config.py", + "hash": "c7f683abd71bcacdff34a6446cd374f3" }, { - "path": "whl/cnocr-2.2.2.3-py3-none-any.whl", - "hash": "fff249a0f8c75f5bc4f0f97c95880bd8" + "path": "model/label_cn.txt", + "hash": "e3f7c9400f4379e05cadbbc8a43dda45" }, { - "path": "whl/cnstd-1.2.2-py3-none-any.whl", - "hash": "2e700dd1d42f71c71b739bd6afa67a8a" + "path": "model/cnocr/1.2/ppocr/en_PP-OCRv3_det_infer.onnx", + "hash": "72708a3ac241e25fefbc606832dc7529" }, { - "path": "locale/EN/LC_MESSAGES/sra.mo", - "hash": "4c9ed87ca1d8f72de21590de507c9d32" + "path": "model/cnocr/1.2/ppocr/ch_PP-OCRv3_det_infer.onnx", + "hash": "5732f8c84bd4cc0dab35094e7260f080" }, { - "path": "locale/zh_TC/LC_MESSAGES/sra.mo", - "hash": "ef66f8b317d24e3eb326e739cb9b00ee" + "path": "model/cnstd/2.2/densenet_lite_114-fc/cnocr-v2.2-densenet_lite_114-fc-epoch=037-complete_match_epoch=0.7859-model.onnx", + "hash": "d661b811419ff7dde7eb8543690cdd2b" }, { - "path": "locale/zh_CN/LC_MESSAGES/sra.mo", - "hash": "0a0ccfe2f4f2da8626fda930bd84ef9c" + "path": "model/cnstd/2.2/densenet_lite_134-fc/cnocr-v2.2-densenet_lite_134-fc-epoch=034-complete_match_epoch=0.8376-model.onnx", + "hash": "332265c72378b39e83ced6b4e42954c4" + }, + { + "path": "model/cnstd/2.2/ppocr/en_number_mobile_v2.0_rec_infer.onnx", + "hash": "442ea7b4dabdbaec95af17a6d17c3503" + }, + { + "path": "model/cnstd/2.2/ppocr/en_PP-OCRv3_rec_infer.onnx", + "hash": "003da6ca16cae88c5270882fc5e7417b" } ] \ No newline at end of file diff --git a/version.json b/version.json index df86e097..e9b001a9 100644 --- a/version.json +++ b/version.json @@ -1 +1 @@ -{"version": "20230719170636"} \ No newline at end of file +{"version": "20230719175805"} \ No newline at end of file From bbe21b35118e3635e349ad90f93573bd9b0b290c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sat, 22 Jul 2023 10:19:25 +0000 Subject: [PATCH 15/28] =?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 | 148 ++++++++++++++++++++++++------------------------- version.json | 2 +- 2 files changed, 73 insertions(+), 77 deletions(-) diff --git a/star_list.json b/star_list.json index 7a69910b..5c1081bc 100644 --- a/star_list.json +++ b/star_list.json @@ -1,154 +1,150 @@ [ { - "path": "get_width.py", - "hash": "61565cea390d9c40255924732e732f15" + "path": "requirements.txt", + "hash": "c0634c7e1ad31883a39d552b0e4e5e85" }, { - "path": "README_EN.md", - "hash": "62cd316b3b5cafca47b24d9647f957ff" + "path": "Honkai_Star_Rail.py", + "hash": "fcb90503847871c32f3458d0097a995a" }, { - "path": "map_res_list.py", - "hash": "2027d7dba3a3e12565621b101a2dc1cb" + "path": "README_EN.md", + "hash": "86793ffe1c415f308624e02b9924a4f8" }, { - "path": "requirements.txt", - "hash": "168bf19887a7da79ae637d9d7d7d3593" + "path": "map_res_list.py", + "hash": "61ddda8760a56ea082d5d7276747312a" }, { "path": "gui.py", - "hash": "b3559d90dc3d5e25d7fb775222a6f3e9" + "hash": "40ff0b633f5f7f902d38290ce750ee3c" }, { - "path": "README.md", - "hash": "128cc342a20ff51f35219d18e602c21a" + "path": "get_width.py", + "hash": "883cd3ffb3c1f7a0e8fff08ba61269b3" }, { "path": "README_CHT.md", - "hash": "03fe99bddfc640bb2d83f4a29857147d" + "hash": "f26e29d09b17110ad6f79d5c40224d57" }, { - "path": "Honkai_Star_Rail.py", - "hash": "205200bf7c570768f39bf30deb91cebe" - }, - { - "path": "locale/EN/LC_MESSAGES/sra.mo", - "hash": "4c9ed87ca1d8f72de21590de507c9d32" + "path": "README.md", + "hash": "868a185cfef9da32b507636ffa5b2898" }, { - "path": "locale/zh_CN/LC_MESSAGES/sra.mo", - "hash": "0a0ccfe2f4f2da8626fda930bd84ef9c" + "path": "model/label_cn.txt", + "hash": "e3f7c9400f4379e05cadbbc8a43dda45" }, { - "path": "locale/zh_TC/LC_MESSAGES/sra.mo", - "hash": "ef66f8b317d24e3eb326e739cb9b00ee" + "path": "model/cnocr/1.2/ppocr/ch_PP-OCRv3_det_infer.onnx", + "hash": "5732f8c84bd4cc0dab35094e7260f080" }, { - "path": "whl/cnstd-1.2.2-py3-none-any.whl", - "hash": "2e700dd1d42f71c71b739bd6afa67a8a" + "path": "model/cnocr/1.2/ppocr/en_PP-OCRv3_det_infer.onnx", + "hash": "72708a3ac241e25fefbc606832dc7529" }, { - "path": "whl/Polygon3-3.0.9.1-cp310-cp310-win_amd64.whl", - "hash": "0c19795eb68713cde783a434ea636ba9" + "path": "model/cnstd/2.2/ppocr/en_PP-OCRv3_rec_infer.onnx", + "hash": "003da6ca16cae88c5270882fc5e7417b" }, { - "path": "whl/httpx_socks-0.7.7-py3-none-any.whl", - "hash": "9c9fcdf730445180029471858d8e8c27" + "path": "model/cnstd/2.2/ppocr/en_number_mobile_v2.0_rec_infer.onnx", + "hash": "442ea7b4dabdbaec95af17a6d17c3503" }, { - "path": "whl/cnocr-2.2.2.3-py3-none-any.whl", - "hash": "fff249a0f8c75f5bc4f0f97c95880bd8" + "path": "model/cnstd/2.2/densenet_lite_134-fc/cnocr-v2.2-densenet_lite_134-fc-epoch=034-complete_match_epoch=0.8376-model.onnx", + "hash": "332265c72378b39e83ced6b4e42954c4" }, { - "path": "whl/Polygon3-3.0.9-cp311-cp311-win_amd64.whl", - "hash": "43a2cab179598fdaaa21da76cdaaaafc" + "path": "model/cnstd/2.2/densenet_lite_114-fc/cnocr-v2.2-densenet_lite_114-fc-epoch=037-complete_match_epoch=0.7859-model.onnx", + "hash": "d661b811419ff7dde7eb8543690cdd2b" }, { - "path": "utils/exceptions.py", - "hash": "2fe9316ec5635fe87cfdf70d1c870a32" + "path": "utils/requests.py", + "hash": "27952d3e76aca6502a540c69dbf58a2a" }, { - "path": "utils/calculated.py", - "hash": "2ab077de87ed166292305209579db084" + "path": "utils/cv_tools.py", + "hash": "1a21f925133502d281e24adfb1310cc7" }, { - "path": "utils/adb.py", - "hash": "20961effe5eb9e7c6eb71252bf1749db" + "path": "utils/get_angle.py", + "hash": "2dc46330cef1b3720658f62c619b54ac" }, { - "path": "utils/commission.py", - "hash": "741433251d5d1de1eab82a21cac4ab81" + "path": "utils/log.py", + "hash": "172d7d4d63c1b3136c5600055e666967" }, { - "path": "utils/route_helper.py", - "hash": "cca50ef52d7075c186e12badeb0a35d0" + "path": "utils/simulated_universe.py", + "hash": "ee14b83bd91b720095188ccc475c014d" }, { - "path": "utils/cv_tracker.py", - "hash": "2826aef66cb9699d3585efa0407caa10" + "path": "utils/commission.py", + "hash": "f2911ffe8697a5cfc6301ba66e383116" }, { - "path": "utils/map.py", - "hash": "ef2eeadf10e8e57614bc7347573f9d93" + "path": "utils/record_v7.2.py", + "hash": "fbf62da314595e8f70487b8cf8944bee" }, { - "path": "utils/requests.py", - "hash": "27952d3e76aca6502a540c69dbf58a2a" + "path": "utils/config.py", + "hash": "c8bbf58f0fa356e95e4ab7786eda185a" }, { - "path": "utils/record_v7.2.py", - "hash": "2acb4a974b3cc2814be54e97ad784c23" + "path": "utils/adb.py", + "hash": "4a19acb6a8f259b2818172d4c3b5a1ba" }, { - "path": "utils/update_file.py", - "hash": "1bcf2389fd810095defc49d9662895cd" + "path": "utils/map.py", + "hash": "73835fd33d9a2b1c9bb4c9eebcdd0565" }, { - "path": "utils/simulated_universe.py", - "hash": "1f66356054e142c4aa11a65b3680b465" + "path": "utils/calculated.py", + "hash": "ca48023cd4e48c09a5c4286234d72615" }, { - "path": "utils/log.py", - "hash": "76b71a9efcb79996420e23449e73df14" + "path": "utils/update_file.py", + "hash": "87a73918b809dfc4dfb136625a87786d" }, { - "path": "utils/cv_tools.py", - "hash": "30562220bf4127ed62abd9f3fa71ae5a" + "path": "utils/exceptions.py", + "hash": "77cc57669183fd844fbc2345fef88a3f" }, { - "path": "utils/get_angle.py", - "hash": "2dc46330cef1b3720658f62c619b54ac" + "path": "utils/route_helper.py", + "hash": "cca50ef52d7075c186e12badeb0a35d0" }, { - "path": "utils/config.py", - "hash": "c7f683abd71bcacdff34a6446cd374f3" + "path": "whl/Polygon3-3.0.9.1-cp310-cp310-win_amd64.whl", + "hash": "0c19795eb68713cde783a434ea636ba9" }, { - "path": "model/label_cn.txt", - "hash": "e3f7c9400f4379e05cadbbc8a43dda45" + "path": "whl/httpx_socks-0.7.7-py3-none-any.whl", + "hash": "9c9fcdf730445180029471858d8e8c27" }, { - "path": "model/cnocr/1.2/ppocr/en_PP-OCRv3_det_infer.onnx", - "hash": "72708a3ac241e25fefbc606832dc7529" + "path": "whl/Polygon3-3.0.9-cp311-cp311-win_amd64.whl", + "hash": "43a2cab179598fdaaa21da76cdaaaafc" }, { - "path": "model/cnocr/1.2/ppocr/ch_PP-OCRv3_det_infer.onnx", - "hash": "5732f8c84bd4cc0dab35094e7260f080" + "path": "whl/cnocr-2.2.2.3-py3-none-any.whl", + "hash": "fff249a0f8c75f5bc4f0f97c95880bd8" }, { - "path": "model/cnstd/2.2/densenet_lite_114-fc/cnocr-v2.2-densenet_lite_114-fc-epoch=037-complete_match_epoch=0.7859-model.onnx", - "hash": "d661b811419ff7dde7eb8543690cdd2b" + "path": "whl/cnstd-1.2.2-py3-none-any.whl", + "hash": "2e700dd1d42f71c71b739bd6afa67a8a" }, { - "path": "model/cnstd/2.2/densenet_lite_134-fc/cnocr-v2.2-densenet_lite_134-fc-epoch=034-complete_match_epoch=0.8376-model.onnx", - "hash": "332265c72378b39e83ced6b4e42954c4" + "path": "locale/EN/LC_MESSAGES/sra.mo", + "hash": "4c9ed87ca1d8f72de21590de507c9d32" }, { - "path": "model/cnstd/2.2/ppocr/en_number_mobile_v2.0_rec_infer.onnx", - "hash": "442ea7b4dabdbaec95af17a6d17c3503" + "path": "locale/zh_TC/LC_MESSAGES/sra.mo", + "hash": "ef66f8b317d24e3eb326e739cb9b00ee" }, { - "path": "model/cnstd/2.2/ppocr/en_PP-OCRv3_rec_infer.onnx", - "hash": "003da6ca16cae88c5270882fc5e7417b" + "path": "locale/zh_CN/LC_MESSAGES/sra.mo", + "hash": "0a0ccfe2f4f2da8626fda930bd84ef9c" } ] \ No newline at end of file diff --git a/version.json b/version.json index e9b001a9..9a8790c4 100644 --- a/version.json +++ b/version.json @@ -1 +1 @@ -{"version": "20230719175805"} \ No newline at end of file +{"version": "20230722181848"} \ No newline at end of file From 95fcff25efb302f33b2bbea80cfbc3dcf5fcdb69 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sat, 22 Jul 2023 10:29:34 +0000 Subject: [PATCH 16/28] =?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 | 2 +- version.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/star_list.json b/star_list.json index 5c1081bc..b9bb7fbc 100644 --- a/star_list.json +++ b/star_list.json @@ -105,7 +105,7 @@ }, { "path": "utils/update_file.py", - "hash": "87a73918b809dfc4dfb136625a87786d" + "hash": "a81d8336f7aad613d7223e1a6eb9b458" }, { "path": "utils/exceptions.py", diff --git a/version.json b/version.json index 9a8790c4..86c25a1c 100644 --- a/version.json +++ b/version.json @@ -1 +1 @@ -{"version": "20230722181848"} \ No newline at end of file +{"version": "20230722182922"} \ No newline at end of file From f19c27e691be8a60c263e7735d04d473924f1414 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sat, 22 Jul 2023 13:15:25 +0000 Subject: [PATCH 17/28] =?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 b9bb7fbc..7bb57a49 100644 --- a/star_list.json +++ b/star_list.json @@ -1,7 +1,7 @@ [ { "path": "requirements.txt", - "hash": "c0634c7e1ad31883a39d552b0e4e5e85" + "hash": "168bf19887a7da79ae637d9d7d7d3593" }, { "path": "Honkai_Star_Rail.py", @@ -89,7 +89,7 @@ }, { "path": "utils/config.py", - "hash": "c8bbf58f0fa356e95e4ab7786eda185a" + "hash": "14220162aafc54ef96bab11f3210c3ee" }, { "path": "utils/adb.py", @@ -101,7 +101,7 @@ }, { "path": "utils/calculated.py", - "hash": "ca48023cd4e48c09a5c4286234d72615" + "hash": "dbff14bee88a6b5e6c04d7967cf0acc8" }, { "path": "utils/update_file.py", diff --git a/version.json b/version.json index 86c25a1c..9420c3a2 100644 --- a/version.json +++ b/version.json @@ -1 +1 @@ -{"version": "20230722182922"} \ No newline at end of file +{"version": "20230722211513"} \ No newline at end of file From c1c8d1055415863ba3c6347c9f579d2129bfb42f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 24 Jul 2023 12:31:31 +0000 Subject: [PATCH 18/28] =?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 | 2 +- version.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/star_list.json b/star_list.json index 7bb57a49..5f875d60 100644 --- a/star_list.json +++ b/star_list.json @@ -29,7 +29,7 @@ }, { "path": "README.md", - "hash": "868a185cfef9da32b507636ffa5b2898" + "hash": "4ceb43ba4366b6220af4f0cbc5cc101f" }, { "path": "model/label_cn.txt", diff --git a/version.json b/version.json index 9420c3a2..fc4855b5 100644 --- a/version.json +++ b/version.json @@ -1 +1 @@ -{"version": "20230722211513"} \ No newline at end of file +{"version": "20230724203117"} \ No newline at end of file From fea2cb53556ef62b26c0c24ef5192b571ca4deec Mon Sep 17 00:00:00 2001 From: Night-stars-1 <99261160+Night-stars-1@users.noreply.github.com> Date: Sat, 29 Jul 2023 16:42:16 +0800 Subject: [PATCH 19/28] Update README.md --- README.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/README.md b/README.md index cc9f0a00..351eff02 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,6 @@
-**⚠️缺少维护者⚠️** - -**[Night-stars-1](https://github.com/Night-stars-1)没有精力继续维护该项目，请等待其他维护者接手或者等待仓库拥有者继续更新** +**因`闲鱼`倒卖本项目停更** [简体中文](README.md) | [繁体中文](README_CHT.md) | [English](README_EN.md) | [文档](https://sra.stysqy.top) From 58d21ff4b3d01dce1d1c6e9c6c9455ec5f08de66 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sat, 29 Jul 2023 08:42:43 +0000 Subject: [PATCH 20/28] =?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 | 2 +- version.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/star_list.json b/star_list.json index 5f875d60..147cd5bb 100644 --- a/star_list.json +++ b/star_list.json @@ -29,7 +29,7 @@ }, { "path": "README.md", - "hash": "4ceb43ba4366b6220af4f0cbc5cc101f" + "hash": "a1ad881e6fda31d2739e1a6a962fb196" }, { "path": "model/label_cn.txt", diff --git a/version.json b/version.json index fc4855b5..6e8985ec 100644 --- a/version.json +++ b/version.json @@ -1 +1 @@ -{"version": "20230724203117"} \ No newline at end of file +{"version": "20230729164231"} \ No newline at end of file From d8aaa487504722f5238c11d055364b6185129e80 Mon Sep 17 00:00:00 2001 From: Night-stars-1 <99261160+Night-stars-1@users.noreply.github.com> Date: Sun, 30 Jul 2023 23:56:18 +0800 Subject: [PATCH 21/28] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 351eff02..efefd659 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,8 @@ **因`闲鱼`倒卖本项目停更** +其他项目: [Auto_Star_Rail](https://github.com/Night-stars-1/Auto_Star_Rail) + [简体中文](README.md) | [繁体中文](README_CHT.md) | [English](README_EN.md) | [文档](https://sra.stysqy.top) LOGO From 103207d5811e64fe2b63494bc0156acc9200975b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sun, 30 Jul 2023 15:56:41 +0000 Subject: [PATCH 22/28] =?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 | 2 +- version.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/star_list.json b/star_list.json index 147cd5bb..b532acbe 100644 --- a/star_list.json +++ b/star_list.json @@ -29,7 +29,7 @@ }, { "path": "README.md", - "hash": "a1ad881e6fda31d2739e1a6a962fb196" + "hash": "37d14d0ce0bb80d7f31c497f7b125060" }, { "path": "model/label_cn.txt", diff --git a/version.json b/version.json index 6e8985ec..353591b4 100644 --- a/version.json +++ b/version.json @@ -1 +1 @@ -{"version": "20230729164231"} \ No newline at end of file +{"version": "20230730235630"} \ No newline at end of file From 367ca86dff6b4734f9dee4d62b306cc5fef9971f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=A0=E6=AA=AC=E6=A9=99=E5=91=B3=E5=A4=B9=E5=BF=83?= =?UTF-8?q?=E7=B3=96?= <80755556+iceNo9@users.noreply.github.com> Date: Thu, 28 Sep 2023 10:33:20 +0800 Subject: [PATCH 23/28] =?UTF-8?q?perf&feat:=E4=BC=98=E5=8C=96=E5=BC=80?= =?UTF-8?q?=E5=90=AF=E8=87=AA=E5=8A=A8=E6=88=98=E6=96=97=E8=AF=86=E5=88=AB?= =?UTF-8?q?=E7=9A=84=E9=80=BB=E8=BE=91=EF=BC=9B=E6=B7=BB=E5=8A=A0=E6=AF=8F?= =?UTF-8?q?=E4=B8=AA=E5=9C=B0=E5=9B=BE=E9=94=84=E5=9C=B0=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E4=B8=8E=E6=80=BB=E6=97=B6=E9=97=B4=E7=BB=9F=E8=AE=A1=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- utils/calculated.py | 2 +- utils/map.py | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/utils/calculated.py b/utils/calculated.py index a1e8bb3b..5a16fe3b 100644 --- a/utils/calculated.py +++ b/utils/calculated.py @@ -519,7 +519,7 @@ def wait_fight_end(self, type=0): start_time = time.time() if sra_config_obj.auto_battle_persistence != 1: #这个设置建议放弃,看了看浪费性能加容易出问题 while True: - result = self.scan_screenshot(self.auto) + result = self.scan_screenshot(self.auto, points=(90, 0, 100, 10)) if result["max_val"] > 0.95: time.sleep(0.3) self.keyboard.press("v") diff --git a/utils/map.py b/utils/map.py index 05e8f736..cf7f5c0c 100644 --- a/utils/map.py +++ b/utils/map.py @@ -111,6 +111,17 @@ def start_map(self, map, map_name): else: raise Exception(_("map数据错误,未匹配对应操作:{map_filename}").format(map_filename=map_filename), map) ''' + def format_time(self, seconds): + # 格式化时间 + minutes, seconds = divmod(seconds, 60) + hours, minutes = divmod(minutes, 60) + + if hours > 0: + return f"{hours:.0f}小时{minutes:.0f}分{seconds:.1f}秒" + elif minutes > 0: + return f"{minutes:.0f}分{seconds:.1f}秒" + else: + return f"{seconds:.1f}秒" def auto_map(self, start): __, __, __, __, __, width, length = self.calculated.take_screenshot() @@ -122,6 +133,7 @@ def auto_map(self, start): if roles: set_log('-'.join(roles)) def start_map(self:Map, start, check:bool=False): + total_processing_time = 0 wrong_map = True if f'map_{start}.json' in self.map_list: if not check: @@ -180,6 +192,19 @@ def start_map(self:Map, start, check:bool=False): count = self.calculated.wait_join() log.info(_('地图加载完毕，加载时间为 {count} 秒').format(count=count)) time.sleep(2) # 加2s防止人物未加载 + + # 记录处理开始时间 + start_time = time.time() + + # 记录处理结束时间 + end_time = time.time() + + # 计算处理时间并输出 + processing_time = end_time - start_time + formatted_time = self.format_time(processing_time) + total_processing_time += processing_time + log.info(f"{map}用时\033[1;92m『{formatted_time}』\033[0m,总计:\033[1;92m『{self.format_time(total_processing_time)}』\033[0m") + #map_name = name.split("-")[0] self.start_map(map, name) else: From 98672b9962794b3b0cf4ecc8373c149dff701670 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=A0=E6=AA=AC=E6=A9=99=E5=91=B3=E5=A4=B9=E5=BF=83?= =?UTF-8?q?=E7=B3=96?= <80755556+iceNo9@users.noreply.github.com> Date: Thu, 28 Sep 2023 10:53:28 +0800 Subject: [PATCH 24/28] =?UTF-8?q?perf:=E8=AE=B0=E5=BD=95=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=86=99=E9=94=99=E4=BA=86=EF=BC=8C=E6=94=B9?= =?UTF-8?q?=E4=B8=80=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- utils/map.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/utils/map.py b/utils/map.py index cf7f5c0c..5f40afbd 100644 --- a/utils/map.py +++ b/utils/map.py @@ -196,6 +196,9 @@ def start_map(self:Map, start, check:bool=False): # 记录处理开始时间 start_time = time.time() + #map_name = name.split("-")[0] + self.start_map(map, name) + # 记录处理结束时间 end_time = time.time() @@ -204,9 +207,6 @@ def start_map(self:Map, start, check:bool=False): formatted_time = self.format_time(processing_time) total_processing_time += processing_time log.info(f"{map}用时\033[1;92m『{formatted_time}』\033[0m,总计:\033[1;92m『{self.format_time(total_processing_time)}』\033[0m") - - #map_name = name.split("-")[0] - self.start_map(map, name) else: log.info(_('地图编号 {start} 不存在，请尝试检查更新').format(start=start)) threading.Thread(target=self.set_stop).start() From ebe497af6b714d2c5c4f74d8e9c587d6fe64365a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Thu, 28 Sep 2023 04:32:45 +0000 Subject: [PATCH 25/28] =?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 | 132 ++++++++++++++++++++++++------------------------- version.json | 2 +- 2 files changed, 67 insertions(+), 67 deletions(-) diff --git a/star_list.json b/star_list.json index b532acbe..8cdeb1e4 100644 --- a/star_list.json +++ b/star_list.json @@ -1,31 +1,31 @@ [ { - "path": "requirements.txt", - "hash": "168bf19887a7da79ae637d9d7d7d3593" - }, - { - "path": "Honkai_Star_Rail.py", - "hash": "fcb90503847871c32f3458d0097a995a" - }, - { - "path": "README_EN.md", - "hash": "86793ffe1c415f308624e02b9924a4f8" + "path": "get_width.py", + "hash": "883cd3ffb3c1f7a0e8fff08ba61269b3" }, { "path": "map_res_list.py", "hash": "61ddda8760a56ea082d5d7276747312a" }, + { + "path": "README_CHT.md", + "hash": "f26e29d09b17110ad6f79d5c40224d57" + }, { "path": "gui.py", "hash": "40ff0b633f5f7f902d38290ce750ee3c" }, { - "path": "get_width.py", - "hash": "883cd3ffb3c1f7a0e8fff08ba61269b3" + "path": "requirements.txt", + "hash": "168bf19887a7da79ae637d9d7d7d3593" }, { - "path": "README_CHT.md", - "hash": "f26e29d09b17110ad6f79d5c40224d57" + "path": "Honkai_Star_Rail.py", + "hash": "fcb90503847871c32f3458d0097a995a" + }, + { + "path": "README_EN.md", + "hash": "86793ffe1c415f308624e02b9924a4f8" }, { "path": "README.md", @@ -36,12 +36,12 @@ "hash": "e3f7c9400f4379e05cadbbc8a43dda45" }, { - "path": "model/cnocr/1.2/ppocr/ch_PP-OCRv3_det_infer.onnx", - "hash": "5732f8c84bd4cc0dab35094e7260f080" + "path": "model/cnstd/2.2/densenet_lite_114-fc/cnocr-v2.2-densenet_lite_114-fc-epoch=037-complete_match_epoch=0.7859-model.onnx", + "hash": "d661b811419ff7dde7eb8543690cdd2b" }, { - "path": "model/cnocr/1.2/ppocr/en_PP-OCRv3_det_infer.onnx", - "hash": "72708a3ac241e25fefbc606832dc7529" + "path": "model/cnstd/2.2/densenet_lite_134-fc/cnocr-v2.2-densenet_lite_134-fc-epoch=034-complete_match_epoch=0.8376-model.onnx", + "hash": "332265c72378b39e83ced6b4e42954c4" }, { "path": "model/cnstd/2.2/ppocr/en_PP-OCRv3_rec_infer.onnx", @@ -52,99 +52,99 @@ "hash": "442ea7b4dabdbaec95af17a6d17c3503" }, { - "path": "model/cnstd/2.2/densenet_lite_134-fc/cnocr-v2.2-densenet_lite_134-fc-epoch=034-complete_match_epoch=0.8376-model.onnx", - "hash": "332265c72378b39e83ced6b4e42954c4" + "path": "model/cnocr/1.2/ppocr/ch_PP-OCRv3_det_infer.onnx", + "hash": "5732f8c84bd4cc0dab35094e7260f080" }, { - "path": "model/cnstd/2.2/densenet_lite_114-fc/cnocr-v2.2-densenet_lite_114-fc-epoch=037-complete_match_epoch=0.7859-model.onnx", - "hash": "d661b811419ff7dde7eb8543690cdd2b" + "path": "model/cnocr/1.2/ppocr/en_PP-OCRv3_det_infer.onnx", + "hash": "72708a3ac241e25fefbc606832dc7529" }, { - "path": "utils/requests.py", - "hash": "27952d3e76aca6502a540c69dbf58a2a" + "path": "locale/zh_CN/LC_MESSAGES/sra.mo", + "hash": "0a0ccfe2f4f2da8626fda930bd84ef9c" }, { - "path": "utils/cv_tools.py", - "hash": "1a21f925133502d281e24adfb1310cc7" + "path": "locale/zh_TC/LC_MESSAGES/sra.mo", + "hash": "ef66f8b317d24e3eb326e739cb9b00ee" }, { - "path": "utils/get_angle.py", - "hash": "2dc46330cef1b3720658f62c619b54ac" + "path": "locale/EN/LC_MESSAGES/sra.mo", + "hash": "4c9ed87ca1d8f72de21590de507c9d32" }, { - "path": "utils/log.py", - "hash": "172d7d4d63c1b3136c5600055e666967" + "path": "whl/cnocr-2.2.2.3-py3-none-any.whl", + "hash": "fff249a0f8c75f5bc4f0f97c95880bd8" }, { - "path": "utils/simulated_universe.py", - "hash": "ee14b83bd91b720095188ccc475c014d" + "path": "whl/cnstd-1.2.2-py3-none-any.whl", + "hash": "2e700dd1d42f71c71b739bd6afa67a8a" }, { - "path": "utils/commission.py", - "hash": "f2911ffe8697a5cfc6301ba66e383116" + "path": "whl/httpx_socks-0.7.7-py3-none-any.whl", + "hash": "9c9fcdf730445180029471858d8e8c27" }, { - "path": "utils/record_v7.2.py", - "hash": "fbf62da314595e8f70487b8cf8944bee" + "path": "whl/Polygon3-3.0.9.1-cp310-cp310-win_amd64.whl", + "hash": "0c19795eb68713cde783a434ea636ba9" }, { - "path": "utils/config.py", - "hash": "14220162aafc54ef96bab11f3210c3ee" + "path": "whl/Polygon3-3.0.9-cp311-cp311-win_amd64.whl", + "hash": "43a2cab179598fdaaa21da76cdaaaafc" }, { - "path": "utils/adb.py", - "hash": "4a19acb6a8f259b2818172d4c3b5a1ba" + "path": "utils/route_helper.py", + "hash": "cca50ef52d7075c186e12badeb0a35d0" }, { - "path": "utils/map.py", - "hash": "73835fd33d9a2b1c9bb4c9eebcdd0565" + "path": "utils/simulated_universe.py", + "hash": "ee14b83bd91b720095188ccc475c014d" }, { - "path": "utils/calculated.py", - "hash": "dbff14bee88a6b5e6c04d7967cf0acc8" + "path": "utils/adb.py", + "hash": "4a19acb6a8f259b2818172d4c3b5a1ba" }, { - "path": "utils/update_file.py", - "hash": "a81d8336f7aad613d7223e1a6eb9b458" + "path": "utils/map.py", + "hash": "fdae28cad082981183dc28308a67e625" }, { - "path": "utils/exceptions.py", - "hash": "77cc57669183fd844fbc2345fef88a3f" + "path": "utils/log.py", + "hash": "172d7d4d63c1b3136c5600055e666967" }, { - "path": "utils/route_helper.py", - "hash": "cca50ef52d7075c186e12badeb0a35d0" + "path": "utils/commission.py", + "hash": "f2911ffe8697a5cfc6301ba66e383116" }, { - "path": "whl/Polygon3-3.0.9.1-cp310-cp310-win_amd64.whl", - "hash": "0c19795eb68713cde783a434ea636ba9" + "path": "utils/calculated.py", + "hash": "44442d8fbb0a339c3cf24f5f55145685" }, { - "path": "whl/httpx_socks-0.7.7-py3-none-any.whl", - "hash": "9c9fcdf730445180029471858d8e8c27" + "path": "utils/config.py", + "hash": "14220162aafc54ef96bab11f3210c3ee" }, { - "path": "whl/Polygon3-3.0.9-cp311-cp311-win_amd64.whl", - "hash": "43a2cab179598fdaaa21da76cdaaaafc" + "path": "utils/update_file.py", + "hash": "a81d8336f7aad613d7223e1a6eb9b458" }, { - "path": "whl/cnocr-2.2.2.3-py3-none-any.whl", - "hash": "fff249a0f8c75f5bc4f0f97c95880bd8" + "path": "utils/cv_tools.py", + "hash": "1a21f925133502d281e24adfb1310cc7" }, { - "path": "whl/cnstd-1.2.2-py3-none-any.whl", - "hash": "2e700dd1d42f71c71b739bd6afa67a8a" + "path": "utils/exceptions.py", + "hash": "77cc57669183fd844fbc2345fef88a3f" }, { - "path": "locale/EN/LC_MESSAGES/sra.mo", - "hash": "4c9ed87ca1d8f72de21590de507c9d32" + "path": "utils/record_v7.2.py", + "hash": "fbf62da314595e8f70487b8cf8944bee" }, { - "path": "locale/zh_TC/LC_MESSAGES/sra.mo", - "hash": "ef66f8b317d24e3eb326e739cb9b00ee" + "path": "utils/requests.py", + "hash": "27952d3e76aca6502a540c69dbf58a2a" }, { - "path": "locale/zh_CN/LC_MESSAGES/sra.mo", - "hash": "0a0ccfe2f4f2da8626fda930bd84ef9c" + "path": "utils/get_angle.py", + "hash": "2dc46330cef1b3720658f62c619b54ac" } ] \ No newline at end of file diff --git a/version.json b/version.json index 353591b4..f13b07c0 100644 --- a/version.json +++ b/version.json @@ -1 +1 @@ -{"version": "20230730235630"} \ No newline at end of file +{"version": "20230928123234"} \ No newline at end of file From 01b817033f91a01272c938f9a6eb948f4f306683 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sun, 1 Oct 2023 15:08:55 +0000 Subject: [PATCH 26/28] =?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 | 136 +++++++++++++++++++++++++------------------------ version.json | 2 +- 2 files changed, 71 insertions(+), 67 deletions(-) diff --git a/star_list.json b/star_list.json index 8cdeb1e4..247b2193 100644 --- a/star_list.json +++ b/star_list.json @@ -1,43 +1,67 @@ [ + { + "path": "README_CHT.md", + "hash": "f26e29d09b17110ad6f79d5c40224d57" + }, + { + "path": "Honkai_Star_Rail.py", + "hash": "b52ce56c7618c1b5afd89f17c753d41d" + }, + { + "path": "requirements.txt", + "hash": "168bf19887a7da79ae637d9d7d7d3593" + }, { "path": "get_width.py", "hash": "883cd3ffb3c1f7a0e8fff08ba61269b3" }, + { + "path": "README.md", + "hash": "37d14d0ce0bb80d7f31c497f7b125060" + }, { "path": "map_res_list.py", "hash": "61ddda8760a56ea082d5d7276747312a" }, { - "path": "README_CHT.md", - "hash": "f26e29d09b17110ad6f79d5c40224d57" + "path": "README_EN.md", + "hash": "86793ffe1c415f308624e02b9924a4f8" }, { "path": "gui.py", - "hash": "40ff0b633f5f7f902d38290ce750ee3c" + "hash": "12f482d0d0cc8b100fb7f465e65c9169" }, { - "path": "requirements.txt", - "hash": "168bf19887a7da79ae637d9d7d7d3593" + "path": "whl/Polygon3-3.0.9-cp311-cp311-win_amd64.whl", + "hash": "43a2cab179598fdaaa21da76cdaaaafc" }, { - "path": "Honkai_Star_Rail.py", - "hash": "fcb90503847871c32f3458d0097a995a" + "path": "whl/cnstd-1.2.2-py3-none-any.whl", + "hash": "2e700dd1d42f71c71b739bd6afa67a8a" }, { - "path": "README_EN.md", - "hash": "86793ffe1c415f308624e02b9924a4f8" + "path": "whl/Polygon3-3.0.9.1-cp310-cp310-win_amd64.whl", + "hash": "0c19795eb68713cde783a434ea636ba9" }, { - "path": "README.md", - "hash": "37d14d0ce0bb80d7f31c497f7b125060" + "path": "whl/httpx_socks-0.7.7-py3-none-any.whl", + "hash": "9c9fcdf730445180029471858d8e8c27" + }, + { + "path": "whl/cnocr-2.2.2.3-py3-none-any.whl", + "hash": "fff249a0f8c75f5bc4f0f97c95880bd8" }, { "path": "model/label_cn.txt", "hash": "e3f7c9400f4379e05cadbbc8a43dda45" }, { - "path": "model/cnstd/2.2/densenet_lite_114-fc/cnocr-v2.2-densenet_lite_114-fc-epoch=037-complete_match_epoch=0.7859-model.onnx", - "hash": "d661b811419ff7dde7eb8543690cdd2b" + "path": "model/cnocr/1.2/ppocr/en_PP-OCRv3_det_infer.onnx", + "hash": "72708a3ac241e25fefbc606832dc7529" + }, + { + "path": "model/cnocr/1.2/ppocr/ch_PP-OCRv3_det_infer.onnx", + "hash": "5732f8c84bd4cc0dab35094e7260f080" }, { "path": "model/cnstd/2.2/densenet_lite_134-fc/cnocr-v2.2-densenet_lite_134-fc-epoch=034-complete_match_epoch=0.8376-model.onnx", @@ -52,99 +76,79 @@ "hash": "442ea7b4dabdbaec95af17a6d17c3503" }, { - "path": "model/cnocr/1.2/ppocr/ch_PP-OCRv3_det_infer.onnx", - "hash": "5732f8c84bd4cc0dab35094e7260f080" - }, - { - "path": "model/cnocr/1.2/ppocr/en_PP-OCRv3_det_infer.onnx", - "hash": "72708a3ac241e25fefbc606832dc7529" - }, - { - "path": "locale/zh_CN/LC_MESSAGES/sra.mo", - "hash": "0a0ccfe2f4f2da8626fda930bd84ef9c" - }, - { - "path": "locale/zh_TC/LC_MESSAGES/sra.mo", - "hash": "ef66f8b317d24e3eb326e739cb9b00ee" - }, - { - "path": "locale/EN/LC_MESSAGES/sra.mo", - "hash": "4c9ed87ca1d8f72de21590de507c9d32" + "path": "model/cnstd/2.2/densenet_lite_114-fc/cnocr-v2.2-densenet_lite_114-fc-epoch=037-complete_match_epoch=0.7859-model.onnx", + "hash": "d661b811419ff7dde7eb8543690cdd2b" }, { - "path": "whl/cnocr-2.2.2.3-py3-none-any.whl", - "hash": "fff249a0f8c75f5bc4f0f97c95880bd8" + "path": "utils/calculated.py", + "hash": "62c8e59e52c3c8afc738151f5ed14d26" }, { - "path": "whl/cnstd-1.2.2-py3-none-any.whl", - "hash": "2e700dd1d42f71c71b739bd6afa67a8a" + "path": "utils/update_file.py", + "hash": "4e4299b884808a778eba8acd3df47f5c" }, { - "path": "whl/httpx_socks-0.7.7-py3-none-any.whl", - "hash": "9c9fcdf730445180029471858d8e8c27" + "path": "utils/exceptions.py", + "hash": "77cc57669183fd844fbc2345fef88a3f" }, { - "path": "whl/Polygon3-3.0.9.1-cp310-cp310-win_amd64.whl", - "hash": "0c19795eb68713cde783a434ea636ba9" + "path": "utils/record_v7.2.py", + "hash": "cdb55d975f8d60af7fac1b3464eb18bf" }, { - "path": "whl/Polygon3-3.0.9-cp311-cp311-win_amd64.whl", - "hash": "43a2cab179598fdaaa21da76cdaaaafc" + "path": "utils/cv_tools.py", + "hash": "2ff051a5ad70adfc3c673dd3f0810654" }, { - "path": "utils/route_helper.py", - "hash": "cca50ef52d7075c186e12badeb0a35d0" + "path": "utils/map.py", + "hash": "295b2c0f75d55c0857d78781a168330f" }, { - "path": "utils/simulated_universe.py", - "hash": "ee14b83bd91b720095188ccc475c014d" + "path": "utils/old_cv_tools.py", + "hash": "d58c447d88f7924704ddbc593985bf0b" }, { "path": "utils/adb.py", "hash": "4a19acb6a8f259b2818172d4c3b5a1ba" }, - { - "path": "utils/map.py", - "hash": "fdae28cad082981183dc28308a67e625" - }, { "path": "utils/log.py", "hash": "172d7d4d63c1b3136c5600055e666967" }, { - "path": "utils/commission.py", - "hash": "f2911ffe8697a5cfc6301ba66e383116" + "path": "utils/requests.py", + "hash": "27952d3e76aca6502a540c69dbf58a2a" }, { - "path": "utils/calculated.py", - "hash": "44442d8fbb0a339c3cf24f5f55145685" + "path": "utils/simulated_universe.py", + "hash": "ee14b83bd91b720095188ccc475c014d" }, { "path": "utils/config.py", - "hash": "14220162aafc54ef96bab11f3210c3ee" + "hash": "ad44ededa78b1830f6ad63dd8e28af27" }, { - "path": "utils/update_file.py", - "hash": "a81d8336f7aad613d7223e1a6eb9b458" + "path": "utils/get_angle.py", + "hash": "d87199a94a0f12290e75b68936e68326" }, { - "path": "utils/cv_tools.py", - "hash": "1a21f925133502d281e24adfb1310cc7" + "path": "utils/commission.py", + "hash": "f2911ffe8697a5cfc6301ba66e383116" }, { - "path": "utils/exceptions.py", - "hash": "77cc57669183fd844fbc2345fef88a3f" + "path": "utils/route_helper.py", + "hash": "cca50ef52d7075c186e12badeb0a35d0" }, { - "path": "utils/record_v7.2.py", - "hash": "fbf62da314595e8f70487b8cf8944bee" + "path": "locale/zh_CN/LC_MESSAGES/sra.mo", + "hash": "0a0ccfe2f4f2da8626fda930bd84ef9c" }, { - "path": "utils/requests.py", - "hash": "27952d3e76aca6502a540c69dbf58a2a" + "path": "locale/zh_TC/LC_MESSAGES/sra.mo", + "hash": "ef66f8b317d24e3eb326e739cb9b00ee" }, { - "path": "utils/get_angle.py", - "hash": "2dc46330cef1b3720658f62c619b54ac" + "path": "locale/EN/LC_MESSAGES/sra.mo", + "hash": "110d45fcca6c7b86a9770cf3e3009026" } ] \ No newline at end of file diff --git a/version.json b/version.json index f13b07c0..5ea97dec 100644 --- a/version.json +++ b/version.json @@ -1 +1 @@ -{"version": "20230928123234"} \ No newline at end of file +{"version": "20231001230843"} \ No newline at end of file From 0447fa05321aca319a2466762d98c846660e033c Mon Sep 17 00:00:00 2001 From: Night-stars-1 <99261160+Night-stars-1@users.noreply.github.com> Date: Sun, 1 Oct 2023 23:13:20 +0800 Subject: [PATCH 27/28] Update README.md --- README.md | 40 +++++++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index efefd659..7200aa03 100644 --- a/README.md +++ b/README.md @@ -1,17 +1,25 @@ +
-**因`闲鱼`倒卖本项目停更** +[嗨！点点我！点点我！点点我！](#使用说明) -其他项目: [Auto_Star_Rail](https://github.com/Night-stars-1/Auto_Star_Rail) - -[简体中文](README.md) | [繁体中文](README_CHT.md) | [English](README_EN.md) | [文档](https://sra.stysqy.top) - -LOGO +[简体中文](README.md) | [文档](https://sra.stysqy.top)

-崩坏：星穹铁道小助手|StarRailAssistant|StarRailAssistant +StarRailAssistan +⚠️本项目不会在`咸鱼`、`淘宝`、`拼多多`等平台售卖，发现售卖请帮忙举报。⚠️ + +⚠️本项目不允许以任何方式在`咸鱼`、`淘宝`、`拼多多`等平台是售卖⚠️

[![GitHub Stars](https://img.shields.io/github/stars/Starry-Wind/StarRailAssistant?style=flat-square)](https://github.com/Starry-Wind/StarRailAssistant/stargazers) @@ -21,7 +29,9 @@ [![GitHub License](https://img.shields.io/github/license/Starry-Wind/StarRailAssistant?style=flat-square)](https://github.com/Starry-Wind/StarRailAssistant/blob/main/LICENSE)
-找到BUG了？代码问题想吐槽？欢迎加入 技术 & 吹水群：[QQ 群1(可能满了)](https://qm.qq.com/cgi-bin/qm/qr?k=xdCO46fHlVcY7D2L7elXzqcxL3nyTGnW&jump_from=webapi&authKey=uWZooQ2szv+nG/re7luCKn8LW1KibSb0vvi0FycA45Mglm5AGM1GP2iJ+SiWmDwg)|[QQ 群2](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=ShfX_OHrFCHG6fuvXhq7W-oJ4omo0p-_&authKey=7VuSrSVbfqP6bj3%2BBJdI4NwLRrYtUEYOJp2JiT8%2BJnRDhv9sWpJ%2FHjSh5iiY8T4c&noverify=0&group_code=618070253)|[QQ频道](https://pd.qq.com/s/e910fud13)|[Telegram Group](https://t.me/+yeQEhnuT9O41NDM1)
+## 界面展示 + + ## 免责声明 @@ -52,7 +62,7 @@ This software is open source, free of charge and for learning and exchange purpo ```json { "name": "乌拉乌拉-1", （地图json名为1-1_1.json） - "author": "Starry-Wind", （作者名，第二作者不能覆盖第一作者名称） + "author": "Night-stars-1", （作者名，第二作者不能覆盖第一作者名称） "start": [ （开局传送地图识别图片，并将鼠标移动至图片中间并按下按键） {"map": 1}, （按下m键打开地图） {"picture\\orientation_1.jpg": 1.5}, （识别到orientation_1.jpg图片后，将鼠标移动至图片中间并按下按键） @@ -63,22 +73,17 @@ This software is open source, free of charge and for learning and exchange purpo } ``` -## 注意事项 - -1. 识图为截取游戏画面，所以不能有任何覆盖 -2. 支持地图 **空间站「黑塔」、雅利洛VI、仙舟「罗浮」** -3. 如果你发现地图有撞墙问题，可以协助更新[地图文件提交到这里](https://github.com/Starry-Wind/StarRailAssistant/tree/map) -4. 请使用**三月七**来跑图以获得最佳体验 -5. 遇到问题,请先确定你使用的是最新版本记得看[文档](https://sra.stysqy.top) - ⭐**如果喜欢，点个星星~**⭐ ## 未来目标 +- [ ] 基于小地图锄大地(当前`铁卫禁区`开放地图识别，仅返回坐标无实际操作，需要将地图文件的debug设置为true) - [ ] 模拟宇宙正在开发 - [x] GUI开发 - [ ] 后续将会新增找宝箱、锄大地顺带捡垃圾等功能 +[项目进度请点击查看](https://github.com/users/Night-stars-1/projects/2) + ## 贡献 [问题反馈](https://github.com/Starry-Wind/StarRailAssistant/issues/new/choose) | [PR 提交](https://github.com/Starry-Wind/StarRailAssistant/compare) @@ -102,3 +107,4 @@ This software is open source, free of charge and for learning and exchange purpo ## Star History [![Star History Chart](https://api.star-history.com/svg?repos=Starry-Wind/StarRailAssistant&type=Date)](https://star-history.com/#Starry-Wind/StarRailAssistant&Date) + From 4fe4db0d5bd865717a67148f282091ddae7fe6cf Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sun, 1 Oct 2023 15:13:47 +0000 Subject: [PATCH 28/28] =?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 | 2 +- version.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/star_list.json b/star_list.json index 247b2193..cd771947 100644 --- a/star_list.json +++ b/star_list.json @@ -17,7 +17,7 @@ }, { "path": "README.md", - "hash": "37d14d0ce0bb80d7f31c497f7b125060" + "hash": "1660ab49252e3b10e9305dcf1d974401" }, { "path": "map_res_list.py", diff --git a/version.json b/version.json index 5ea97dec..4990da43 100644 --- a/version.json +++ b/version.json @@ -1 +1 @@ -{"version": "20231001230843"} \ No newline at end of file +{"version": "20231001231335"} \ No newline at end of file