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

Merge pull request #1457 from LGG686/dev

feat: 添加寮活动监控,解决部分寮活动开启时间不定
huangrunheng 8 месяцев назад
Родитель
Сommit
22c455ae9c

+ 4 - 0
assets/i18n/zh-CN.json

@@ -11,10 +11,14 @@
   "costume_carpbanner_default": "吉鲤游风",
   "costume_carpbanner_default": "吉鲤游风",
   "costume_carpbanner_1": "无垢莲台",
   "costume_carpbanner_1": "无垢莲台",
   "costume_carpbanner_2": "萤灯月夜",
   "costume_carpbanner_2": "萤灯月夜",
+  "costume_carpbanner_3": "鸢戏游鲤",
   "costume_carpbanner_type_help": "多数结界通用",
   "costume_carpbanner_type_help": "多数结界通用",
   "costume_battle_10": "流焰蝶舞",
   "costume_battle_10": "流焰蝶舞",
   "costume_battle_11": "辰烁奇夜",
   "costume_battle_11": "辰烁奇夜",
   "enable_courtyard_affairs": "庭院事务",
   "enable_courtyard_affairs": "庭院事务",
+  "GuildActivityMonitor": "寮活动监控",
+  "guild_activity_monitor_combat_time": "监控时间设置",
+  "guild_activity": "监控活动",
   "AutoCheckinBigGod": "大神签到",
   "AutoCheckinBigGod": "大神签到",
   "auto_checkin_big_god": "大神签到",
   "auto_checkin_big_god": "大神签到",
   "checkin_config": "签到配置",
   "checkin_config": "签到配置",

+ 1 - 1
module/config/config_manual.py

@@ -11,7 +11,7 @@ class ConfigManual:
         Restart > SoulsTidy
         Restart > SoulsTidy
         > KekkaiUtilize > KekkaiActivation > DemonEncounter
         > KekkaiUtilize > KekkaiActivation > DemonEncounter
         > AreaBoss > GoldYoukai > ExperienceYoukai > Nian > Tako > AutoCheckinBigGod > RealmRaid > RyouToppa > DailyTrifles > Exploration
         > AreaBoss > GoldYoukai > ExperienceYoukai > Nian > Tako > AutoCheckinBigGod > RealmRaid > RyouToppa > DailyTrifles > Exploration
-        > Dokan > AbyssShadows > Hunt > GuildBanquet > DemonRetreat
+        > Dokan > AbyssShadows > Hunt > GuildBanquet > DemonRetreat > GuildActivityMonitor
         > Orochi > OrochiMoans > OrochiJudgement > Sougenbi > FallenSun > EternitySea > SixRealms
         > Orochi > OrochiMoans > OrochiJudgement > Sougenbi > FallenSun > EternitySea > SixRealms
         > ActivityShikigami > WantedQuests
         > ActivityShikigami > WantedQuests
         > BondlingFairyland > EvoZone > GoryouRealm > HeroTest
         > BondlingFairyland > EvoZone > GoryouRealm > HeroTest

+ 2 - 2
module/config/config_menu.py

@@ -37,7 +37,7 @@ class ConfigMenu:
         ]
         ]
         # 阴阳寮
         # 阴阳寮
         self.menu["Guild"] = ['KekkaiUtilize', 'KekkaiActivation', 'RealmRaid', 'RyouToppa', 'Dokan', 'CollectiveMissions',
         self.menu["Guild"] = ['KekkaiUtilize', 'KekkaiActivation', 'RealmRaid', 'RyouToppa', 'Dokan', 'CollectiveMissions',
-                              'Hunt' , 'AbyssShadows', 'GuildBanquet', 'DemonRetreat']
+                              'Hunt' , 'AbyssShadows', 'GuildBanquet', 'DemonRetreat', 'GuildActivityMonitor']
         # 每周任务
         # 每周任务
         self.menu["Weekly Task"] = ['TrueOrochi', 'RichMan', 'Secret', 'WeeklyTrifles', 'MysteryShop', 'Duel']
         self.menu["Weekly Task"] = ['TrueOrochi', 'RichMan', 'Secret', 'WeeklyTrifles', 'MysteryShop', 'Duel']
         # 活动的任务
         # 活动的任务
@@ -65,4 +65,4 @@ if __name__ == "__main__":
         m = ConfigMenu()
         m = ConfigMenu()
         print(m.gui_menu)
         print(m.gui_menu)
     except:
     except:
-        print('weih')
+        print('weih')

+ 3 - 0
module/config/config_model.py

@@ -1,6 +1,7 @@
 # This Python file uses the following encoding: utf-8
 # This Python file uses the following encoding: utf-8
 # @author runhey
 # @author runhey
 # github https://github.com/runhey
 # github https://github.com/runhey
