Jelajahi Sumber

feat(Activity): Update

ryland 2 tahun lalu
induk
melakukan
ffee27bee7
25 mengubah file dengan 102 tambahan dan 145 penghapusan
  1. 1 1
      dev_tools/assets_extract.py
  2. TEMPAT SAMPAH
      tasks/ActivityShikigami/0110/0110_battle_check_1.png
  3. TEMPAT SAMPAH
      tasks/ActivityShikigami/0110/0110_battle_check_2.png
  4. TEMPAT SAMPAH
      tasks/ActivityShikigami/0110/0110_battle_check_3.png
  5. TEMPAT SAMPAH
      tasks/ActivityShikigami/0110/0110_battle_check_4.png
  6. TEMPAT SAMPAH
      tasks/ActivityShikigami/0110/0110_battle_class_1.png
  7. TEMPAT SAMPAH
      tasks/ActivityShikigami/0110/0110_battle_class_2.png
  8. TEMPAT SAMPAH
      tasks/ActivityShikigami/0110/0110_battle_class_3.png
  9. TEMPAT SAMPAH
      tasks/ActivityShikigami/0110/0110_battle_class_4.png
  10. TEMPAT SAMPAH
      tasks/ActivityShikigami/0110/0110_c_confirm1.png
  11. TEMPAT SAMPAH
      tasks/ActivityShikigami/0110/0110_n_battle.png
  12. TEMPAT SAMPAH
      tasks/ActivityShikigami/0110/0110_n_confirm.png
  13. 12 57
      tasks/ActivityShikigami/0110/image.json
  14. TEMPAT SAMPAH
      tasks/ActivityShikigami/as/as_ap.png
  15. TEMPAT SAMPAH
      tasks/ActivityShikigami/as/as_ap_activity.png
  16. TEMPAT SAMPAH
      tasks/ActivityShikigami/as/as_battle.png
  17. TEMPAT SAMPAH
      tasks/ActivityShikigami/as/as_fire.png
  18. TEMPAT SAMPAH
      tasks/ActivityShikigami/as/as_lock.png
  19. TEMPAT SAMPAH
      tasks/ActivityShikigami/as/as_shi.png
  20. TEMPAT SAMPAH
      tasks/ActivityShikigami/as/as_switch.png
  21. TEMPAT SAMPAH
      tasks/ActivityShikigami/as/as_unlock.png
  22. 16 16
      tasks/ActivityShikigami/as/image.json
  23. 4 4
      tasks/ActivityShikigami/as/ocr.json
  24. 13 23
      tasks/ActivityShikigami/assets.py
  25. 56 44
      tasks/ActivityShikigami/script_task.py

+ 1 - 1
dev_tools/assets_extract.py

