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

Merge pull request #1016 from yEs1do/feat(ActivityShikigami)

霜火寂境活动更新
huangrunheng 1 год назад
Родитель
Сommit
da0e2d6741

BIN
tasks/ActivityShikigami/as/as_ap.png


BIN
tasks/ActivityShikigami/as/as_ap_activity.png


BIN
tasks/ActivityShikigami/as/as_battle.png


BIN
tasks/ActivityShikigami/as/as_fire.png


BIN
tasks/ActivityShikigami/as/as_lock.png


BIN
tasks/ActivityShikigami/as/as_shi.png


BIN
tasks/ActivityShikigami/as/as_switch.png


BIN
tasks/ActivityShikigami/as/as_unlock.png


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

@@ -2,7 +2,7 @@
   {
   {
     "itemName": "shi",
     "itemName": "shi",
     "imageName": "as_shi.png",
     "imageName": "as_shi.png",
-    "roiFront": "1183,241,47,38",
+    "roiFront": "1183,319,47,38",
     "roiBack": "1164,134,83,318",
     "roiBack": "1164,134,83,318",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.7,
     "threshold": 0.7,
@@ -20,16 +20,16 @@
   {
   {
     "itemName": "battle",
     "itemName": "battle",
     "imageName": "as_battle.png",
     "imageName": "as_battle.png",
-    "roiFront": "1088,244,35,135",
-    "roiBack": "1043,152,154,315",
+    "roiFront": "475,194,35,135",
+    "roiBack": "454,107,154,315",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.7,
     "threshold": 0.7,
-    "description": "巡梦环游"
+    "description": "霜火寂境"
   },
   },
   {
   {
     "itemName": "battle_1",
     "itemName": "battle_1",
     "imageName": "as_battle_1.png",
     "imageName": "as_battle_1.png",
-    "roiFront": "541,663,191,26",
+    "roiFront": "541,197,149,26",
     "roiBack": "506,622,273,96",
     "roiBack": "506,622,273,96",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.7,
     "threshold": 0.7,
@@ -47,7 +47,7 @@
   {
   {
     "itemName": "lock",
     "itemName": "lock",
     "imageName": "as_lock.png",
     "imageName": "as_lock.png",
-    "roiFront": "781,650,28,25",
+    "roiFront": "884,648,28,25",
     "roiBack": "761,613,255,76",
     "roiBack": "761,613,255,76",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
@@ -56,7 +56,7 @@
   {
   {
     "itemName": "unlock",
     "itemName": "unlock",
     "imageName": "as_unlock.png",
     "imageName": "as_unlock.png",
-    "roiFront": "781,650,28,25",
+    "roiFront": "884,648,28,25",
     "roiBack": "758,607,242,85",
     "roiBack": "758,607,242,85",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
@@ -74,7 +74,7 @@
   {
   {
     "itemName": "ap",
     "itemName": "ap",
     "imageName": "as_ap.png",
     "imageName": "as_ap.png",
-    "roiFront": "1114,546,23,24",
+    "roiFront": "1091,550,23,24",
     "roiBack": "1081,532,103,71",
     "roiBack": "1081,532,103,71",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
@@ -83,7 +83,7 @@
   {
   {
     "itemName": "ap_activity",
     "itemName": "ap_activity",
     "imageName": "as_ap_activity.png",
     "imageName": "as_ap_activity.png",
-    "roiFront": "1152,552,21,25",
+    "roiFront": "1140,550,21,25",
     "roiBack": "1108,542,84,54",
     "roiBack": "1108,542,84,54",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
@@ -92,8 +92,8 @@
   {
   {
     "itemName": "switch",
     "itemName": "switch",
     "imageName": "as_switch.png",
     "imageName": "as_switch.png",
-    "roiFront": "1242,553,23,23",
-    "roiBack": "1222,541,54,49",
+    "roiFront": "1215,551,23,23",
+    "roiBack": "1204,538,74,49",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "切换按键"
     "description": "切换按键"

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

@@ -1,8 +1,8 @@
 [
 [
   {
   {
     "itemName": "remain_ap",
     "itemName": "remain_ap",
-    "roiFront": "98,591,38,28",
-    "roiBack": "98,591,38,28",
+    "roiFront": "910,18,62,28",
+    "roiBack": "910,18,62,28",
     "mode": "DigitCounter",
     "mode": "DigitCounter",
     "method": "Default",
     "method": "Default",
     "keyword": "",
     "keyword": "",
@@ -28,8 +28,8 @@
   },
   },
   {
   {
     "itemName": "remain_ap_activity2",
     "itemName": "remain_ap_activity2",
-    "roiFront": "740,25,71,29",
-    "roiBack": "740,25,71,29",
+    "roiFront": "558,18,47,29",
+    "roiBack": "558,18,47,29",
     "mode": "Digit",
     "mode": "Digit",
     "method": "Default",
     "method": "Default",
     "keyword": "",
     "keyword": "",
@@ -37,11 +37,11 @@
   },
   },
   {
   {
     "itemName": "entry_activity",
     "itemName": "entry_activity",
-    "roiFront": "71,241,98,32",
-    "roiBack": "71,241,98,32",
+    "roiFront": "70,103,98,32",
+    "roiBack": "70,103,98,32",
     "mode": "Single",
     "mode": "Single",
     "method": "Default",
     "method": "Default",
-    "keyword": "阵练演武",
-    "description": "Ocr-description"
+    "keyword": "驻守平安",
+    "description": "从左侧进入战斗"
   }
   }
 ]
 ]

+ 13 - 13
tasks/ActivityShikigami/assets.py

@@ -45,27 +45,27 @@ class ActivityShikigamiAssets:
 
 
 	# Image Rule Assets
 	# Image Rule Assets
 	# 进入活动 
 	# 进入活动 
-	I_SHI = RuleImage(roi_front=(1183,241,47,38), roi_back=(1164,134,83,318), threshold=0.7, method="Template matching", file="./tasks/ActivityShikigami/as/as_shi.png")
+	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_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=(1088,244,35,135), roi_back=(1043,152,154,315), threshold=0.7, method="Template matching", file="./tasks/ActivityShikigami/as/as_battle.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")
 	# 进入爬塔1 
 	# 进入爬塔1 
-	I_BATTLE_1 = RuleImage(roi_front=(541,663,191,26), roi_back=(506,622,273,96), threshold=0.7, method="Template matching", file="./tasks/ActivityShikigami/as/as_battle_1.png")
+	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_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=(781,650,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.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_lock.png")
 	# 还未上锁图片 
 	# 还未上锁图片 
-	I_UNLOCK = RuleImage(roi_front=(781,650,28,25), roi_back=(758,607,242,85), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_unlock.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=(1123,589,124,88), threshold=0.7, method="Template matching", file="./tasks/ActivityShikigami/as/as_fire.png")
 	I_FIRE = RuleImage(roi_front=(1131,598,103,54), roi_back=(1123,589,124,88), threshold=0.7, method="Template matching", file="./tasks/ActivityShikigami/as/as_fire.png")
 	# 寿司体力 
 	# 寿司体力 
-	I_AP = RuleImage(roi_front=(1114,546,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=(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_ACTIVITY = RuleImage(roi_front=(1152,552,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=(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_SWITCH = RuleImage(roi_front=(1242,553,23,23), roi_back=(1222,541,54,49), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_switch.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_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_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")
 	# 增加到最大 
 	# 增加到最大 
@@ -80,14 +80,14 @@ class ActivityShikigamiAssets:
 
 
 	# Ocr Rule Assets
 	# Ocr Rule Assets
 	# 体力的数量检测 
 	# 体力的数量检测 
-	O_REMAIN_AP = RuleOcr(roi=(98,591,38,28), area=(98,591,38,28), mode="DigitCounter", method="Default", keyword="", name="remain_ap")
+	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_ACTIVITY = RuleOcr(roi=(534,18,70,28), area=(534,18,70,28), mode="DigitCounter", method="Default", keyword="", name="remain_ap_activity")
 	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_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=(740,25,71,29), area=(740,25,71,29), mode="Digit", method="Default", keyword="", name="remain_ap_activity2")
-	# Ocr-description 
-	O_ENTRY_ACTIVITY = RuleOcr(roi=(71,241,98,32), area=(71,241,98,32), mode="Single", method="Default", keyword="阵练演武", name="entry_activity")
+	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_ENTRY_ACTIVITY = RuleOcr(roi=(70,103,98,32), area=(70,103,98,32), mode="Single", method="Default", keyword="驻守平安", name="entry_activity")
 
 
 
 

+ 41 - 34
tasks/ActivityShikigami/script_task.py

@@ -45,6 +45,7 @@ class ScriptTask(GameUi, BaseActivity, SwitchSoul, ActivityShikigamiAssets):
         self.ui_get_current_page()
         self.ui_get_current_page()
         self.ui_goto(page_main)
         self.ui_goto(page_main)
 
 
+        # 某些活动需要开启御魂加成
         # self.open_buff()
         # self.open_buff()
         # self.soul(is_open=True)
         # self.soul(is_open=True)
         # self.close_buff()
         # self.close_buff()
@@ -154,6 +155,8 @@ class ScriptTask(GameUi, BaseActivity, SwitchSoul, ActivityShikigamiAssets):
                 break
                 break
             if self.appear_then_click(self.I_SHI, interval=1):
             if self.appear_then_click(self.I_SHI, interval=1):
                 continue
                 continue
+            if self.ocr_appear_click(self.O_ENTRY_ACTIVITY, interval=1):
+                continue
             if self.appear_then_click(self.I_TOGGLE_BUTTON, interval=3):
             if self.appear_then_click(self.I_TOGGLE_BUTTON, interval=3):
                 continue
                 continue
             if self.appear_then_click(self.I_SKIP_BUTTON, interval=1.5):
             if self.appear_then_click(self.I_SKIP_BUTTON, interval=1.5):
@@ -249,42 +252,45 @@ class ScriptTask(GameUi, BaseActivity, SwitchSoul, ActivityShikigamiAssets):
                 if self.appear(self.I_AP_ACTIVITY, interval=1):
                 if self.appear(self.I_AP_ACTIVITY, interval=1):
                     self.appear_then_click(self.I_SWITCH, interval=2)
                     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):
-    #                     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()
+    def battle_wait(self, random_click_swipt_enable: bool) -> bool:
+        # 重写,不出现达摩版本999专用
+        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"
+        click_count = 0
+        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):
+                click_count += 1
+                continue
+            # 如果出现了 “鼓”
+            if self.appear(self.I_WIN) or click_count >= 1:
+                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()
 
 
+    """
     def battle_wait(self, random_click_swipt_enable: bool) -> bool:
     def battle_wait(self, random_click_swipt_enable: bool) -> bool:
-        # 重写
+        # 重写,出现达摩版本月度常用
         self.device.stuck_record_add('BATTLE_STATUS_S')
         self.device.stuck_record_add('BATTLE_STATUS_S')
         self.device.click_record_clear()
         self.device.click_record_clear()
         logger.info("Start battle process")
         logger.info("Start battle process")
@@ -325,6 +331,7 @@ class ScriptTask(GameUi, BaseActivity, SwitchSoul, ActivityShikigamiAssets):
             # 如果开启战斗过程随机滑动
             # 如果开启战斗过程随机滑动
             if random_click_swipt_enable:
             if random_click_swipt_enable:
                 self.random_click_swipt()
                 self.random_click_swipt()
+    """
 
 
 
 
 if __name__ == '__main__':
 if __name__ == '__main__':

+ 4 - 3
tasks/Component/BaseActivity/config_activity.py

@@ -65,6 +65,7 @@ class GeneralClimb(ConfigBase):
             return def_value
             return def_value
         return def_value
         return def_value
 
 
-    @field_validator('ap_mode', mode='after')
-    def check_mode(cls, value):
-        return ApMode.AP_GAME
+    # 适用于活动爬塔仅有游戏体力的情况
+    # @field_validator('ap_mode', mode='after')
+    # def check_mode(cls, value):
+    #     return ApMode.AP_GAME