+from tasks.GuildActivityMonitor.config import GuildActivityMonitor
 from typing import Dict, Any
 from typing import Dict, Any
 
 
 import re
 import re
@@ -49,6 +50,7 @@ from tasks.Hunt.config import Hunt
 from tasks.AbyssShadows.config import AbyssShadows
 from tasks.AbyssShadows.config import AbyssShadows
 from tasks.GuildBanquet.config import GuildBanquet
 from tasks.GuildBanquet.config import GuildBanquet
 from tasks.DemonRetreat.config import DemonRetreat
 from tasks.DemonRetreat.config import DemonRetreat
+from tasks.GuildActivityMonitor.config import GuildActivityMonitor
 
 
 # 这一部分是活动的配置-----------------------------------------------------------------------------------------------------
 # 这一部分是活动的配置-----------------------------------------------------------------------------------------------------
 from tasks.ActivityShikigami.config import ActivityShikigami
 from tasks.ActivityShikigami.config import ActivityShikigami
@@ -147,6 +149,7 @@ class ConfigModel(ConfigBase):
     abyss_shadows: AbyssShadows = Field(default_factory=AbyssShadows)
     abyss_shadows: AbyssShadows = Field(default_factory=AbyssShadows)
     guild_banquet: GuildBanquet = Field(default_factory=GuildBanquet)
     guild_banquet: GuildBanquet = Field(default_factory=GuildBanquet)
     demon_retreat: DemonRetreat = Field(default_factory=DemonRetreat)
     demon_retreat: DemonRetreat = Field(default_factory=DemonRetreat)
+    guild_activity_monitor: GuildActivityMonitor = Field(default_factory=GuildActivityMonitor)
 
 
     def __init__(self, config_name: str=None) -> None:
     def __init__(self, config_name: str=None) -> None:
         """
         """

+ 1 - 0
tasks/Component/Costume/config.py

@@ -31,6 +31,7 @@ class CarpBannerType(str, Enum):
     COSTUME_CARPBANNER_DEFAULT = 'costume_carpbanner_default'  # 吉鲤游风
     COSTUME_CARPBANNER_DEFAULT = 'costume_carpbanner_default'  # 吉鲤游风
     COSTUME_CARPBANNER_1 = 'costume_carpbanner_1'  # 无垢莲台
     COSTUME_CARPBANNER_1 = 'costume_carpbanner_1'  # 无垢莲台
     COSTUME_CARPBANNER_2 = 'costume_carpbanner_2'  # 萤灯月夜
     COSTUME_CARPBANNER_2 = 'costume_carpbanner_2'  # 萤灯月夜
+    COSTUME_CARPBANNER_3 = 'costume_carpbanner_3'  # 鸢戏游鲤
 
 
 # 主题,就是庭院最右下角的展开按钮
 # 主题,就是庭院最右下角的展开按钮
 class ThemeType(str, Enum):
 class ThemeType(str, Enum):

+ 1 - 1
tasks/Component/Costume/costume_base.py

@@ -31,7 +31,7 @@ carpbanner_costume_model = {
         'I_SHI_CARD': f'I_SHI_CARD_{i}',
         'I_SHI_CARD': f'I_SHI_CARD_{i}',
         'I_SHI_DEFENSE': f'I_SHI_DEFENSE_{i}',
         'I_SHI_DEFENSE': f'I_SHI_DEFENSE_{i}',
         'I_SHI_GROWN': f'I_SHI_GROWN_{i}',
         'I_SHI_GROWN': f'I_SHI_GROWN_{i}',
-    } for i in range(1, 3)
+    } for i in range(1, 4)
 }
 }
 
 
 
 

+ 9 - 0
tasks/Component/CostumeCarpBanner/assets.py

@@ -28,3 +28,12 @@ class CostumeCarpBannerAssets:
 	I_SHI_DEFENSE_2 = RuleImage(roi_front=(287,343,19,38), roi_back=(178,209,261,274), threshold=0.5, method="Template matching", file="./tasks/Component/CostumeCarpBanner/cb2/cb2_shi_defense_2.png")
 	I_SHI_DEFENSE_2 = RuleImage(roi_front=(287,343,19,38), roi_back=(178,209,261,274), threshold=0.5, method="Template matching", file="./tasks/Component/CostumeCarpBanner/cb2/cb2_shi_defense_2.png")
 
 
 
 
