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

fix(ActivityShikigami): Update

ryland 10 месяцев назад
Родитель
Сommit
481f5237be

+ 2 - 2
module/device/device.py

@@ -202,8 +202,8 @@ class Device(Platform, Screenshot, Control, AppControl):
         count = {}
         for key in self.click_record:
             count[key] = count.get(key, 0) + 1
-        count = sorted(count.items(), key=lambda item: item[1])
-        if count[0][1] >= 12:
+        count = sorted(count.items(), key=lambda item: item[1], reverse=True)
+        if count[0][1] >= 10:
             logger.warning(f'Too many click for a button: {count[0][0]}')
             logger.warning(f'History click: {[str(prev) for prev in self.click_record]}')
             self.click_record_clear()

BIN
tasks/ActivityShikigami/as/as_check_battle_main.png


BIN
tasks/ActivityShikigami/as/as_shi.png


BIN
tasks/ActivityShikigami/as/as_to_battle_main.png


+ 29 - 2
tasks/ActivityShikigami/as/image.json

@@ -38,8 +38,8 @@
   {
     "itemName": "switch",
     "imageName": "as_switch.png",
-    "roiFront": "1215,551,23,23",
-    "roiBack": "1204,538,74,49",
+    "roiFront": "1241,533,23,23",
+    "roiBack": "1202,521,74,49",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "切换按键"
@@ -70,5 +70,32 @@
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
+  },
+  {
+    "itemName": "climb_mode_pass",
+    "imageName": "as_climb_mode_pass.png",
+    "roiFront": "1151,528,21,28",
+    "roiBack": "1118,500,62,100",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "活动爬塔标志"
+  },
+  {
+    "itemName": "climb_mode_ap",
+    "imageName": "as_climb_mode_ap.png",
+    "roiFront": "1100,530,22,25",
+    "roiBack": "1063,508,100,100",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "体力爬塔标志"
+  },
+  {
+    "itemName": "climb_mode_switch",
+    "imageName": "as_climb_mode_switch.png",
+    "roiFront": "1238,531,29,26",
+    "roiBack": "1179,494,100,100",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "切换按键"
   }
 ]

+ 8 - 8
tasks/ActivityShikigami/as/pages.json