@@ -267,7 +267,7 @@ class AssetsExtractor:
         获取所有json文件
         :return: json文件(带后缀)列表
         """
-        return [str(x) for x in self.task_path.rglob('*.json')]
+        return [str(x) for x in self.task_path.rglob('*.json') if 'temp' not in str(x)]
 
     @classmethod
     def read_file(cls, file: str) -> list:

TEMPAT SAMPAH
tasks/ActivityShikigami/0110/0110_battle_check_1.png


TEMPAT SAMPAH
tasks/ActivityShikigami/0110/0110_battle_check_2.png


TEMPAT SAMPAH
tasks/ActivityShikigami/0110/0110_battle_check_3.png


TEMPAT SAMPAH
tasks/ActivityShikigami/0110/0110_battle_check_4.png


TEMPAT SAMPAH
tasks/ActivityShikigami/0110/0110_battle_class_1.png


TEMPAT SAMPAH
tasks/ActivityShikigami/0110/0110_battle_class_2.png


TEMPAT SAMPAH
tasks/ActivityShikigami/0110/0110_battle_class_3.png


TEMPAT SAMPAH
tasks/ActivityShikigami/0110/0110_battle_class_4.png


TEMPAT SAMPAH
tasks/ActivityShikigami/0110/0110_c_confirm1.png


TEMPAT SAMPAH
tasks/ActivityShikigami/0110/0110_n_battle.png


TEMPAT SAMPAH
tasks/ActivityShikigami/0110/0110_n_confirm.png


+ 12 - 57
tasks/ActivityShikigami/0110/image.json

@@ -1,72 +1,27 @@
 [
   {
-    "itemName": "battle_class_1",
-    "imageName": "0110_battle_class_1.png",
-    "roiFront": "126,132,124,81",
-    "roiBack": "126,132,124,81",
+    "itemName": "n_battle",
+    "imageName": "0110_n_battle.png",
+    "roiFront": "131,164,86,86",
+    "roiBack": "119,50,1075,635",
     "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",
+    "itemName": "n_confirm",
+    "imageName": "0110_n_confirm.png",
+    "roiFront": "670,402,176,63",
+    "roiBack": "670,402,176,63",
     "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",
+    "itemName": "c_confirm1",
+    "imageName": "0110_c_confirm1.png",
+    "roiFront": "560,341,37,38",
+    "roiBack": "560,341,37,38",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"

TEMPAT SAMPAH
tasks/ActivityShikigami/as/as_ap.png


TEMPAT SAMPAH
tasks/ActivityShikigami/as/as_ap_activity.png


TEMPAT SAMPAH
tasks/ActivityShikigami/as/as_battle.png


TEMPAT SAMPAH
tasks/ActivityShikigami/as/as_fire.png


TEMPAT SAMPAH
tasks/ActivityShikigami/as/as_lock.png


TEMPAT SAMPAH
tasks/ActivityShikigami/as/as_shi.png


TEMPAT SAMPAH
tasks/ActivityShikigami/as/as_switch.png


TEMPAT SAMPAH
tasks/ActivityShikigami/as/as_unlock.png


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

@@ -2,8 +2,8 @@
   {
     "itemName": "shi",
     "imageName": "as_shi.png",
-    "roiFront": "443,307,28,39",
-    "roiBack": "64,265,1029,277",
+    "roiFront": "427,337,82,120",
+    "roiBack": "64,265,1110,277",
     "method": "Template matching",
     "threshold": 0.7,
     "description": "进入活动"
@@ -20,8 +20,8 @@
   {
     "itemName": "battle",
     "imageName": "as_battle.png",
-    "roiFront": "207,264,47,172",
-    "roiBack": "187,239,105,220",
+    "roiFront": "111,176,35,165",
+    "roiBack": "74,148,105,220",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "进入爬塔"
@@ -38,8 +38,8 @@
   {
     "itemName": "lock",
     "imageName": "as_lock.png",
-    "roiFront": "795,654,25,32",
-    "roiBack": "795,654,25,32",
+    "roiFront": "666,597,25,32",
+    "roiBack": "666,597,25,32",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "上锁图标"
@@ -47,8 +47,8 @@
   {
     "itemName": "unlock",
     "imageName": "as_unlock.png",
-    "roiFront": "795,656,28,28",
-    "roiBack": "795,656,28,28",
+    "roiFront": "665,597,28,28",
+    "roiBack": "665,597,28,28",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "还未上锁图片"
@@ -56,8 +56,8 @@
   {
     "itemName": "fire",
     "imageName": "as_fire.png",
-    "roiFront": "1132,592,70,79",
-    "roiBack": "1132,592,70,79",
+    "roiFront": "983,547,107,62",
+    "roiBack": "983,547,107,62",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "点击战斗"
@@ -65,8 +65,8 @@
   {
     "itemName": "ap",
     "imageName": "as_ap.png",
-    "roiFront": "1118,510,32,26",
-    "roiBack": "1118,510,32,26",
+    "roiFront": "984,474,29,26",
+    "roiBack": "984,474,29,26",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "体力按钮"
@@ -74,8 +74,8 @@
   {
     "itemName": "ap_activity",
     "imageName": "as_ap_activity.png",
-    "roiFront": "1122,515,27,25",
-    "roiBack": "1122,515,27,25",
+    "roiFront": "987,476,27,25",
+    "roiBack": "987,476,27,25",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "活动体力"
@@ -83,8 +83,8 @@
   {
     "itemName": "switch",
     "imageName": "as_switch.png",
-    "roiFront": "1212,517,23,23",
-    "roiBack": "1212,517,23,23",
+    "roiFront": "1075,480,23,23",
+    "roiBack": "1075,480,23,23",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "切换按键"

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

@@ -1,8 +1,8 @@
 [
   {
     "itemName": "remain_ap",
-    "roiFront": "1177,679,77,25",
-    "roiBack": "1177,679,77,25",
+    "roiFront": "1011,612,77,25",
+    "roiBack": "1011,612,77,25",
     "mode": "DigitCounter",
     "method": "Default",
     "keyword": "",
@@ -10,8 +10,8 @@
   },
   {
     "itemName": "remain_ap_activity",
-    "roiFront": "714,26,95,30",
-    "roiBack": "714,26,95,30",
+    "roiFront": "1062,13,95,30",
+    "roiBack": "1062,13,95,30",
     "mode": "DigitCounter",
     "method": "Default",
     "keyword": "",

+ 13 - 23
tasks/ActivityShikigami/assets.py

@@ -12,21 +12,11 @@ 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")
+	I_N_BATTLE = RuleImage(roi_front=(131,164,86,86), roi_back=(119,50,1075,635), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/0110/0110_n_battle.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")
+	I_N_CONFIRM = RuleImage(roi_front=(670,402,176,63), roi_back=(670,402,176,63), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/0110/0110_n_confirm.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")
+	I_C_CONFIRM1 = RuleImage(roi_front=(560,341,37,38), roi_back=(560,341,37,38), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/0110/0110_c_confirm1.png")
 
 
 	# Click Rule Assets
@@ -44,25 +34,25 @@ class ActivityShikigamiAssets:
 
 	# Image Rule Assets
 	# 进入活动 
-	I_SHI = RuleImage(roi_front=(443,307,28,39), roi_back=(64,265,1029,277), threshold=0.7, method="Template matching", file="./tasks/ActivityShikigami/as/as_shi.png")
+	I_SHI = RuleImage(roi_front=(427,337,82,120), roi_back=(64,265,1110,277), threshold=0.7, method="Template matching", file="./tasks/ActivityShikigami/as/as_shi.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=(207,264,47,172), roi_back=(187,239,105,220), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_battle.png")
+	I_BATTLE = RuleImage(roi_front=(111,176,35,165), roi_back=(74,148,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_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=(666,597,25,32), roi_back=(666,597,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=(665,597,28,28), roi_back=(665,597,28,28), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_unlock.png")
 	# 点击战斗 
-	I_FIRE = RuleImage(roi_front=(1132,592,70,79), roi_back=(1132,592,70,79), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_fire.png")
+	I_FIRE = RuleImage(roi_front=(983,547,107,62), roi_back=(983,547,107,62), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_fire.png")
 	# 体力按钮 
-	I_AP = RuleImage(roi_front=(1118,510,32,26), roi_back=(1118,510,32,26), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_ap.png")
+	I_AP = RuleImage(roi_front=(984,474,29,26), roi_back=(984,474,29,26), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_ap.png")
 	# 活动体力 
-	I_AP_ACTIVITY = RuleImage(roi_front=(1122,515,27,25), roi_back=(1122,515,27,25), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_ap_activity.png")
+	I_AP_ACTIVITY = RuleImage(roi_front=(987,476,27,25), roi_back=(987,476,27,25), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_ap_activity.png")
 	# 切换按键 
-	I_SWITCH = RuleImage(roi_front=(1212,517,23,23), roi_back=(1212,517,23,23), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_switch.png")
+	I_SWITCH = RuleImage(roi_front=(1075,480,23,23), roi_back=(1075,480,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")
 	# 增加到最大 
@@ -73,9 +63,9 @@ class ActivityShikigamiAssets:
 
 	# Ocr Rule Assets
 	# 体力的数量检测 
-	O_REMAIN_AP = RuleOcr(roi=(1177,679,77,25), area=(1177,679,77,25), mode="DigitCounter", method="Default", keyword="", name="remain_ap")
+	O_REMAIN_AP = RuleOcr(roi=(1011,612,77,25), area=(1011,612,77,25), mode="DigitCounter", method="Default", keyword="", name="remain_ap")
 	# 活动体力的剩余检测 
-	O_REMAIN_AP_ACTIVITY = RuleOcr(roi=(714,26,95,30), area=(714,26,95,30), mode="DigitCounter", method="Default", keyword="", name="remain_ap_activity")
+	O_REMAIN_AP_ACTIVITY = RuleOcr(roi=(1062,13,95,30), area=(1062,13,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")
 

+ 56 - 44
tasks/ActivityShikigami/script_task.py

@@ -32,6 +32,13 @@ class ScriptTask(GameUi, BaseActivity, ActivityShikigamiAssets):
         self.ui_goto(page_main)
         self.home_main()
 
+        # 2024-04-04 ---------------------start
+        config.general_climb.ap_mode = ApMode.AP_GAME
+        # 2024-04-04 ---------------------end
+        # 选择是游戏的体力还是活动的体力
+        current_ap = config.general_climb.ap_mode
+        self.switch(current_ap)
+
         # 设定是否锁定阵容
         if config.general_battle.lock_team_enable:
             logger.info("Lock team")
@@ -50,10 +57,6 @@ class ScriptTask(GameUi, BaseActivity, ActivityShikigamiAssets):
                 if self.appear(self.I_UNLOCK):
                     break
 
-        # 选择是游戏的体力还是活动的体力
-        current_ap = config.general_climb.ap_mode
-        self.switch(current_ap)
-
         # 流程应该是 在页面处:
         # 1. 判定计数是否超了,时间是否超了
         # 2. 如果是消耗活动体力,判定活动体力是否足够 如果是消耗一般的体力,判定一般体力是否足够
@@ -84,16 +87,20 @@ class ScriptTask(GameUi, BaseActivity, ActivityShikigamiAssets):
                     logger.info("Activity ap out")
                     break
 
-
             # 点击战斗
-
             logger.info("Click battle")
             while 1:
                 self.screenshot()
-                if self.appear_then_click(self.I_FIRE, interval=1):
+                if self.appear_then_click(self.I_FIRE, interval=2):
                     continue
                 if not self.appear(self.I_FIRE):
                     break
+                if self.appear_then_click(self.I_C_CONFIRM1, interval=0.6):
+                    continue
+                if self.appear_then_click(self.I_UI_CONFIRM_SAMLL, interval=1):
+                    continue
+                if self.appear_then_click(self.I_UI_CONFIRM, interval=1):
+                    continue
 
             if self.run_general_battle(config=config.general_battle):
                 logger.info("General battle success")
@@ -102,7 +109,6 @@ class ScriptTask(GameUi, BaseActivity, ActivityShikigamiAssets):
         self.set_next_run(task="ActivityShikigami", success=True)
         raise TaskEnd
 
-
     def home_main(self) -> bool:
         """
         从庭院到活动的爬塔界面
