Просмотр исходного кода

Merge branch 'dev' into fixAreaBoss

ChengRanORZ 2 лет назад
Родитель
Сommit
5cd4836ae2

+ 3 - 3
tasks/Component/Costume/assets.py

@@ -118,11 +118,11 @@ class CostumeAssets:
 	# description 
 	I_CHECK_MAIN_9 = RuleImage(roi_front=(764,117,134,42), roi_back=(149,109,1099,100), threshold=0.8, method="Template matching", file="./tasks/Component/Costume/main9/main9_check_main_9.png")
 	# description 
-	I_MAIN_GOTO_EXPLORATION_9 = RuleImage(roi_front=(553,107,31,30), roi_back=(234,98,904,68), threshold=0.7, method="Template matching", file="./tasks/Component/Costume/main9/main9_main_goto_exploration_9.png")
+	I_MAIN_GOTO_EXPLORATION_9 = RuleImage(roi_front=(553,107,31,30), roi_back=(234,98,904,68), threshold=0.3, method="Template matching", file="./tasks/Component/Costume/main9/main9_main_goto_exploration_9.png")
 	#  
-	I_MAIN_GOTO_SUMMON_9 = RuleImage(roi_front=(970,210,35,29), roi_back=(609,194,623,68), threshold=0.7, method="Template matching", file="./tasks/Component/Costume/main9/main9_main_goto_summon_9.png")
+	I_MAIN_GOTO_SUMMON_9 = RuleImage(roi_front=(970,210,35,29), roi_back=(609,194,623,68), threshold=0.25, method="Template matching", file="./tasks/Component/Costume/main9/main9_main_goto_summon_9.png")
 	# description 
-	I_MAIN_GOTO_TOWN_9 = RuleImage(roi_front=(684,342,41,42), roi_back=(276,321,999,78), threshold=0.8, method="Template matching", file="./tasks/Component/Costume/main9/main9_main_goto_town_9.png")
+	I_MAIN_GOTO_TOWN_9 = RuleImage(roi_front=(684,342,41,42), roi_back=(276,321,999,78), threshold=0.7, method="Template matching", file="./tasks/Component/Costume/main9/main9_main_goto_town_9.png")
 	# description 
 	I_PET_HOUSE_9 = RuleImage(roi_front=(888,327,40,35), roi_back=(730,316,440,57), threshold=0.8, method="Template matching", file="./tasks/Component/Costume/main9/main9_pet_house_9.png")
 

+ 3 - 3
tasks/Component/Costume/main9/image.json

@@ -14,7 +14,7 @@
     "roiFront": "553,107,31,30",
     "roiBack": "234,98,904,68",
     "method": "Template matching",
-    "threshold": 0.7,
+    "threshold": 0.3,
     "description": "description"
   },
   {
@@ -23,7 +23,7 @@
     "roiFront": "970,210,35,29",
     "roiBack": "609,194,623,68",
     "method": "Template matching",
-    "threshold": 0.7,
+    "threshold": 0.25,
     "description": ""
   },
   {
@@ -32,7 +32,7 @@
     "roiFront": "684,342,41,42",
     "roiBack": "276,321,999,78",
     "method": "Template matching",
-    "threshold": 0.8,
+    "threshold": 0.7,
     "description": "description"
   },
   {

+ 2 - 1
tasks/Component/GeneralBattle/general_battle.py

@@ -336,7 +336,8 @@ class GeneralBattle(GeneralBuff, GeneralBattleAssets):
         # 点击预设确认
         while 1:
             self.screenshot()
-            if self.appear_then_click(self.I_PRESET_ENSURE, threshold=0.8):
+            if self.wait_until_appear(self, self.I_PRESET_ENSURE, wait_time=1):
+                self.click(self.I_PRESET_ENSURE)
                 continue
             if not self.appear(self.I_PRESET_ENSURE):
                 break

+ 1 - 1
tasks/FloatParade/script_task.py

@@ -18,7 +18,7 @@ class ScriptTask(GameUi, FloatParadeAssets, TalismanPassAssets):
     def run(self):
         self.ui_get_current_page()
         self.ui_goto(page_main)
-        con: FloatParadeConfig = self.config.talisman_pass.talisman
+        con: FloatParadeConfig = self.config.float_parade.float_parade
 
         # 收取全部奖励
         self.get_all()