Merge branch 'main' into main-beta

Starry-Wind · Oct 1, 2023 · d59dfcb · d59dfcb
2 parents 0b8a9c0 + 4fe4db0
commit d59dfcb
Show file tree

Hide file tree

Showing 4 changed files with 61 additions and 87 deletions.
diff --git a/star_list.json b/star_list.json
@@ -1,142 +1,91 @@
 [
   {
-    "path": "requirements.txt",
-    "hash": "8ddf218f9469f91f0cb38ef37f281cd1"
+    "path": "README_CHT.md",
+    "hash": "f26e29d09b17110ad6f79d5c40224d57"
   },
   {
     "path": "Honkai_Star_Rail.py",
-    "hash": "8318bfe60d5b766d6f0b0fdaffd1825d"
-  },
-  {
-    "path": "map_res_list.py",
-    "hash": "61ddda8760a56ea082d5d7276747312a"
+    "hash": "b52ce56c7618c1b5afd89f17c753d41d"
   },
   {
-    "path": "gui.py",
-    "hash": "f3e6d2b84e6880d54d87237b8b026cd8"
+    "path": "requirements.txt",
+    "hash": "8ddf218f9469f91f0cb38ef37f281cd1"
   },
   {
     "path": "get_width.py",
     "hash": "883cd3ffb3c1f7a0e8fff08ba61269b3"
   },
   {
     "path": "README.md",
-    "hash": "1456925103f8bef9794e60581265086c"
+    "hash": "1660ab49252e3b10e9305dcf1d974401"
   },
   {
-    "path": "model/cnocr/label_cn.txt",
-    "hash": "e3f7c9400f4379e05cadbbc8a43dda45"
-  },
-  {
-    "path": "model/cnocr/2.2/ppocr/en_PP-OCRv3_rec_infer.onnx",
-    "hash": "003da6ca16cae88c5270882fc5e7417b"
-  },
-  {
-    "path": "model/cnocr/2.2/ppocr/en_number_mobile_v2.0_rec_infer.onnx",
-    "hash": "442ea7b4dabdbaec95af17a6d17c3503"
+    "path": "map_res_list.py",
+    "hash": "61ddda8760a56ea082d5d7276747312a"
   },
   {
-    "path": "model/cnocr/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": "README_EN.md",
+    "hash": "86793ffe1c415f308624e02b9924a4f8"
   },
   {
-    "path": "model/cnocr/2.2/densenet_lite_114-fc/cnocr-v2.2-densenet_lite_114-fc-epoch=037-val-complete_match-epoch=0.9667-model.onnx",
-    "hash": "079f9e53539b1e636df518dfc8343f38"
+    "path": "gui.py",
+    "hash": "12f482d0d0cc8b100fb7f465e65c9169"
   },
   {
-    "path": "model/cnstd/1.2/ppocr/ch_PP-OCRv3_det_infer.onnx",
-    "hash": "5732f8c84bd4cc0dab35094e7260f080"
+    "path": "whl/Polygon3-3.0.9-cp311-cp311-win_amd64.whl",
+    "hash": "43a2cab179598fdaaa21da76cdaaaafc"
   },
   {
-    "path": "model/cnstd/1.2/ppocr/en_PP-OCRv3_det_infer.onnx",
-    "hash": "72708a3ac241e25fefbc606832dc7529"
+    "path": "whl/cnstd-1.2.2-py3-none-any.whl",
+    "hash": "2e700dd1d42f71c71b739bd6afa67a8a"
   },
   {
-    "path": "utils/requests.py",
-    "hash": "27952d3e76aca6502a540c69dbf58a2a"
+    "path": "whl/Polygon3-3.0.9.1-cp310-cp310-win_amd64.whl",
+    "hash": "0c19795eb68713cde783a434ea636ba9"
   },
   {
-    "path": "utils/cv_tools.py",
-    "hash": "6529b623d0df7ce6109ac12eb61de50b"
+    "path": "whl/httpx_socks-0.7.7-py3-none-any.whl",
+    "hash": "9c9fcdf730445180029471858d8e8c27"
   },
   {
-    "path": "utils/get_angle.py",
-    "hash": "2dc46330cef1b3720658f62c619b54ac"
+    "path": "whl/cnocr-2.2.2.3-py3-none-any.whl",
+    "hash": "fff249a0f8c75f5bc4f0f97c95880bd8"
   },
   {
-    "path": "utils/log.py",
-    "hash": "172d7d4d63c1b3136c5600055e666967"
+    "path": "model/cnocr/label_cn.txt",
+    "hash": "e3f7c9400f4379e05cadbbc8a43dda45"
+  }
   },
   {
     "path": "utils/simulated_universe.py",
     "hash": "ee14b83bd91b720095188ccc475c014d"
   },