+	# Image Rule Assets
+	# 育成 
+	I_SHI_GROWN_3 = RuleImage(roi_front=(600,277,19,34), roi_back=(519,212,220,281), threshold=0.5, method="Template matching", file="./tasks/Component/CostumeCarpBanner/cb3/cb3_shi_grown_3.png")
+	# 结界卡 
+	I_SHI_CARD_3 = RuleImage(roi_front=(899,281,21,40), roi_back=(823,210,252,297), threshold=0.5, method="Template matching", file="./tasks/Component/CostumeCarpBanner/cb3/cb3_shi_card_3.png")
+	# 防守 
+	I_SHI_DEFENSE_3 = RuleImage(roi_front=(298,279,19,38), roi_back=(178,209,261,274), threshold=0.5, method="Template matching", file="./tasks/Component/CostumeCarpBanner/cb3/cb3_shi_defense_3.png")
+
+

BIN
tasks/Component/CostumeCarpBanner/cb3/cb3_shi_card_3.png


BIN
tasks/Component/CostumeCarpBanner/cb3/cb3_shi_defense_3.png


BIN
tasks/Component/CostumeCarpBanner/cb3/cb3_shi_grown_3.png


+ 29 - 0
tasks/Component/CostumeCarpBanner/cb3/image.json

@@ -0,0 +1,29 @@
+[
+  {
+    "itemName": "shi_grown_3",
+    "imageName": "cb3_shi_grown_3.png",
+    "roiFront": "600,277,19,34",
+    "roiBack": "519,212,220,281",
+    "method": "Template matching",
+    "threshold": 0.5,
+    "description": "育成"
+  },
+  {
+    "itemName": "shi_card_3",
+    "imageName": "cb3_shi_card_3.png",
+    "roiFront": "899,281,21,40",
+    "roiBack": "823,210,252,297",
+    "method": "Template matching",
+    "threshold": 0.5,
+    "description": "结界卡"
+  },
+  {
+    "itemName": "shi_defense_3",
+    "imageName": "cb3_shi_defense_3.png",
+    "roiFront": "298,279,19,38",
+    "roiBack": "178,209,261,274",
+    "method": "Template matching",
+    "threshold": 0.5,
+    "description": "防守"
+  }
+]

+ 12 - 0
tasks/GuildActivityMonitor/assets.py

@@ -0,0 +1,12 @@
+from module.atom.image import RuleImage
+from module.atom.click import RuleClick
+from module.atom.long_click import RuleLongClick
+from module.atom.swipe import RuleSwipe
+from module.atom.ocr import RuleOcr
+from module.atom.list import RuleList
+
+# This file was automatically generated by ./dev_tools/assets_extract.py.
+# Don't modify it manually.
+class GuildActivityMonitorAssets: 
+	pass
+

+ 27 - 0
tasks/GuildActivityMonitor/config.py

@@ -0,0 +1,27 @@
+from pydantic import Field
+
+from tasks.Component.config_scheduler import Scheduler
+from tasks.Component.config_base import ConfigBase
+from pydantic import BaseModel, Field
+
+class GuildActivityMonitorCombatTime(BaseModel):
+    # 设置检测时间
+    detection_interval: int = Field(default=30, description="通知检测间隔(秒)\n通过adb检测系统中收到的活动推送,自动拉起对应任务")
+    monitor_duration: int = Field(default=15, description="监控持续时间(分)\n请确保已开启游戏通知权限,游戏设置权限中对应活动推送")
+    recheck_interval: int = Field(default=5, description="拉起对应活动后,间隔多久再次开启检测(分)\n若监控时间内未检测到活动,则按调度器设置下次运行时间")
+
+class GuildActivity(BaseModel):
+    # 道馆
+    Dokan: bool = Field(default=True)
+    # 狭间
+    AbyssShadows: bool = Field(default=True)
+    # 宴会
+    GuildBanquet: bool = Field(default=True)
+    # 退治
+    DemonRetreat: bool = Field(default=True)
+
+
+class GuildActivityMonitor(ConfigBase):
+    scheduler: Scheduler = Field(default_factory=Scheduler)
+    guild_activity_monitor_combat_time: GuildActivityMonitorCombatTime = Field(default_factory=GuildActivityMonitorCombatTime)
+    guild_activity: GuildActivity = Field(default_factory=GuildActivity)

+ 134 - 0
tasks/GuildActivityMonitor/script_task.py

