From be40ae0ea79553a8b7d2128bb582feb95b56dbca Mon Sep 17 00:00:00 2001
From: ZYX_QZ <chnzyx2016@gmail.com>
Date: Sun, 7 Jul 2024 00:13:02 +0800
Subject: [PATCH] =?UTF-8?q?v7.15=20=E4=BA=8B=E4=BB=B6=E9=80=89=E9=A1=B9?=
 =?UTF-8?q?=E5=88=86=E5=89=B2-=E4=BC=98=E5=8C=96=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E6=BB=A4=E9=95=9C-=E4=BF=AE=E5=A4=8Donnx=E5=8A=A0=E8=BD=BD?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99-=E5=A2=9E=E5=8A=A0=E5=91=A8=E6=9C=9F?=
 =?UTF-8?q?=E6=BC=94=E7=AE=97=E6=A8=A1=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 actions/default.json      |  4 ++--
 diver.py                  | 20 +++++++++++++-------
 info_example.yml          |  4 +++-
 requirements.txt          |  2 +-
 utils/diver/config.py     |  3 +++
 utils/diver/utils.py      | 14 ++++++++++++++
 utils/gui/config_diver.py | 16 +++++++++++++---
 7 files changed, 49 insertions(+), 14 deletions(-)

diff --git a/actions/default.json b/actions/default.json
index c39fbeb..33e3a20 100644
--- a/actions/default.json
+++ b/actions/default.json
@@ -307,14 +307,14 @@
         "name": "确认界面",
         "trigger":{ 
             "text": "确认",
-            "box": [1152, 1205, 648, 678],
+            "box": [1111, 1225, 648, 678],
             "redundancy": 30
         },
         "actions":
         [
             {
                 "text": "确认",
-                "box": [1152, 1205, 648, 678],
+                "box": [1111, 1225, 648, 678],
                 "redundancy": 30
             },
             {
diff --git a/diver.py b/diver.py
index ead4ffa..201697e 100644
--- a/diver.py
+++ b/diver.py
@@ -28,7 +28,7 @@
 from collections import defaultdict
 
 # 版本号
-version = "v7.13"
+version = "v7.15"
 
 
 class DivergentUniverse(UniverseUtils):
@@ -59,6 +59,8 @@ def __init__(self, debug=0, nums=-1, speed=0):
         self.saved_num = 0
         self.default_json_path = "actions/default.json"
         self.default_json = self.load_actions(self.default_json_path)
+        if config.weekly_mode:
+            self.default_json['模式选择'][0]['actions'][1]['text'] = '周期演算'
         if debug != 2:
             pyautogui.FAILSAFE = False
         self.update_count()
@@ -353,7 +355,7 @@ def forward_until(self, text_list=[], timeout=5, moving=0):
                 print(text_list)
                 if self.check_f(is_in=text_list):
                     self.press('f')
-                    for _ in range(2):
+                    for _ in range(1):
                         self.press('s',0.2)
                         self.press('f')
                     return 1
@@ -439,7 +441,7 @@ def event_score(self, text, event):
         event_weight = [2*self.speed, 1, -10]
         for i in range(3):
             for e in event[i].split('-'):
-                if e in text:
+                if e in text and len(e):
                     score += event_weight[i]
         return score
 
@@ -479,11 +481,13 @@ def event(self):
                     text = self.ts.find_with_box([1300, 1920, 100, 1080], redundancy=30)
                     events = []
                     event_now = None
+                    last_star = 0
                     for i in text:
-                        if i['raw_text'].startswith('米'):
+                        if self.check_box("star", [1250, 1460, i['box'][2]-30, i['box'][3]+30]) and last_star<self.ty-20:
+                            last_star = self.ty
                             if event_now is not None:
                                 events.append(event_now)
-                            event_now = {'raw_text': i['raw_text'][1:], 'box': i['box']}
+                            event_now = {'raw_text': i['raw_text'].lstrip('米'), 'box': i['box']}
                         else:
                             if event_now is not None:
                                 event_now['raw_text'] += i['raw_text']
@@ -772,10 +776,10 @@ def area(self):
                     keyops.keyUp('d')
                     self.portal_opening_days(static=1)
                 else:
-                    self.portal_opening_days()
+                    self.portal_opening_days(static=1)
             else:
                 time.sleep(1)
-                self.portal_opening_days()
+                self.portal_opening_days(static=1)
         elif area_now == '战斗':
             if self.area_state == 0:
                 self.press('w', 3)
@@ -808,6 +812,8 @@ def area(self):
             self.keys.fff = 0
             self.portal_opening_days(static=1)
         elif area_now == '位面':
+            pyautogui.click()
+            time.sleep(2)
             self.close_and_exit()
         else:
             self.press('F4')
diff --git a/info_example.yml b/info_example.yml
index f1ca160..bdc7f72 100644
--- a/info_example.yml
+++ b/info_example.yml
@@ -11,6 +11,8 @@ config:
   team: 终结技
   # 速通模式
   speed_mode: 0
+  # 周期演算
+  weekly_mode: 0
   # 图像识别强制使用cpu
   cpu_mode: 0
   # 首领房间需要开秘技的角色，按顺序开
@@ -23,7 +25,7 @@ config:
     - 阮梅
     - 黄泉
   # 自动存档数量，0-4，0代表不存档，1-4代表自动存档到前1-4个存档位
-  save: 4
+  save: 0
   timezone: Default
   max_run: 34
   # 图像识别精度，默认1440，越高越精确，但是也越慢（最高1920）
diff --git a/requirements.txt b/requirements.txt
index 90fd7f9..bc067dc 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,7 +7,7 @@ pyuac
 pillow
 keyboard
 requests
-onnxruntime-directml
+onnxruntime-directml==1.18.0
 shapely
 pyclipper
 pyscreeze==0.1.28
diff --git a/utils/diver/config.py b/utils/diver/config.py
index 1851d97..362b5df 100644
--- a/utils/diver/config.py
+++ b/utils/diver/config.py
@@ -21,6 +21,7 @@ def __init__(self):
         self.long_press_sprint = 0
         self.debug_mode = 0
         self.speed_mode = 0
+        self.weekly_mode = 0
         self.cpu_mode = 0
         self.save_cnt = 4
         self.accuracy = 1440
@@ -78,6 +79,7 @@ def read(self):
                     self.difficult = config['difficulty']
                     self.team = config['team']
                     self.speed_mode = config['speed_mode']
+                    self.weekly_mode = config['weekly_mode']
                     self.cpu_mode = config['cpu_mode']
                     self.update_skill(config['skill'])
                     self.timezone = config['timezone']
@@ -104,6 +106,7 @@ def save(self):
                     "difficulty": self.diffi,
                     "team": self.team,
                     "speed_mode": self.speed_mode,
+                    "weekly_mode": self.weekly_mode,
                     "cpu_mode": self.cpu_mode,
                     "skill": self.skill_char,
                     "save": self.save_cnt,
diff --git a/utils/diver/utils.py b/utils/diver/utils.py
index 537f32d..4649721 100644
--- a/utils/diver/utils.py
+++ b/utils/diver/utils.py
@@ -405,6 +405,20 @@ def check(self, path, x, y, mask=None, threshold=None, large=True):
                 log.info("匹配到图片 %s 相似度 %f 阈值 %f" % (path, max_val, threshold))
             self.last_info = path
         return max_val > threshold
+    
+    def check_box(self, path, box=[0,1920,0,1080], threshold=0.96):
+        path = self.format_path(path)
+        target = cv.imread(path)
+        local_screen = self.screen[box[2]:box[3],box[0]:box[1]]
+        result = cv.matchTemplate(local_screen, target, cv.TM_CCORR_NORMED)
+        min_val, max_val, min_loc, max_loc = cv.minMaxLoc(result)
+        self.tx, self.ty = (max_loc[0]+box[0], max_loc[1]+box[2])
+        self.tm = max_val
+        if max_val > threshold:
+            if self.last_info != path:
+                log.info("匹配到图片 %s 相似度 %f 阈值 %f" % (path, max_val, threshold))
+            self.last_info = path
+        return max_val > threshold
 
     def get_end_point(self, mask=0):
         self.get_screen()
diff --git a/utils/gui/config_diver.py b/utils/gui/config_diver.py
index 74f0955..dd9e24d 100644
--- a/utils/gui/config_diver.py
+++ b/utils/gui/config_diver.py
@@ -23,6 +23,9 @@ def debug_checkbox_changed(_e):
     def speed_checkbox_changed(_e):
         config.speed_mode = not config.speed_mode
 
+    def weekly_checkbox_changed(_e):
+        config.weekly_mode = not config.weekly_mode
+
     def cpu_checkbox_changed(_e):
         config.cpu_mode = not config.cpu_mode
 
@@ -140,6 +143,13 @@ def getnum():
                                             label_position='left',
                                             scale=1.2
                                         ),
+                                        ft.Switch(
+                                            label="周期演算",
+                                            value=get_info_mode(config.weekly_mode),
+                                            on_change=weekly_checkbox_changed,
+                                            label_position='left',
+                                            scale=1.2
+                                        ),
                                         ft.Switch(
                                             label="禁用GPU加速",
                                             value=get_info_mode(config.cpu_mode),
@@ -214,7 +224,7 @@ def getnum():
                                         ),
                                     ]
                                 ),
-                                ft.Container(height=20),
+                                ft.Container(height=15),
                                 ft.Row(
                                     [
                                         ft.Text("秘技角色:",weight=ft.FontWeight.W_600,size=18),
@@ -224,7 +234,7 @@ def getnum():
                                         ),
                                     ]
                                 ),
-                                ft.Container(height=20),
+                                ft.Container(height=5),
                                 ft.Row(
                                     [
                                         txt,
@@ -246,7 +256,7 @@ def getnum():
                                         ft.Text("次",weight=ft.FontWeight.W_400,size=18),
                                     ]
                                 ),
-                                ft.Container(height=40),
+                                ft.Container(height=20),
                                 ft.ElevatedButton(
                                     content=ft.Row(
                                         [