@@ -114,6 +120,10 @@ class ScriptTask(GameUi, BaseActivity, ActivityShikigamiAssets):
             self.screenshot()
             if self.appear(self.I_FIRE):
                 break
+            # 2024-04-04 --------------start
+            if self.appear_then_click(self.I_N_BATTLE, interval=1):
+                continue
+            # 2024-04-04 --------------end
             if self.appear_then_click(self.I_SHI, interval=1):
                 continue
             if self.appear_then_click(self.I_DRUM, interval=1):
@@ -121,8 +131,6 @@ class ScriptTask(GameUi, BaseActivity, ActivityShikigamiAssets):
             if self.appear_then_click(self.I_BATTLE, interval=1):
                 continue
 
-
-
     def main_home(self) -> bool:
         """
         从活动的爬塔界面到庭院
@@ -138,7 +146,6 @@ class ScriptTask(GameUi, BaseActivity, ActivityShikigamiAssets):
             if self.appear_then_click(self.I_BACK_GREEN, interval=1):
                 continue
 
-
     def check_ap_remain(self, current_ap: ApMode) -> bool:
         """
         检查体力是否足够
@@ -175,6 +182,10 @@ class ScriptTask(GameUi, BaseActivity, ActivityShikigamiAssets):
                 self.screenshot()
                 if self.appear(self.I_AP_ACTIVITY):
                     break
