Browse Source

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

爬塔活动更新_花间取牌
huangrunheng 1 year ago
parent
commit
dd7572bc98

BIN
tasks/ActivityShikigami/as/as_battle.png


BIN
tasks/ActivityShikigami/as/as_battle_org.png


BIN
tasks/ActivityShikigami/as/as_fire.png


BIN
tasks/ActivityShikigami/as/as_fire_org.png


BIN
tasks/ActivityShikigami/as/as_shi.png


BIN
tasks/ActivityShikigami/as/as_shi_org.png


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

@@ -2,7 +2,7 @@
   {
     "itemName": "shi",
     "imageName": "as_shi.png",
-    "roiFront": "476,387,33,34",
+    "roiFront": "520,265,33,34",
     "roiBack": "64,115,1110,427",
     "method": "Template matching",
     "threshold": 0.7,
@@ -20,8 +20,8 @@
   {
     "itemName": "battle",
     "imageName": "as_battle.png",
-    "roiFront": "641,148,35,145",
-    "roiBack": "583,75,153,315",
+    "roiFront": "375,285,35,135",
+    "roiBack": "300,200,153,315",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "进入爬塔"

+ 2 - 2
tasks/ActivityShikigami/assets.py

@@ -45,11 +45,11 @@ class ActivityShikigamiAssets:
 
 	# Image Rule Assets
 	# 进入活动 
-	I_SHI = RuleImage(roi_front=(476,387,33,34), roi_back=(64,115,1110,427), threshold=0.7, method="Template matching", file="./tasks/ActivityShikigami/as/as_shi.png")
+	I_SHI = RuleImage(roi_front=(520,265,33,34), roi_back=(64,115,1110,427), 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=(641,148,35,145), roi_back=(583,75,153,315), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_battle.png")
+	I_BATTLE = RuleImage(roi_front=(375,285,35,135), roi_back=(300,200,153,315), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_battle.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")
 	# 上锁图标 

+ 26 - 19
tasks/ActivityShikigami/script_task.py

@@ -44,29 +44,34 @@ class ScriptTask(GameUi, BaseActivity, SwitchSoul, ActivityShikigamiAssets):
 
         self.ui_get_current_page()
         self.ui_goto(page_main)
+
+        self.open_buff()
+        self.soul(is_open=True)
+        self.close_buff()
+
         self.home_main()
 
         # 选择是游戏的体力还是活动的体力
         current_ap = config.general_climb.ap_mode
-        self.switch(current_ap)
+        #self.switch(current_ap)
 
         # 设定是否锁定阵容
-        if config.general_battle.lock_team_enable:
-            logger.info("Lock team")
-            while 1:
-                self.screenshot()
-                if self.appear_then_click(self.I_UNLOCK, interval=1):
-                    continue
-                if self.appear(self.I_LOCK):
-                    break
-        else:
-            logger.info("Unlock team")
-            while 1:
-                self.screenshot()
-                if self.appear_then_click(self.I_LOCK, interval=1):
-                    continue
-                if self.appear(self.I_UNLOCK):
-                    break
+        # if config.general_battle.lock_team_enable:
+        #     logger.info("Lock team")
+        #     while 1:
+        #         self.screenshot()
+        #         if self.appear_then_click(self.I_UNLOCK, interval=1):
+        #             continue
+        #         if self.appear(self.I_LOCK):
+        #             break
+        # else:
+        #     logger.info("Unlock team")
+        #     while 1:
+        #         self.screenshot()
+        #         if self.appear_then_click(self.I_LOCK, interval=1):
+        #             continue
+        #         if self.appear(self.I_UNLOCK):
+        #             break
 
         # 流程应该是 在页面处:
         # 1. 判定计数是否超了,时间是否超了
@@ -122,6 +127,9 @@ class ScriptTask(GameUi, BaseActivity, SwitchSoul, ActivityShikigamiAssets):
                 logger.info("General battle success")
 
         self.main_home()
+        self.open_buff()
+        self.soul(is_open=False)
+        self.close_buff()
         if config.general_climb.active_souls_clean:
             self.set_next_run(task='SoulsTidy', success=False, finish=False, target=datetime.now())
         self.set_next_run(task="ActivityShikigami", success=True)
@@ -140,8 +148,7 @@ class ScriptTask(GameUi, BaseActivity, SwitchSoul, ActivityShikigamiAssets):
                 break
             if self.appear_then_click(self.I_SHI, interval=1):
                 continue
-            if self.appear_then_click(self.I_DRUM, interval=1):
-                continue
+
             if self.appear_then_click(self.I_BATTLE, interval=1):
                 continue