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

pref(task): activity shikigami

runhey 3 лет назад
Родитель
Сommit
ff1c27e8a2

BIN
module/config/i18n/zh_CN.qm


+ 13 - 2
module/config/i18n/zh_CN.ts

@@ -379,7 +379,18 @@
 	<message><source>ShikigamiConfig</source><translation>活动</translation></message>
 	<message><source>Limit Time</source><translation>限制运行时间</translation></message>
 	<message><source>Limit Count</source><translation>限制挑战次数</translation></message>
-	<message><source>limit_time_help</source><translation>单位秒</translation></message>
-	<message><source>limit_count_help</source><translation>两个限制需要同时设置,最先达到就会退出</translation></message>
+	<message><source>limit_time_help</source><translation>时间格式:"[days] [hours]:[minutes]:[seconds]"
+注意天数和小时之间有一个空格,不按照格式输入会无法正确设置</translation></message>
+	<message><source>limit_count_help</source><translation>两个限制需要同时设置,最先达到就会退出。
+建议执行时间设置成一个小时足够长,此时基于次数来判定设置为100次</translation></message>
+	<message><source>GeneralClimb</source><translation>通用爬塔</translation></message>
+	<message><source>Ap Game Max</source><translation>活动每日使用体力挑战的最大次数</translation></message>
+	<message><source>ap_game_max_help</source><translation>保持默认300即可</translation></message>
+	<message><source>ApMode</source><translation>挂体力模式</translation></message>
+	<message><source>ap_mode_help</source><translation>设置是挂活动的次数(ap_activity)还是游戏的体力(ap_game)</translation></message>
+	<message><source>Activity Toggle</source><translation>挂完活动次数后切换到体力模式</translation></message>
+	<message><source>Buy Ap Activity</source><translation>游戏体力不足是否需要话勾玉购买</translation></message>
+	<message><source>buy_ap_activity_help</source><translation>该设置只有是设定为活动次数时有效</translation></message>
+	<message><source>activity_toggle_help</source><translation>该设置只有是设定为活动次数时有效</translation></message>
 </context>
 </TS>

+ 3 - 0
module/ocr/sub_ocr.py

@@ -79,6 +79,9 @@ class Single(BaseCor):
             # 如果没有识别到,这个时候考虑到可能是竖方向的文本, 使用detect_and_ocr来进行识别
             logger.info(f"OCR {self.name}: No text detected in ROI, try to detect vertically")
             result = self.detect_and_ocr(image)
+            if not result:
+                logger.info(f"OCR {self.name}: No text detected in ROI")
+                return ""
             if result[0].ocr_text != "" and result[0].score > self.score:
                 return result[0].ocr_text
 

+ 1 - 1
script.py

@@ -445,4 +445,4 @@ if __name__ == "__main__":
     script = Script("oas1")
     # print(script.get_next_task())
     script.run("ActivityShikigami")
-    # script.run('RealmRaid')
+    # script.run('AreaBoss')

BIN
tasks/ActivityShikigami/as/as_add_max.png


BIN
tasks/ActivityShikigami/as/as_ap.png


BIN
tasks/ActivityShikigami/as/as_ap_activity.png


BIN
tasks/ActivityShikigami/as/as_buy_jade.png


BIN
tasks/ActivityShikigami/as/as_new.png


BIN
tasks/ActivityShikigami/as/as_switch.png


+ 54 - 0
tasks/ActivityShikigami/as/image.json

@@ -61,5 +61,59 @@
     "method": "Template matching",
     "threshold": 0.8,
     "description": "点击战斗"
+  },
+  {
+    "itemName": "ap",
+    "imageName": "as_ap.png",
+    "roiFront": "1126,510,27,37",
+    "roiBack": "1126,510,27,37",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "体力按钮"
+  },
+  {
+    "itemName": "ap_activity",
+    "imageName": "as_ap_activity.png",
+    "roiFront": "1125,516,27,27",
+    "roiBack": "1125,516,27,27",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "活动体力"
+  },
+  {
+    "itemName": "switch",
+    "imageName": "as_switch.png",
+    "roiFront": "1207,514,33,30",
+    "roiBack": "1207,514,33,30",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "切换按键"
+  },
+  {
+    "itemName": "buy_jade",
+    "imageName": "as_buy_jade.png",
+    "roiFront": "836,619,38,42",
+    "roiBack": "789,614,143,52",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "购买活动的体力"
+  },
+  {
+    "itemName": "add_max",
+    "imageName": "as_add_max.png",
+    "roiFront": "974,524,57,54",
+    "roiBack": "974,524,57,54",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "增加到最大"
+  },
+  {
+    "itemName": "new",
+    "imageName": "as_new.png",
+    "roiFront": "0,0,100,100",
+    "roiBack": "0,0,100,100",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
   }
 ]