@@ -2,8 +2,8 @@
   {
     "itemName": "shi",
     "imageName": "as_shi.png",
-    "roiFront": "1182,391,47,29",
-    "roiBack": "1164,134,83,318",
+    "roiFront": "1184,300,47,29",
+    "roiBack": "1164,134,83,393",
     "method": "Template matching",
     "threshold": 0.7,
     "description": "进入活动"
@@ -38,8 +38,8 @@
   {
     "itemName": "to_battle_main",
     "imageName": "as_to_battle_main.png",
-    "roiFront": "646,121,39,176",
-    "roiBack": "606,91,100,241",
+    "roiFront": "478,340,39,176",
+    "roiBack": "449,297,100,241",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "进入主要的战斗界面"
@@ -56,8 +56,8 @@
   {
     "itemName": "check_battle_main",
     "imageName": "as_check_battle_main.png",
-    "roiFront": "30,130,75,46",
-    "roiBack": "17,104,100,100",
+    "roiFront": "45,629,63,61",
+    "roiBack": "24,602,264,100",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
@@ -74,8 +74,8 @@
   {
     "itemName": "battle_main_to_records",
     "imageName": "as_battle_main_to_records.png",
-    "roiFront": "1208,112,39,42",
-    "roiBack": "1171,86,100,100",
+    "roiFront": "1017,572,39,42",
+    "roiBack": "976,539,146,100",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "从main进入到式神录"

+ 13 - 7
tasks/ActivityShikigami/assets.py

@@ -33,18 +33,24 @@ class ActivityShikigamiAssets:
 	# 活动体力 
 	I_AP_ACTIVITY = RuleImage(roi_front=(1153,636,21,25), roi_back=(1124,621,84,54), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_ap_activity.png")
 	# 切换按键 
-	I_SWITCH = RuleImage(roi_front=(1215,551,23,23), roi_back=(1204,538,74,49), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_switch.png")
+	I_SWITCH = RuleImage(roi_front=(1241,533,23,23), roi_back=(1202,521,74,49), 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_ADD_MAX = RuleImage(roi_front=(17,24,33,37), roi_back=(974,524,57,54), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_add_max.png")
 	# description 
 	I_TOGGLE_BUTTON = RuleImage(roi_front=(1193,463,27,25), roi_back=(1169,146,73,403), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_toggle_button.png")
+	# 活动爬塔标志 
+	I_CLIMB_MODE_PASS = RuleImage(roi_front=(1151,528,21,28), roi_back=(1118,500,62,100), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_climb_mode_pass.png")
+	# 体力爬塔标志 
+	I_CLIMB_MODE_AP = RuleImage(roi_front=(1100,530,22,25), roi_back=(1063,508,100,100), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_climb_mode_ap.png")
+	# 切换按键 
+	I_CLIMB_MODE_SWITCH = RuleImage(roi_front=(1238,531,29,26), roi_back=(1179,494,100,100), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_climb_mode_switch.png")
 
 
 	# Image Rule Assets
 	# 进入活动 
-	I_SHI = RuleImage(roi_front=(1182,391,47,29), roi_back=(1164,134,83,318), threshold=0.7, method="Template matching", file="./tasks/ActivityShikigami/as/as_shi.png")
+	I_SHI = RuleImage(roi_front=(1184,300,47,29), roi_back=(1164,134,83,393), threshold=0.7, method="Template matching", file="./tasks/ActivityShikigami/as/as_shi.png")
 	# 左上角返回 
 	I_BACK_GREEN = RuleImage(roi_front=(27,19,34,38), roi_back=(2,1,170,75), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_back_green.png")
 	# 右上跳过按钮 
@@ -52,15 +58,15 @@ class ActivityShikigamiAssets:
 	# 红色退出 
 	I_RED_EXIT = RuleImage(roi_front=(1162,96,39,38), roi_back=(1120,49,110,135), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_red_exit.png")
 	# 进入主要的战斗界面 
-	I_TO_BATTLE_MAIN = RuleImage(roi_front=(646,121,39,176), roi_back=(606,91,100,241), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_to_battle_main.png")
+	I_TO_BATTLE_MAIN = RuleImage(roi_front=(478,340,39,176), roi_back=(449,297,100,241), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_to_battle_main.png")
 	# 点击进入boss战斗页面 
 	I_TO_BATTLE_BOSS = RuleImage(roi_front=(931,217,37,173), roi_back=(909,198,100,219), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_to_battle_boss.png")
 	# description 
-	I_CHECK_BATTLE_MAIN = RuleImage(roi_front=(30,130,75,46), roi_back=(17,104,100,100), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_check_battle_main.png")
+	I_CHECK_BATTLE_MAIN = RuleImage(roi_front=(45,629,63,61), roi_back=(24,602,264,100), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_check_battle_main.png")
 	# description 
 	I_CHECK_BATTLE_BOSS = RuleImage(roi_front=(0,0,100,100), roi_back=(0,0,100,100), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_check_battle_boss.png")
 	# 从main进入到式神录 
-	I_BATTLE_MAIN_TO_RECORDS = RuleImage(roi_front=(1208,112,39,42), roi_back=(1171,86,100,100), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_battle_main_to_records.png")
+	I_BATTLE_MAIN_TO_RECORDS = RuleImage(roi_front=(1017,572,39,42), roi_back=(976,539,146,100), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_battle_main_to_records.png")
 
 
 	# Image Rule Assets
@@ -96,9 +102,9 @@ class ActivityShikigamiAssets:
 	# 挑战 
 	O_FIRE = RuleOcr(roi=(1137,599,83,44), area=(1129,570,100,100), mode="Single", method="Default", keyword="挑战", name="fire")
 	# 体力的数量检测 
-	O_REMAIN_AP = RuleOcr(roi=(749,18,73,29), area=(749,18,73,29), mode="DigitCounter", method="Default", keyword="", name="remain_ap")
+	O_REMAIN_AP = RuleOcr(roi=(939,18,73,29), area=(939,18,73,29), mode="DigitCounter", method="Default", keyword="", name="remain_ap")
 	# 活动体力的剩余检测 
-	O_REMAIN_PASS = RuleOcr(roi=(959,18,57,28), area=(959,18,57,28), mode="DigitCounter", method="Default", keyword="", name="remain_pass")
+	O_REMAIN_PASS = RuleOcr(roi=(552,18,57,28), area=(552,18,57,28), mode="DigitCounter", method="Default", keyword="", name="remain_pass")
 	# 还有多少次购买体力的机会 
 	O_REMAIN_BUY = RuleOcr(roi=(808,531,39,42), area=(808,531,39,42), mode="DigitCounter", method="Default", keyword="", name="remain_buy")
 	# 活动票数(没有百分比) 

+ 5 - 6
tasks/ActivityShikigami/fire/ocr.json

@@ -10,8 +10,8 @@
   },
   {
     "itemName": "remain_ap",
-    "roiFront": "749,18,73,29",
-    "roiBack": "749,18,73,29",
+    "roiFront": "939,18,73,29",
+    "roiBack": "939,18,73,29",
     "mode": "DigitCounter",
     "method": "Default",
     "keyword": "",
@@ -19,8 +19,8 @@
   },
   {
     "itemName": "remain_pass",
-    "roiFront": "959,18,57,28",
-    "roiBack": "959,18,57,28",
+    "roiFront": "552,18,57,28",
+    "roiBack": "552,18,57,28",
     "mode": "DigitCounter",
     "method": "Default",
     "keyword": "",
@@ -53,8 +53,7 @@
     "keyword": "",
     "description": "boss剩余攻击次数"
   },
-
-    {
+  {
     "itemName": "remain_ap100",
     "roiFront": "922,21,112,39",
     "roiBack": "913,8,131,62",

+ 38 - 28
tasks/ActivityShikigami/script_task.py

@@ -181,6 +181,7 @@ class ScriptTask(StateMachine, GameUi, BaseActivity, SwitchSoul, ActivityShikiga
         logger.hr(f'Start run climb type PASS', 1)
         self.ui_click(self.I_TO_BATTLE_MAIN, stop=self.I_CHECK_BATTLE_MAIN, interval=1)
         self.switch_soul(self.I_BATTLE_MAIN_TO_RECORDS, self.I_CHECK_BATTLE_MAIN)
+        self.switch_climb_mode_in_game('pass')
 
         ocr_limit_timer = Timer(1).start()
         click_limit_timer = Timer(4).start()
@@ -204,36 +205,36 @@ class ScriptTask(StateMachine, GameUi, BaseActivity, SwitchSoul, ActivityShikiga
             #     self.run_general_battle(config=_battle_config)
             #     continue
             # 领箱子
-            if self.appear_then_click(self.I_PASS_5):
-                logger.info('Found箱子')
-                continue
+            # if self.appear_then_click(self.I_PASS_5):
+            #     logger.info('Found箱子')
+            #     continue
             # 印记
-            if self.appear(self.I_PASS_6):
-                logger.info('Found印记')
-                click_index = 0
-                clicks = [self.I_PASS_8, self.I_PASS_10, self.I_PASS_11]
-                self.ui_click(self.I_PASS_6, stop=self.I_UI_BACK_RED, interval=1)
-                self.screenshot()
-                if not self.appear(self.I_UI_BACK_RED):
-                    continue
-                while 1:
-                    self.screenshot()
-                    if self.ui_reward_appear_click():
-                        break
-                    if not self.appear(self.I_UI_BACK_RED):
-                        break
-                    # 按照顺序 间隔点击
-                    if self.click(clicks[click_index], interval=1):
-                        sleep(1.6)
-                        click_index += 1
-                        click_index = click_index % len(clicks)
-                    if self.appear_then_click(self.I_PASS_9, interval=1.1):
-                        logger.info('Select one done')
-                        continue
+            # if self.appear(self.I_PASS_6):
+            #     logger.info('Found印记')
+            #     click_index = 0
+            #     clicks = [self.I_PASS_8, self.I_PASS_10, self.I_PASS_11]
+            #     self.ui_click(self.I_PASS_6, stop=self.I_UI_BACK_RED, interval=1)
+            #     self.screenshot()
+            #     if not self.appear(self.I_UI_BACK_RED):
+            #         continue
+            #     while 1:
+            #         self.screenshot()
+            #         if self.ui_reward_appear_click():
+            #             break
+            #         if not self.appear(self.I_UI_BACK_RED):
+            #             break
+            #         # 按照顺序 间隔点击
+            #         if self.click(clicks[click_index], interval=1):
+            #             sleep(1.6)
+            #             click_index += 1
+            #             click_index = click_index % len(clicks)
+            #         if self.appear_then_click(self.I_PASS_9, interval=1.1):
+            #             logger.info('Select one done')
+            #             continue
             # 下一层
-            if self.appear_then_click(self.I_PASS_7, interval=1, threshold=0.65):
-                logger.info('Next layer')
-                continue
+            # if self.appear_then_click(self.I_PASS_7, interval=1, threshold=0.65):
+            #     logger.info('Next layer')
+            #     continue
             if click_limit_timer.reached():
                 click_limit_timer.reset()
                 if (self.appear_then_click(self.I_PASS_1)
@@ -265,6 +266,7 @@ class ScriptTask(StateMachine, GameUi, BaseActivity, SwitchSoul, ActivityShikiga
         logger.hr(f'Start run climb type AP')
         self.ui_click(self.I_TO_BATTLE_MAIN, stop=self.I_CHECK_BATTLE_MAIN, interval=1)
         self.switch_soul(self.I_BATTLE_MAIN_TO_RECORDS, self.I_CHECK_BATTLE_MAIN)
+        self.switch_climb_mode_in_game('ap')
 
         ocr_limit_timer = Timer(1).start()
         while 1:
@@ -389,6 +391,14 @@ class ScriptTask(StateMachine, GameUi, BaseActivity, SwitchSoul, ActivityShikiga
             self.run_switch_soul(group_team)
         self.ui_click(self.I_UI_BACK_YELLOW, stop=cur_img, interval=1)
 
+    def switch_climb_mode_in_game(self, mode: str = 'ap'):
+        map_check = {
+            'ap': self.I_CLIMB_MODE_AP,
+            'pass': self.I_CLIMB_MODE_PASS,
+        }
+        logger.info(f'Switch climb mode to {mode}')
+        self.ui_click(self.I_CLIMB_MODE_SWITCH, stop=map_check[mode], interval=1)
+
     def lock_team(self, battle_conf: GeneralBattleConfig):
         """
         根据配置判断当前爬塔类型是否锁定阵容, 并执行锁定或解锁