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

Merge pull request #172 from runhey/dev

Dev
huangrunheng 2 лет назад
Родитель
Сommit
fa4b16e155
43 измененных файлов с 336 добавлено и 63 удалено
  1. BIN
      tasks/ActivityShikigami/0110/0110_battle_check_1.png
  2. BIN
      tasks/ActivityShikigami/0110/0110_battle_check_2.png
  3. BIN
      tasks/ActivityShikigami/0110/0110_battle_check_3.png
  4. BIN
      tasks/ActivityShikigami/0110/0110_battle_check_4.png
  5. BIN
      tasks/ActivityShikigami/0110/0110_battle_class_1.png
  6. BIN
      tasks/ActivityShikigami/0110/0110_battle_class_2.png
  7. BIN
      tasks/ActivityShikigami/0110/0110_battle_class_3.png
  8. BIN
      tasks/ActivityShikigami/0110/0110_battle_class_4.png
  9. 74 0
      tasks/ActivityShikigami/0110/image.json
  10. BIN
      tasks/ActivityShikigami/as/as_ap.png
  11. BIN
      tasks/ActivityShikigami/as/as_ap_activity.png
  12. BIN
      tasks/ActivityShikigami/as/as_back_green.png
  13. BIN
      tasks/ActivityShikigami/as/as_battle.png
  14. BIN
      tasks/ActivityShikigami/as/as_fire.png
  15. BIN
      tasks/ActivityShikigami/as/as_lock.png
  16. BIN
      tasks/ActivityShikigami/as/as_shi.png
  17. BIN
      tasks/ActivityShikigami/as/as_switch.png
  18. BIN
      tasks/ActivityShikigami/as/as_unlock.png
  19. 15 15
      tasks/ActivityShikigami/as/image.json
  20. 4 4
      tasks/ActivityShikigami/as/ocr.json
  21. 29 10
      tasks/ActivityShikigami/assets.py
  22. 17 2
      tasks/ActivityShikigami/script_task.py
  23. 10 2
      tasks/Component/BaseActivity/config_activity.py
  24. 1 1
      tasks/Component/GeneralBattle/general_battle.py
  25. 2 0
      tasks/Component/GeneralInvite/assets.py
  26. 4 0
      tasks/Component/GeneralInvite/general_invite.py
  27. BIN
      tasks/Component/GeneralInvite/gi/gi_in_room.png
  28. 9 0
      tasks/Component/GeneralInvite/gi/image.json
  29. 10 1
      tasks/EternitySea/assets.py
  30. 2 0
      tasks/EternitySea/config.py
  31. BIN
      tasks/EternitySea/res/es_eternity_sea.png
  32. BIN
      tasks/EternitySea/res/es_eternity_sea_fire.png
  33. BIN
      tasks/EternitySea/res/es_form_team.png
  34. 29 0
      tasks/EternitySea/res/image.json
  35. 97 13
      tasks/EternitySea/script_task.py
  36. 3 1
      tasks/Exploration/assets.py
  37. 10 1
      tasks/Exploration/res/image.json
  38. BIN
      tasks/Exploration/res/res_red_close.png
  39. 7 2
      tasks/Exploration/script_task.py
  40. 1 1
      tasks/GameUi/game_ui.py
  41. 1 1
      tasks/KekkaiActivation/script_task.py
  42. 8 6
      tasks/RyouToppa/script_task.py
  43. 3 3
      tasks/TrueOrochi/script_task.py

BIN
tasks/ActivityShikigami/0110/0110_battle_check_1.png


BIN
tasks/ActivityShikigami/0110/0110_battle_check_2.png


BIN
tasks/ActivityShikigami/0110/0110_battle_check_3.png


BIN
tasks/ActivityShikigami/0110/0110_battle_check_4.png


BIN
tasks/ActivityShikigami/0110/0110_battle_class_1.png


BIN
tasks/ActivityShikigami/0110/0110_battle_class_2.png


BIN
tasks/ActivityShikigami/0110/0110_battle_class_3.png


BIN
tasks/ActivityShikigami/0110/0110_battle_class_4.png


+ 74 - 0
tasks/ActivityShikigami/0110/image.json

@@ -0,0 +1,74 @@
+[
+  {
+    "itemName": "battle_class_1",
+    "imageName": "0110_battle_class_1.png",
+    "roiFront": "126,132,124,81",
+    "roiBack": "126,132,124,81",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "battle_class_2",
+    "imageName": "0110_battle_class_2.png",
+    "roiFront": "120,231,129,83",
+    "roiBack": "120,231,129,83",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "battle_class_3",
+    "imageName": "0110_battle_class_3.png",
+    "roiFront": "141,331,100,89",
+    "roiBack": "141,331,100,89",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "battle_class_4",
+    "imageName": "0110_battle_class_4.png",
+    "roiFront": "141,435,100,83",
+    "roiBack": "141,435,100,83",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "battle_check_1",
+    "imageName": "0110_battle_check_1.png",
+    "roiFront": "36,643,39,41",
+    "roiBack": "36,643,39,41",
+    "method": "Template matching",
+    "threshold": 0.7,
+    "description": "description"
+  },
+  {
+    "itemName": "battle_check_2",
+    "imageName": "0110_battle_check_2.png",
+    "roiFront": "31,649,39,45",
+    "roiBack": "31,649,39,45",
+    "method": "Template matching",
+    "threshold": 0.7,
+    "description": "description"
+  },
+  {
+    "itemName": "battle_check_3",
+    "imageName": "0110_battle_check_3.png",
+    "roiFront": "34,652,38,42",
+    "roiBack": "34,652,38,42",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "battle_check_4",
+    "imageName": "0110_battle_check_4.png",
+    "roiFront": "33,652,38,40",
+    "roiBack": "33,652,38,40",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  }
+]

BIN
tasks/ActivityShikigami/as/as_ap.png


BIN
tasks/ActivityShikigami/as/as_ap_activity.png


BIN
tasks/ActivityShikigami/as/as_back_green.png


BIN
tasks/ActivityShikigami/as/as_battle.png


BIN
tasks/ActivityShikigami/as/as_fire.png


