Automated PR 2026.05.22

assets/i18n/zh-CN.json

@@ -9,6 +9,7 @@
   "costume_shikigami_7": "赤溟幽界",
   "costume_shikigami_8": "童梦基地",
   "costume_shikigami_9": "眠鹿之森",
+  "costume_shikigami_10": "今宵胧明",
   "costume_carpbanner_type": "鲤鱼旗皮肤",
   "costume_carpbanner_default": "吉鲤游风",
   "costume_carpbanner_1": "无垢莲台",

tasks/Component/Costume/config.py

@@ -48,7 +48,8 @@ class ShikigamiType(str, Enum):
     COSTUME_SHIKIGAMI_6 = 'costume_shikigami_6'  # 月下火舞
     COSTUME_SHIKIGAMI_7 = 'costume_shikigami_7'  # 赤溟幽界
     COSTUME_SHIKIGAMI_8 = 'costume_shikigami_8'  # 童梦基地
-    COSTUME_SHIKIGAMI_9 = 'costume_shikigami_9'  # 眠鹿之森
+    COSTUME_SHIKIGAMI_9 = 'costume_shikigami_9'  # 鹿眠之森
+    COSTUME_SHIKIGAMI_10 = 'costume_shikigami_10'  # 今宵胧明
 
 # 签到主题
 class SignType(str, Enum):

tasks/Component/Costume/costume_base.py

@@ -77,7 +77,7 @@
         'I_ST_SOULS': f'I_ST_SOULS_{i}',
         'I_ST_REPLACE': f'I_ST_REPLACE_{i}',
     }
-    for i in range(1, 10)  # 目前支持 COSTUME_SHIKIGAMI_1 到 COSTUME_SHIKIGAMI_9
+    for i in range(1, 11)  # 目前支持 COSTUME_SHIKIGAMI_1 到 COSTUME_SHIKIGAMI_10
 }
 
 class CostumeBase:

tasks/Component/CostumeShikigami/assets.py

