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

Merge branch 'dev' into fixAreaBoss

ChengRanORZ 2 лет назад
Родитель
Сommit
757c7cfcad

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

@@ -334,10 +334,10 @@ class GeneralBattle(GeneralBuff, GeneralBattleAssets):
         logger.info("Select preset team")
         logger.info("Select preset team")
 
 
         # 点击预设确认
         # 点击预设确认
+        self.wait_until_appear(self.I_PRESET_ENSURE, wait_time=1)
         while 1:
         while 1:
             self.screenshot()
             self.screenshot()
-            if self.wait_until_appear(self, self.I_PRESET_ENSURE, wait_time=1):
-                self.click(self.I_PRESET_ENSURE)
+            if self.appear_then_click(self.I_PRESET_ENSURE, threshold=0.8):
                 continue
                 continue
             if not self.appear(self.I_PRESET_ENSURE):
             if not self.appear(self.I_PRESET_ENSURE):
                 break
                 break

+ 16 - 0
tasks/SixRealms/config.py

@@ -0,0 +1,16 @@
+# This Python file uses the following encoding: utf-8
+# @author runhey
+# github https://github.com/runhey
+from pydantic import BaseModel, Field
+
+from tasks.Component.config_scheduler import Scheduler
+from tasks.Component.config_base import ConfigBase
+
+class SixRealmsGate(BaseModel):
+    # 还没想好
+    greed_maneki: bool = Field(default=False, description="greed_maneki_help")
+
+
+class SoulsTidy(ConfigBase):
+    scheduler: Scheduler = Field(default_factory=Scheduler)
+    # six_realms_gate: SixRealmsGate = Field(default_factory=SixRealmsGate)

+ 0 - 0
tasks/SixRealms/gate1/image.json


+ 3 - 0
tasks/SixRealms/script_task.py

@@ -0,0 +1,3 @@
+# This Python file uses the following encoding: utf-8
+# @author runhey
+# github https://github.com/runhey