Răsfoiți Sursa

perf(tasks): save ocochi, can alone and leader

runhey 3 ani în urmă
părinte
comite
6e0a6fcfb3
50 a modificat fișierele cu 512 adăugiri și 73 ștergeri
  1. BIN
      tasks/Component/GeneralBattle/GeneralBattle_greed_ghost.png
  2. BIN
      tasks/Component/GeneralBattle/GeneralBattle_win.png
  3. 23 18
      tasks/Component/GeneralBattle/assets.py
  4. 0 0
      tasks/Component/GeneralBattle/gb/click.json
  5. BIN
      tasks/Component/GeneralBattle/gb/gb_buff.png
  6. BIN
      tasks/Component/GeneralBattle/gb/gb_exit.png
  7. BIN
      tasks/Component/GeneralBattle/gb/gb_exit_ensure.png
  8. BIN
      tasks/Component/GeneralBattle/gb/gb_false.png
  9. BIN
      tasks/Component/GeneralBattle/gb/gb_greed_ghost.png
  10. BIN
      tasks/Component/GeneralBattle/gb/gb_local.png
  11. BIN
      tasks/Component/GeneralBattle/gb/gb_prepare_dark.png
  12. BIN
      tasks/Component/GeneralBattle/gb/gb_prepare_highlight.png
  13. BIN
      tasks/Component/GeneralBattle/gb/gb_preset.png
  14. BIN
      tasks/Component/GeneralBattle/gb/gb_preset_ensure.png
  15. BIN
      tasks/Component/GeneralBattle/gb/gb_reward.png
  16. BIN
      tasks/Component/GeneralBattle/gb/gb_statistics.png
  17. BIN
      tasks/Component/GeneralBattle/gb/gb_win.png
  18. 20 20
      tasks/Component/GeneralBattle/gb/image.json
  19. 11 0
      tasks/Component/GeneralBattle/gb/img_supplement.json
  20. BIN
      tasks/Component/GeneralBattle/gb/res_win.png
  21. 0 0
      tasks/Component/GeneralBattle/gb/swipe.json
  22. 18 6
      tasks/Component/GeneralBattle/general_battle.py
  23. 10 3
      tasks/Component/GeneralInvite/assets.py
  24. 87 6
      tasks/Component/GeneralInvite/general_invite.py
  25. BIN
      tasks/Component/GeneralInvite/gi/gi_cancel.png
  26. BIN
      tasks/Component/GeneralInvite/gi/gi_gi_emoji_1.png
  27. BIN
      tasks/Component/GeneralInvite/gi/gi_gi_emoji_2.png
  28. BIN
      tasks/Component/GeneralInvite/gi/gi_gi_sure.png
  29. BIN
      tasks/Component/GeneralInvite/gi/gi_sure.png
  30. 10 10
      tasks/Component/GeneralInvite/gi/image.json
  31. 20 0
      tasks/Component/GeneralInvite/gi/member.json
  32. 4 0
      tasks/Component/GeneralRoom/assets.py
  33. 13 0
      tasks/Component/GeneralRoom/general_room.py
  34. BIN
      tasks/Component/GeneralRoom/gr/gr_gr_back_yellow.png
  35. BIN
      tasks/Component/GeneralRoom/gr/gr_gr_matching_new.png
  36. 18 0
      tasks/Component/GeneralRoom/gr/image.json
  37. 1 1
      tasks/GameUi/assets.py
  38. 0 2
      tasks/GameUi/game_ui.py
  39. BIN
      tasks/GameUi/page/page_check_town.png
  40. 2 2
      tasks/GameUi/page/page_img_2.json
  41. 17 0
      tasks/Orochi/assets.py
  42. 65 0
      tasks/Orochi/o/image.json
  43. BIN
      tasks/Orochi/o/o_fire.png
  44. BIN
      tasks/Orochi/o/o_form_team.png
  45. BIN
      tasks/Orochi/o/o_lock.png
  46. BIN
      tasks/Orochi/o/o_matching.png
  47. BIN
      tasks/Orochi/o/o_orochi.png
  48. BIN
      tasks/Orochi/o/o_shi_records.png
  49. BIN
      tasks/Orochi/o/o_unlock.png
  50. 193 5
      tasks/Orochi/script_task.py

BIN
tasks/Component/GeneralBattle/GeneralBattle_greed_ghost.png


BIN
tasks/Component/GeneralBattle/GeneralBattle_win.png


+ 23 - 18
tasks/Component/GeneralBattle/assets.py

@@ -51,41 +51,46 @@ class GeneralBattleAssets:
 
 	# Image Rule Assets
 	# 奖励,就是那个魂 