-  {
-    "path": "utils/commission.py",
-    "hash": "f2911ffe8697a5cfc6301ba66e383116"
-  },
-  {
-    "path": "utils/record_v7.2.py",
-    "hash": "fbf62da314595e8f70487b8cf8944bee"
-  },
   {
     "path": "utils/config.py",
-    "hash": "986b64807c52d543f0eb443c7be2c577"
-  },
-  {
-    "path": "utils/adb.py",
-    "hash": "4a19acb6a8f259b2818172d4c3b5a1ba"
-  },
-  {
-    "path": "utils/map.py",
-    "hash": "ad7447286ca04d45fe0b99c255ecf7c1"
+    "hash": "ad44ededa78b1830f6ad63dd8e28af27"
   },
   {
-    "path": "utils/calculated.py",
-    "hash": "4d16bd886ba4ad599e37986afa5575f6"
-  },
-  {
-    "path": "utils/update_file.py",
-    "hash": "4f965fe20541476f30a81e7846453f7c"
+    "path": "utils/get_angle.py",
+    "hash": "d87199a94a0f12290e75b68936e68326"
   },
   {
-    "path": "utils/exceptions.py",
-    "hash": "77cc57669183fd844fbc2345fef88a3f"
+    "path": "utils/commission.py",
+    "hash": "f2911ffe8697a5cfc6301ba66e383116"
   },
   {
     "path": "utils/route_helper.py",
     "hash": "cca50ef52d7075c186e12badeb0a35d0"
   },
   {
-    "path": "whl/Polygon3-3.0.9.1-cp310-cp310-win_amd64.whl",
-    "hash": "0c19795eb68713cde783a434ea636ba9"
-  },
-  {
-    "path": "whl/httpx_socks-0.7.7-py3-none-any.whl",
-    "hash": "9c9fcdf730445180029471858d8e8c27"
-  },
-  {
-    "path": "whl/Polygon3-3.0.9-cp311-cp311-win_amd64.whl",
-    "hash": "43a2cab179598fdaaa21da76cdaaaafc"
-  },
-  {
-    "path": "whl/cnocr-2.2.2.3-py3-none-any.whl",
-    "hash": "fff249a0f8c75f5bc4f0f97c95880bd8"
-  },
-  {
-    "path": "whl/cnstd-1.2.2-py3-none-any.whl",
-    "hash": "2e700dd1d42f71c71b739bd6afa67a8a"
-  },
-  {
-    "path": "locale/EN/LC_MESSAGES/sra.mo",
-    "hash": "4c9ed87ca1d8f72de21590de507c9d32"
+    "path": "locale/zh_CN/LC_MESSAGES/sra.mo",
+    "hash": "0a0ccfe2f4f2da8626fda930bd84ef9c"
   },
   {
     "path": "locale/zh_TC/LC_MESSAGES/sra.mo",
     "hash": "ef66f8b317d24e3eb326e739cb9b00ee"
   },
   {
-    "path": "locale/zh_CN/LC_MESSAGES/sra.mo",
-    "hash": "0a0ccfe2f4f2da8626fda930bd84ef9c"
+    "path": "locale/EN/LC_MESSAGES/sra.mo",
+    "hash": "110d45fcca6c7b86a9770cf3e3009026"
   }
 ]
diff --git a/utils/calculated.py b/utils/calculated.py
@@ -443,7 +443,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
@@ -113,6 +113,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()
@@ -124,6 +135,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:
@@ -186,8 +198,21 @@ 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()
+
                     #map_name = name.split("-")[0]
                     self.start_map(map, name)
+
+                    # 记录处理结束时间
+                    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")
             else:
                 log.info(_('地图编号 {start} 不存在，请尝试检查更新').format(start=start))
         threading.Thread(target=self.set_stop).start()

diff --git a/version.json b/version.json
@@ -1 +1 @@
-{"version": "20230801200202"}
+{"version": "20231001231335"}
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"version": "20230801200202"}
		{"version": "20231001231335"}