+                if self.appear_then_click(self.I_UI_CONFIRM_SAMLL, interval=1):
+                    continue
+                if self.appear_then_click(self.I_UI_CONFIRM, interval=1):
+                    continue
                 if self.appear(self.I_AP, interval=1):
                     self.appear_then_click(self.I_SWITCH, interval=2)  # 点击切换
         else:
@@ -186,44 +197,45 @@ class ScriptTask(GameUi, BaseActivity, ActivityShikigamiAssets):
                 if self.appear(self.I_AP_ACTIVITY, interval=1):
                     self.appear_then_click(self.I_SWITCH, interval=2)
 
-    # def battle_wait(self, random_click_swipt_enable: bool) -> bool:
-    #     # 重写
-    #     self.device.stuck_record_add('BATTLE_STATUS_S')
-    #     self.device.click_record_clear()
-    #     logger.info("Start battle process")
-    #     self.C_RANDOM_LEFT.name = "BATTLE_RANDOM"
-    #     self.C_RANDOM_RIGHT.name = "BATTLE_RANDOM"
-    #     self.C_RANDOM_TOP.name = "BATTLE_RANDOM"
-    #     self.C_RANDOM_BOTTOM.name = "BATTLE_RANDOM"
-    #     while 1:
-    #         self.screenshot()
-    #         # 如果出现了 “获得奖励”
-    #         reward_click = random.choice([self.C_RANDOM_LEFT, self.C_RANDOM_RIGHT, self.C_RANDOM_TOP, self.C_RANDOM_BOTTOM])
-    #         if self.appear_then_click(self.I_UI_REWARD, action=reward_click, interval=1.3):
-    #             continue
-    #         # 如果出现了 “鼓”
-    #         if self.appear(self.I_WIN):
-    #             logger.info("Win")
-    #             while 1:
-    #                 self.screenshot()
-    #                 if not self.appear(self.I_WIN):
-    #                     break
-    #                 if self.appear_then_click(self.I_WIN, action=self.C_RANDOM_ALL, interval=1.1):
-    #                     continuee
-    #             return True
-    #         # 失败 -> 正常人不会失败
-    #         if self.appear(self.I_FALSE):
-    #             logger.warning('False battle')
-    #             self.ui_click_until_disappear(self.I_FALSE)
-    #             return False
-    #         # 如果开启战斗过程随机滑动
-    #         if random_click_swipt_enable:
-    #             self.random_click_swipt()
+    def battle_wait(self, random_click_swipt_enable: bool) -> bool:
+        # 重写
+        self.device.stuck_record_add('BATTLE_STATUS_S')
+        self.device.click_record_clear()
+        logger.info("Start battle process")
+        self.C_RANDOM_LEFT.name = "BATTLE_RANDOM"
+        self.C_RANDOM_RIGHT.name = "BATTLE_RANDOM"
+        self.C_RANDOM_TOP.name = "BATTLE_RANDOM"
+        self.C_RANDOM_BOTTOM.name = "BATTLE_RANDOM"
+        while 1:
+            self.screenshot()
+            # 如果出现了 “获得奖励”
+            reward_click = random.choice([self.C_RANDOM_LEFT, self.C_RANDOM_RIGHT, self.C_RANDOM_TOP, self.C_RANDOM_BOTTOM])
+            if self.appear_then_click(self.I_UI_REWARD, action=reward_click, interval=1.3):
+                continue
+            # 如果出现了 “鼓”
+            if self.appear(self.I_WIN):
+                logger.info("Win")
+                while 1:
+                    self.screenshot()
+                    if not self.appear(self.I_WIN):
+                        break
+                    if self.appear_then_click(self.I_WIN, action=self.C_RANDOM_ALL, interval=1.1):
+                        continue
+                return True
+            # 失败 -> 正常人不会失败
+            if self.appear(self.I_FALSE):
+                logger.warning('False battle')
+                self.ui_click_until_disappear(self.I_FALSE)
+                return False
+            # 如果开启战斗过程随机滑动
+            if random_click_swipt_enable:
+                self.random_click_swipt()
 
 
 if __name__ == '__main__':
     from module.config.config import Config
     from module.device.device import Device
+
     c = Config('oas1')
     d = Device(c)
     t = ScriptTask(c, d)