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

Merge pull request #1133 from BluettDream/dev_climb_act

dev_climb_act
huangrunheng 1 год назад
Родитель
Сommit
f2f3a64e5b

BIN
tasks/ActivityShikigami/as/as_act_map_switch.png


BIN
tasks/ActivityShikigami/as/as_ap_activity.png


BIN
tasks/ActivityShikigami/as/as_battle.png


BIN
tasks/ActivityShikigami/as/as_boss.png


BIN
tasks/ActivityShikigami/as/as_check_act_list_climb_act.png


BIN
tasks/ActivityShikigami/as/as_check_battle_2.png


BIN
tasks/ActivityShikigami/as/as_check_boss.png


BIN
tasks/ActivityShikigami/as/as_entry_activity.png


BIN
tasks/ActivityShikigami/as/as_fire.png


BIN
tasks/ActivityShikigami/as/as_fire_org.png


BIN
tasks/ActivityShikigami/as/as_lock.png


BIN
tasks/ActivityShikigami/as/as_pass_act_locat.png


BIN
tasks/ActivityShikigami/as/as_unlock.png


+ 50 - 23
tasks/ActivityShikigami/as/image.json

@@ -20,11 +20,11 @@
   {
     "itemName": "battle",
     "imageName": "as_battle.png",
-    "roiFront": "475,194,35,135",
-    "roiBack": "454,107,154,315",
+    "roiFront": "813,254,35,135",
+    "roiBack": "754,140,154,315",
     "method": "Template matching",
     "threshold": 0.7,
-    "description": "霜火寂境"
+    "description": "征伐斗场"
   },
   {
     "itemName": "battle_1",
@@ -50,7 +50,7 @@
     "roiFront": "884,648,28,25",
     "roiBack": "761,613,255,76",
     "method": "Template matching",
-    "threshold": 0.8,
+    "threshold": 0.5,
     "description": "上锁图标"
   },
   {
@@ -59,32 +59,23 @@
     "roiFront": "884,648,28,25",
     "roiBack": "758,607,242,85",
     "method": "Template matching",
-    "threshold": 0.8,
+    "threshold": 0.5,
     "description": "还未上锁图片"
   },