+ 21 - 3
tasks/ActivityShikigami/as/ocr.json

@@ -1,11 +1,29 @@
 [
   {
-    "itemName": "number",
-    "roiFront": "1180,678,86,30",
+    "itemName": "remain_ap",
+    "roiFront": "1180,678,82,30",
     "roiBack": "1180,678,86,30",
     "mode": "DigitCounter",
     "method": "Default",
     "keyword": "",
-    "description": "Ocr-description"
+    "description": "体力的数量检测"
+  },
+  {
+    "itemName": "remain_ap_activity",
+    "roiFront": "722,23,87,34",
+    "roiBack": "722,23,96,34",
+    "mode": "DigitCounter",
+    "method": "Default",
+    "keyword": "",
+    "description": "活动体力的剩余检测"
+  },
+  {
+    "itemName": "remain_buy",
+    "roiFront": "808,531,39,42",
+    "roiBack": "808,531,39,42",
+    "mode": "DigitCounter",
+    "method": "Default",
+    "keyword": "",
+    "description": "还有多少次购买体力的机会"
   }
 ]

+ 18 - 2
tasks/ActivityShikigami/assets.py

@@ -25,10 +25,26 @@ class ActivityShikigamiAssets:
 	I_UNLOCK = RuleImage(roi_front=(796,653,27,35), roi_back=(796,653,27,35), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_unlock.png")
 	# 点击战斗 
 	I_FIRE = RuleImage(roi_front=(1140,585,75,73), roi_back=(1140,585,75,73), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_fire.png")
+	# 体力按钮 
+	I_AP = RuleImage(roi_front=(1126,510,27,37), roi_back=(1126,510,27,37), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_ap.png")
+	# 活动体力 
+	I_AP_ACTIVITY = RuleImage(roi_front=(1125,516,27,27), roi_back=(1125,516,27,27), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_ap_activity.png")
+	# 切换按键 
+	I_SWITCH = RuleImage(roi_front=(1207,514,33,30), roi_back=(1207,514,33,30), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_switch.png")
+	# 购买活动的体力 
+	I_BUY_JADE = RuleImage(roi_front=(836,619,38,42), roi_back=(789,614,143,52), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_buy_jade.png")
+	# 增加到最大 
+	I_ADD_MAX = RuleImage(roi_front=(974,524,57,54), roi_back=(974,524,57,54), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_add_max.png")
+	# description 
+	I_NEW = RuleImage(roi_front=(0,0,100,100), roi_back=(0,0,100,100), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_new.png")
 
 
 	# Ocr Rule Assets
-	# Ocr-description 
-	O_NUMBER = RuleOcr(roi=(1180,678,86,30), area=(1180,678,86,30), mode="DigitCounter", method="Default", keyword="", name="number")
+	# 体力的数量检测 
+	O_REMAIN_AP = RuleOcr(roi=(1180,678,86,30), area=(1180,678,86,30), mode="DigitCounter", method="Default", keyword="", name="remain_ap")
+	# 活动体力的剩余检测 
+	O_REMAIN_AP_ACTIVITY = RuleOcr(roi=(722,23,96,34), area=(722,23,96,34), 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")
 
 

+ 3 - 1
tasks/ActivityShikigami/config.py

@@ -7,6 +7,7 @@ from pydantic import BaseModel, Field
 from tasks.Component.GeneralBattle.config_general_battle import GeneralBattleConfig
 from tasks.Component.config_scheduler import Scheduler
 from tasks.Component.config_base import ConfigBase, TimeDelta
+from tasks.Component.BaseActivity.config_activity import GeneralClimb
 
 class ShikigamiConfig(BaseModel):
     limit_time: timedelta = Field(default=timedelta(hours=0, minutes=30, seconds=0), description='limit_time_help')
@@ -15,7 +16,8 @@ class ShikigamiConfig(BaseModel):
 
 class ActivityShikigami(ConfigBase):
     scheduler: Scheduler = Field(default_factory=Scheduler)
-    shikigami: ShikigamiConfig = Field(default_factory=ShikigamiConfig)
+    # shikigami: ShikigamiConfig = Field(default_factory=ShikigamiConfig)
+    general_climb: GeneralClimb = Field(default_factory=GeneralClimb)
     general_battle: GeneralBattleConfig = Field(default_factory=GeneralBattleConfig)
 
 

+ 70 - 5
tasks/ActivityShikigami/script_task.py

@@ -8,6 +8,7 @@ from tasks.base_task import BaseTask
 from tasks.Component.GeneralBattle.general_battle import GeneralBattle
 from tasks.AreaBoss.assets import AreaBossAssets
 from tasks.Component.BaseActivity.base_activity import BaseActivity
+from tasks.Component.BaseActivity.config_activity import ApMode
 from tasks.ActivityShikigami.assets import ActivityShikigamiAssets
 from module.logger import logger
 from module.exception import TaskEnd
@@ -18,10 +19,12 @@ class ScriptTask(BaseActivity, ActivityShikigamiAssets):
     def run(self) -> None:
 
         config = self.config.activity_shikigami
-        self.limit_time: timedelta = config.shikigami.limit_time
-        self.limit_count = config.shikigami.limit_count
+        self.limit_time: timedelta = config.general_climb.limit_time
+        self.limit_count = config.general_climb.limit_count
 
         self.home_main()
+
+        # 设定是否锁定阵容
         self.wait_until_appear(self.I_BACK_GREEN)
         if config.general_battle.lock_team_enable:
             logger.info("Lock team")
@@ -40,19 +43,39 @@ class ScriptTask(BaseActivity, ActivityShikigamiAssets):
                 if self.appear(self.I_UNLOCK):
                     break
 
+        # 选择是游戏的体力还是活动的体力
+        current_ap = config.general_climb.ap_mode
+        self.switch(current_ap)
 
-
-
+        # 流程应该是 在页面处:
+        # 1. 判定计数是否超了,时间是否超了
+        # 2. 如果是消耗活动体力,判定活动体力是否足够 如果是消耗一般的体力,判定一般体力是否足够
+        # 3. 如果开启买体力,就买体力
+        # 4. 如果开启了切换到游戏体力,就切换
         while 1:
+            # 1
             if self.limit_time is not None and self.limit_time + self.start_time < datetime.now():
                 logger.info("Time out")
                 break
             if self.current_count >= self.limit_count:
                 logger.info("Count out")
                 break
+            # 2
+            self.wait_until_appear(self.I_FIRE)
+            is_remain = self.check_ap_remain(current_ap)
+            # 如果没有剩余了且这个时候是体力,就退出活动
+            if not is_remain and current_ap == ApMode.AP_GAME:
+                logger.info("Game ap out")
+                break
+            # 如果不是那就切换到体力
+            elif not is_remain and current_ap == ApMode.AP_ACTIVITY:
+                logger.info("Activity ap out and switch to game ap")
+                current_ap = ApMode.AP_GAME
+                self.switch(current_ap)
+
 
             # 点击战斗
-            self.wait_until_appear(self.I_FIRE)
+
             logger.info("Click battle")
             while 1:
                 self.screenshot()
@@ -100,3 +123,45 @@ class ScriptTask(BaseActivity, ActivityShikigamiAssets):
             if self.appear(self.I_SHI):
                 break
 
+    def check_ap_remain(self, current_ap: ApMode) -> bool:
+        """
+        检查体力是否足够
+        :return: 如何还有体力,返回True,否则返回False
+        """
+        self.screenshot()
+        if current_ap == ApMode.AP_ACTIVITY:
+            cu, res, total = self.O_REMAIN_AP_ACTIVITY.ocr(image=self.device.image)
+            if cu == 0 and cu + res == total:
+                logger.warning("Activity ap not enough")
+                return False
+            return True
+
+        elif current_ap == ApMode.AP_GAME:
+            cu, res, total = self.O_REMAIN_AP.ocr(image=self.device.image)
+            if cu == total and cu + res == total:
+                logger.warning("Game ap not enough")
+                return False
+            return True
+
+    def switch(self, current_ap: ApMode) -> None:
+        """
+        切换体力
+        :param current_ap:
+        :return:
+        """
+        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(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)

+ 30 - 0
tasks/Component/BaseActivity/config_activity.py

@@ -0,0 +1,30 @@
+# This Python file uses the following encoding: utf-8
+# @author runhey
+# github https://github.com/runhey
+from datetime import time, timedelta
+from pydantic import BaseModel, Field
+from enum import Enum
+
+from tasks.Component.config_base import ConfigBase, TimeDelta
+
+class ApMode(str, Enum):
+    AP_ACTIVITY = 'ap_activity'
+    AP_GAME = 'ap_game'
+
+
+class GeneralClimb(ConfigBase):
+    # 限制执行的时间
+    limit_time: TimeDelta = Field(default=TimeDelta(hours=1), description='limit_time_help')
+    # 限制执行的次数
+    limit_count: int = Field(default=50, description='limit_count_help')
+    # 每日使用体力挑战的最大次数,默认是300
+    ap_game_max: int = Field(default=300, description='ap_game_max_help')
+    # 爬塔活动挂活动的体力还是游戏的体力
+    ap_mode: ApMode = Field(default=ApMode.AP_ACTIVITY, description='ap_mode_help')
+    # 游戏体力不足是否需要话勾玉购买
+    # buy_ap_activity: bool = Field(default=False, description='buy_ap_activity_help')  # 该功能已经废弃
+    # 如果挂完的活动的体力,是不是需要挂游戏的体力
+    # 在我的设计理念中:活动体力>游戏体力。所以不提供从300挂满然后才到挂活动币
+    activity_toggle: bool = Field(default=False, description='activity_toggle_help')
+
+

BIN
tasks/GlobalGame/gg/gg_accept.png


+ 1 - 1
tasks/RealmRaid/assets.py

@@ -53,6 +53,6 @@ class RealmRaidAssets:
 	# 刷新的时间 
 	O_FRESH_TIME = RuleOcr(roi=(1042,582,85,36), area=(0,0,100,100), mode="Duration", method="Default", keyword="", name="fresh_time")
 	# 右上角 突破卷的数量 
-	O_NUMBER = RuleOcr(roi=(1139,13,91,39), area=(0,0,100,100), mode="DigitCounter", method="Default", keyword="", name="number")
+	O_NUMBER = RuleOcr(roi=(1143,13,80,39), area=(0,0,100,100), mode="DigitCounter", method="Default", keyword="", name="number")
 
 

+ 1 - 1
tasks/RealmRaid/res/ocr.json

@@ -10,7 +10,7 @@
   },
   {
     "itemName": "number",
-    "roiFront": "1139,13,91,39",
+    "roiFront": "1143,13,80,39",
     "roiBack": "0,0,100,100",
     "mode": "DigitCounter",
     "method": "Default",

+ 1 - 0
tasks/RealmRaid/script_task.py

@@ -87,6 +87,7 @@ class ScriptTask(GeneralBattle, GameUi, RealmRaidAssets):
         如果没有票了,那么就返回False
         :return:
         """
+        self.wait_until_appear(self.I_BACK_RED)
         self.screenshot()
         cu, res, total = self.O_NUMBER.ocr(self.device.image)
         if cu == 0 and cu+res == total:

+ 3 - 3
tasks/base_task.py

@@ -69,7 +69,7 @@ class BaseTask(GlobalGameAssets):
                 # 如果是接受邀请
                 logger.info(f"Accept friend invitation")
                 while 1:
-                    if self.appear_then_click(self.I_ACCEPT):
+                    if self.appear_then_click(self.I_ACCEPT, interval=1):
                         continue
                     if not self.appear(self.I_ACCEPT):
                         break
@@ -77,7 +77,7 @@ class BaseTask(GlobalGameAssets):
             elif invite and self.config.global_game.emergency.friend_invitation == FriendInvitation.REJECT:
                 logger.info(f"Reject friend invitation")
                 while 1:
-                    if self.appear_then_click(self.I_REJECT):
+                    if self.appear_then_click(self.I_REJECT, interval=1):
                         continue
                     if not self.appear(self.I_REJECT):
                         break
@@ -85,7 +85,7 @@ class BaseTask(GlobalGameAssets):
             elif invite and self.config.global_game.emergency.friend_invitation == FriendInvitation.ONLY_JADE:
                 logger.info(f"Accept jade invitation")
                 while 1:
-                    if self.appear_then_click(self.I_ACCEPT):
+                    if self.appear_then_click(self.I_ACCEPT, interval=1):
                         continue
                     if not self.appear(self.I_ACCEPT):
                         break