@@ -53,6 +53,49 @@ class CostumeShikigamiAssets:
 	I_ST_REPLACE_1 = RuleImage(roi_front=(856,170,100,100), roi_back=(856,170,100,100), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk1/sk1_st_replace_1.png")
 
 
+	# Image Rule Assets
+	# 用于判断在式神录 
+	I_CHECK_RECORDS_10 = RuleImage(roi_front=(276,79,34,36), roi_back=(265,71,60,50), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk10/sk10_check_records_10.png")
+	# 退出式神录 
+	I_RECORD_SOUL_BACK_10 = RuleImage(roi_front=(19,9,51,44), roi_back=(19,9,51,44), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk10/sk10_record_soul_back_10.png")
+	# 预设 
+	I_SOUL_PRESET_10 = RuleImage(roi_front=(342,82,73,36), roi_back=(310,57,169,72), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk10/sk10_soul_preset_10.png")
+	# 第一组切换 
+	I_SOU_SWITCH_1_10 = RuleImage(roi_front=(979,141,25,27), roi_back=(960,131,60,50), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk10/sk10_sou_switch_1_10.png")
+	# 第二组切换 
+	I_SOU_SWITCH_2_10 = RuleImage(roi_front=(980,296,25,27), roi_back=(960,285,60,50), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk10/sk10_sou_switch_2_10.png")
+	# 第三组切换 
+	I_SOU_SWITCH_3_10 = RuleImage(roi_front=(980,450,25,27), roi_back=(960,442,60,50), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk10/sk10_sou_switch_3_10.png")
+	# 第四组切换 
+	I_SOU_SWITCH_4_10 = RuleImage(roi_front=(979,602,25,27), roi_back=(960,592,60,50), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk10/sk10_sou_switch_4_10.png")
+	# 确认切换 
+	I_SOU_SWITCH_SURE_10 = RuleImage(roi_front=(669,401,190,61), roi_back=(669,401,190,61), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk10/sk10_sou_switch_sure_10.png")
+	# 用于判断是否在式神录里面 
+	I_SOU_CHECK_IN_10 = RuleImage(roi_front=(277,79,34,36), roi_back=(265,71,60,50), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk10/sk10_sou_check_in_10.png")
+	# 检查是否为第一组 
+	I_SOU_CHECK_GROUP_1_10 = RuleImage(roi_front=(1096,80,25,56), roi_back=(1096,80,25,56), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk10/sk10_sou_check_group_1_10.png")
+	# 检查是否为第二组 
+	I_SOU_CHECK_GROUP_2_10 = RuleImage(roi_front=(1098,150,25,60), roi_back=(1098,150,25,60), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk10/sk10_sou_check_group_2_10.png")
+	# 检查是否为第三组 
+	I_SOU_CHECK_GROUP_3_10 = RuleImage(roi_front=(1096,219,25,60), roi_back=(1096,219,25,60), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk10/sk10_sou_check_group_3_10.png")
+	# 检查是否为第四组 
+	I_SOU_CHECK_GROUP_4_10 = RuleImage(roi_front=(1096,288,25,60), roi_back=(1096,288,25,60), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk10/sk10_sou_check_group_4_10.png")
+	# 检查是否为第五组 
+	I_SOU_CHECK_GROUP_5_10 = RuleImage(roi_front=(1096,356,25,60), roi_back=(1096,356,25,60), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk10/sk10_sou_check_group_5_10.png")
+	# 检查是否为第六组 
+	I_SOU_CHECK_GROUP_6_10 = RuleImage(roi_front=(1094,428,25,60), roi_back=(1094,428,25,60), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk10/sk10_sou_check_group_6_10.png")
+	# 检查是否为第七组 
+	I_SOU_CHECK_GROUP_7_10 = RuleImage(roi_front=(1095,496,25,60), roi_back=(1095,496,25,60), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk10/sk10_sou_check_group_7_10.png")
+	# 匹配队伍预设 
+	I_SOU_TEAM_PRESENT_10 = RuleImage(roi_front=(720,76,112,35), roi_back=(706,69,175,63), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk10/sk10_sou_team_present_10.png")
+	# 需要切换的预设按钮(颜色深一点) 
+	I_SOU_CLICK_PRESENT_10 = RuleImage(roi_front=(980,294,25,27), roi_back=(965,132,49,500), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk10/sk10_sou_click_present_10.png")
+	# 选中的御魂 
+	I_ST_SOULS_10 = RuleImage(roi_front=(1196,234,33,65), roi_back=(1170,220,70,90), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk10/sk10_st_souls_10.png")
+	# 更换 
+	I_ST_REPLACE_10 = RuleImage(roi_front=(878,224,63,39), roi_back=(855,175,110,130), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk10/sk10_st_replace_10.png")
+
+
 	# Image Rule Assets
 	# 用于判断在式神录 
 	I_CHECK_RECORDS_2 = RuleImage(roi_front=(267,76,51,46), roi_back=(265,74,55,50), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeShikigami/sk2/sk2_check_records_2.png")

tasks/Component/CostumeShikigami/sk10/image.json

@@ -0,0 +1,182 @@
+[
+  {
+    "itemName": "check_records_10",
+    "imageName": "sk10_check_records_10.png",
+    "roiFront": "276,79,34,36",
+    "roiBack": "265,71,60,50",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "用于判断在式神录"
+  },
+  {
+    "itemName": "record_soul_back_10",
+    "imageName": "sk10_record_soul_back_10.png",
+    "roiFront": "19,9,51,44",
+    "roiBack": "19,9,51,44",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "退出式神录"
+  },
+  {
+    "itemName": "soul_preset_10",
+    "imageName": "sk10_soul_preset_10.png",
+    "roiFront": "342,82,73,36",
+    "roiBack": "310,57,169,72",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "预设"
+  },
+  {
+    "itemName": "sou_switch_1_10",
+    "imageName": "sk10_sou_switch_1_10.png",
+    "roiFront": "979,141,25,27",
+    "roiBack": "960,131,60,50",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "第一组切换"
+  },
+  {
+    "itemName": "sou_switch_2_10",
+    "imageName": "sk10_sou_switch_2_10.png",
+    "roiFront": "980,296,25,27",
+    "roiBack": "960,285,60,50",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "第二组切换"
+  },
+  {
+    "itemName": "sou_switch_3_10",
+    "imageName": "sk10_sou_switch_3_10.png",
+    "roiFront": "980,450,25,27",
+    "roiBack": "960,442,60,50",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "第三组切换"
+  },
+  {
+    "itemName": "sou_switch_4_10",
+    "imageName": "sk10_sou_switch_4_10.png",
+    "roiFront": "979,602,25,27",
+    "roiBack": "960,592,60,50",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "第四组切换"
+  },
+  {
+    "itemName": "sou_switch_sure_10",
+    "imageName": "sk10_sou_switch_sure_10.png",
+    "roiFront": "669,401,190,61",
+    "roiBack": "669,401,190,61",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "确认切换"
+  },
+  {
+    "itemName": "sou_check_in_10",
+    "imageName": "sk10_sou_check_in_10.png",
+    "roiFront": "277,79,34,36",
+    "roiBack": "265,71,60,50",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "用于判断是否在式神录里面"
+  },
+  {
+    "itemName": "sou_check_group_1_10",
+    "imageName": "sk10_sou_check_group_1_10.png",
+    "roiFront": "1096,80,25,56",
+    "roiBack": "1096,80,25,56",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "检查是否为第一组"
+  },
+  {
+    "itemName": "sou_check_group_2_10",
+    "imageName": "sk10_sou_check_group_2_10.png",
+    "roiFront": "1098,150,25,60",
+    "roiBack": "1098,150,25,60",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "检查是否为第二组"
+  },
+  {
+    "itemName": "sou_check_group_3_10",
+    "imageName": "sk10_sou_check_group_3_10.png",
+    "roiFront": "1096,219,25,60",
+    "roiBack": "1096,219,25,60",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "检查是否为第三组"
+  },
+  {
+    "itemName": "sou_check_group_4_10",
+    "imageName": "sk10_sou_check_group_4_10.png",
+    "roiFront": "1096,288,25,60",
+    "roiBack": "1096,288,25,60",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "检查是否为第四组"
+  },
+  {
+    "itemName": "sou_check_group_5_10",
+    "imageName": "sk10_sou_check_group_5_10.png",
+    "roiFront": "1096,356,25,60",
+    "roiBack": "1096,356,25,60",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "检查是否为第五组"
+  },
+  {
+    "itemName": "sou_check_group_6_10",
+    "imageName": "sk10_sou_check_group_6_10.png",
+    "roiFront": "1094,428,25,60",
+    "roiBack": "1094,428,25,60",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "检查是否为第六组"
+  },
+  {
+    "itemName": "sou_check_group_7_10",
+    "imageName": "sk10_sou_check_group_7_10.png",
+    "roiFront": "1095,496,25,60",
+    "roiBack": "1095,496,25,60",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "检查是否为第七组"
+  },
+  {
+    "itemName": "sou_team_present_10",
+    "imageName": "sk10_sou_team_present_10.png",
+    "roiFront": "720,76,112,35",
+    "roiBack": "706,69,175,63",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "匹配队伍预设"
+  },
+  {
+    "itemName": "sou_click_present_10",
+    "imageName": "sk10_sou_click_present_10.png",
+    "roiFront": "980,294,25,27",
+    "roiBack": "965,132,49,500",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "需要切换的预设按钮(颜色深一点)"
+  },
+  {
+    "itemName": "st_souls_10",
+    "imageName": "sk10_st_souls_10.png",
+    "roiFront": "1196,234,33,65",
+    "roiBack": "1170,220,70,90",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "选中的御魂"
+  },
+  {
+    "itemName": "st_replace_10",
+    "imageName": "sk10_st_replace_10.png",
+    "roiFront": "878,224,63,39",
+    "roiBack": "855,175,110,130",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "更换"
+  }
+]

tasks/DemonEncounter/config.py

@@ -45,8 +45,7 @@ class DemonConfig(BaseModel):
         description="通过预设名称来匹配普通封魔御魂分组\n例如=> 逢魔之时,歌(中间的是英文逗号)",
     )
     # 周一
-    demon_kiryou_utahime: str = Field(default="group,team", description="鬼灵歌姬御魂1")
-    demon_kiryou_utahime_supplementary: str = Field(default="group,team", description="鬼灵歌姬御魂补充")
+    demon_kiryou_utahime: str = Field(default="group,team", description="鬼灵歌姬御魂")
     # 周二
     demon_shinkirou: str = Field(default="group,team", description="蜃气楼御魂")
     # 周三 土蜘蛛
@@ -67,17 +66,16 @@ class BestDemonConfig(BaseModel):
         default=False,
         description="通过预设名称来匹配极封魔御魂分组\n例如=> 逢魔之时,歌(中间的是英文逗号)",
     )
-    best_demon_kiryou_utahime: str = Field(default="group,team", description="极鬼灵歌姬御魂1")
-    best_demon_kiryou_utahime_supplementary: str = Field(default="group,team", description="极鬼灵歌姬御魂补充")
+    best_demon_kiryou_utahime: str = Field(default="group,team", description="极鬼灵歌姬御魂")
     best_demon_shinkirou: str = Field(default="group,team", description="极蜃气楼御魂")
     best_demon_tsuchigumo: str = Field(default="group,team", description="极土蜘蛛御魂")
     best_demon_gashadokuro: str = Field(default="group,team", description="极荒骷髅御魂")
     best_demon_namazu: str = Field(default="group,team", description="极地震鲇御魂")
     best_demon_oboroguruma: str = Field(default="group,team", description="极胧车御魂")
     best_demon_nightly_aramitamau: str = Field(default="group,team", description="极夜荒魂御魂")
 
-    hide_fields = dynamic_hide('best_demon_kiryou_utahime', 'best_demon_kiryou_utahime_supplementary',
-                               'best_demon_oboroguruma', 'best_demon_nightly_aramitamau')
+    hide_fields = dynamic_hide('best_demon_kiryou_utahime', 'best_demon_oboroguruma',
+                               'best_demon_nightly_aramitamau')
 
 
 def convert_to_general_battle_config(boss_type: str, demon_battle_conf: 'DemonBattleConfig' = None,

tasks/DemonEncounter/script_task.py

@@ -65,12 +65,8 @@ def checkout_soul(self):
             group, team = getattr(self.conf.demon_soul_config, self.boss_type).split(",")
         if group and team:
             self.run_switch_soul_by_name(group, team)
-            if datetime.now().weekday() == 0:
-                if select_best_demon:
-                    group, team = getattr(self.conf.best_demon_soul_config, f'{self.boss_type}_supplementary').split(",")
-                else:
-                    group, team = getattr(self.conf.demon_soul_config, f'{self.boss_type}_supplementary').split(",")
-                self.run_switch_soul_by_name(group, team)
+            return
+        logger.error(f'Unknown switch soul conf: group[{group}], team[{team}]')
 
     def execute_boss(self):
         """

tasks/GameUi/additional/guild.json

@@ -0,0 +1,11 @@
+[
+  {
+    "itemName": "close_chat_window",
+    "imageName": "additional_close_chat_window.png",
+    "roiFront": "653,397,18,18",
+    "roiBack": "653,397,18,18",
+    "method": "Template matching",
+    "threshold": 0.91,
+    "description": "关闭聊天窗口"
+  }
+]

tasks/GameUi/assets.py

@@ -24,6 +24,11 @@ class GameUiAssets:
 	O_CLICK_CLOSE_2 = RuleOcr(roi=(508,584,214,40), area=(508,584,214,40), mode="Single", method="Default", keyword="点击空白处关闭弹窗", name="click_close_2")
 
 
+	# Image Rule Assets
+	# 关闭聊天窗口 
+	I_CLOSE_CHAT_WINDOW = RuleImage(roi_front=(653,397,18,18), roi_back=(653,397,18,18), threshold=0.91, method="Template matching", file="./tasks/GameUi/additional/additional_close_chat_window.png")
+
+
 	# Image Rule Assets
 	# 商店弹窗红色关闭 
 	I_AD_CLOSE_RED = RuleImage(roi_front=(993,130,33,36), roi_back=(953,91,215,121), threshold=0.8, method="Template matching", file="./tasks/GameUi/additional/additional_ad_close_red.png")
@@ -172,7 +177,7 @@ class GameUiAssets:
 	# description 
 	I_CHECK_TEAM = RuleImage(roi_front=(32,585,82,90), roi_back=(32,585,82,90), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_check_team.png")
 	# description 
-	I_CHECK_COLLECTION = RuleImage(roi_front=(380,620,100,100), roi_back=(380,620,100,100), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_check_collection.png")
+	I_CHECK_COLLECTION = RuleImage(roi_front=(579,639,63,65), roi_back=(118,626,1162,94), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_check_collection.png")
 	# description 
 	I_BACK_Y = RuleImage(roi_front=(15,4,57,52), roi_back=(1,2,100,91), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_back_y.png")
 	# description 

tasks/GameUi/game_ui.py

@@ -353,9 +353,13 @@ def appear_then_operate(self, target: RuleList | RuleImage | RuleGif | RuleOcr |
 if __name__ == '__main__':
     from module.config.config import Config
     from module.device.device import Device
+    from tasks.GameUi.page import page_guild
 
-    c = Config('oas2')
+    c = Config('oas1')
     d = Device(c)
     game = GameUi(config=c, device=d)
-    game.ui_get_current_page()
-    game.ui_goto(page_main)
+    for i in range(10):
+        game.ui_get_current_page()
+        game.ui_goto(page_guild)
+        game.ui_get_current_page()
+        game.ui_goto(page_main)

tasks/GameUi/page.py

@@ -54,7 +54,8 @@ def link(self, button, destination):
 # Main Home 主页
 page_main = Page(G.I_CHECK_MAIN)
 page_main.additional = [G.I_AD_CLOSE_RED, G.I_BACK_FRIENDS, RestartAssets.I_CANCEL_BATTLE,
-                        [RestartAssets.I_LOGIN_COURTYARD, RestartAssets.C_LOGIN_SCROLL_CLOSE_AREA]]
+                        [RestartAssets.I_LOGIN_COURTYARD, RestartAssets.C_LOGIN_SCROLL_CLOSE_AREA,
+                         G.I_CLOSE_CHAT_WINDOW]]
 # 召唤summon
 page_summon = Page(G.I_CHECK_SUMMON)
 page_summon.link(button=G.I_SUMMON_GOTO_MAIN, destination=page_main)
@@ -181,7 +182,7 @@ def link(self, button, destination):
 page_main.link(button=G.I_MAIN_GOTO_MALL, destination=page_mall)
 # 阴阳寮 guild
 page_guild = Page(G.I_CHECK_GUILD)
-page_guild.additional = [KekkaiUtilizeAssets.I_PLANT_TREE_CLOSE]
+page_guild.additional = [KekkaiUtilizeAssets.I_PLANT_TREE_CLOSE, G.I_CLOSE_CHAT_WINDOW]
 page_guild.link(button=G.I_BACK_Y, destination=page_main)
 page_main.link(button=G.I_MAIN_GOTO_GUILD, destination=page_guild)
 # 组队 team

tasks/GameUi/page/page_img_3.json

@@ -137,8 +137,8 @@
   {
     "itemName": "check_collection",
     "imageName": "page_check_collection.png",
-    "roiFront": "380,620,100,100",
-    "roiBack": "380,620,100,100",
+    "roiFront": "579,639,63,65",
+    "roiBack": "118,626,1162,94",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"