فهرست منبع

fix(task): update DemonEncounter in version 66

runhey 3 سال پیش
والد
کامیت
f94a53be16

+ 1 - 1
module/device/device.py

@@ -26,7 +26,7 @@ class Device(Screenshot, Control, AppControl, EmulatorManager):
     detect_record = set()
     click_record = deque(maxlen=15)
     stuck_timer = Timer(60, count=60).start()
-    stuck_timer_long = Timer(180, count=180).start()
+    stuck_timer_long = Timer(300, count=300).start()
     stuck_long_wait_list = ['BATTLE_STATUS_S', 'PAUSE', 'LOGIN_CHECK']
 
     def __init__(self, *args, **kwargs):

+ 5 - 5
tasks/DemonEncounter/assets.py

@@ -76,15 +76,15 @@ class DemonEncounterAssets:
 	# 右侧的宝箱 
 	I_DE_BOX = RuleImage(roi_front=(1210,295,34,33), roi_back=(1183,278,96,277), threshold=0.8, method="Template matching", file="./tasks/DemonEncounter/demon/demon_de_box.png")
 	# 挑战某一个后的封印图片 
-	I_DE_DEFEAT_2 = RuleImage(roi_front=(1211,422,28,35), roi_back=(1211,422,28,35), threshold=0.8, method="Template matching", file="./tasks/DemonEncounter/demon/demon_de_defeat_2.png")
+	I_DE_DEFEAT_2 = RuleImage(roi_front=(1211,422,28,35), roi_back=(1211,422,28,35), threshold=0.7, method="Template matching", file="./tasks/DemonEncounter/demon/demon_de_defeat_2.png")
 	# description 
-	I_DE_DEFEAT_1 = RuleImage(roi_front=(1223,489,42,41), roi_back=(1223,489,42,41), threshold=0.8, method="Template matching", file="./tasks/DemonEncounter/demon/demon_de_defeat_1.png")
+	I_DE_DEFEAT_1 = RuleImage(roi_front=(1223,489,42,41), roi_back=(1223,489,42,41), threshold=0.7, method="Template matching", file="./tasks/DemonEncounter/demon/demon_de_defeat_1.png")
 	# description 
-	I_DE_DEFEAT_3 = RuleImage(roi_front=(1231,358,38,35), roi_back=(1231,358,38,35), threshold=0.8, method="Template matching", file="./tasks/DemonEncounter/demon/demon_de_defeat_3.png")
+	I_DE_DEFEAT_3 = RuleImage(roi_front=(1231,358,38,35), roi_back=(1231,358,38,35), threshold=0.7, method="Template matching", file="./tasks/DemonEncounter/demon/demon_de_defeat_3.png")
 	# description 
-	I_DE_DEFEAT_4 = RuleImage(roi_front=(1215,295,35,35), roi_back=(1215,295,35,35), threshold=0.8, method="Template matching", file="./tasks/DemonEncounter/demon/demon_de_defeat_4.png")
+	I_DE_DEFEAT_4 = RuleImage(roi_front=(1215,295,35,35), roi_back=(1215,295,35,35), threshold=0.7, method="Template matching", file="./tasks/DemonEncounter/demon/demon_de_defeat_4.png")
 	# 已领取四次的奖励 
-	I_DE_AWARD = RuleImage(roi_front=(1214,210,43,41), roi_back=(1214,210,43,41), threshold=0.8, method="Template matching", file="./tasks/DemonEncounter/demon/demon_de_award.png")
+	I_DE_AWARD = RuleImage(roi_front=(1216,214,42,36), roi_back=(1195,198,74,67), threshold=0.8, method="Template matching", file="./tasks/DemonEncounter/demon/demon_de_award.png")
 	# 信 
 	I_DE_LETTER = RuleImage(roi_front=(1236,358,33,35), roi_back=(1177,261,100,294), threshold=0.8, method="Template matching", file="./tasks/DemonEncounter/demon/demon_de_letter.png")
 	# 关闭封魔密信 

BIN
tasks/DemonEncounter/demon/demon_de_award.png


+ 6 - 6
tasks/DemonEncounter/demon/image_side.json

@@ -23,7 +23,7 @@
     "roiFront": "1211,422,28,35",
     "roiBack": "1211,422,28,35",
     "method": "Template matching",
-    "threshold": 0.8,
+    "threshold": 0.7,
     "description": "挑战某一个后的封印图片"
   },
   {
@@ -32,7 +32,7 @@
     "roiFront": "1223,489,42,41",
     "roiBack": "1223,489,42,41",
     "method": "Template matching",
-    "threshold": 0.8,
+    "threshold": 0.7,
     "description": "description"
   },
   {
@@ -41,7 +41,7 @@
     "roiFront": "1231,358,38,35",
     "roiBack": "1231,358,38,35",
     "method": "Template matching",
-    "threshold": 0.8,
+    "threshold": 0.7,
     "description": "description"
   },
   {
@@ -50,14 +50,14 @@
     "roiFront": "1215,295,35,35",
     "roiBack": "1215,295,35,35",
     "method": "Template matching",
-    "threshold": 0.8,
+    "threshold": 0.7,
     "description": "description"
   },
   {
     "itemName": "de_award",
     "imageName": "demon_de_award.png",
-    "roiFront": "1214,210,43,41",
-    "roiBack": "1214,210,43,41",
+    "roiFront": "1216,214,42,36",
+    "roiBack": "1195,198,74,67",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "已领取四次的奖励"

+ 29 - 1
tasks/DemonEncounter/script_task.py

@@ -232,8 +232,36 @@ class ScriptTask(GameUi, GeneralBattle, DemonEncounterAssets):
                 continue
         logger.info('Question answering Start')
         for i in range(1,4):
+            # 还未测试题库无法识别的情况
             logger.hr(f'Answer {i}', 3)
-            self.ui_get_reward(answer())
+            answer_click = answer()
+            # self.ui_get_reward(answer())
+            while 1:
+                self.screenshot()
+                if self.ui_reward_appear_click():
+                    time.sleep(0.5)
+                    while 1:
+                        self.screenshot()
+                        # 等待动画结束
+                        if not self.appear(self.I_UI_REWARD, threshold=0.6):
+                            logger.info('Get reward success')
+                            break
+                        # 一直点击
+                        if self.ui_reward_appear_click():
+                            continue
+                    break
+                # 如果没有出现红色关闭按钮,说明答题结束
+                if not self.appear(self.I_LETTER_CLOSE):
+                    time.sleep(0.5)
+                    self.screenshot()
+                    if self.appear(self.I_LETTER_CLOSE):
+                        continue
+                    else:
+                        logger.warning('Answer finish')
+                        return
+
+                # 一直点击
+                self.click(answer_click, interval=1)
             time.sleep(0.5)
 
     def _battle(self, target_click):