Explorar o código

feat(ActivityShikigami): Update

ryland %!s(int64=2) %!d(string=hai) anos
pai
achega
940b3c2459

BIN=BIN
tasks/ActivityShikigami/as/as_ap.png


BIN=BIN
tasks/ActivityShikigami/as/as_ap_activity.png


BIN=BIN
tasks/ActivityShikigami/as/as_battle.png


BIN=BIN
tasks/ActivityShikigami/as/as_fire.png


BIN=BIN
tasks/ActivityShikigami/as/as_lock.png


BIN=BIN
tasks/ActivityShikigami/as/as_shi.png


BIN=BIN
tasks/ActivityShikigami/as/as_switch.png


BIN=BIN
tasks/ActivityShikigami/as/as_unlock.png


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

@@ -20,8 +20,8 @@
   {
   {
     "itemName": "battle",
     "itemName": "battle",
     "imageName": "as_battle.png",
     "imageName": "as_battle.png",
-    "roiFront": "883,291,35,165",
-    "roiBack": "840,218,138,315",
+    "roiFront": "854,108,35,165",
+    "roiBack": "790,58,138,315",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "进入爬塔"
     "description": "进入爬塔"
@@ -38,8 +38,8 @@
   {
   {
     "itemName": "lock",
     "itemName": "lock",
     "imageName": "as_lock.png",
     "imageName": "as_lock.png",
-    "roiFront": "816,655,25,32",
-    "roiBack": "816,655,25,32",
+    "roiFront": "827,655,25,32",
+    "roiBack": "749,592,139,116",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "上锁图标"
     "description": "上锁图标"
@@ -47,8 +47,8 @@
   {
   {
     "itemName": "unlock",
     "itemName": "unlock",
     "imageName": "as_unlock.png",
     "imageName": "as_unlock.png",
-    "roiFront": "813,656,28,28",
-    "roiBack": "813,656,28,28",
+    "roiFront": "823,654,28,28",
+    "roiBack": "802,610,86,87",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "还未上锁图片"
     "description": "还未上锁图片"
@@ -56,8 +56,8 @@
   {
   {
     "itemName": "fire",
     "itemName": "fire",
     "imageName": "as_fire.png",
     "imageName": "as_fire.png",
-    "roiFront": "1117,564,107,108",
-    "roiBack": "1117,564,107,108",
+    "roiFront": "1143,585,84,78",
+    "roiBack": "1117,498,142,174",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "点击战斗"
     "description": "点击战斗"
@@ -65,8 +65,8 @@
   {
   {
     "itemName": "ap",
     "itemName": "ap",
     "imageName": "as_ap.png",
     "imageName": "as_ap.png",
-    "roiFront": "984,474,29,26",
-    "roiBack": "984,474,29,26",
+    "roiFront": "1135,515,29,26",
+    "roiBack": "1092,487,103,71",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "体力按钮"
     "description": "体力按钮"
@@ -74,8 +74,8 @@
   {
   {
     "itemName": "ap_activity",
     "itemName": "ap_activity",
     "imageName": "as_ap_activity.png",
     "imageName": "as_ap_activity.png",
-    "roiFront": "987,476,27,25",
-    "roiBack": "987,476,27,25",
+    "roiFront": "1133,516,27,25",
+    "roiBack": "1090,500,84,54",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "活动体力"
     "description": "活动体力"
@@ -83,8 +83,8 @@
   {
   {
     "itemName": "switch",
     "itemName": "switch",
     "imageName": "as_switch.png",
     "imageName": "as_switch.png",
-    "roiFront": "1075,480,23,23",
-    "roiBack": "1075,480,23,23",
+    "roiFront": "1221,518,23,23",
+    "roiBack": "1200,497,69,56",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "切换按键"
     "description": "切换按键"

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

@@ -10,8 +10,8 @@
   },
   },
   {
   {
     "itemName": "remain_ap_activity",
     "itemName": "remain_ap_activity",
-    "roiFront": "1062,13,95,30",
-    "roiBack": "1062,13,95,30",
+    "roiFront": "912,25,95,30",
+    "roiBack": "912,25,95,30",
     "mode": "DigitCounter",
     "mode": "DigitCounter",
     "method": "Default",
     "method": "Default",
     "keyword": "",
     "keyword": "",

+ 8 - 8
tasks/ActivityShikigami/assets.py

@@ -38,21 +38,21 @@ class ActivityShikigamiAssets:
 	# 左上角返回 
 	# 左上角返回 
 	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_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=(883,291,35,165), roi_back=(840,218,138,315), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_battle.png")
+	I_BATTLE = RuleImage(roi_front=(854,108,35,165), roi_back=(790,58,138,315), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_battle.png")
 	# 归鹿之途 
 	# 归鹿之途 
 	I_DRUM = RuleImage(roi_front=(885,310,29,145), roi_back=(860,244,87,232), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_drum.png")
 	I_DRUM = RuleImage(roi_front=(885,310,29,145), roi_back=(860,244,87,232), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_drum.png")
 	# 上锁图标 
 	# 上锁图标 
-	I_LOCK = RuleImage(roi_front=(816,655,25,32), roi_back=(816,655,25,32), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_lock.png")
+	I_LOCK = RuleImage(roi_front=(827,655,25,32), roi_back=(749,592,139,116), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_lock.png")
 	# 还未上锁图片 
 	# 还未上锁图片 
-	I_UNLOCK = RuleImage(roi_front=(813,656,28,28), roi_back=(813,656,28,28), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_unlock.png")
+	I_UNLOCK = RuleImage(roi_front=(823,654,28,28), roi_back=(802,610,86,87), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_unlock.png")
 	# 点击战斗 
 	# 点击战斗 
-	I_FIRE = RuleImage(roi_front=(1117,564,107,108), roi_back=(1117,564,107,108), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_fire.png")
+	I_FIRE = RuleImage(roi_front=(1143,585,84,78), roi_back=(1117,498,142,174), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_fire.png")
 	# 体力按钮 
 	# 体力按钮 
-	I_AP = RuleImage(roi_front=(984,474,29,26), roi_back=(984,474,29,26), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_ap.png")
+	I_AP = RuleImage(roi_front=(1135,515,29,26), roi_back=(1092,487,103,71), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_ap.png")
 	# 活动体力 
 	# 活动体力 
-	I_AP_ACTIVITY = RuleImage(roi_front=(987,476,27,25), roi_back=(987,476,27,25), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_ap_activity.png")
+	I_AP_ACTIVITY = RuleImage(roi_front=(1133,516,27,25), roi_back=(1090,500,84,54), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_ap_activity.png")
 	# 切换按键 
 	# 切换按键 
-	I_SWITCH = RuleImage(roi_front=(1075,480,23,23), roi_back=(1075,480,23,23), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_switch.png")
+	I_SWITCH = RuleImage(roi_front=(1221,518,23,23), roi_back=(1200,497,69,56), 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")
 	# 增加到最大 
 	# 增加到最大 
@@ -65,7 +65,7 @@ class ActivityShikigamiAssets:
 	# 体力的数量检测 
 	# 体力的数量检测 
 	O_REMAIN_AP = RuleOcr(roi=(1155,672,87,25), area=(1155,672,87,25), mode="DigitCounter", method="Default", keyword="", name="remain_ap")
 	O_REMAIN_AP = RuleOcr(roi=(1155,672,87,25), area=(1155,672,87,25), mode="DigitCounter", method="Default", keyword="", name="remain_ap")
 	# 活动体力的剩余检测 
 	# 活动体力的剩余检测 
-	O_REMAIN_AP_ACTIVITY = RuleOcr(roi=(1062,13,95,30), area=(1062,13,95,30), mode="DigitCounter", method="Default", keyword="", name="remain_ap_activity")
+	O_REMAIN_AP_ACTIVITY = RuleOcr(roi=(912,25,95,30), area=(912,25,95,30), 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")
 
 

+ 23 - 24
tasks/ActivityShikigami/script_task.py

@@ -32,9 +32,9 @@ class ScriptTask(GameUi, BaseActivity, ActivityShikigamiAssets):
         self.ui_goto(page_main)
         self.ui_goto(page_main)
         self.home_main()
         self.home_main()
 
 
-        # 2024-04-04 ---------------------start
-        config.general_climb.ap_mode = ApMode.AP_GAME
-        # 2024-04-04 ---------------------end
+        # # 2024-04-04 ---------------------start
+        # config.general_climb.ap_mode = ApMode.AP_GAME
+        # # 2024-04-04 ---------------------end
         # 选择是游戏的体力还是活动的体力
         # 选择是游戏的体力还是活动的体力
         current_ap = config.general_climb.ap_mode
         current_ap = config.general_climb.ap_mode
         self.switch(current_ap)
         self.switch(current_ap)
@@ -178,27 +178,26 @@ class ScriptTask(GameUi, BaseActivity, ActivityShikigamiAssets):
         :param current_ap:
         :param current_ap:
         :return:
         :return:
         """
         """
-        pass
-        # if current_ap == ApMode.AP_ACTIVITY:
-        #     logger.info("Select activity ap")
-        #     while 1:
-        #         self.screenshot()
-        #         if self.appear(self.I_AP_ACTIVITY):
-        #             break
-        #         if self.appear_then_click(self.I_UI_CONFIRM_SAMLL, interval=1):
-        #             continue
-        #         if self.appear_then_click(self.I_UI_CONFIRM, interval=1):
-        #             continue
-        #         if self.appear(self.I_AP, interval=1):
-        #             self.appear_then_click(self.I_SWITCH, interval=2)  # 点击切换
-        # else:
-        #     logger.info("Select game ap")
-        #     while 1:
-        #         self.screenshot()
-        #         if self.appear(self.I_AP):
-        #             break
-        #         if self.appear(self.I_AP_ACTIVITY, interval=1):
-        #             self.appear_then_click(self.I_SWITCH, interval=2)
+        if current_ap == ApMode.AP_ACTIVITY:
+            logger.info("Select activity ap")
+            while 1:
+                self.screenshot()
+                if self.appear(self.I_AP_ACTIVITY):
+                    break
+                if self.appear_then_click(self.I_UI_CONFIRM_SAMLL, interval=1):
+                    continue
+                if self.appear_then_click(self.I_UI_CONFIRM, interval=1):
+                    continue
+                if self.appear(self.I_AP, interval=1):
+                    self.appear_then_click(self.I_SWITCH, interval=2)  # 点击切换
+        else:
+            logger.info("Select game ap")
+            while 1:
+                self.screenshot()
+                if self.appear(self.I_AP):
+                    break
+                if self.appear(self.I_AP_ACTIVITY, interval=1):
+                    self.appear_then_click(self.I_SWITCH, interval=2)
 
 
     # def battle_wait(self, random_click_swipt_enable: bool) -> bool:
     # def battle_wait(self, random_click_swipt_enable: bool) -> bool:
     #     # 重写
     #     # 重写