fix

pur1fying · Feb 18, 2024 · 1bef95a · 1bef95a
1 parent a7062f9
commit 1bef95a
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 28 deletions.
diff --git a/core/default_config.py b/core/default_config.py
@@ -558,6 +558,22 @@
     },
   "student_names":
     [
+      {
+        "CN_name": "爱丽丝",
+        "CN_implementation": true,
+        "Global_name": "Aris",
+        "Global_implementation": true,
+        "JP_name": "アリス",
+        "JP_implementation": true
+      },
+      {
+        "CN_name": "爱丽丝(女仆)",
+        "CN_implementation": false,
+        "Global_name": "Aris (Maid)",
+        "Global_implementation": true,
+        "JP_name": "アリス(メイド)",
+        "JP_implementation": true
+      },
       {
         "CN_name": "优香",
         "CN_implementation": true,
@@ -1177,7 +1193,7 @@
       },
       {
         "CN_name": "芹香(正月)",
-        "CN_implementation": false,
+        "CN_implementation": true,
         "Global_name": "Serika(New Year)",
         "Global_implementation": true,
         "JP_name": "セリカ(正月)",
@@ -1233,23 +1249,23 @@
       },
       {
         "CN_name": "吹雪",
-        "CN_implementation": false,
+        "CN_implementation": true,
         "Global_name": "Fubuki",
         "Global_implementation": true,
         "JP_name": "フブキ",
         "JP_implementation": true
       },
       {
         "CN_name": "濑名",
-        "CN_implementation": false,
+        "CN_implementation": true,
         "Global_name": "Sena",
         "Global_implementation": true,
         "JP_name": "セナ",
         "JP_implementation": true
       },
       {
         "CN_name": "千寻",
-        "CN_implementation": false,
+        "CN_implementation": true,
         "Global_name": "Chihiro",
         "Global_implementation": true,
         "JP_name": "チヒロ",
@@ -1663,14 +1679,6 @@
         "JP_name": "カホ",
         "JP_implementation": true
       },
-      {
-        "CN_name": "爱丽丝(女仆)",
-        "CN_implementation": false,
-        "Global_name": "Aris (Maid)",
-        "Global_implementation": true,
-        "JP_name": "アリス(メイド)",
-        "JP_implementation": true
-      },
       {
         "CN_name": "柚子(女仆)",
         "CN_implementation": false,
@@ -1887,14 +1895,6 @@
         "Global_implementation": false,
         "JP_name": "レンゲ",
         "JP_implementation": true
-      },
-      {
-        "CN_name": "爱丽丝",
-        "CN_implementation": true,
-        "Global_name": "Aris",
-        "Global_implementation": true,
-        "JP_name": "アリス",
-        "JP_implementation": true
       }
     ]
 }

diff --git a/module/explore_normal_task.py b/module/explore_normal_task.py
@@ -64,18 +64,20 @@ def implement(self):
                     normal_task.to_normal_event(self, True)
                     break
                 if mission == 'SUB':
-                    self.click(645, 511, wait_over=True)
                     start_choose_side_team(self, self.config[self.stage_data[str(region)]['SUB']])
-                    time.sleep(1)
-                    self.click(1171, 670, wait_over=True)
+                    rgb_possibles = {
+                        "formation_edit" + str(self.config[self.stage_data[str(region)]['SUB']]): (1171, 670),
+                    }
+                    rgb_ends = "fighting_feature"
+                    picture.co_detect(self, rgb_ends, rgb_possibles, None, None, True)
                 else:
                     current_task_stage_data = self.stage_data[mission]
                     img_possibles = {
                         'normal_task_help': (1017, 131),
                         'normal_task_task-info': (946, 540)
                     }
                     img_ends = "normal_task_task-wait-to-begin-feature"
-                    picture.co_detect(self, None, img_possibles, img_ends, None, True)
+                    picture.co_detect(self, None,None, img_ends, img_possibles, True)
                     choose_team_according_to_stage_data_and_config(self, current_task_stage_data)
                     start_mission(self)
                     check_skip_fight_and_auto_over(self)
@@ -242,6 +244,9 @@ def start_choose_side_team(self, index):
     self.logger.info("According to the config. Choose formation " + str(index))
     loy = [195, 275, 354, 423]
     y = loy[index - 1]
+    img_possibles = {
+        'normal_task_task-info': (946, 540)
+    }
     rgb_possibles = {
         "formation_edit1": (74, y),
         "formation_edit2": (74, y),
@@ -250,7 +255,7 @@ def start_choose_side_team(self, index):
     }
     rgb_ends = "formation_edit" + str(index)
     rgb_possibles.pop("formation_edit" + str(index))
-    picture.co_detect(self, rgb_ends, rgb_possibles, None, None, True)
+    picture.co_detect(self, rgb_ends, rgb_possibles, None, img_possibles, True)
 
 
 def choose_region(self, region):

diff --git a/module/main_story.py b/module/main_story.py
@@ -90,8 +90,9 @@ def enter_fight(self):
 
 def auto_fight(self, need_change_acc=True):
     enter_fight(self)
-    time.sleep(1)
     if need_change_acc:
+        time.sleep(2)
+        self.latest_img_array = self.get_screenshot_array()
         change_acc_auto(self)
 
 

diff --git a/src/images/JP/x_y_range/arena.py b/src/images/JP/x_y_range/arena.py
@@ -6,6 +6,6 @@
     'opponent-info': (574, 81, 701, 114),
     'battle-win': (571, 124, 702, 162),
     'battle-lost': (571, 191, 702, 229),
-    # 'season-record': (682, 137, 746, 172),
-    # 'best-record': (653, 139, 715, 172)
+    'season-record': (682, 137, 746, 172),
+    'best-record': (653, 139, 715, 172)
 }