@@ -0,0 +1,134 @@
+import re
+import time
+from datetime import datetime, timedelta
+from module.base.timer import Timer
+from module.exception import TaskEnd
+from module.logger import logger
+from tasks.GameUi.game_ui import GameUi
+from tasks.GameUi.page import page_main
+
+
+class ScriptTask(GameUi):
+
+    def run(self):
+        """ 阴阳寮活动监控主函数
+
+        :return:
+        """
+        # 构建关键字映射
+        self.ui_get_current_page()
+        self.ui_goto(page_main)
+        guild_config = self.config.guild_activity_monitor.guild_activity
+        KEYWORD_MAP = {
+            '道馆': 'Dokan' if guild_config.Dokan else None,
+            '狭间': 'AbyssShadows' if guild_config.AbyssShadows else None,
+            '宴会': 'GuildBanquet' if guild_config.GuildBanquet else None,
+            '退治': 'DemonRetreat' if guild_config.DemonRetreat else None,
+        }
+        KEYWORD_MAP = {k: v for k, v in KEYWORD_MAP.items() if v}
+        monitored_activities = list(KEYWORD_MAP.keys())
+        logger.info(f"监控活动: {monitored_activities}")
+
+        # 初始化监控配置
+        monitor_config = self.config.guild_activity_monitor.guild_activity_monitor_combat_time
+        duration_minutes = monitor_config.monitor_duration
+        interval = monitor_config.detection_interval
+        logger.info(f"开始阴阳寮活动监控,持续{duration_minutes}分钟,每{interval}秒检测一次")
+
+        # 初始化定时器
+        check_timer = Timer(monitor_config.monitor_duration * 60)
+        check_timer.start()
+        log_timer = Timer(60)
+        log_timer.start()
+
+        # 获取初始通知时间
+        init_time, _ = self.get_notification_info()
+
+        # 主监控循环
+        while True:
+            if check_timer.reached():
+                logger.info("监控时间到,任务结束")
+                self.set_next_run(task='GuildActivityMonitor', success=True, finish=True)
+                raise TaskEnd('GuildActivityMonitor')
+
+            if log_timer.reached():
+                remaining = int(check_timer.remain() // 60)
+                logger.info(f"监控中... 剩余时间: {remaining}分钟")
+                log_timer.reset()
+
+            # 处理突发事件
+            self.screenshot()
+
+            # 检测新通知
+            current_time, notification_text = self.get_notification_info()
+            if current_time > init_time and notification_text:
+                logger.info(f"检测到新通知: {notification_text}")
+                for keyword, task_name in KEYWORD_MAP.items():
+                    if keyword in notification_text:
+                        logger.info(f"检测到关键字 '{keyword}',启动任务: {task_name}")
+                        self.set_next_run(task=task_name, success=False, finish=False, server=False, target=datetime.now())
+                        recheck_interval = monitor_config.recheck_interval
+                        self.set_next_run(task='GuildActivityMonitor', success=False, finish=False, server=False, target=datetime.now() + timedelta(minutes=recheck_interval))
+                        raise TaskEnd('GuildActivityMonitor')
+
+            time.sleep(interval)
+
+    def get_notification_info(self) -> tuple:
+        try:
+            output = self.device.adb_shell(['dumpsys', 'notification', '--noredact'])
+
+            # 改进的通知时间提取逻辑 - 只获取最新的通知
+            notification_time = 0
+            notification_text = ""
+            
+            # 使用更精确的正则表达式匹配每个通知块
+            # 查找所有通知块,每个块包含时间戳和文本
+            notification_blocks = re.findall(r'(when=(\d+)[\s\S]*?(?=when=|\Z))', output)
+            
+            if notification_blocks:
+                # 找到最新的通知块
+                latest_block_time = 0
+                latest_text = ""
+                
+                for block, time_str in notification_blocks:
+                    current_time = float(time_str)
+                    if current_time > latest_block_time:
+                        latest_block_time = current_time
+                        # 在当前块中查找活动类型
+                        if re.search(r'宴会[^\w]', block) or '寮宴会' in block:
+                            latest_text = '宴会'
+                        elif re.search(r'狭间[^\w]', block) or '狭间暗域' in block:
+                            latest_text = '狭间'
+                        elif re.search(r'退治[^\w]', block) or '首领退治' in block:
+                            latest_text = '退治'
+                        elif re.search(r'道馆[^\w]', block) or '道馆突破' in block:
+                            latest_text = '道馆'
+                
+                notification_time = latest_block_time
+                notification_text = latest_text
+
+            return notification_time, notification_text
+        except Exception as e:
+            logger.warning(f"获取通知失败: {e}")
+            return 0, ""
+
+    '''
+    def clear_notifications(self):
+        """清理系统通知"""
+        try:
+            # 清理所有通知
+            self.device.adb_shell(['cmd', 'notification', 'remove-all'])
+            logger.info("已清理系统通知")
+        except Exception as e:
+            logger.warning(f"清理通知失败: {e}")
+    '''
+
+
+if __name__ == '__main__':
+    from module.config.config import Config
+    from module.device.device import Device
+
+    c = Config('oas1')
+    d = Device(c)
+    t = ScriptTask(c, d)
+    t.run()