-  {
-    "itemName": "fire",
-    "imageName": "as_fire.png",
-    "roiFront": "1131,598,103,54",
-    "roiBack": "1113,564,136,111",
-    "method": "Template matching",
-    "threshold": 0.7,
-    "description": "点击战斗"
-  },
   {
     "itemName": "ap",
     "imageName": "as_ap.png",
-    "roiFront": "1091,550,23,24",
-    "roiBack": "1081,532,103,71",
+    "roiFront": "1181,657,23,24",
+    "roiBack": "1149,631,103,71",
     "method": "Template matching",
-    "threshold": 0.8,
+    "threshold": 0.65,
     "description": "寿司体力"
   },
   {
     "itemName": "ap_activity",
     "imageName": "as_ap_activity.png",
-    "roiFront": "1140,550,21,25",
-    "roiBack": "1108,542,84,54",
+    "roiFront": "1153,636,21,25",
+    "roiBack": "1124,621,84,54",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "活动体力"
@@ -146,8 +137,8 @@
   {
     "itemName": "boss",
     "imageName": "as_boss.png",
-    "roiFront": "1054,265,33,132",
-    "roiBack": "966,131,211,355",
+    "roiFront": "165,339,33,132",
+    "roiBack": "103,218,160,355",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "爬塔进入首领战"
@@ -164,8 +155,8 @@
   {
     "itemName": "check_battle_2",
     "imageName": "as_check_battle_2.png",
-    "roiFront": "93,12,128,46",
-    "roiBack": "82,0,148,86",
+    "roiFront": "22,632,61,69",
+    "roiBack": "1,601,109,117",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "爬塔活动副页检查标志"
@@ -241,5 +232,41 @@
     "method": "Template matching",
     "threshold": 0.8,
     "description": "爬塔活动buff页"
+  },
+  {
+    "itemName": "entry_activity",
+    "imageName": "as_entry_activity.png",
+    "roiFront": "567,258,46,42",
+    "roiBack": "254,56,774,524",
+    "method": "Template matching",
+    "threshold": 0.5,
+    "description": "进入门票活动"
+  },
+  {
+    "itemName": "check_act_list_climb_act",
+    "imageName": "as_check_act_list_climb_act.png",
+    "roiFront": "538,194,497,193",
+    "roiBack": "415,67,773,390",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "活动列表页爬塔活动"
+  },
+  {
+    "itemName": "act_map_switch",
+    "imageName": "as_act_map_switch.png",
+    "roiFront": "1196,303,59,48",
+    "roiBack": "1174,263,104,118",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "活动地图切换"
+  },
+  {
+    "itemName": "pass_act_locat",
+    "imageName": "as_pass_act_locat.png",
+    "roiFront": "1214,395,29,31",
+    "roiBack": "1179,373,100,86",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "门票活动定位"
   }
 ]

+ 17 - 8
tasks/ActivityShikigami/as/ocr.json

@@ -1,8 +1,8 @@
 [
   {
     "itemName": "remain_ap",
-    "roiFront": "910,18,62,28",
-    "roiBack": "910,18,62,28",
+    "roiFront": "727,18,105,28",
+    "roiBack": "716,11,122,41",
     "mode": "DigitCounter",
     "method": "Default",
     "keyword": "",
@@ -28,8 +28,8 @@
   },
   {
     "itemName": "remain_ap_activity2",
-    "roiFront": "558,18,47,29",
-    "roiBack": "558,18,47,29",
+    "roiFront": "1115,25,88,29",
+    "roiBack": "1107,14,103,50",
     "mode": "Digit",
     "method": "Default",
     "keyword": "",
@@ -37,20 +37,29 @@
   },
   {
     "itemName": "entry_activity",
-    "roiFront": "70,103,98,32",
-    "roiBack": "70,103,98,32",
+    "roiFront": "72,279,98,32",
+    "roiBack": "73,279,98,32",
     "mode": "Single",
     "method": "Default",
-    "keyword": "驻守平安",
+    "keyword": "临战演武",
     "description": "从左侧进入战斗"
   },
   {
     "itemName": "remain_boss",
     "roiFront": "1113,669,131,31",
-    "roiBack": "0,0,100,100",
+    "roiBack": "1099,659,162,52",
     "mode": "DigitCounter",
     "method": "Default",
     "keyword": "",
     "description": "boss剩余攻击次数"
+  },
+  {
+    "itemName": "fire",
+    "roiFront": "1137,599,83,44",
+    "roiBack": "1129,570,100,100",
+    "mode": "Single",
+    "method": "Default",
+    "keyword": "挑战",
+    "description": "挑战"
   }
 ]

+ 22 - 14
tasks/ActivityShikigami/assets.py

@@ -62,22 +62,20 @@ class ActivityShikigamiAssets:
 	I_SHI = RuleImage(roi_front=(1183,319,47,38), roi_back=(1164,134,83,318), 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")
-	# 霜火寂境 
-	I_BATTLE = RuleImage(roi_front=(475,194,35,135), roi_back=(454,107,154,315), threshold=0.7, method="Template matching", file="./tasks/ActivityShikigami/as/as_battle.png")
+	# 征伐斗场 
+	I_BATTLE = RuleImage(roi_front=(813,254,35,135), roi_back=(754,140,154,315), threshold=0.7, method="Template matching", file="./tasks/ActivityShikigami/as/as_battle.png")
 	# 进入爬塔1 
 	I_BATTLE_1 = RuleImage(roi_front=(541,197,149,26), roi_back=(506,622,273,96), threshold=0.7, method="Template matching", file="./tasks/ActivityShikigami/as/as_battle_1.png")
 	# 归鹿之途 
 	I_DRUM = RuleImage(roi_front=(327,627,145,28), roi_back=(256,462,301,232), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_drum.png")
 	# 上锁图标 
-	I_LOCK = RuleImage(roi_front=(884,648,28,25), roi_back=(761,613,255,76), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_lock.png")
+	I_LOCK = RuleImage(roi_front=(884,648,28,25), roi_back=(761,613,255,76), threshold=0.5, method="Template matching", file="./tasks/ActivityShikigami/as/as_lock.png")
 	# 还未上锁图片 
-	I_UNLOCK = RuleImage(roi_front=(884,648,28,25), roi_back=(758,607,242,85), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_unlock.png")
-	# 点击战斗 
-	I_FIRE = RuleImage(roi_front=(1131,598,103,54), roi_back=(1113,564,136,111), threshold=0.7, method="Template matching", file="./tasks/ActivityShikigami/as/as_fire.png")
+	I_UNLOCK = RuleImage(roi_front=(884,648,28,25), roi_back=(758,607,242,85), threshold=0.5, method="Template matching", file="./tasks/ActivityShikigami/as/as_unlock.png")
 	# 寿司体力 
-	I_AP = RuleImage(roi_front=(1091,550,23,24), roi_back=(1081,532,103,71), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_ap.png")
+	I_AP = RuleImage(roi_front=(1181,657,23,24), roi_back=(1149,631,103,71), threshold=0.65, method="Template matching", file="./tasks/ActivityShikigami/as/as_ap.png")
 	# 活动体力 
-	I_AP_ACTIVITY = RuleImage(roi_front=(1140,550,21,25), roi_back=(1108,542,84,54), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_ap_activity.png")
+	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")
 	# 购买活动的体力 
@@ -91,11 +89,11 @@ class ActivityShikigamiAssets:
 	# 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_BOSS = RuleImage(roi_front=(1054,265,33,132), roi_back=(966,131,211,355), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_boss.png")
+	I_BOSS = RuleImage(roi_front=(165,339,33,132), roi_back=(103,218,160,355), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_boss.png")
 	# 爬塔boss战页面检查图像 
 	I_CHECK_BOSS = RuleImage(roi_front=(87,18,126,37), roi_back=(63,0,172,81), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_check_boss.png")
 	# 爬塔活动副页检查标志 
-	I_CHECK_BATTLE_2 = RuleImage(roi_front=(93,12,128,46), roi_back=(82,0,148,86), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_check_battle_2.png")
+	I_CHECK_BATTLE_2 = RuleImage(roi_front=(22,632,61,69), roi_back=(1,601,109,117), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_check_battle_2.png")
 	# 爬塔活动页面的红色退出 
 	I_RED_EXIT_2 = RuleImage(roi_front=(1097,177,46,45), roi_back=(1069,152,100,100), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_red_exit_2.png")
 	# 卸载buff 
@@ -112,20 +110,30 @@ class ActivityShikigamiAssets:
 	I_BUFF_SWITCH = RuleImage(roi_front=(640,624,100,39), roi_back=(180,601,1026,100), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_buff_switch.png")
 	# 爬塔活动buff页 
 	I_CHECK_BUFF = RuleImage(roi_front=(91,12,130,47), roi_back=(77,0,156,83), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_check_buff.png")
+	# 进入门票活动 
+	I_ENTRY_ACTIVITY = RuleImage(roi_front=(567,258,46,42), roi_back=(254,56,774,524), threshold=0.5, method="Template matching", file="./tasks/ActivityShikigami/as/as_entry_activity.png")
+	# 活动列表页爬塔活动 
+	I_CHECK_ACT_LIST_CLIMB_ACT = RuleImage(roi_front=(538,194,497,193), roi_back=(415,67,773,390), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_check_act_list_climb_act.png")
+	# 活动地图切换 
+	I_ACT_MAP_SWITCH = RuleImage(roi_front=(1196,303,59,48), roi_back=(1174,263,104,118), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_act_map_switch.png")
+	# 门票活动定位 
+	I_PASS_ACT_LOCAT = RuleImage(roi_front=(1214,395,29,31), roi_back=(1179,373,100,86), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_pass_act_locat.png")
 
 
 	# Ocr Rule Assets
 	# 体力的数量检测 
-	O_REMAIN_AP = RuleOcr(roi=(910,18,62,28), area=(910,18,62,28), mode="DigitCounter", method="Default", keyword="", name="remain_ap")
+	O_REMAIN_AP = RuleOcr(roi=(727,18,105,28), area=(716,11,122,41), mode="DigitCounter", method="Default", keyword="", name="remain_ap")
 	# 活动体力的剩余检测 
 	O_REMAIN_AP_ACTIVITY = RuleOcr(roi=(534,18,70,28), area=(534,18,70,28), 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_AP_ACTIVITY2 = RuleOcr(roi=(558,18,47,29), area=(558,18,47,29), mode="Digit", method="Default", keyword="", name="remain_ap_activity2")
+	O_REMAIN_AP_ACTIVITY2 = RuleOcr(roi=(1115,25,88,29), area=(1107,14,103,50), mode="Digit", method="Default", keyword="", name="remain_ap_activity2")
 	# 从左侧进入战斗 
-	O_ENTRY_ACTIVITY = RuleOcr(roi=(70,103,98,32), area=(70,103,98,32), mode="Single", method="Default", keyword="驻守平安", name="entry_activity")
+	O_ENTRY_ACTIVITY = RuleOcr(roi=(72,279,98,32), area=(73,279,98,32), mode="Single", method="Default", keyword="临战演武", name="entry_activity")
 	# boss剩余攻击次数 
-	O_REMAIN_BOSS = RuleOcr(roi=(1113,669,131,31), area=(0,0,100,100), mode="DigitCounter", method="Default", keyword="", name="remain_boss")
+	O_REMAIN_BOSS = RuleOcr(roi=(1113,669,131,31), area=(1099,659,162,52), mode="DigitCounter", method="Default", keyword="", name="remain_boss")
+	# 挑战 
+	O_FIRE = RuleOcr(roi=(1137,599,83,44), area=(1129,570,100,100), mode="Single", method="Default", keyword="挑战", name="fire")
 
 

+ 25 - 15
tasks/ActivityShikigami/script_task.py

@@ -19,14 +19,14 @@ from tasks.Component.BaseActivity.config_activity import GeneralClimb
 from tasks.Component.SwitchSoul.switch_soul import SwitchSoul
 from tasks.GameUi.game_ui import GameUi
 from tasks.GameUi.page import page_main, page_shikigami_records, page_climb_act, page_climb_act_pass, \
-    page_climb_act_boss, page_climb_act_ap, Page, page_climb_act_buff
+    page_climb_act_boss, page_climb_act_ap, Page, page_climb_act_buff, page_climb_act_2
 
 
 def get_run_order_list(climb_conf: GeneralClimb) -> list[str]:
     if not climb_conf.run_sequence or len(climb_conf.run_sequence.split(',')) == 1:
         raise ValueError('Run sequence now is empty, must set it')
     run_order_list = [climb_type.strip() for climb_type in climb_conf.run_sequence.split(',')]
-    return [climb_type for climb_type in run_order_list if getattr(climb_conf, f'enable_{climb_type}')]
+    return [climb_type for climb_type in run_order_list if getattr(climb_conf, f'enable_{climb_type}', False)]
 
 
 def _prepare_image_for_ocr(image: np.ndarray, asset: RuleOcr) -> np.ndarray:
@@ -118,7 +118,7 @@ class ScriptTask(GameUi, BaseActivity, SwitchSoul, ActivityShikigamiAssets):
             # 进入爬塔活动主界面
             self.home_main()
             # 切换buff
-            self.switch_buff(config.general_climb)
+            # self.switch_buff(config.general_climb)
             # 锁定阵容
             self.lock_team(config.general_battle)
             while 1:
@@ -176,8 +176,7 @@ class ScriptTask(GameUi, BaseActivity, SwitchSoul, ActivityShikigamiAssets):
         :param battle_conf: 战斗配置
         :return:
         """
-        self.ui_get_current_page()
-        self.ui_goto(self.page_map[self.climb_type])
+        self.goto_act()
         enable_preset = getattr(battle_conf, f"enable_{self.climb_type}_preset", False)
         if not enable_preset:
             logger.info(f'Lock {self.climb_type} team')
@@ -254,10 +253,9 @@ class ScriptTask(GameUi, BaseActivity, SwitchSoul, ActivityShikigamiAssets):
         boss: 剩余挑战次数>0
         :return: True 可以运行 or False
         """
-        self.ui_get_current_page()
-        self.ui_goto(self.page_map[self.climb_type])
+        self.goto_act()
         logger.info(f'Check the {self.climb_type} can work')
-        self.wait_until_appear(self.I_FIRE)
+        self.wait_until_appear(self.O_FIRE)
         self.screenshot()
         remain_times = 0
         if self.climb_type == 'pass':
@@ -294,6 +292,7 @@ class ScriptTask(GameUi, BaseActivity, SwitchSoul, ActivityShikigamiAssets):
         return True
 
     def start_battle(self):
+        self.goto_act()
         # 点击战斗前随机休息
         if self.config.activity_shikigami.general_climb.random_sleep:
             random_sleep(probability=0.2)
@@ -301,9 +300,9 @@ class ScriptTask(GameUi, BaseActivity, SwitchSoul, ActivityShikigamiAssets):
         while 1:
             self.screenshot()
             # 点击挑战
-            if self.appear_then_click(self.I_FIRE, interval=2):
+            if self.ocr_appear_click(self.O_FIRE, interval=2):
                 continue
-            if not self.appear(self.I_FIRE):
+            if self.is_in_battle(False):
                 break
             if self.appear_then_click(self.I_C_CONFIRM1, interval=0.6):
                 continue
@@ -336,12 +335,12 @@ class ScriptTask(GameUi, BaseActivity, SwitchSoul, ActivityShikigamiAssets):
 
     def home_main(self) -> bool:
         """
-        从庭院到活动的爬塔界面,(只到爬塔活动主界面)
+        从庭院到活动的爬塔界面
         :return:
         """
         logger.hr("Enter Shikigami", 2)
-        self.ui_get_current_page()
-        self.main_goto_act_by_list(page_climb_act)
+        self.ui_get_current_page(False)
+        self.ui_goto(page_climb_act)
 
     def main_home(self) -> bool:
         """
@@ -349,9 +348,20 @@ class ScriptTask(GameUi, BaseActivity, SwitchSoul, ActivityShikigamiAssets):
         :return:
         """
         logger.hr("Exit Shikigami", 2)
-        self.ui_get_current_page()
+        self.ui_get_current_page(False)
         self.ui_goto(page_main)
 
+    def goto_act(self):
+        page = self.ui_get_current_page(False)
+        if page == self.page_map[self.climb_type]:
+            return
+        # # 门票活动特殊处理
+        # if self.climb_type == 'pass':
+        #     self.ui_goto(page_climb_act_2)
+        #     return
+        # 其余走page默认逻辑
+        self.ui_goto(self.page_map[self.climb_type])
+
     def random_reward_click(self, exclude_bottom=False):
         options = [self.C_RANDOM_LEFT, self.C_RANDOM_RIGHT, self.C_RANDOM_TOP]
         if not exclude_bottom:
@@ -424,4 +434,4 @@ if __name__ == '__main__':
     d = Device(c)
     t = ScriptTask(c, d)
 
-    t.switch_buff(c.activity_shikigami.general_climb)
+    t.run()

+ 6 - 6
tasks/Component/BaseActivity/config_activity.py

@@ -33,12 +33,12 @@ class GeneralClimb(ConfigBase):
     # 爬塔运行顺序
     run_sequence: str = Field(default='pass,boss,ap',
                               description='爬塔运行顺序,英文逗号分隔,从左到右运行,若没启用自动跳过对应类型(pass:门票,boss:boss战,ap:体力)')
-    # 门票爬塔buff
-    pass_buff: str = Field(default='buff_4,buff_5', description='门票爬塔加成,buff1-5,加成页从左往右顺序,清空则不切换加成')
-    # 体力爬塔buff
-    ap_buff: str = Field(default='buff_4,buff_5', description='体力爬塔加成,buff1-5,加成页从左往右顺序,清空则不切换加成')
-    # boss爬塔buff
-    boss_buff: str = Field(default='buff_1,buff_3', description='boss战爬塔加成,buff1-5,加成页从左往右顺序,清空则不切换加成')
+    # # 门票爬塔buff
+    # pass_buff: str = Field(default='buff_4,buff_5', description='门票爬塔加成,buff1-5,加成页从左往右顺序,清空则不切换加成')
+    # # 体力爬塔buff
+    # ap_buff: str = Field(default='buff_4,buff_5', description='体力爬塔加成,buff1-5,加成页从左往右顺序,清空则不切换加成')
+    # # boss爬塔buff
+    # boss_buff: str = Field(default='buff_1,buff_3', description='boss战爬塔加成,buff1-5,加成页从左往右顺序,清空则不切换加成')
     # 结束后激活 御魂清理
     active_souls_clean: bool = Field(default=False, description='是否运行结束后清理御魂')
     # 点击战斗随机休息

+ 4 - 3
tasks/GameUi/assets.py

@@ -181,7 +181,8 @@ class GameUiAssets:
 	I_BACK_ACT_LIST = RuleImage(roi_front=(1165,65,51,47), roi_back=(1124,23,131,133), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_back_act_list.png")
 	# 下载拓展包弹窗 
 	I_DLC_CLOSE = RuleImage(roi_front=(916,147,24,25), roi_back=(916,147,24,25), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/store_dlc_close.png")
-
+	# 退出战斗按钮 
+	I_BACK_BATTLE = RuleImage(roi_front=(24,19,40,38), roi_back=(0,0,90,85), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_back_battle.png")
 
 	# Image Rule Assets
 	# description 
@@ -220,8 +221,8 @@ class GameUiAssets:
 
 	# List Rule Assets
 	# 活动列表页文字列表 
-	L_ACT_LIST_OCR = RuleList(folder="./tasks/GameUi/page", direction="vertical", mode="ocr", roi_back=(192,90,190,513), size=(186, 78), 
-					 array=["冰火永烬"])
+	L_ACT_LIST_OCR = RuleList(folder="./tasks/GameUi/page", direction="vertical", mode="ocr", roi_back=(219,91,47,513), size=(42, 78), 
+					 array=["日之"])
 
 
 	# Image Rule Assets

+ 5 - 46
tasks/GameUi/game_ui.py

@@ -6,6 +6,7 @@ from time import sleep
 
 import random
 from module.atom.image import RuleImage
+from module.atom.list import RuleList
 from module.atom.ocr import RuleOcr
 from module.base.decorator import run_once
 from module.base.timer import Timer
@@ -36,7 +37,8 @@ class GameUi(BaseTask, GameUiAssets):
         page_shikigami_records, page_onmyodo, page_friends, page_daily, page_mall, page_guild, page_team,
         page_collection, page_act_list,
         # 爬塔活动
-        page_climb_act, page_climb_act_2, page_climb_act_pass, page_climb_act_ap, page_climb_act_boss, page_climb_act_buff
+        page_act_list_climb_act, page_climb_act, page_climb_act_2, page_climb_act_3, page_climb_act_pass, page_climb_act_ap,
+        page_climb_act_boss, page_climb_act_buff
     ]
     ui_close = [GameUiAssets.I_BACK_MALL,
                 BaseTask.I_UI_BACK_RED, BaseTask.I_UI_BACK_YELLOW, BaseTask.I_UI_BACK_BLUE,
@@ -242,7 +244,8 @@ class GameUi(BaseTask, GameUiAssets):
                 if self.appear(page.check_button, interval=4):
                     logger.info(f'Page switch: {page} -> {page.parent}')
                     button = page.links[page.parent]
-                    if self.appear_then_click(button, interval=2) or (
+                    if (isinstance(button, RuleList) and self.list_appear_click(button)) or self.appear_then_click(
+                            button, interval=2) or (
                             isinstance(button, RuleOcr) and self.ocr_appear_click(button, interval=2)):
                         self.ui_button_interval_reset(button)
                         confirm_timer.reset()
@@ -280,47 +283,6 @@ class GameUi(BaseTask, GameUiAssets):
         time.sleep(1)
         return
 
-    def main_goto_act_by_list(self, dest_act: Page):
-        """
-        庭院通过活动列表页跳转到对应活动页面
-        :param dest_act: 活动页面
-        :return:
-        """
-        # key: page名称, value: (活动列表中文字, 活动列表中png图像名称)
-        # png图像必须存放在page文件夹下
-        # 添加其他活动列表页的活动时需同时添加下方map内容
-        act_map = {
-            'page_climb_act': ('冰火永烬', 'page_act_list_climb_act')
-        }
-        self.ui_get_current_page()
-        self.ui_goto(page_act_list)
-        # 获取活动页面在活动列表中的文字和图标
-        text, png = act_map[dest_act.name]
-        ok_cnt, max_retry = 0, 3
-        while True:
-            # 多次成功才算成功
-            if ok_cnt >= max_retry:
-                break
-            self.screenshot()
-            # 先尝试文字识别,失败则尝试图像识别,都失败则向下滑动
-            result = self.L_ACT_LIST_OCR.ocr_appear(self.device.image, name=text)
-            if not isinstance(result, tuple):
-                result = self.L_ACT_LIST_IMG.image_appear(self.device.image, name=png)
-            if isinstance(result, tuple):
-                pos = result
-                ok_cnt += 1
-            else:
-                ok_cnt = 0
-            # 一次都未成功则向下滑动
-            if ok_cnt == 0:
-                x1, y1, x2, y2 = self.L_ACT_LIST_OCR.swipe_pos(number=1)
-                self.device.swipe(p1=(x1, y1), p2=(x2, y2))
-            sleep(0.5)
-        if isinstance(pos, tuple):
-            x, y = pos
-            self.device.click(x, y)
-        self.ui_goto(dest_act, confirm_wait=2)
-
 
 if __name__ == '__main__':
     from module.config.config import Config
@@ -331,6 +293,3 @@ if __name__ == '__main__':
     game = GameUi(config=c, device=d)
     game.ui_get_current_page()
     game.ui_goto(page_main)
-    game.main_goto_act_by_list(page_climb_act)
-    game.ui_get_current_page()
-    game.ui_goto(page_climb_act_pass)

+ 17 - 9
tasks/GameUi/page.py

@@ -185,29 +185,37 @@ page_dokan.link(button=G.I_BACK_Y, destination=page_main)
 # ************************************* 活动部分 *****************************************#
 from tasks.ActivityShikigami.assets import ActivityShikigamiAssets as asa
 from tasks.GlobalGame.assets import GlobalGameAssets as gga
+# 活动列表页爬塔活动
+page_act_list_climb_act = Page(asa.I_CHECK_ACT_LIST_CLIMB_ACT)
+page_act_list.link(button=G.L_ACT_LIST_OCR, destination=page_act_list_climb_act)
+page_act_list_climb_act.link(button=G.I_BACK_ACT_LIST, destination=page_main)
 # 爬塔活动界面
 page_climb_act = Page(asa.I_BATTLE)
-page_climb_act.additional = [gga.I_UI_REWARD, asa.I_SKIP_BUTTON, asa.I_TOGGLE_BUTTON, asa.I_RED_EXIT_2]
+page_climb_act.additional = [gga.I_UI_REWARD, asa.I_SKIP_BUTTON, asa.I_RED_EXIT_2]
 page_climb_act.link(button=G.I_BACK_Y, destination=page_main)
-page_act_list.link(button=G.I_ACT_LIST_GOTO_ACT, destination=page_climb_act)
+page_act_list_climb_act.link(button=G.I_ACT_LIST_GOTO_ACT, destination=page_climb_act)
 # 爬塔活动副界面
 page_climb_act_2 = Page(asa.I_CHECK_BATTLE_2)
-page_climb_act_2.additional = [asa.I_SKIP_BUTTON, asa.I_TOGGLE_BUTTON, gga.I_UI_REWARD, asa.I_RED_EXIT]
-page_climb_act_2.link(button=G.I_BACK_Y, destination=page_climb_act)
+page_climb_act_2.additional = [asa.I_SKIP_BUTTON, gga.I_UI_REWARD, asa.I_RED_EXIT]
+page_climb_act_2.link(button=G.I_BACK_BATTLE, destination=page_climb_act)
 page_climb_act.link(button=asa.I_BATTLE, destination=page_climb_act_2)
+page_climb_act_3 = Page(asa.I_ENTRY_ACTIVITY)
+page_climb_act_3.additional = [asa.I_PASS_ACT_LOCAT, ]
+page_climb_act_2.link(button=asa.I_ACT_MAP_SWITCH, destination=page_climb_act_3)
+page_climb_act_3.link(button=asa.I_ACT_MAP_SWITCH, destination=page_climb_act_2)
 # 门票爬塔活动界面
 page_climb_act_pass = Page(asa.I_AP_ACTIVITY)
-page_climb_act_pass.additional = [asa.I_SKIP_BUTTON, asa.I_TOGGLE_BUTTON, gga.I_UI_REWARD, asa.I_RED_EXIT]
-page_climb_act_pass.link(button=G.I_BACK_Y, destination=page_climb_act_2)
-page_climb_act_2.link(button=asa.O_ENTRY_ACTIVITY, destination=page_climb_act_pass)
+page_climb_act_pass.additional = [asa.I_SKIP_BUTTON, gga.I_UI_REWARD, asa.I_RED_EXIT]
+page_climb_act_pass.link(button=G.I_BACK_Y, destination=page_climb_act_3)
+page_climb_act_3.link(button=asa.I_ENTRY_ACTIVITY, destination=page_climb_act_pass)
 # 体力爬塔活动界面
 page_climb_act_ap = Page(asa.I_AP)
 page_climb_act_ap.additional = [asa.O_ENTRY_ACTIVITY, asa.I_SKIP_BUTTON, asa.I_TOGGLE_BUTTON, gga.I_UI_REWARD, asa.I_RED_EXIT]
 page_climb_act_ap.link(button=G.I_BACK_Y, destination=page_climb_act_2)
 page_climb_act_2.link(button=asa.O_ENTRY_ACTIVITY, destination=page_climb_act_ap)
 # 体力, 门票互相跳转
-page_climb_act_ap.link(button=asa.I_SWITCH, destination=page_climb_act_pass)
-page_climb_act_pass.link(button=asa.I_SWITCH, destination=page_climb_act_ap)
+# page_climb_act_ap.link(button=asa.I_SWITCH, destination=page_climb_act_pass)
+# page_climb_act_pass.link(button=asa.I_SWITCH, destination=page_climb_act_ap)
 # 爬塔活动boss战界面
 page_climb_act_boss = Page(asa.I_CHECK_BOSS)
 page_climb_act_boss.additional = [BT.I_UI_BACK_RED, asa.I_SKIP_BUTTON]

BIN
tasks/GameUi/page/climb_act.png


BIN
tasks/GameUi/page/page_act_list_climb_act.png


BIN
tasks/GameUi/page/page_back_battle.png


+ 9 - 0
tasks/GameUi/page/page_img_3.json

@@ -196,5 +196,14 @@
     "method": "Template matching",
     "threshold": 0.8,
     "description": "下载拓展包弹窗"
+  },
+  {
+    "itemName": "back_battle",
+    "imageName": "page_back_battle.png",
+    "roiFront": "24,19,40,38",
+    "roiBack": "0,0,90,85",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "退出战斗按钮"
   }
 ]

+ 3 - 3
tasks/GameUi/page/page_list_act_ocr.json

@@ -2,12 +2,12 @@
   "name": "act_list_ocr",
   "direction": "vertical",
   "type": "ocr",
-  "roiBack": "192,90,190,513",
+  "roiBack": "219,91,47,513",
   "description": "活动列表页文字列表",
   "list": [
     {
-      "itemName": "冰火永烬",
-      "roiFront": "194,361,186,78"
+      "itemName": "日之",
+      "roiFront": "221,212,42,78"
     }
   ]
 }

+ 14 - 2
tasks/base_task.py

@@ -201,7 +201,7 @@ class BaseTask(GlobalGameAssets, CostumeBase):
         return appear
 
     def wait_until_appear(self,
-                          target: RuleImage,
+                          target: RuleImage | RuleOcr,
                           skip_first_screenshot=False,
                           wait_time: int = None) -> bool:
         """
@@ -223,7 +223,9 @@ class BaseTask(GlobalGameAssets, CostumeBase):
             if wait_timer and wait_timer.reached():
                 logger.warning(f"Wait until appear {target.name} timeout")
                 return False
-            if self.appear(target):
+            if isinstance(target, RuleImage) and self.appear(target):
+                return True
+            if isinstance(target, RuleOcr) and self.ocr_appear(target):
                 return True
 
     def wait_until_appear_then_click(self,
@@ -493,6 +495,16 @@ class BaseTask(GlobalGameAssets, CostumeBase):
                 self.device.swipe(p1=(x1, y1), p2=(x2, y2))
                 sleep(1)  # 等待滑动完成, 还没想好如何优化
 
+    def list_appear_click(self, target: RuleList) -> bool:
+        appear = self.list_find(target, name=target.array[0])
+        if not appear:
+            return False
+        if isinstance(appear, tuple):
+            x, y = appear
+            self.device.click(x, y)
+            return True
+        return False
+
     def set_next_run(self, task: str, finish: bool = False,
                      success: bool = None, server: bool = True, target: datetime = None) -> None:
         """