-	I_REWARD = RuleImage(roi_front=(547,518,172,96), roi_back=(547,518,172,96), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/res_reward.png")
+	I_REWARD = RuleImage(roi_front=(547,518,172,96), roi_back=(547,518,172,96), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/gb/gb_reward.png")
 	# 预设的小图标 
-	I_PRESET = RuleImage(roi_front=(32,650,47,45), roi_back=(32,650,47,45), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/res_preset.png")
+	I_PRESET = RuleImage(roi_front=(32,650,47,45), roi_back=(32,650,47,45), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/gb/gb_preset.png")
 	# 准备 
-	I_PREPARE_HIGHLIGHT = RuleImage(roi_front=(1128,536,100,100), roi_back=(1128,536,100,100), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/res_prepare_highlight.png")
+	I_PREPARE_HIGHLIGHT = RuleImage(roi_front=(1128,536,100,100), roi_back=(1128,536,100,100), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/gb/gb_prepare_highlight.png")
 	# 战斗胜利 
-	I_WIN = RuleImage(roi_front=(427,135,100,100), roi_back=(427,135,100,100), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/res_win.png")
+	I_WIN = RuleImage(roi_front=(425,141,100,100), roi_back=(296,41,414,216), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/gb/gb_win.png")
 	# 准备但是界面还未加载这个时候是黑色的 
-	I_PREPARE_DARK = RuleImage(roi_front=(1131,538,100,100), roi_back=(1131,538,100,100), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/res_prepare_dark.png")
+	I_PREPARE_DARK = RuleImage(roi_front=(1131,538,100,100), roi_back=(1131,538,100,100), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/gb/gb_prepare_dark.png")
 	# 失败 
-	I_FALSE = RuleImage(roi_front=(413,124,100,100), roi_back=(413,124,100,100), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/res_false.png")
+	I_FALSE = RuleImage(roi_front=(413,124,100,100), roi_back=(413,124,100,100), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/gb/gb_false.png")
 	# 确认预设的队伍 
-	I_PRESET_ENSURE = RuleImage(roi_front=(354,641,141,50), roi_back=(354,641,141,50), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/res_preset_ensure.png")
+	I_PRESET_ENSURE = RuleImage(roi_front=(354,641,141,50), roi_back=(354,641,141,50), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/gb/gb_preset_ensure.png")
 	# 选择buff 
-	I_BUFF = RuleImage(roi_front=(113,653,44,62), roi_back=(113,653,44,62), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/res_buff.png")
+	I_BUFF = RuleImage(roi_front=(113,653,44,62), roi_back=(113,653,44,62), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/gb/gb_buff.png")
 	# 觉醒加成 
-	I_BUFF_AWAKEN = RuleImage(roi_front=(373,126,383,53), roi_back=(373,126,383,53), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/res_buff_awaken.png")
+	I_BUFF_AWAKEN = RuleImage(roi_front=(373,126,383,53), roi_back=(373,126,383,53), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/gb/gb_buff_awaken.png")
 	# 御魂加成 
-	I_BUFF_SOUL = RuleImage(roi_front=(377,192,371,56), roi_back=(377,192,371,56), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/res_buff_soul.png")
+	I_BUFF_SOUL = RuleImage(roi_front=(377,192,371,56), roi_back=(377,192,371,56), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/gb/gb_buff_soul.png")
 	# 金币加成50 
-	I_BUFF_GOLD_50 = RuleImage(roi_front=(375,259,373,56), roi_back=(375,259,373,56), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/res_buff_gold_50.png")
+	I_BUFF_GOLD_50 = RuleImage(roi_front=(375,259,373,56), roi_back=(375,259,373,56), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/gb/gb_buff_gold_50.png")
 	# 金币加成100 
-	I_BUFF_GOLD_100 = RuleImage(roi_front=(371,329,389,54), roi_back=(371,329,389,54), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/res_buff_gold_100.png")
+	I_BUFF_GOLD_100 = RuleImage(roi_front=(371,329,389,54), roi_back=(371,329,389,54), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/gb/gb_buff_gold_100.png")
 	# 经验加成50 
-	I_BUFF_EXP_50 = RuleImage(roi_front=(378,400,370,50), roi_back=(378,400,370,50), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/res_buff_exp_50.png")
+	I_BUFF_EXP_50 = RuleImage(roi_front=(378,400,370,50), roi_back=(378,400,370,50), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/gb/gb_buff_exp_50.png")
 	# 经验加成100 
-	I_BUFF_EXP_100 = RuleImage(roi_front=(372,463,386,50), roi_back=(372,463,386,50), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/res_buff_exp_100.png")
+	I_BUFF_EXP_100 = RuleImage(roi_front=(372,463,386,50), roi_back=(372,463,386,50), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/gb/gb_buff_exp_100.png")
 	# 左下角的位置指针 
-	I_LOCAL = RuleImage(roi_front=(25,563,30,34), roi_back=(25,563,30,34), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/res_local.png")
+	I_LOCAL = RuleImage(roi_front=(25,563,30,34), roi_back=(25,563,30,34), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/gb/gb_local.png")
 	# description 
-	I_STATISTICS = RuleImage(roi_front=(61,644,33,28), roi_back=(61,644,33,28), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/res_statistics.png")
+	I_STATISTICS = RuleImage(roi_front=(61,644,33,28), roi_back=(61,644,33,28), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/gb/gb_statistics.png")
 	# 左上角的退出 
-	I_EXIT = RuleImage(roi_front=(14,12,43,41), roi_back=(14,12,43,41), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/res_exit.png")
+	I_EXIT = RuleImage(roi_front=(14,12,43,41), roi_back=(14,12,43,41), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/gb/gb_exit.png")
 	# 退出确认 
-	I_EXIT_ENSURE = RuleImage(roi_front=(674,388,135,63), roi_back=(674,388,135,63), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/res_exit_ensure.png")
+	I_EXIT_ENSURE = RuleImage(roi_front=(674,388,135,63), roi_back=(674,388,135,63), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/gb/gb_exit_ensure.png")
+
+
+	# Image Rule Assets
+	# description 
+	I_GREED_GHOST = RuleImage(roi_front=(49,29,56,65), roi_back=(49,29,56,65), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/gb/gb_greed_ghost.png")
 
 
 	# Swipe Rule Assets

+ 0 - 0
tasks/Component/GeneralBattle/click.json → tasks/Component/GeneralBattle/gb/click.json


BIN
tasks/Component/GeneralBattle/gb/gb_buff.png


BIN
tasks/Component/GeneralBattle/gb/gb_exit.png


BIN
tasks/Component/GeneralBattle/gb/gb_exit_ensure.png


BIN
tasks/Component/GeneralBattle/gb/gb_false.png


BIN
tasks/Component/GeneralBattle/gb/gb_greed_ghost.png


BIN
tasks/Component/GeneralBattle/gb/gb_local.png


BIN
tasks/Component/GeneralBattle/gb/gb_prepare_dark.png


BIN
tasks/Component/GeneralBattle/gb/gb_prepare_highlight.png


BIN
tasks/Component/GeneralBattle/gb/gb_preset.png


BIN
tasks/Component/GeneralBattle/gb/gb_preset_ensure.png


BIN
tasks/Component/GeneralBattle/gb/gb_reward.png


BIN
tasks/Component/GeneralBattle/gb/gb_statistics.png


BIN
tasks/Component/GeneralBattle/gb/gb_win.png


+ 20 - 20
tasks/Component/GeneralBattle/image.json → tasks/Component/GeneralBattle/gb/image.json

@@ -1,7 +1,7 @@
 [
   {
     "itemName": "reward",
-    "imageName": "res_reward.png",
+    "imageName": "gb_reward.png",
     "roiFront": "547,518,172,96",
     "roiBack": "547,518,172,96",
     "method": "Template matching",
@@ -10,7 +10,7 @@
   },
   {
     "itemName": "preset",
-    "imageName": "res_preset.png",
+    "imageName": "gb_preset.png",
     "roiFront": "32,650,47,45",
     "roiBack": "32,650,47,45",
     "method": "Template matching",
@@ -19,7 +19,7 @@
   },
   {
     "itemName": "prepare_highlight",
-    "imageName": "res_prepare_highlight.png",
+    "imageName": "gb_prepare_highlight.png",
     "roiFront": "1128,536,100,100",
     "roiBack": "1128,536,100,100",
     "method": "Template matching",
@@ -28,16 +28,16 @@
   },
   {
     "itemName": "win",
-    "imageName": "res_win.png",
-    "roiFront": "427,135,100,100",
-    "roiBack": "427,135,100,100",
+    "imageName": "gb_win.png",
+    "roiFront": "425,141,100,100",
+    "roiBack": "296,41,414,216",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "战斗胜利"
   },
   {
     "itemName": "prepare_dark",
-    "imageName": "res_prepare_dark.png",
+    "imageName": "gb_prepare_dark.png",
     "roiFront": "1131,538,100,100",
     "roiBack": "1131,538,100,100",
     "method": "Template matching",
@@ -46,7 +46,7 @@
   },
   {
     "itemName": "false",
-    "imageName": "res_false.png",
+    "imageName": "gb_false.png",
     "roiFront": "413,124,100,100",
     "roiBack": "413,124,100,100",
     "method": "Template matching",
@@ -55,7 +55,7 @@
   },
   {
     "itemName": "preset_ensure",
-    "imageName": "res_preset_ensure.png",
+    "imageName": "gb_preset_ensure.png",
     "roiFront": "354,641,141,50",
     "roiBack": "354,641,141,50",
     "method": "Template matching",
@@ -64,7 +64,7 @@
   },
   {
     "itemName": "buff",
-    "imageName": "res_buff.png",
+    "imageName": "gb_buff.png",
     "roiFront": "113,653,44,62",
     "roiBack": "113,653,44,62",
     "method": "Template matching",
@@ -73,7 +73,7 @@
   },
   {
     "itemName": "buff_awaken",
-    "imageName": "res_buff_awaken.png",
+    "imageName": "gb_buff_awaken.png",
     "roiFront": "373,126,383,53",
     "roiBack": "373,126,383,53",
     "method": "Template matching",
@@ -82,7 +82,7 @@
   },
   {
     "itemName": "buff_soul",
-    "imageName": "res_buff_soul.png",
+    "imageName": "gb_buff_soul.png",
     "roiFront": "377,192,371,56",
     "roiBack": "377,192,371,56",
     "method": "Template matching",
@@ -91,7 +91,7 @@
   },
   {
     "itemName": "buff_gold_50",
-    "imageName": "res_buff_gold_50.png",
+    "imageName": "gb_buff_gold_50.png",
     "roiFront": "375,259,373,56",
     "roiBack": "375,259,373,56",
     "method": "Template matching",
@@ -100,7 +100,7 @@
   },
   {
     "itemName": "buff_gold_100",
-    "imageName": "res_buff_gold_100.png",
+    "imageName": "gb_buff_gold_100.png",
     "roiFront": "371,329,389,54",
     "roiBack": "371,329,389,54",
     "method": "Template matching",
@@ -109,7 +109,7 @@
   },
   {
     "itemName": "buff_exp_50",
-    "imageName": "res_buff_exp_50.png",
+    "imageName": "gb_buff_exp_50.png",
     "roiFront": "378,400,370,50",
     "roiBack": "378,400,370,50",
     "method": "Template matching",
@@ -118,7 +118,7 @@
   },
   {
     "itemName": "buff_exp_100",
-    "imageName": "res_buff_exp_100.png",
+    "imageName": "gb_buff_exp_100.png",
     "roiFront": "372,463,386,50",
     "roiBack": "372,463,386,50",
     "method": "Template matching",
@@ -127,7 +127,7 @@
   },
   {
     "itemName": "local",
-    "imageName": "res_local.png",
+    "imageName": "gb_local.png",
     "roiFront": "25,563,30,34",
     "roiBack": "25,563,30,34",
     "method": "Template matching",
@@ -136,7 +136,7 @@
   },
   {
     "itemName": "statistics",
-    "imageName": "res_statistics.png",
+    "imageName": "gb_statistics.png",
     "roiFront": "61,644,33,28",
     "roiBack": "61,644,33,28",
     "method": "Template matching",
@@ -145,7 +145,7 @@
   },
   {
     "itemName": "exit",
-    "imageName": "res_exit.png",
+    "imageName": "gb_exit.png",
     "roiFront": "14,12,43,41",
     "roiBack": "14,12,43,41",
     "method": "Template matching",
@@ -154,7 +154,7 @@
   },
   {
     "itemName": "exit_ensure",
-    "imageName": "res_exit_ensure.png",
+    "imageName": "gb_exit_ensure.png",
     "roiFront": "674,388,135,63",
     "roiBack": "674,388,135,63",
     "method": "Template matching",

+ 11 - 0
tasks/Component/GeneralBattle/gb/img_supplement.json

@@ -0,0 +1,11 @@
+[
+  {
+    "itemName": "greed_ghost",
+    "imageName": "gb_greed_ghost.png",
+    "roiFront": "49,29,56,65",
+    "roiBack": "49,29,56,65",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  }
+]

BIN
tasks/Component/GeneralBattle/gb/res_win.png


+ 0 - 0
tasks/Component/GeneralBattle/swipe.json → tasks/Component/GeneralBattle/gb/swipe.json


+ 18 - 6
tasks/Component/GeneralBattle/general_battle.py

@@ -110,12 +110,24 @@ class GeneralBattle(BaseTask, GeneralBattleAssets):
             logger.info("Green is enable")
             x, y = None, None
             match config.green_mark:
-                case GreenMarkType.GREEN_LEFT1: x, y = self.C_GREEN_LEFT_1.coord()
-                case GreenMarkType.GREEN_LEFT2: x, y = self.C_GREEN_LEFT_2.coord()
-                case GreenMarkType.GREEN_LEFT3: x, y = self.C_GREEN_LEFT_3.coord()
-                case GreenMarkType.GREEN_LEFT4: x, y = self.C_GREEN_LEFT_4.coord()
-                case GreenMarkType.GREEN_LEFT5: x, y = self.C_GREEN_LEFT_5.coord()
-                case GreenMarkType.GREEN_MAIN: x, y = self.C_GREEN_MAIN.coord()
+                case GreenMarkType.GREEN_LEFT1:
+                    x, y = self.C_GREEN_LEFT_1.coord()
+                    logger.info("Green left 1")
+                case GreenMarkType.GREEN_LEFT2:
+                    x, y = self.C_GREEN_LEFT_2.coord()
+                    logger.info("Green left 2")
+                case GreenMarkType.GREEN_LEFT3:
+                    x, y = self.C_GREEN_LEFT_3.coord()
+                    logger.info("Green left 3")
+                case GreenMarkType.GREEN_LEFT4:
+                    x, y = self.C_GREEN_LEFT_4.coord()
+                    logger.info("Green left 4")
+                case GreenMarkType.GREEN_LEFT5:
+                    x, y = self.C_GREEN_LEFT_5.coord()
+                    logger.info("Green left 5")
+                case GreenMarkType.GREEN_MAIN:
+                    x, y = self.C_GREEN_MAIN.coord()
+                    logger.info("Green main")
 
             # 判断有无坐标的偏移
             self.appear_then_click(self.I_LOCAL)

+ 10 - 3
tasks/Component/GeneralInvite/assets.py

@@ -78,11 +78,18 @@ class GeneralInviteAssets:
 	# 勾选 默认邀请 
 	I_I_DEFAULT = RuleImage(roi_front=(541,342,41,39), roi_back=(541,342,41,39), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_i_default.png")
 	# description 
-	I_CANCEL = RuleImage(roi_front=(435,404,171,65), roi_back=(435,404,171,65), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_cancel.png")
+	I_GI_CANCEL = RuleImage(roi_front=(438,407,171,55), roi_back=(438,407,171,55), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_gi_cancel.png")
 	# 队长邀请 确定 
-	I_SURE = RuleImage(roi_front=(668,401,175,60), roi_back=(668,401,175,60), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/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_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_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")
+
+
+	# Image Rule Assets
+	# description 
+	I_GI_EMOJI_1 = RuleImage(roi_front=(25,538,50,56), roi_back=(25,538,50,56), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_gi_emoji_1.png")
+	# description 
+	I_GI_EMOJI_2 = RuleImage(roi_front=(21,632,53,64), roi_back=(21,632,53,64), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_gi_emoji_2.png")
 
 
 	# Ocr Rule Assets

+ 87 - 6
tasks/Component/GeneralInvite/general_invite.py

@@ -36,6 +36,7 @@ class RoomType(str, Enum):
 class GeneralInvite(BaseTask, GeneralInviteAssets):
     timer_invite = None
     timer_wait = None
+    timer_emoji = None  # 等待期间如果没有操作的话,可能会导致长时间无响应报错
 
     """
     这个类就三个api
@@ -47,6 +48,8 @@ class GeneralInvite(BaseTask, GeneralInviteAssets):
     def run_invite(self, config: InviteConfig, is_first: bool = False) -> bool:
         """
         队长!!身份。。。在组件界面邀请好友( 如果开启is_first) 等待队员进入开启挑战
+        请注意,返回的时候成功时是进入战斗了!!!
+        如果是失败,那就是没有队友进入,然后会退出房间的界面
         :param config:
         :param is_first: 如果是第一次开房间的那就要邀请队员,其他情况等待队员进入
         :return:
@@ -61,6 +64,10 @@ class GeneralInvite(BaseTask, GeneralInviteAssets):
             self.timer_invite.start()
             self.ensure_room_type(config.invite_number)
             self.invite_friends(config)
+        else:
+            self.timer_invite = None
+            self.timer_emoji = Timer(20)
+            self.timer_emoji.start()
         wait_second = config.wait_time.second + config.wait_time.minute * 60
         self.timer_wait = Timer(wait_second)
         self.timer_wait.start()
@@ -78,6 +85,11 @@ class GeneralInvite(BaseTask, GeneralInviteAssets):
                 logger.warning('Timeout, now is no room')
                 return False
 
+            if self.timer_emoji and self.timer_emoji.reached():
+                self.timer_emoji.reset()
+                self.appear_then_click(self.I_GI_EMOJI_1)
+                self.appear_then_click(self.I_GI_EMOJI_2)
+
 
             # 如果这个房间最多只容纳两个人(意思是只可以邀请一个人),且已经邀请一个人了,那就开启挑战
             if self.room_type == RoomType.NORMAL_2 and not self.appear(self.I_ADD_2):
@@ -162,6 +174,40 @@ class GeneralInvite(BaseTask, GeneralInviteAssets):
             if self.appear(self.I_MATCHING):
                 return False
 
+    # 判断是否在房间里面
+    def is_in_room(self) -> bool:
+        """
+        判断是否在房间里面
+        :return:
+        """
+        self.screenshot()
+        if self.appear(self.I_GI_EMOJI_1):
+            return True
+        if self.appear(self.I_GI_EMOJI_2):
+            return True
+        if self.appear(self.I_MATCHING):
+            return False
+        return False
+
+    def exit_room(self) -> bool:
+        """
+        退出房间
+        :return:
+        """
+        if not self.is_in_room():
+            return False
+        logger.info('Exit room')
+        while 1:
+            self.screenshot()
+            if not self.is_in_room():
+                break
+            if self.appear_then_click(self.I_GI_SURE, interval=0.5):
+                continue
+            if self.appear_then_click(self.I_BACK_YELLOW, interval=0.5):
+                continue
+        return True
+
+
     @cached_property
     def room_type(self) -> RoomType:
         """
@@ -448,7 +494,7 @@ class GeneralInvite(BaseTask, GeneralInviteAssets):
         # 判断是否进入界面
         while 1:
             self.screenshot()
-            if self.appear(self.I_SURE):
+            if self.appear(self.I_GI_SURE):
                 break
         # 如果勾选了默认邀请
         if default_invite:
@@ -472,11 +518,43 @@ class GeneralInvite(BaseTask, GeneralInviteAssets):
         logger.info('Click invite ensure')
         while 1:
             self.screenshot()
-            if not self.appear(self.I_SURE):
+            if not self.appear(self.I_GI_SURE):
                 break
-            if self.appear_then_click(self.I_SURE):
+            if self.appear_then_click(self.I_GI_SURE):
                 continue
 
+    def check_and_invite(self, default_invite: bool=True) -> bool:
+        """
+        队长战斗后 邀请队友
+        :param default_invite:
+        :return:
+        """
+        if not self.appear(self.I_GI_SURE):
+            return False
+
+        if default_invite:
+            # 有可能是挑战失败的
+            if self.appear(self.I_I_DEFAULT) or self.appear(self.I_I_NO_DEFAULT):
+                logger.info('Click default invite')
+                while 1:
+                    self.screenshot()
+                    if self.appear(self.I_I_DEFAULT):
+                        break
+                    if self.appear_then_click(self.I_I_NO_DEFAULT, interval=1):
+                        continue
+        # 点击确认
+        while 1:
+            self.screenshot()
+            if not self.appear(self.I_GI_SURE):
+                break
+            if self.appear_then_click(self.I_GI_SURE, interval=1):
+                continue
+
+        return True
+
+
+
+
     def accept_invite(self) -> bool:
         """
         队员接受邀请, 保持在庭院界面
@@ -484,7 +562,7 @@ class GeneralInvite(BaseTask, GeneralInviteAssets):
         """
         while 1:
             self.screenshot()
-            if self.appear(self.I_BUFF):
+            if self.appear(self.I_GI_BUFF):
                 break
             if self.appear_then_click(self.I_I_ACCEPT_DEFAULT, interval=1):
                 continue
@@ -499,5 +577,8 @@ if __name__ == '__main__':
     c = Config('oas1')
     d = Device(c)
     t = GeneralInvite(c, d)
-    # t.invite_friend('城凉文月', FindMode.RECENT_FRIEND)
-    t.run_invite(c.orochi.invite_config, is_first=True)
+
+    # t.run_invite(c.orochi.invite_config, is_first=True)
+    t.screenshot()
+    print(t.check_and_invite(True))
+

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


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


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


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


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


+ 10 - 10
tasks/Component/GeneralInvite/gi/image.json

@@ -297,26 +297,26 @@
     "description": "勾选 默认邀请"
   },
   {
-    "itemName": "cancel",
-    "imageName": "gi_cancel.png",
-    "roiFront": "435,404,171,65",
-    "roiBack": "435,404,171,65",
+    "itemName": "gi_cancel",
+    "imageName": "gi_gi_cancel.png",
+    "roiFront": "438,407,171,55",
+    "roiBack": "438,407,171,55",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
   },
   {
-    "itemName": "sure",
-    "imageName": "gi_sure.png",
-    "roiFront": "668,401,175,60",
-    "roiBack": "668,401,175,60",
+    "itemName": "gi_sure",
+    "imageName": "gi_gi_sure.png",
+    "roiFront": "670,402,175,60",
+    "roiBack": "670,402,175,60",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "队长邀请 确定"
   },
   {
-    "itemName": "buff",
-    "imageName": "gi_buff.png",
+    "itemName": "gi_buff",
+    "imageName": "gi_gi_buff.png",
     "roiFront": "794,38,46,42",
     "roiBack": "794,38,46,42",
     "method": "Template matching",

+ 20 - 0
tasks/Component/GeneralInvite/gi/member.json

@@ -0,0 +1,20 @@
+[
+  {
+    "itemName": "gi_emoji_1",
+    "imageName": "gi_gi_emoji_1.png",
+    "roiFront": "25,538,50,56",
+    "roiBack": "25,538,50,56",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "gi_emoji_2",
+    "imageName": "gi_gi_emoji_2.png",
+    "roiFront": "21,632,53,64",
+    "roiBack": "21,632,53,64",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  }
+]

+ 4 - 0
tasks/Component/GeneralRoom/assets.py

@@ -25,5 +25,9 @@ class GeneralRoomAssets:
 	I_ENSURE_PRIVATE_FALSE_2 = RuleImage(roi_front=(400,408,36,38), roi_back=(400,408,36,38), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralRoom/gr/gr_ensure_private_false_2.png")
 	# description 
 	I_CREATE_ENSURE_2 = RuleImage(roi_front=(552,489,42,55), roi_back=(552,489,42,55), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralRoom/gr/gr_create_ensure_2.png")
+	# description 
+	I_GR_MATCHING_NEW = RuleImage(roi_front=(1204,102,42,121), roi_back=(1204,102,42,121), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralRoom/gr/gr_gr_matching_new.png")
+	# description 
+	I_GR_BACK_YELLOW = RuleImage(roi_front=(19,13,53,53), roi_back=(19,13,53,53), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralRoom/gr/gr_gr_back_yellow.png")
 
 

+ 13 - 0
tasks/Component/GeneralRoom/general_room.py

@@ -74,3 +74,16 @@ class GeneralRoom(BaseTask, GeneralRoomAssets):
             if not self.appear(target):
                 return True
 
+    def exit_team(self) -> bool:
+        """
+        在组队界面 退出组队的界面, 返回到庭院或者是你一开始进入的入口
+        :return:
+        """
+        if self.appear(self.I_GR_MATCHING_NEW):
+            logger.info('Exit team ui')
+            while 1:
+                self.screenshot()
+                if not self.appear(self.I_GR_MATCHING_NEW):
+                    return True
+                if self.appear_then_click(self.I_GR_BACK_YELLOW, interval=0.5):
+                    continue

BIN
tasks/Component/GeneralRoom/gr/gr_gr_back_yellow.png


BIN
tasks/Component/GeneralRoom/gr/gr_gr_matching_new.png


+ 18 - 0
tasks/Component/GeneralRoom/gr/image.json

@@ -61,5 +61,23 @@
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
+  },
+  {
+    "itemName": "gr_matching_new",
+    "imageName": "gr_gr_matching_new.png",
+    "roiFront": "1204,102,42,121",
+    "roiBack": "1204,102,42,121",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "gr_back_yellow",
+    "imageName": "gr_gr_back_yellow.png",
+    "roiFront": "19,13,53,53",
+    "roiBack": "19,13,53,53",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
   }
 ]

+ 1 - 1
tasks/GameUi/assets.py

@@ -69,7 +69,7 @@ class GameUiAssets:
 	# description 
 	I_MAIN_GOTO_TOWN = RuleImage(roi_front=(706,249,61,57), roi_back=(200,120,951,298), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_main_goto_town.png")
 	# description 
-	I_CHECK_TOWN = RuleImage(roi_front=(1034,94,100,100), roi_back=(1034,94,100,100), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_check_town.png")
+	I_CHECK_TOWN = RuleImage(roi_front=(1026,106,68,82), roi_back=(765,98,402,96), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_check_town.png")
 	# description 
 	I_TOWN_GOTO_MAIN = RuleImage(roi_front=(1017,231,78,73), roi_back=(302,216,868,127), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_town_goto_main.png")
 	# description 

+ 0 - 2
tasks/GameUi/game_ui.py

@@ -177,8 +177,6 @@ class GameUi(BaseTask, GameUiAssets):
 
 
         logger.hr(f"UI goto {destination}")
-        for page in visited:
-            logger.info(f"visited: {page}")
         confirm_timer = Timer(confirm_wait, count=int(confirm_wait // 0.5)).start()
         while 1:
             if skip_first_screenshot:

BIN
tasks/GameUi/page/page_check_town.png


+ 2 - 2
tasks/GameUi/page/page_img_2.json

@@ -11,8 +11,8 @@
   {
     "itemName": "check_town",
     "imageName": "page_check_town.png",
-    "roiFront": "1034,94,100,100",
-    "roiBack": "1034,94,100,100",
+    "roiFront": "1026,106,68,82",
+    "roiBack": "765,98,402,96",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"

+ 17 - 0
tasks/Orochi/assets.py

@@ -10,6 +10,23 @@ from module.atom.list import RuleList
 class OrochiAssets: 
 
 
+	# Image Rule Assets
+	# 八级大蛇进入 
+	I_OROCHI = RuleImage(roi_front=(55,104,295,406), roi_back=(55,104,295,406), threshold=0.8, method="Template matching", file="./tasks/Orochi/o/o_orochi.png")
+	# 组队 
+	I_FORM_TEAM = RuleImage(roi_front=(937,591,100,100), roi_back=(937,591,100,100), threshold=0.8, method="Template matching", file="./tasks/Orochi/o/o_form_team.png")
+	# description 
+	I_OROCHI_LOCK = RuleImage(roi_front=(558,562,31,33), roi_back=(558,562,31,33), threshold=0.8, method="Template matching", file="./tasks/Orochi/o/o_lock.png")
+	# description 
+	I_OROCHI_UNLOCK = RuleImage(roi_front=(560,564,26,29), roi_back=(560,564,26,29), threshold=0.8, method="Template matching", file="./tasks/Orochi/o/o_unlock.png")
+	# 点击挑战 
+	I_OROCHI_FIRE = RuleImage(roi_front=(1095,577,131,124), roi_back=(1095,577,131,124), threshold=0.6, method="Template matching", file="./tasks/Orochi/o/o_fire.png")
+	# 式神录 
+	I_SHI_RECORDS = RuleImage(roi_front=(821,638,48,45), roi_back=(821,638,48,45), threshold=0.8, method="Template matching", file="./tasks/Orochi/o/o_shi_records.png")
+	# description 
+	I_OROCHI_MATCHING = RuleImage(roi_front=(1205,106,44,114), roi_back=(1205,106,44,114), threshold=0.8, method="Template matching", file="./tasks/Orochi/o/o_matching.png")
+
+
 	# List Rule Assets
 	# 这个是御魂界面选择不同层数的 
 	L_LAYER_LIST = RuleList(folder="./tasks/Orochi/res", direction="vertical", mode="ocr", roi_back=(276,130,52,500), size=(45, 88), 

+ 65 - 0
tasks/Orochi/o/image.json

@@ -0,0 +1,65 @@
+[
+  {
+    "itemName": "orochi",
+    "imageName": "o_orochi.png",
+    "roiFront": "55,104,295,406",
+    "roiBack": "55,104,295,406",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "八级大蛇进入"
+  },
+  {
+    "itemName": "form_team",
+    "imageName": "o_form_team.png",
+    "roiFront": "937,591,100,100",
+    "roiBack": "937,591,100,100",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "组队"
+  },
+  {
+    "itemName": "orochi_lock",
+    "imageName": "o_lock.png",
+    "roiFront": "558,562,31,33",
+    "roiBack": "558,562,31,33",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "orochi_unlock",
+    "imageName": "o_unlock.png",
+    "roiFront": "560,564,26,29",
+    "roiBack": "560,564,26,29",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "orochi_fire",
+    "imageName": "o_fire.png",
+    "roiFront": "1095,577,131,124",
+    "roiBack": "1095,577,131,124",
+    "method": "Template matching",
+    "threshold": 0.6,
+    "description": "点击挑战"
+  },
+  {
+    "itemName": "shi_records",
+    "imageName": "o_shi_records.png",
+    "roiFront": "821,638,48,45",
+    "roiBack": "821,638,48,45",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "式神录"
+  },
+  {
+    "itemName": "orochi_matching",
+    "imageName": "o_matching.png",
+    "roiFront": "1205,106,44,114",
+    "roiBack": "1205,106,44,114",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  }
+]

BIN
tasks/Orochi/o/o_fire.png


BIN
tasks/Orochi/o/o_form_team.png


BIN
tasks/Orochi/o/o_lock.png


BIN
tasks/Orochi/o/o_matching.png


BIN
tasks/Orochi/o/o_orochi.png


BIN
tasks/Orochi/o/o_shi_records.png


BIN
tasks/Orochi/o/o_unlock.png


+ 193 - 5
tasks/Orochi/script_task.py

@@ -1,7 +1,7 @@
 # This Python file uses the following encoding: utf-8
 # @author runhey
 # github https://github.com/runhey
-
+from datetime import time, datetime, timedelta
 
 from tasks.base_task import BaseTask
 from tasks.Component.GeneralBattle.general_battle import GeneralBattle
@@ -9,6 +9,7 @@ from tasks.Component.GeneralInvite.general_invite import GeneralInvite
 from tasks.Component.GeneralBuff.general_buff import GeneralBuff
 from tasks.Component.GeneralRoom.general_room import GeneralRoom
 from tasks.GameUi.game_ui import GameUi
+from tasks.GameUi.page import page_main, page_soul_zones
 from tasks.Orochi.assets import OrochiAssets
 from tasks.Orochi.config import Orochi, UserStatus
 from module.logger import logger
@@ -16,19 +17,50 @@ from module.logger import logger
 class ScriptTask(GeneralBattle, GeneralInvite, GeneralBuff, GeneralRoom, GameUi, OrochiAssets):
 
     def run(self) -> bool:
+
+        limit_count = self.config.orochi.orochi_config.limit_count
+        limit_time = self.config.orochi.orochi_config.limit_time
+        self.current_count = 0
+        self.limit_count: int = limit_count
+        self.limit_time: timedelta = timedelta(hours=limit_time.hour, minutes=limit_time.minute, seconds=limit_time.second)
+
+        self.ui_get_current_page()
+        self.ui_goto(page_main)
         config: Orochi = self.config.orochi
         if config.orochi_config.soul_buff_enable:
             self.open_buff()
             self.soul(is_open=True)
             self.close_buff()
 
+        success = True
         match config.orochi_config.user_status:
-            case UserStatus.LEADER: self.run_leader()
+            case UserStatus.LEADER: success = self.run_leader()
             case UserStatus.MEMBER: self.run_member()
             case UserStatus.ALONE: self.run_alone()
             case UserStatus.WILD: self.run_wild()
             case _: logger.error('Unknown user status')
 
+        # 记得关掉
+        if config.orochi_config.soul_buff_enable:
+            self.open_buff()
+            self.soul(is_open=False)
+            self.close_buff()
+        # 下一次运行时间
+        if success:
+            self.set_next_run('Orochi', finish=True, success=True)
+        else:
+            self.set_next_run('Orochi', finish=False, success=False)
+
+
+
+    def orochi_enter(self) -> bool:
+        logger.info('Enter orochi')
+        while True:
+            self.screenshot()
+            if self.appear(self.I_FORM_TEAM):
+                return True
+            if self.appear_then_click(self.I_OROCHI, interval=1):
+                continue
 
     def check_layer(self, layer: str) -> bool:
         """
@@ -40,15 +72,170 @@ class ScriptTask(GeneralBattle, GeneralInvite, GeneralBuff, GeneralRoom, GameUi,
             self.device.click(x=pos[0], y=pos[1])
             return True
 
+    def check_lock(self, lock: bool = True) -> bool:
+        """
+        检查是否锁定阵容, 要求在八岐大蛇界面
+        :param lock:
+        :return:
+        """
+        logger.info('Check lock: %s', lock)
+        if lock:
+            while 1:
+                self.screenshot()
+                if self.appear(self.I_OROCHI_LOCK):
+                    return True
+                if self.appear_then_click(self.I_OROCHI_UNLOCK, interval=1):
+                    continue
+        else:
+            while 1:
+                self.screenshot()
+                if self.appear(self.I_OROCHI_UNLOCK):
+                    return True
+                if self.appear_then_click(self.I_OROCHI_LOCK, interval=1):
+                    continue
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
     def run_leader(self):
-        pass
+        logger.info('Start run leader')
+        self.ui_get_current_page()
+        self.ui_goto(page_soul_zones)
+        self.orochi_enter()
+        layer = self.config.orochi.orochi_config.layer[0]
+        self.check_layer(layer)
+        self.check_lock(self.config.orochi.general_battle_config.lock_team_enable)
+
+        # 创建队伍
+        logger.info('Create team')
+        while 1:
+            self.screenshot()
+            if self.appear(self.I_OROCHI_MATCHING):
+                break
+            if self.appear_then_click(self.I_FORM_TEAM, interval=1):
+                continue
+        # 创建房间
+        self.create_room()
+        self.ensure_private()
+        self.create_ensure()
+
+        # 邀请队友
+        success = True
+        is_first = True
+        # 这个时候我已经进入房间了哦
+        while 1:
+            # 无论胜利与否, 都会出现是否邀请一次队友
+            # 区别在于,失败的话不会出现那个勾选默认邀请的框
+            if self.check_and_invite(self.config.orochi.invite_config.default_invite):
+                continue
+
+            # 如果在探索界面或者是出现在组队界面, 那就是可能房间死了
+            # 要结束任务
+            if self.appear(self.I_MATCHING) or self.appear(self.I_CHECK_EXPLORATION):
+                break
+            if self.current_count >= self.limit_count:
+                if self.is_in_room():
+                    logger.info('Orochi count limit out')
+                    break
+            if datetime.now() - self.start_time >= self.limit_time:
+                if self.is_in_room():
+                    logger.info('Orochi time limit out')
+                    break
+
+
+            # 如果没有进入房间那就不需要后面的邀请
+            if not self.is_in_room():
+                continue
+
+            # 点击挑战
+            if not is_first:
+                if self.run_invite(config=self.config.orochi.invite_config):
+                    self.run_general_battle(config=self.config.orochi.general_battle_config)
+                else:
+                    # 邀请失败,退出任务
+                    logger.warning('Invite failed and exit this orochi task')
+                    success = False
+                    break
+
+            # 第一次会邀请队友
+            if is_first:
+                if not self.run_invite(config=self.config.orochi.invite_config, is_first=True):
+                    logger.warning('Invite failed and exit this orochi task')
+                    success = False
+                    break
+                else:
+                    is_first = False
+                    self.run_general_battle(config=self.config.orochi.general_battle_config)
+
+        # 当结束或者是失败退出循环的时候只有两个UI的可能,在房间或者是在组队界面
+        # 如果在房间就退出
+        if self.exit_room():
+            pass
+        # 如果在组队界面就退出
+        if self.exit_team():
+            pass
+
+        self.ui_get_current_page()
+        self.ui_goto(page_main)
+
+        if not success:
+            return False
+        return True
 
     def run_member(self):
         pass
 
     def run_alone(self):
-        pass
+        logger.info('Start run alone')
+        self.ui_get_current_page()
+        self.ui_goto(page_soul_zones)
+        self.orochi_enter()
+        layer = self.config.orochi.orochi_config.layer[0]
+        self.check_layer(layer)
+        self.check_lock(self.config.orochi.general_battle_config.lock_team_enable)
+
+        while 1:
+            if self.current_count >= self.limit_count:
+                logger.info('Orochi count limit out')
+                break
+            if datetime.now() - self.start_time >= self.limit_time:
+                logger.info('Orochi time limit out')
+                break
+
+            # 点击挑战
+            while 1:
+                self.screenshot()
+                if not self.appear(self.I_OROCHI_FIRE):
+                    self.run_general_battle(config=self.config.orochi.general_battle_config)
+                    break
+                if self.appear_then_click(self.I_OROCHI_FIRE, interval=1):
+                    continue
+
+        # 回去
+        while 1:
+            self.screenshot()
+            if not self.appear(self.I_FORM_TEAM):
+                break
+            if self.appear_then_click(self.I_BACK_BL, interval=1):
+                continue
+
+        self.ui_current = page_soul_zones
+        self.ui_goto(page_main)
+
+
 
     def run_wild(self):
         logger.error('Wild mode is not implemented')
@@ -65,7 +252,8 @@ if __name__ == '__main__':
     c = Config('oas1')
     d = Device(c)
     t = ScriptTask(c, d)
-    t.check_layer('陆')
+
+    t.run()