BIN
tasks/ActivityShikigami/as/as_lock.png


BIN
tasks/ActivityShikigami/as/as_shi.png


BIN
tasks/ActivityShikigami/as/as_switch.png


BIN
tasks/ActivityShikigami/as/as_unlock.png


+ 15 - 15
tasks/ActivityShikigami/as/image.json

@@ -2,7 +2,7 @@
   {
   {
     "itemName": "shi",
     "itemName": "shi",
     "imageName": "as_shi.png",
     "imageName": "as_shi.png",
-    "roiFront": "437,348,49,39",
+    "roiFront": "382,308,49,39",
     "roiBack": "64,280,1029,142",
     "roiBack": "64,280,1029,142",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.7,
     "threshold": 0.7,
@@ -11,8 +11,8 @@
   {
   {
     "itemName": "back_green",
     "itemName": "back_green",
     "imageName": "as_back_green.png",
     "imageName": "as_back_green.png",
-    "roiFront": "16,21,44,44",
-    "roiBack": "13,18,49,49",
+    "roiFront": "23,27,44,44",
+    "roiBack": "23,27,44,44",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "左上角返回"
     "description": "左上角返回"
@@ -20,8 +20,8 @@
   {
   {
     "itemName": "battle",
     "itemName": "battle",
     "imageName": "as_battle.png",
     "imageName": "as_battle.png",
-    "roiFront": "642,173,47,172",
-    "roiBack": "618,151,105,220",
+    "roiFront": "558,236,47,172",
+    "roiBack": "526,208,105,220",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "进入爬塔"
     "description": "进入爬塔"
@@ -47,8 +47,8 @@
   {
   {
     "itemName": "unlock",
     "itemName": "unlock",
     "imageName": "as_unlock.png",
     "imageName": "as_unlock.png",
-    "roiFront": "795,656,28,28",
-    "roiBack": "795,656,28,28",
+    "roiFront": "801,652,28,28",
+    "roiBack": "801,652,28,28",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "还未上锁图片"
     "description": "还未上锁图片"
@@ -56,8 +56,8 @@
   {
   {
     "itemName": "fire",
     "itemName": "fire",
     "imageName": "as_fire.png",
     "imageName": "as_fire.png",
-    "roiFront": "1130,575,70,79",
-    "roiBack": "1130,575,70,79",
+    "roiFront": "1143,575,70,79",
+    "roiBack": "1143,575,70,79",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "点击战斗"
     "description": "点击战斗"
@@ -65,8 +65,8 @@
   {
   {
     "itemName": "ap",
     "itemName": "ap",
     "imageName": "as_ap.png",
     "imageName": "as_ap.png",
-    "roiFront": "1107,497,32,34",
-    "roiBack": "1107,497,32,34",
+    "roiFront": "1127,493,32,26",
+    "roiBack": "1127,493,32,26",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "体力按钮"
     "description": "体力按钮"
@@ -74,8 +74,8 @@
   {
   {
     "itemName": "ap_activity",
     "itemName": "ap_activity",
     "imageName": "as_ap_activity.png",
     "imageName": "as_ap_activity.png",
-    "roiFront": "1108,498,27,31",
-    "roiBack": "1108,498,27,31",
+    "roiFront": "1129,499,27,25",
+    "roiBack": "1129,499,27,25",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "活动体力"
     "description": "活动体力"
@@ -83,8 +83,8 @@
   {
   {
     "itemName": "switch",
     "itemName": "switch",
     "imageName": "as_switch.png",
     "imageName": "as_switch.png",
-    "roiFront": "1198,502,33,30",
-    "roiBack": "1198,502,33,30",
+    "roiFront": "1220,499,23,23",
+    "roiBack": "1220,499,23,23",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "切换按键"
     "description": "切换按键"

+ 4 - 4
tasks/ActivityShikigami/as/ocr.json

@@ -1,8 +1,8 @@
 [
 [
   {
   {
     "itemName": "remain_ap",
     "itemName": "remain_ap",
-    "roiFront": "1177,674,80,25",
-    "roiBack": "1177,674,80,25",
+    "roiFront": "1154,679,104,25",
+    "roiBack": "1154,679,104,25",
     "mode": "DigitCounter",
     "mode": "DigitCounter",
     "method": "Default",
     "method": "Default",
     "keyword": "",
     "keyword": "",
@@ -10,8 +10,8 @@
   },
   },
   {
   {
     "itemName": "remain_ap_activity",
     "itemName": "remain_ap_activity",
-    "roiFront": "707,24,106,34",
-    "roiBack": "707,24,106,34",
+    "roiFront": "912,25,95,30",
+    "roiBack": "912,25,95,30",
     "mode": "DigitCounter",
     "mode": "DigitCounter",
     "method": "Default",
     "method": "Default",
     "keyword": "",
     "keyword": "",

+ 29 - 10
tasks/ActivityShikigami/assets.py

@@ -10,6 +10,25 @@ from module.atom.list import RuleList
 class ActivityShikigamiAssets: 
 class ActivityShikigamiAssets: 
 
 
 
 
+	# Image Rule Assets
+	# description 
+	I_BATTLE_CLASS_1 = RuleImage(roi_front=(126,132,124,81), roi_back=(126,132,124,81), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/0110/0110_battle_class_1.png")
+	# description 
+	I_BATTLE_CLASS_2 = RuleImage(roi_front=(120,231,129,83), roi_back=(120,231,129,83), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/0110/0110_battle_class_2.png")
+	# description 
+	I_BATTLE_CLASS_3 = RuleImage(roi_front=(141,331,100,89), roi_back=(141,331,100,89), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/0110/0110_battle_class_3.png")
+	# description 
+	I_BATTLE_CLASS_4 = RuleImage(roi_front=(141,435,100,83), roi_back=(141,435,100,83), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/0110/0110_battle_class_4.png")
+	# description 
+	I_BATTLE_CHECK_1 = RuleImage(roi_front=(36,643,39,41), roi_back=(36,643,39,41), threshold=0.7, method="Template matching", file="./tasks/ActivityShikigami/0110/0110_battle_check_1.png")
+	# description 
+	I_BATTLE_CHECK_2 = RuleImage(roi_front=(31,649,39,45), roi_back=(31,649,39,45), threshold=0.7, method="Template matching", file="./tasks/ActivityShikigami/0110/0110_battle_check_2.png")
+	# description 
+	I_BATTLE_CHECK_3 = RuleImage(roi_front=(34,652,38,42), roi_back=(34,652,38,42), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/0110/0110_battle_check_3.png")
+	# description 
+	I_BATTLE_CHECK_4 = RuleImage(roi_front=(33,652,38,40), roi_back=(33,652,38,40), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/0110/0110_battle_check_4.png")
+
+
 	# Click Rule Assets
 	# Click Rule Assets
 	# description 
 	# description 
 	C_RANDOM_LEFT = RuleClick(roi_front=(21,23,290,599), roi_back=(21,23,290,599), name="random_left")
 	C_RANDOM_LEFT = RuleClick(roi_front=(21,23,290,599), roi_back=(21,23,290,599), name="random_left")
@@ -25,25 +44,25 @@ class ActivityShikigamiAssets:
 
 
 	# Image Rule Assets
 	# Image Rule Assets
 	# 进入活动 
 	# 进入活动 
-	I_SHI = RuleImage(roi_front=(437,348,49,39), roi_back=(64,280,1029,142), threshold=0.7, method="Template matching", file="./tasks/ActivityShikigami/as/as_shi.png")
+	I_SHI = RuleImage(roi_front=(382,308,49,39), roi_back=(64,280,1029,142), threshold=0.7, method="Template matching", file="./tasks/ActivityShikigami/as/as_shi.png")
 	# 左上角返回 
 	# 左上角返回 
-	I_BACK_GREEN = RuleImage(roi_front=(16,21,44,44), roi_back=(13,18,49,49), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_back_green.png")
+	I_BACK_GREEN = RuleImage(roi_front=(23,27,44,44), roi_back=(23,27,44,44), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_back_green.png")
 	# 进入爬塔 
 	# 进入爬塔 
-	I_BATTLE = RuleImage(roi_front=(642,173,47,172), roi_back=(618,151,105,220), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_battle.png")
+	I_BATTLE = RuleImage(roi_front=(558,236,47,172), roi_back=(526,208,105,220), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_battle.png")
 	# 归鹿之途 
 	# 归鹿之途 
 	I_DRUM = RuleImage(roi_front=(1011,114,29,31), roi_back=(1011,114,29,31), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_drum.png")
 	I_DRUM = RuleImage(roi_front=(1011,114,29,31), roi_back=(1011,114,29,31), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_drum.png")
 	# 上锁图标 
 	# 上锁图标 
 	I_LOCK = RuleImage(roi_front=(795,654,25,32), roi_back=(795,654,25,32), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_lock.png")
 	I_LOCK = RuleImage(roi_front=(795,654,25,32), roi_back=(795,654,25,32), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_lock.png")
 	# 还未上锁图片 
 	# 还未上锁图片 
-	I_UNLOCK = RuleImage(roi_front=(795,656,28,28), roi_back=(795,656,28,28), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_unlock.png")
+	I_UNLOCK = RuleImage(roi_front=(801,652,28,28), roi_back=(801,652,28,28), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_unlock.png")
 	# 点击战斗 
 	# 点击战斗 
-	I_FIRE = RuleImage(roi_front=(1130,575,70,79), roi_back=(1130,575,70,79), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_fire.png")
+	I_FIRE = RuleImage(roi_front=(1143,575,70,79), roi_back=(1143,575,70,79), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_fire.png")
 	# 体力按钮 
 	# 体力按钮 
-	I_AP = RuleImage(roi_front=(1107,497,32,34), roi_back=(1107,497,32,34), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_ap.png")
+	I_AP = RuleImage(roi_front=(1127,493,32,26), roi_back=(1127,493,32,26), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_ap.png")
 	# 活动体力 
 	# 活动体力 
-	I_AP_ACTIVITY = RuleImage(roi_front=(1108,498,27,31), roi_back=(1108,498,27,31), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_ap_activity.png")
+	I_AP_ACTIVITY = RuleImage(roi_front=(1129,499,27,25), roi_back=(1129,499,27,25), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_ap_activity.png")
 	# 切换按键 
 	# 切换按键 
-	I_SWITCH = RuleImage(roi_front=(1198,502,33,30), roi_back=(1198,502,33,30), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_switch.png")
+	I_SWITCH = RuleImage(roi_front=(1220,499,23,23), roi_back=(1220,499,23,23), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_switch.png")
 	# 购买活动的体力 
 	# 购买活动的体力 
 	I_BUY_JADE = RuleImage(roi_front=(1004,192,38,42), roi_back=(836,619,38,42), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_buy_jade.png")
 	I_BUY_JADE = RuleImage(roi_front=(1004,192,38,42), roi_back=(836,619,38,42), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_buy_jade.png")
 	# 增加到最大 
 	# 增加到最大 
@@ -54,9 +73,9 @@ class ActivityShikigamiAssets:
 
 
 	# Ocr Rule Assets
 	# Ocr Rule Assets
 	# 体力的数量检测 
 	# 体力的数量检测 
-	O_REMAIN_AP = RuleOcr(roi=(1177,674,80,25), area=(1177,674,80,25), mode="DigitCounter", method="Default", keyword="", name="remain_ap")
+	O_REMAIN_AP = RuleOcr(roi=(1154,679,104,25), area=(1154,679,104,25), mode="DigitCounter", method="Default", keyword="", name="remain_ap")
 	# 活动体力的剩余检测 
 	# 活动体力的剩余检测 
-	O_REMAIN_AP_ACTIVITY = RuleOcr(roi=(707,24,106,34), area=(707,24,106,34), mode="DigitCounter", method="Default", keyword="", name="remain_ap_activity")
+	O_REMAIN_AP_ACTIVITY = RuleOcr(roi=(912,25,95,30), area=(912,25,95,30), mode="DigitCounter", method="Default", keyword="", name="remain_ap_activity")
 	# 还有多少次购买体力的机会 
 	# 还有多少次购买体力的机会 
 	O_REMAIN_BUY = RuleOcr(roi=(808,531,39,42), area=(808,531,39,42), mode="DigitCounter", method="Default", keyword="", name="remain_buy")
 	O_REMAIN_BUY = RuleOcr(roi=(808,531,39,42), area=(808,531,39,42), mode="DigitCounter", method="Default", keyword="", name="remain_buy")
 
 

+ 17 - 2
tasks/ActivityShikigami/script_task.py

@@ -10,11 +10,14 @@ from tasks.AreaBoss.assets import AreaBossAssets
 from tasks.Component.BaseActivity.base_activity import BaseActivity
 from tasks.Component.BaseActivity.base_activity import BaseActivity
 from tasks.Component.BaseActivity.config_activity import ApMode
 from tasks.Component.BaseActivity.config_activity import ApMode
 from tasks.ActivityShikigami.assets import ActivityShikigamiAssets
 from tasks.ActivityShikigami.assets import ActivityShikigamiAssets
+from tasks.GameUi.page import page_main
+from tasks.GameUi.game_ui import GameUi
+
 from module.logger import logger
 from module.logger import logger
 from module.exception import TaskEnd
 from module.exception import TaskEnd
 
 
 
 
-class ScriptTask(BaseActivity, ActivityShikigamiAssets):
+class ScriptTask(GameUi, BaseActivity, ActivityShikigamiAssets):
 
 
     def run(self) -> None:
     def run(self) -> None:
 
 
@@ -25,6 +28,8 @@ class ScriptTask(BaseActivity, ActivityShikigamiAssets):
                                         seconds=self.limit_time.second)
                                         seconds=self.limit_time.second)
         self.limit_count = config.general_climb.limit_count
         self.limit_count = config.general_climb.limit_count
 
 
+        self.ui_get_current_page()
+        self.ui_goto(page_main)
         self.home_main()
         self.home_main()
 
 
         # 设定是否锁定阵容
         # 设定是否锁定阵容
@@ -103,11 +108,21 @@ class ScriptTask(BaseActivity, ActivityShikigamiAssets):
         从庭院到活动的爬塔界面
         从庭院到活动的爬塔界面
         :return:
         :return:
         """
         """
+        from tasks.Component.BaseActivity.config_activity import BattleMode
+        match (self.config.model.activity_shikigami.general_climb.battle_mode):
+            case BattleMode.CLASS1: target_image = self.I_BATTLE_CLASS_1
+            case BattleMode.CLASS2: target_image = self.I_BATTLE_CLASS_2
+            case BattleMode.CLASS3: target_image = self.I_BATTLE_CLASS_3
+            case BattleMode.CLASS4: target_image = self.I_BATTLE_CLASS_4
+            case _: raise ValueError("Unknown battle mode")
+
         logger.hr("Enter Shikigami", 2)
         logger.hr("Enter Shikigami", 2)
         while 1:
         while 1:
             self.screenshot()
             self.screenshot()
             if self.appear(self.I_FIRE):
             if self.appear(self.I_FIRE):
                 break
                 break
+            if self.appear_then_click(target_image, interval=2):
+                continue
             if self.appear_then_click(self.I_SHI, interval=1):
             if self.appear_then_click(self.I_SHI, interval=1):
                 continue
                 continue
             if self.appear_then_click(self.I_DRUM, interval=1):
             if self.appear_then_click(self.I_DRUM, interval=1):
@@ -203,7 +218,7 @@ class ScriptTask(BaseActivity, ActivityShikigamiAssets):
     #                 if not self.appear(self.I_WIN):
     #                 if not self.appear(self.I_WIN):
     #                     break
     #                     break
     #                 if self.appear_then_click(self.I_WIN, action=self.C_RANDOM_ALL, interval=1.1):
     #                 if self.appear_then_click(self.I_WIN, action=self.C_RANDOM_ALL, interval=1.1):
-    #                     continue
+    #                     continuee
     #             return True
     #             return True
     #         # 失败 -> 正常人不会失败
     #         # 失败 -> 正常人不会失败
     #         if self.appear(self.I_FALSE):
     #         if self.appear(self.I_FALSE):

+ 10 - 2
tasks/Component/BaseActivity/config_activity.py

@@ -13,6 +13,13 @@ class ApMode(str, Enum):
     AP_ACTIVITY = 'ap_activity'
     AP_ACTIVITY = 'ap_activity'
     AP_GAME = 'ap_game'
     AP_GAME = 'ap_game'
 
 
+class BattleMode(str, Enum):
+    CLASS1 = '活动室'
+    CLASS2 = '战术厅'
+    CLASS3 = '船员室'
+    CLASS4 = '黄金阁'
+
+
 
 
 class GeneralClimb(ConfigBase):
 class GeneralClimb(ConfigBase):
     # 限制执行的时间
     # 限制执行的时间
@@ -20,7 +27,7 @@ class GeneralClimb(ConfigBase):
     # 限制执行的次数
     # 限制执行的次数
     limit_count: int = Field(default=50, description='limit_count_help')
     limit_count: int = Field(default=50, description='limit_count_help')
     # 每日使用体力挑战的最大次数,默认是300
     # 每日使用体力挑战的最大次数,默认是300
-    ap_game_max: int = Field(default=300, description='ap_game_max_help')
+    ap_game_max: int = Field(default=1800, description='ap_game_max_help')
     # 爬塔活动挂活动的体力还是游戏的体力
     # 爬塔活动挂活动的体力还是游戏的体力
     ap_mode: ApMode = Field(default=ApMode.AP_ACTIVITY, description='ap_mode_help')
     ap_mode: ApMode = Field(default=ApMode.AP_ACTIVITY, description='ap_mode_help')
     # 游戏体力不足是否需要话勾玉购买
     # 游戏体力不足是否需要话勾玉购买
@@ -28,6 +35,7 @@ class GeneralClimb(ConfigBase):
     # 如果挂完的活动的体力,是不是需要挂游戏的体力
     # 如果挂完的活动的体力,是不是需要挂游戏的体力
     # 在我的设计理念中:活动体力>游戏体力。所以不提供从300挂满然后才到挂活动币
     # 在我的设计理念中:活动体力>游戏体力。所以不提供从300挂满然后才到挂活动币
     activity_toggle: bool = Field(default=False, description='activity_toggle_help')
     activity_toggle: bool = Field(default=False, description='activity_toggle_help')
+    battle_mode: BattleMode = Field(default=BattleMode.CLASS1, description='battle_mode_help')
 
 
     @validator('limit_time', pre=True, always=True)
     @validator('limit_time', pre=True, always=True)
     def parse_limit_time(cls, value):
     def parse_limit_time(cls, value):
@@ -50,7 +58,7 @@ class GeneralClimb(ConfigBase):
 
 
     @validator('ap_game_max', pre=True, always=True)
     @validator('ap_game_max', pre=True, always=True)
     def reset_game_max(cls, value):
     def reset_game_max(cls, value):
-        def_value = int(300)
+        def_value = int(1800)
         if isinstance(value, str):
         if isinstance(value, str):
             try:
             try:
                 return int(value)
                 return int(value)

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

@@ -20,7 +20,7 @@ class GeneralBattle(GeneralBuff, GeneralBattleAssets):
     使用这个通用的战斗必须要求这个任务的config有config_general_battle
     使用这个通用的战斗必须要求这个任务的config有config_general_battle
     """
     """
 
 
-    def run_general_battle(self, config: dict=None, buff: BuffClass or list[BuffClass]=None) -> bool:
+    def run_general_battle(self, config: GeneralBattleConfig=None, buff: BuffClass or list[BuffClass]=None) -> bool:
         """
         """
         运行脚本
         运行脚本
         :return:
         :return:

+ 2 - 0
tasks/Component/GeneralInvite/assets.py

@@ -83,6 +83,8 @@ class GeneralInviteAssets:
 	I_GI_SURE = RuleImage(roi_front=(670,402,175,60), roi_back=(670,402,175,60), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_gi_sure.png")
 	I_GI_SURE = RuleImage(roi_front=(670,402,175,60), roi_back=(670,402,175,60), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_gi_sure.png")
 	# 所有的组队界面都有加成 
 	# 所有的组队界面都有加成 
 	I_GI_BUFF = RuleImage(roi_front=(794,38,46,42), roi_back=(794,38,46,42), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_gi_buff.png")
 	I_GI_BUFF = RuleImage(roi_front=(794,38,46,42), roi_back=(794,38,46,42), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_gi_buff.png")
+	# 三人御魂组队左上角的协站队伍 
+	I_GI_IN_ROOM = RuleImage(roi_front=(92,17,213,64), roi_back=(92,17,213,64), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_in_room.png")
 
 
 
 
 	# Image Rule Assets
 	# Image Rule Assets

+ 4 - 0
tasks/Component/GeneralInvite/general_invite.py

@@ -145,6 +145,10 @@ class GeneralInvite(BaseTask, GeneralInviteAssets):
                 return True
                 return True
             if self.appear(self.I_UNLOCK_SEA):
             if self.appear(self.I_UNLOCK_SEA):
                 return True
                 return True
+            # 修复三人组队卡住bug,#78
+            # 增加左上角协战房间判断,存在就说明在组队界面
+            if self.appear(self.I_GI_IN_ROOM):
+                return True
             if self.appear(self.I_MATCHING):
             if self.appear(self.I_MATCHING):
                 return False
                 return False
 
 

BIN
tasks/Component/GeneralInvite/gi/gi_in_room.png


+ 9 - 0
tasks/Component/GeneralInvite/gi/image.json

@@ -322,5 +322,14 @@
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "所有的组队界面都有加成"
     "description": "所有的组队界面都有加成"
+  },
+  {
+    "itemName": "gi_in_room",
+    "imageName": "gi_in_room.png",
+    "roiFront": "92,17,213,64",
+    "roiBack": "92,17,213,64",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "三人御魂组队左上角的协站队伍"
   }
   }
 ]
 ]

+ 10 - 1
tasks/EternitySea/assets.py

@@ -8,5 +8,14 @@ from module.atom.list import RuleList
 # This file was automatically generated by ./dev_tools/assets_extract.py.
 # This file was automatically generated by ./dev_tools/assets_extract.py.
 # Don't modify it manually.
 # Don't modify it manually.
 class EternitySeaAssets: 
 class EternitySeaAssets: 
-	pass
+
+
+	# Image Rule Assets
+	# 选择永生之海 
+	I_ETERNITY_SEA = RuleImage(roi_front=(1150,101,127,416), roi_back=(0,0,1279,719), threshold=0.8, method="Template matching", file="./tasks/EternitySea/res/es_eternity_sea.png")
+	# 组队 
+	I_FORM_TEAM = RuleImage(roi_front=(939,594,96,90), roi_back=(939,594,96,90), threshold=0.8, method="Template matching", file="./tasks/EternitySea/res/es_form_team.png")
+	# 挑战 
+	I_ETERNITY_SEA_FIRE = RuleImage(roi_front=(1108,592,96,93), roi_back=(1108,592,96,93), threshold=0.8, method="Template matching", file="./tasks/EternitySea/res/es_eternity_sea_fire.png")
+
 
 

+ 2 - 0
tasks/EternitySea/config.py

@@ -7,6 +7,7 @@ from datetime import datetime, time
 
 
 from tasks.Component.config_scheduler import Scheduler
 from tasks.Component.config_scheduler import Scheduler
 from tasks.Component.config_base import ConfigBase, Time
 from tasks.Component.config_base import ConfigBase, Time
+from tasks.Component.GeneralBattle.config_general_battle import GeneralBattleConfig
 from tasks.Orochi.config import UserStatus
 from tasks.Orochi.config import UserStatus
 
 
 
 
@@ -29,4 +30,5 @@ class EternitySeaConfig(ConfigBase):
 class EternitySea(ConfigBase):
 class EternitySea(ConfigBase):
     scheduler: Scheduler = Field(default_factory=Scheduler)
     scheduler: Scheduler = Field(default_factory=Scheduler)
     eternity_sea_config: EternitySeaConfig = Field(default_factory=EternitySeaConfig)
     eternity_sea_config: EternitySeaConfig = Field(default_factory=EternitySeaConfig)
+    general_battle_config: GeneralBattleConfig = Field(default_factory=GeneralBattleConfig)
 
 

BIN
tasks/EternitySea/res/es_eternity_sea.png


BIN
tasks/EternitySea/res/es_eternity_sea_fire.png


BIN
tasks/EternitySea/res/es_form_team.png


+ 29 - 0
tasks/EternitySea/res/image.json

@@ -0,0 +1,29 @@
+[
+    {
+        "itemName": "eternity_sea",
+        "imageName": "es_eternity_sea.png",
+        "roiFront": "1150,101,127,416",
+        "roiBack": "0,0,1279,719",
+        "method": "Template matching",
+        "threshold": 0.8,
+        "description": "选择永生之海"
+    },
+    {
+        "itemName": "form_team",
+        "imageName": "es_form_team.png",
+        "roiFront": "939,594,96,90",
+        "roiBack": "939,594,96,90",
+        "method": "Template matching",
+        "threshold": 0.8,
+        "description": "组队"
+    },
+    {
+        "itemName": "eternity_sea_fire",
+        "imageName": "es_eternity_sea_fire.png",
+        "roiFront": "1108,592,96,93",
+        "roiBack": "1108,592,96,93",
+        "method": "Template matching",
+        "threshold": 0.8,
+        "description": "挑战"
+    }
+]

+ 97 - 13
tasks/EternitySea/script_task.py

@@ -1,38 +1,122 @@
 # This Python file uses the following encoding: utf-8
 # This Python file uses the following encoding: utf-8
 # @author runhey
 # @author runhey
 # github https://github.com/runhey
 # github https://github.com/runhey
-from cached_property import cached_property
+from datetime import datetime, timedelta
 
 
 from module.exception import TaskEnd
 from module.exception import TaskEnd
 from module.logger import logger
 from module.logger import logger
-from module.base.timer import Timer
 
 
-from tasks.GameUi.game_ui import GameUi
-from tasks.GameUi.page import page_main, page_soul_zones, page_shikigami_records
+from tasks.GameUi.game_ui import GameUi, Page
+from tasks.GameUi.page import page_soul_zones
 from tasks.Component.GeneralBattle.general_battle import GeneralBattle
 from tasks.Component.GeneralBattle.general_battle import GeneralBattle
-from tasks.Component.GeneralBattle.config_general_battle import GeneralBattleConfig
 from tasks.Component.GeneralRoom.general_room import GeneralRoom
 from tasks.Component.GeneralRoom.general_room import GeneralRoom
 from tasks.Component.GeneralInvite.general_invite import GeneralInvite
 from tasks.Component.GeneralInvite.general_invite import GeneralInvite
 from tasks.Component.SwitchSoul.switch_soul import SwitchSoul
 from tasks.Component.SwitchSoul.switch_soul import SwitchSoul
 from tasks.EternitySea.assets import EternitySeaAssets
 from tasks.EternitySea.assets import EternitySeaAssets
+from tasks.Orochi.config import UserStatus
+from tasks.EternitySea.config import EternitySea
+from module.exception import RequestHumanTakeover
 
 
-class ScriptTask(GameUi, GeneralBattle, GeneralRoom, GeneralInvite, SwitchSoul, EternitySeaAssets):
 
 
-    def run(self):
-        con = self.config.eternity_sea.eternity_sea_config
+class ScriptTask(
+    GameUi, GeneralBattle, GeneralRoom, GeneralInvite, SwitchSoul, EternitySeaAssets
+):
+    @property
+    def task_name(self):
+        return "EternitySea"
+
+    def run(self) -> None:
+        match self._task_config.eternity_sea_config.user_status:
+            case UserStatus.ALONE:
+                success = self.run_alone()
+            case _:
+                logger.critical(
+                    f"UserStatus {self._task_config.eternity_sea_config.user_status} not support"
+                )
+                raise RequestHumanTakeover
+
+        if success:
+            self.set_next_run(self.task_name, finish=True, success=True)
+        else:
+            self.set_next_run(self.task_name, finish=False, success=False)
+
+        raise TaskEnd(self.task_name)
+
+    def run_alone(self) -> bool:
+        logger.info("Start run alone")
+        self._navigate_to_soul_zones()
+        self._enter_eternity_sea()
+
+        if self._task_config.general_battle_config.lock_team_enable == False:
+            logger.critical(f"Only supports lock team mode")
+            raise RequestHumanTakeover
+
+        while 1:
+            self.screenshot()
+
+            if not self._is_in_eternity_sea():
+                continue
+
+            if self.current_count >= self._task_config.eternity_sea_config.limit_count:
+                logger.info("EternitySea count limit out")
+                break
+            if datetime.now() - self.start_time >= self._limit_time:
+                logger.info("EternitySea time limit out")
+                break
+
+            # 点击挑战
+            while 1:
+                self.screenshot()
+                if self.appear_then_click(self.I_ETERNITY_SEA_FIRE, interval=1):
+                    pass
+
+                if not self.appear(self.I_ETERNITY_SEA_FIRE):
+                    self.run_general_battle(
+                        config=self._task_config.general_battle_config
+                    )
+                    break
+
+    def _is_in_eternity_sea(self) -> bool:
+        self.screenshot()
+        return self.appear(self.I_ETERNITY_SEA_FIRE)
+
+    @property
+    def _limit_time(self) -> timedelta:
+        limit_time = self._task_config.eternity_sea_config.limit_time
+        return timedelta(
+            hours=limit_time.hour, minutes=limit_time.minute, seconds=limit_time.second
+        )
+
+    def _enter_eternity_sea(self) -> None:
+        logger.info("Enter eternity_sea")
+        while True:
+            self.screenshot()
+            if self.appear_then_click(self.I_ETERNITY_SEA, interval=1):
+                break
+
+        while True:
+            self.screenshot()
+            if self.appear(self.I_FORM_TEAM):
+                return
+
+    def _navigate_to_soul_zones(self) -> None:
         self.ui_get_current_page()
         self.ui_get_current_page()
         self.ui_goto(page_soul_zones)
         self.ui_goto(page_soul_zones)
 
 
-        self.set_next_run(task='EternitySea', success=True, finish=False)
-        raise TaskEnd('EternitySea')
-
+    def _navigate_to_game_page(self, destination: Page) -> None:
+        self.ui_get_current_page()
+        self.ui_goto(destination)
 
 
+    @property
+    def _task_config(self) -> EternitySea:
+        return self.config.model.eternity_sea
 
 
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     from module.config.config import Config
     from module.config.config import Config
     from module.device.device import Device
     from module.device.device import Device
-    c = Config('oas1')
+
+    c = Config("oas1")
     d = Device(c)
     d = Device(c)
     t = ScriptTask(c, d)
     t = ScriptTask(c, d)
     t.screenshot()
     t.screenshot()

+ 3 - 1
tasks/Exploration/assets.py

@@ -59,11 +59,13 @@ class ExplorationAssets:
 	# 战后奖励 
 	# 战后奖励 
 	I_BATTLE_REWARD = RuleImage(roi_front=(647,395,31,21), roi_back=(1,1,1278,718), threshold=0.8, method="Template matching", file="./tasks/Exploration/res/res_battle_reward.png")
 	I_BATTLE_REWARD = RuleImage(roi_front=(647,395,31,21), roi_back=(1,1,1278,718), threshold=0.8, method="Template matching", file="./tasks/Exploration/res/res_battle_reward.png")
 	# 妖 
 	# 妖 
-	I_EXPLORATION_TITLE = RuleImage(roi_front=(1133,124,47,43), roi_back=(1133,124,47,43), threshold=0.8, method="Template matching", file="./tasks/Exploration/res/res_exploration_title.png")
+	I_EXPLORATION_TITLE = RuleImage(roi_front=(1133,124,47,43), roi_back=(1133,124,47,43), threshold=0.7, method="Template matching", file="./tasks/Exploration/res/res_exploration_title.png")
 	# description 
 	# description 
 	I_BATTLE_START = RuleImage(roi_front=(555,688,39,27.5), roi_back=(221,677,561,41), threshold=0.8, method="Template matching", file="./tasks/Exploration/res/res_battle_start.png")
 	I_BATTLE_START = RuleImage(roi_front=(555,688,39,27.5), roi_back=(221,677,561,41), threshold=0.8, method="Template matching", file="./tasks/Exploration/res/res_battle_start.png")
 	# description 
 	# description 
 	I_GET_REWARD = RuleImage(roi_front=(464,231,339,44), roi_back=(464,231,339,44), threshold=0.8, method="Template matching", file="./tasks/Exploration/res/res_get_reward.png")
 	I_GET_REWARD = RuleImage(roi_front=(464,231,339,44), roi_back=(464,231,339,44), threshold=0.8, method="Template matching", file="./tasks/Exploration/res/res_get_reward.png")
+	# description 
+	I_RED_CLOSE = RuleImage(roi_front=(1027,129,41,42), roi_back=(1021,121,54,55), threshold=0.6, method="Template matching", file="./tasks/Exploration/res/res_red_close.png")
 
 
 
 
 	# Ocr Rule Assets
 	# Ocr Rule Assets

+ 10 - 1
tasks/Exploration/res/image.json

@@ -131,7 +131,7 @@
     "roiFront": "1133,124,47,43",
     "roiFront": "1133,124,47,43",
     "roiBack": "1133,124,47,43",
     "roiBack": "1133,124,47,43",
     "method": "Template matching",
     "method": "Template matching",
-    "threshold": 0.8,
+    "threshold": 0.7,
     "description": "妖"
     "description": "妖"
   },
   },
   {
   {
@@ -151,5 +151,14 @@
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "description"
     "description": "description"
+  },
+  {
+    "itemName": "red_close",
+    "imageName": "res_red_close.png",
+    "roiFront": "1027,129,41,42",
+    "roiBack": "1021,121,54,55",
+    "method": "Template matching",
+    "threshold": 0.6,
+    "description": "description"
   }
   }
 ]
 ]

BIN
tasks/Exploration/res/res_red_close.png


+ 7 - 2
tasks/Exploration/script_task.py

@@ -71,9 +71,14 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, ExplorationAssets):
                     count += 1
                     count += 1
                     # 进入战斗环节
                     # 进入战斗环节
                     self.battle_process()
                     self.battle_process()
-                if self.appear_then_click(self.I_EXPLORATION_TITLE):
+                if self.appear(self.I_EXPLORATION_TITLE):
                     self.open_expect_level()
                     self.open_expect_level()
 
 
+            if self.wait_until_appear(self.I_RED_CLOSE, wait_time=2):
+                self.appear_then_click(self.I_RED_CLOSE)
+            self.ui_goto(page_main)
+            self.set_next_run(task='Exploration', success=True, finish=False)
+
     # 查找指定的章节:
     # 查找指定的章节:
     def open_expect_level(self):
     def open_expect_level(self):
         swipeCount = 0
         swipeCount = 0
@@ -235,7 +240,7 @@ if __name__ == "__main__":
     from module.config.config import Config
     from module.config.config import Config
     from module.device.device import Device
     from module.device.device import Device
 
 
-    config = Config('oas1')
+    config = Config('oas2')
     device = Device(config)
     device = Device(config)
     t = ScriptTask(config, device)
     t = ScriptTask(config, device)
     t.config.exploration.exploration_config.exploration_level = '第二十八章'
     t.config.exploration.exploration_config.exploration_level = '第二十八章'

+ 1 - 1
tasks/GameUi/game_ui.py

@@ -158,7 +158,7 @@ class GameUi(BaseTask, GameUiAssets):
         """
         """
         pass
         pass
 
 
-    def ui_goto(self, destination, confirm_wait=0, skip_first_screenshot=True):
+    def ui_goto(self, destination: Page, confirm_wait=0, skip_first_screenshot=True):
         """
         """
         Args:
         Args:
             destination (Page):
             destination (Page):

+ 1 - 1
tasks/KekkaiActivation/script_task.py

@@ -117,7 +117,7 @@ class ScriptTask(KU, KekkaiActivationAssets):
                 logger.info('Card is selected but not using')
                 logger.info('Card is selected but not using')
                 while 1:
                 while 1:
                     self.screenshot()
                     self.screenshot()
-                    if self.appear(self.I_A_INVITE, threshold=0.7):
+                    if self.appear(self.I_A_INVITE, threshold=0.8):
                         logger.info('Card is activated')
                         logger.info('Card is activated')
                         break
                         break
                     if self.appear_then_click(self.I_UI_CONFIRM, interval=0.6):
                     if self.appear_then_click(self.I_UI_CONFIRM, interval=0.6):

+ 8 - 6
tasks/RyouToppa/script_task.py

@@ -3,7 +3,7 @@
 # github https://github.com/runhey
 # github https://github.com/runhey
 import time
 import time
 from datetime import datetime, timedelta
 from datetime import datetime, timedelta
-from random import random
+import random
 
 
 from tasks.Component.SwitchSoul.switch_soul import SwitchSoul
 from tasks.Component.SwitchSoul.switch_soul import SwitchSoul
 from tasks.RyouToppa.assets import RyouToppaAssets
 from tasks.RyouToppa.assets import RyouToppaAssets
@@ -168,9 +168,9 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, RyouToppaAssets):
         # self.ui_current = page_ryou_toppa
         # self.ui_current = page_ryou_toppa
         # self.ui_goto(page_main)
         # self.ui_goto(page_main)
         if success:
         if success:
-            self.set_next_run(task='RyouToppa', finish=True, server=False, success=True)
+            self.set_next_run(task='RyouToppa', finish=True, server=True, success=True)
         else:
         else:
-            self.set_next_run(task='RyouToppa', finish=True, server=False, success=False)
+            self.set_next_run(task='RyouToppa', finish=True, server=True, success=False)
         raise TaskEnd
         raise TaskEnd
 
 
     def start_ryou_toppa(self):
     def start_ryou_toppa(self):
@@ -229,7 +229,7 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, RyouToppaAssets):
         # 如果该区域已经被攻破则退出
         # 如果该区域已经被攻破则退出
         # Ps: 这时候能打过的都打过了,没有能攻打的结界了, 代表任务已经完成,set_next_run time=1d
         # Ps: 这时候能打过的都打过了,没有能攻打的结界了, 代表任务已经完成,set_next_run time=1d
         if self.appear(f3, threshold=0.8) or self.appear(f4, threshold=0.8):
         if self.appear(f3, threshold=0.8) or self.appear(f4, threshold=0.8):
-            self.set_next_run(task='DevRyouToppa', finish=True, success=True)
+            self.set_next_run(task='RyouToppa', finish=True, success=True)
             raise TaskEnd
             raise TaskEnd
         # 如果该区域攻略失败返回 False
         # 如果该区域攻略失败返回 False
         if self.appear(f1, threshold=0.8) or self.appear(f2, threshold=0.8):
         if self.appear(f1, threshold=0.8) or self.appear(f2, threshold=0.8):
@@ -267,8 +267,8 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, RyouToppaAssets):
 
 
 
 
         rcl = area_map[index].get("rule_click")
         rcl = area_map[index].get("rule_click")
-        # 点击攻击区域,等待攻击按钮出现。
-        self.ui_click(rcl, stop=RealmRaidAssets.I_FIRE, interval=2)
+        # # 点击攻击区域,等待攻击按钮出现。
+        # self.ui_click(rcl, stop=RealmRaidAssets.I_FIRE, interval=2)
         # 塔塔开!
         # 塔塔开!
         click_failure_count = 0
         click_failure_count = 0
         while True:
         while True:
@@ -287,6 +287,8 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, RyouToppaAssets):
             if self.appear_then_click(RealmRaidAssets.I_FIRE, interval=2, threshold=0.8):
             if self.appear_then_click(RealmRaidAssets.I_FIRE, interval=2, threshold=0.8):
                 click_failure_count += 1
                 click_failure_count += 1
                 continue
                 continue
+            if self.click(rcl, interval=5):
+                continue
 
 
 
 
 if __name__ == "__main__":
 if __name__ == "__main__":

+ 3 - 3
tasks/TrueOrochi/script_task.py

@@ -72,7 +72,7 @@ class ScriptTask(OrochiScriptTask, TrueOrochiAssets):
                 break
                 break
             if self.appear_then_click(self.I_UI_CONFIRM, interval=1):
             if self.appear_then_click(self.I_UI_CONFIRM, interval=1):
                 continue
                 continue
-            if self.appear_then_click(self.I_ST_FIRE, interval=1):
+            if self.appear_then_click(self.I_ST_FIRE, interval=4):
                 continue
                 continue
             if self.appear_then_click(self.I_FIND_TS, interval=1):
             if self.appear_then_click(self.I_FIND_TS, interval=1):
                 continue
                 continue
@@ -81,7 +81,7 @@ class ScriptTask(OrochiScriptTask, TrueOrochiAssets):
             self.screenshot()
             self.screenshot()
             if self.appear(self.I_ST_FIRE_PREPARE):
             if self.appear(self.I_ST_FIRE_PREPARE):
                 break
                 break
-            if self.appear_then_click(self.I_FIRE, interval=1, threshold=0.7):
+            if self.appear_then_click(self.I_FIRE, interval=3, threshold=0.7):
                 continue
                 continue
             if self.appear_then_click(self.I_UI_CONFIRM, interval=1):
             if self.appear_then_click(self.I_UI_CONFIRM, interval=1):
                 continue
                 continue
@@ -177,7 +177,7 @@ class ScriptTask(OrochiScriptTask, TrueOrochiAssets):
 if __name__ == '__main__':
 if __name__ == '__main__':
     from module.config.config import Config
     from module.config.config import Config
     from module.device.device import Device
     from module.device.device import Device
-    c = Config('test')
+    c = Config('oas1')
     d = Device(c)
     d = Device(c)
     t = ScriptTask(c, d)
     t = ScriptTask(c, d)
     t.screenshot()
     t.screenshot()