diff --git a/arknights_mower/data/agent.json b/arknights_mower/data/agent.json
index 17712c5d3..ea96886df 100644
--- a/arknights_mower/data/agent.json
+++ b/arknights_mower/data/agent.json
@@ -1 +1 @@
-["芬", "梅", "宴", "砾", "孑", "吽", "红", "空", "黑", "W", "夕", "林", "令", "阿", "黍", "年", "山", "陈", "锏", "煌", "夜刀", "黑角", "杜林", "香草", "翎羽", "卡缇", "斑点", "炎熔", "芙蓉", "梓兰", "夜烟", "远山", "卡达", "深靛", "布丁", "流星", "红云", "白雪", "松果", "酸糖", "铅踝", "跃跃", "讯使", "红豆", "豆苗", "杜宾", "缠丸", "霜叶", "慕斯", "刻刀", "芳汀", "石英", "暗索", "末药", "清流", "褐果", "角峰", "泡泡", "露托", "古米", "坚雷", "地灵", "伊桑", "阿消", "维荻", "云迹", "微风", "瑰盐", "凛冬", "贾维", "青枳", "红隼", "苇草", "野鬃", "极境", "万顷", "夜半", "渡桥", "晓歌", "谜图", "鞭刃", "苍苔", "医生", "炎客", "摩根", "燧石", "断崖", "烈夏", "铎铃", "柏喙", "战车", "星极", "铸铁", "赤冬", "海沫", "奥达", "蓝毒", "白金", "灰喉", "四月", "隐现", "陨星", "慑砂", "截云", "苦艾", "雪绒", "天火", "惊蛰", "星源", "蜜蜡", "寒檀", "薄绿", "和弦", "蚀清", "耶拉", "洛洛", "至简", "折光", "温米", "梅尔", "稀音", "衡沙", "赫默", "亚叶", "锡兰", "絮雨", "图耶", "桑葚", "蜜莓", "刺玫", "明椒", "莎草", "临光", "深律", "森西", "槐琥", "乌有", "裁度", "雷蛇", "深巡", "可颂", "拜松", "火神", "石棉", "暮落", "闪击", "暴雨", "灰毫", "火哨", "极光", "洋灰", "菲莱", "玫拉", "子月", "熔泉", "冰酿", "空构", "崖心", "雪雉", "杏仁", "初雪", "巫恋", "海霓", "真理", "但书", "小满", "掠风", "海蒂", "月禾", "夏栎", "凛视", "波卜", "狮蝎", "绮良", "罗宾", "霜华", "贝娜", "风丸", "双月", "锡人", "空弦", "灰烬", "鸿雪", "远牙", "早露", "提丰", "莱伊", "风笛", "嵯峨", "忍冬", "琴柳", "焰尾", "伺夜", "异客", "澄闪", "黑键", "妮芙", "灵知", "铃兰", "魔王", "白铁", "塑心", "傀影", "老鲤", "温蒂", "水月", "艾拉", "闪灵", "夜莺", "流明", "星熊", "瑕光", "泥岩", "斥罪", "森蚺", "号角", "重岳", "银灰", "棘刺", "仇白", "佩佩", "左乐", "止颂", "暴行", "空爆", "猎蜂", "杰克", "夜魔", "巡林者", "12F", "玫兰莎", "泡普卡", "米格鲁", "克洛丝", "安赛尔", "格雷伊", "杰西卡", "安比尔", "清道夫", "桃金娘", "断罪者", "罗小黑", "休谟斯", "嘉维尔", "苏苏洛", "调香师", "蛇屠箱", "深海色", "波登可", "白面鸮", "诗怀雅", "芙兰卡", "莱欧斯", "因陀罗", "达格达", "幽灵鲨", "布洛卡", "导火索", "羽毛笔", "龙舌兰", "送葬人", "奥斯塔", "阿米娅", "特米米", "爱丽丝", "戴菲恩", "阿罗玛", "特克诺", "华法琳", "哈洛德", "卡夫卡", "车尔尼", "守林人", "安哲拉", "埃拉托", "凯瑟琳", "九色鹿", "食铁兽", "见行者", "能天使", "迷迭香", "伊内丝", "刻俄柏", "逻各斯", "麦哲伦", "弑君者", "多萝西", "凯尔希", "塞雷娅", "赫德雷", "艾丽妮", "赫拉格", "帕拉斯", "玛恩纳", "月见夜", "格拉尼", "斯卡蒂", "安德切尔", "史都华德", "艾丝黛尔", "罗比菈塔", "德克萨斯", "齐尔查克", "拉普兰德", "莱恩哈特", "炎狱炎熔", "濯尘芙蓉", "普罗旺斯", "格劳克斯", "菲亚梅塔", "维什戴尔", "娜仁图亚", "推进之王", "缪尔赛思", "伊芙利特", "莫斯提马", "艾雅法拉", "霍尔海雅", "玛露西尔", "卡涅利安", "安洁莉娜", "淬羽赫默", "歌蕾蒂娅", "阿斯卡纶", "引星棘刺", "焰影苇草", "乌尔比安", "史尔特尔", "薇薇安娜", "正义骑士号", "历阵锐枪芬", "火龙S黑角", "寒芒克洛丝", "承曦格雷伊", "假日威龙陈", "浊心斯卡蒂", "麒麟R夜刀", "琳琅诗怀雅", "归溟幽灵鲨", "涤火杰西卡", "百炼嘉维尔", "耀骑士临光", "圣约送葬人", "荒芜拉普兰德", "缄默德克萨斯", "纯烬艾雅法拉", "THRM-EX", "泰拉大陆调查团", "维娜·维多利亚", "Lancet-2", "Castle-3", "PhonoR-0", "Friston-3", "U-Official"]
\ No newline at end of file
+["芬", "梅", "宴", "砾", "孑", "吽", "红", "空", "黑", "W", "夕", "林", "令", "阿", "黍", "年", "余", "山", "陈", "锏", "煌", "夜刀", "黑角", "杜林", "香草", "翎羽", "卡缇", "斑点", "炎熔", "芙蓉", "梓兰", "夜烟", "远山", "卡达", "深靛", "布丁", "流星", "红云", "白雪", "松果", "酸糖", "铅踝", "跃跃", "讯使", "红豆", "豆苗", "杜宾", "缠丸", "霜叶", "慕斯", "刻刀", "芳汀", "石英", "暗索", "末药", "清流", "褐果", "角峰", "泡泡", "露托", "古米", "坚雷", "地灵", "伊桑", "阿消", "维荻", "云迹", "微风", "瑰盐", "凛冬", "贾维", "青枳", "红隼", "苇草", "野鬃", "极境", "万顷", "夜半", "渡桥", "晓歌", "谜图", "寻澜", "鞭刃", "苍苔", "医生", "炎客", "摩根", "燧石", "断崖", "烈夏", "铎铃", "柏喙", "战车", "星极", "铸铁", "赤冬", "海沫", "奥达", "蓝毒", "白金", "灰喉", "四月", "隐现", "陨星", "慑砂", "截云", "苦艾", "雪绒", "天火", "惊蛰", "星源", "蜜蜡", "寒檀", "薄绿", "和弦", "蚀清", "耶拉", "洛洛", "至简", "折光", "温米", "梅尔", "稀音", "衡沙", "赫默", "亚叶", "锡兰", "絮雨", "图耶", "桑葚", "蜜莓", "刺玫", "明椒", "莎草", "临光", "深律", "森西", "槐琥", "乌有", "裁度", "雷蛇", "深巡", "可颂", "拜松", "火神", "石棉", "暮落", "闪击", "暴雨", "灰毫", "火哨", "极光", "洋灰", "菲莱", "玫拉", "子月", "熔泉", "冰酿", "空构", "崖心", "雪雉", "杏仁", "初雪", "巫恋", "海霓", "真理", "但书", "小满", "掠风", "海蒂", "月禾", "夏栎", "行箸", "凛视", "波卜", "狮蝎", "绮良", "罗宾", "霜华", "贝娜", "风丸", "双月", "锡人", "空弦", "灰烬", "鸿雪", "远牙", "早露", "提丰", "莱伊", "风笛", "嵯峨", "忍冬", "琴柳", "焰尾", "伺夜", "异客", "澄闪", "黑键", "妮芙", "烛煌", "灵知", "铃兰", "魔王", "白铁", "塑心", "傀影", "老鲤", "温蒂", "水月", "艾拉", "闪灵", "夜莺", "流明", "星熊", "瑕光", "泥岩", "斥罪", "森蚺", "号角", "重岳", "银灰", "棘刺", "仇白", "佩佩", "左乐", "止颂", "暴行", "空爆", "猎蜂", "杰克", "夜魔", "巡林者", "12F", "玫兰莎", "泡普卡", "米格鲁", "克洛丝", "安赛尔", "格雷伊", "杰西卡", "安比尔", "清道夫", "桃金娘", "断罪者", "罗小黑", "休谟斯", "嘉维尔", "苏苏洛", "调香师", "蛇屠箱", "深海色", "波登可", "白面鸮", "诗怀雅", "芙兰卡", "莱欧斯", "因陀罗", "达格达", "幽灵鲨", "布洛卡", "导火索", "羽毛笔", "龙舌兰", "送葬人", "奥斯塔", "阿米娅", "特米米", "爱丽丝", "戴菲恩", "阿罗玛", "特克诺", "华法琳", "哈洛德", "卡夫卡", "车尔尼", "守林人", "安哲拉", "埃拉托", "凯瑟琳", "九色鹿", "食铁兽", "见行者", "能天使", "迷迭香", "伊内丝", "刻俄柏", "逻各斯", "麦哲伦", "弑君者", "多萝西", "凯尔希", "塞雷娅", "赫德雷", "艾丽妮", "赫拉格", "帕拉斯", "玛恩纳", "月见夜", "格拉尼", "斯卡蒂", "安德切尔", "史都华德", "艾丝黛尔", "罗比菈塔", "德克萨斯", "齐尔查克", "拉普兰德", "莱恩哈特", "炎狱炎熔", "濯尘芙蓉", "普罗旺斯", "格劳克斯", "菲亚梅塔", "维什戴尔", "娜仁图亚", "推进之王", "缪尔赛思", "伊芙利特", "莫斯提马", "艾雅法拉", "霍尔海雅", "玛露西尔", "卡涅利安", "安洁莉娜", "淬羽赫默", "歌蕾蒂娅", "阿斯卡纶", "引星棘刺", "焰影苇草", "乌尔比安", "史尔特尔", "薇薇安娜", "正义骑士号", "历阵锐枪芬", "火龙S黑角", "寒芒克洛丝", "承曦格雷伊", "假日威龙陈", "浊心斯卡蒂", "麒麟R夜刀", "琳琅诗怀雅", "归溟幽灵鲨", "涤火杰西卡", "百炼嘉维尔", "耀骑士临光", "圣约送葬人", "荒芜拉普兰德", "缄默德克萨斯", "纯烬艾雅法拉", "THRM-EX", "泰拉大陆调查团", "维娜·维多利亚", "Lancet-2", "Castle-3", "PhonoR-0", "Friston-3", "U-Official"]
\ No newline at end of file
diff --git a/arknights_mower/data/agent_profession.json b/arknights_mower/data/agent_profession.json
index 8a346832a..a07e41153 100644
--- a/arknights_mower/data/agent_profession.json
+++ b/arknights_mower/data/agent_profession.json
@@ -1 +1 @@
-{"Lancet-2": "MEDIC", "Castle-3": "WARRIOR", "THRM-EX": "SPECIAL", "正义骑士号": "SNIPER", "泰拉大陆调查团": "SNIPER", "U-Official": "SUPPORT", "Friston-3": "TANK", "PhonoR-0": "SUPPORT", "夜刀": "PIONEER", "黑角": "TANK", "巡林者": "SNIPER", "杜林": "CASTER", "12F": "CASTER", "芬": "PIONEER", "香草": "PIONEER", "翎羽": "PIONEER", "玫兰莎": "WARRIOR", "泡普卡": "WARRIOR", "卡缇": "TANK", "米格鲁": "TANK", "斑点": "TANK", "克洛丝": "SNIPER", "安德切尔": "SNIPER", "炎熔": "CASTER", "芙蓉": "MEDIC", "安赛尔": "MEDIC", "史都华德": "CASTER", "梓兰": "SUPPORT", "夜烟": "CASTER", "远山": "CASTER", "格雷伊": "CASTER", "卡达": "CASTER", "深靛": "CASTER", "布丁": "CASTER", "杰西卡": "SNIPER", "流星": "SNIPER", "红云": "SNIPER", "梅": "SNIPER", "白雪": "SNIPER", "松果": "SNIPER", "安比尔": "SNIPER", "酸糖": "SNIPER", "铅踝": "SNIPER", "跃跃": "SNIPER", "讯使": "PIONEER", "清道夫": "PIONEER", "红豆": "PIONEER", "桃金娘": "PIONEER", "豆苗": "PIONEER", "杜宾": "WARRIOR", "缠丸": "WARRIOR", "断罪者": "WARRIOR", "霜叶": "WARRIOR", "艾丝黛尔": "WARRIOR", "慕斯": "WARRIOR", "刻刀": "WARRIOR", "宴": "WARRIOR", "芳汀": "WARRIOR", "罗小黑": "WARRIOR", "石英": "WARRIOR", "休谟斯": "WARRIOR", "砾": "SPECIAL", "孑": "SPECIAL", "暗索": "SPECIAL", "末药": "MEDIC", "嘉维尔": "MEDIC", "苏苏洛": "MEDIC", "调香师": "MEDIC", "清流": "MEDIC", "褐果": "MEDIC", "角峰": "TANK", "蛇屠箱": "TANK", "泡泡": "TANK", "露托": "TANK", "古米": "TANK", "坚雷": "TANK", "深海色": "SUPPORT", "地灵": "SUPPORT", "波登可": "SUPPORT", "罗比菈塔": "SUPPORT", "伊桑": "SPECIAL", "阿消": "SPECIAL", "维荻": "SPECIAL", "云迹": "SPECIAL", "白面鸮": "MEDIC", "微风": "MEDIC", "瑰盐": "MEDIC", "凛冬": "PIONEER", "德克萨斯": "PIONEER", "贾维": "PIONEER", "青枳": "PIONEER", "红隼": "PIONEER", "苇草": "PIONEER", "野鬃": "PIONEER", "历阵锐枪芬": "PIONEER", "极境": "PIONEER", "万顷": "PIONEER", "夜半": "PIONEER", "渡桥": "PIONEER", "晓歌": "PIONEER", "谜图": "PIONEER", "齐尔查克": "PIONEER", "诗怀雅": "WARRIOR", "鞭刃": "WARRIOR", "苍苔": "WARRIOR", "医生": "WARRIOR", "芙兰卡": "WARRIOR", "炎客": "WARRIOR", "摩根": "WARRIOR", "莱欧斯": "WARRIOR", "因陀罗": "WARRIOR", "燧石": "WARRIOR", "达格达": "WARRIOR", "拉普兰德": "WARRIOR", "断崖": "WARRIOR", "烈夏": "WARRIOR", "铎铃": "WARRIOR", "柏喙": "WARRIOR", "战车": "WARRIOR", "幽灵鲨": "WARRIOR", "布洛卡": "WARRIOR", "导火索": "WARRIOR", "星极": "WARRIOR", "铸铁": "WARRIOR", "赤冬": "WARRIOR", "火龙S黑角": "WARRIOR", "羽毛笔": "WARRIOR", "海沫": "WARRIOR", "龙舌兰": "WARRIOR", "奥达": "WARRIOR", "蓝毒": "SNIPER", "白金": "SNIPER", "灰喉": "SNIPER", "四月": "SNIPER", "寒芒克洛丝": "SNIPER", "隐现": "SNIPER", "陨星": "SNIPER", "慑砂": "SNIPER", "截云": "SNIPER", "送葬人": "SNIPER", "奥斯塔": "SNIPER", "阿米娅": "CASTER", "苦艾": "CASTER", "特米米": "CASTER", "雪绒": "CASTER", "天火": "CASTER", "惊蛰": "CASTER", "星源": "CASTER", "蜜蜡": "CASTER", "莱恩哈特": "CASTER", "寒檀": "CASTER", "薄绿": "CASTER", "爱丽丝": "CASTER", "和弦": "CASTER", "戴菲恩": "CASTER", "炎狱炎熔": "CASTER", "蚀清": "CASTER", "阿罗玛": "CASTER", "耶拉": "CASTER", "洛洛": "CASTER", "至简": "CASTER", "折光": "CASTER", "温米": "CASTER", "特克诺": "CASTER", "梅尔": "SUPPORT", "稀音": "SUPPORT", "衡沙": "SUPPORT", "赫默": "MEDIC", "华法琳": "MEDIC", "亚叶": "MEDIC", "锡兰": "MEDIC", "絮雨": "MEDIC", "图耶": "MEDIC", "桑葚": "MEDIC", "蜜莓": "MEDIC", "哈洛德": "MEDIC", "濯尘芙蓉": "MEDIC", "刺玫": "MEDIC", "明椒": "MEDIC", "莎草": "MEDIC", "临光": "TANK", "吽": "TANK", "深律": "TANK", "森西": "TANK", "红": "SPECIAL", "槐琥": "SPECIAL", "卡夫卡": "SPECIAL", "乌有": "SPECIAL", "裁度": "SPECIAL", "雷蛇": "TANK", "深巡": "TANK", "可颂": "TANK", "拜松": "TANK", "火神": "TANK", "石棉": "TANK", "暮落": "TANK", "车尔尼": "TANK", "闪击": "TANK", "暴雨": "TANK", "灰毫": "TANK", "火哨": "TANK", "极光": "TANK", "洋灰": "TANK", "菲莱": "TANK", "普罗旺斯": "SNIPER", "玫拉": "SNIPER", "守林人": "SNIPER", "安哲拉": "SNIPER", "子月": "SNIPER", "熔泉": "SNIPER", "埃拉托": "SNIPER", "承曦格雷伊": "SNIPER", "冰酿": "SNIPER", "空构": "SPECIAL", "崖心": "SPECIAL", "雪雉": "SPECIAL", "杏仁": "SPECIAL", "初雪": "SUPPORT", "巫恋": "SUPPORT", "海霓": "SUPPORT", "真理": "SUPPORT", "格劳克斯": "SUPPORT", "但书": "SUPPORT", "小满": "SUPPORT", "掠风": "SUPPORT", "凯瑟琳": "SUPPORT", "空": "SUPPORT", "海蒂": "SUPPORT", "月禾": "SUPPORT", "九色鹿": "SUPPORT", "夏栎": "SUPPORT", "凛视": "SUPPORT", "波卜": "SUPPORT", "狮蝎": "SPECIAL", "绮良": "SPECIAL", "食铁兽": "SPECIAL", "见行者": "SPECIAL", "罗宾": "SPECIAL", "霜华": "SPECIAL", "贝娜": "SPECIAL", "风丸": "SPECIAL", "双月": "SPECIAL", "锡人": "SPECIAL", "能天使": "SNIPER", "空弦": "SNIPER", "灰烬": "SNIPER", "黑": "SNIPER", "鸿雪": "SNIPER", "远牙": "SNIPER", "W": "SNIPER", "菲亚梅塔": "SNIPER", "早露": "SNIPER", "提丰": "SNIPER", "迷迭香": "SNIPER", "维什戴尔": "SNIPER", "假日威龙陈": "SNIPER", "莱伊": "SNIPER", "娜仁图亚": "SNIPER", "推进之王": "PIONEER", "风笛": "PIONEER", "嵯峨": "PIONEER", "忍冬": "PIONEER", "琴柳": "PIONEER", "焰尾": "PIONEER", "伺夜": "PIONEER", "缪尔赛思": "PIONEER", "伊内丝": "PIONEER", "伊芙利特": "CASTER", "莫斯提马": "CASTER", "艾雅法拉": "CASTER", "刻俄柏": "CASTER", "霍尔海雅": "CASTER", "逻各斯": "CASTER", "夕": "CASTER", "玛露西尔": "CASTER", "异客": "CASTER", "卡涅利安": "CASTER", "林": "CASTER", "澄闪": "CASTER", "荒芜拉普兰德": "CASTER", "黑键": "CASTER", "妮芙": "CASTER", "灵知": "SUPPORT", "安洁莉娜": "SUPPORT", "铃兰": "SUPPORT", "麦哲伦": "SUPPORT", "浊心斯卡蒂": "SUPPORT", "魔王": "SUPPORT", "淬羽赫默": "SUPPORT", "令": "SUPPORT", "白铁": "SUPPORT", "塑心": "SUPPORT", "傀影": "SPECIAL", "缄默德克萨斯": "SPECIAL", "麒麟R夜刀": "SPECIAL", "弑君者": "SPECIAL", "老鲤": "SPECIAL", "琳琅诗怀雅": "SPECIAL", "温蒂": "SPECIAL", "阿": "SPECIAL", "歌蕾蒂娅": "SPECIAL", "水月": "SPECIAL", "阿斯卡纶": "SPECIAL", "归溟幽灵鲨": "SPECIAL", "多萝西": "SPECIAL", "艾拉": "SPECIAL", "引星棘刺": "SPECIAL", "闪灵": "MEDIC", "夜莺": "MEDIC", "凯尔希": "MEDIC", "流明": "MEDIC", "纯烬艾雅法拉": "MEDIC", "焰影苇草": "MEDIC", "星熊": "TANK", "塞雷娅": "TANK", "瑕光": "TANK", "黍": "TANK", "年": "TANK", "泥岩": "TANK", "斥罪": "TANK", "森蚺": "TANK", "号角": "TANK", "涤火杰西卡": "TANK", "山": "WARRIOR", "重岳": "WARRIOR", "银灰": "WARRIOR", "棘刺": "WARRIOR", "仇白": "WARRIOR", "赫德雷": "WARRIOR", "乌尔比安": "WARRIOR", "佩佩": "WARRIOR", "陈": "WARRIOR", "艾丽妮": "WARRIOR", "锏": "WARRIOR", "煌": "WARRIOR", "百炼嘉维尔": "WARRIOR", "史尔特尔": "WARRIOR", "薇薇安娜": "WARRIOR", "维娜·维多利亚": "WARRIOR", "赫拉格": "WARRIOR", "左乐": "WARRIOR", "帕拉斯": "WARRIOR", "耀骑士临光": "WARRIOR", "止颂": "WARRIOR", "圣约送葬人": "WARRIOR", "玛恩纳": "WARRIOR", "暴行": "WARRIOR", "空爆": "SNIPER", "月见夜": "WARRIOR", "猎蜂": "WARRIOR", "杰克": "WARRIOR", "夜魔": "CASTER", "格拉尼": "PIONEER", "斯卡蒂": "WARRIOR"}
\ No newline at end of file
+{"Lancet-2": "MEDIC", "Castle-3": "WARRIOR", "THRM-EX": "SPECIAL", "正义骑士号": "SNIPER", "泰拉大陆调查团": "SNIPER", "U-Official": "SUPPORT", "Friston-3": "TANK", "PhonoR-0": "SUPPORT", "夜刀": "PIONEER", "黑角": "TANK", "巡林者": "SNIPER", "杜林": "CASTER", "12F": "CASTER", "芬": "PIONEER", "香草": "PIONEER", "翎羽": "PIONEER", "玫兰莎": "WARRIOR", "泡普卡": "WARRIOR", "卡缇": "TANK", "米格鲁": "TANK", "斑点": "TANK", "克洛丝": "SNIPER", "安德切尔": "SNIPER", "炎熔": "CASTER", "芙蓉": "MEDIC", "安赛尔": "MEDIC", "史都华德": "CASTER", "梓兰": "SUPPORT", "夜烟": "CASTER", "远山": "CASTER", "格雷伊": "CASTER", "卡达": "CASTER", "深靛": "CASTER", "布丁": "CASTER", "杰西卡": "SNIPER", "流星": "SNIPER", "红云": "SNIPER", "梅": "SNIPER", "白雪": "SNIPER", "松果": "SNIPER", "安比尔": "SNIPER", "酸糖": "SNIPER", "铅踝": "SNIPER", "跃跃": "SNIPER", "讯使": "PIONEER", "清道夫": "PIONEER", "红豆": "PIONEER", "桃金娘": "PIONEER", "豆苗": "PIONEER", "杜宾": "WARRIOR", "缠丸": "WARRIOR", "断罪者": "WARRIOR", "霜叶": "WARRIOR", "艾丝黛尔": "WARRIOR", "慕斯": "WARRIOR", "刻刀": "WARRIOR", "宴": "WARRIOR", "芳汀": "WARRIOR", "罗小黑": "WARRIOR", "石英": "WARRIOR", "休谟斯": "WARRIOR", "砾": "SPECIAL", "孑": "SPECIAL", "暗索": "SPECIAL", "末药": "MEDIC", "嘉维尔": "MEDIC", "苏苏洛": "MEDIC", "调香师": "MEDIC", "清流": "MEDIC", "褐果": "MEDIC", "角峰": "TANK", "蛇屠箱": "TANK", "泡泡": "TANK", "露托": "TANK", "古米": "TANK", "坚雷": "TANK", "深海色": "SUPPORT", "地灵": "SUPPORT", "波登可": "SUPPORT", "罗比菈塔": "SUPPORT", "伊桑": "SPECIAL", "阿消": "SPECIAL", "维荻": "SPECIAL", "云迹": "SPECIAL", "白面鸮": "MEDIC", "微风": "MEDIC", "瑰盐": "MEDIC", "凛冬": "PIONEER", "德克萨斯": "PIONEER", "贾维": "PIONEER", "青枳": "PIONEER", "红隼": "PIONEER", "苇草": "PIONEER", "野鬃": "PIONEER", "历阵锐枪芬": "PIONEER", "极境": "PIONEER", "万顷": "PIONEER", "夜半": "PIONEER", "渡桥": "PIONEER", "晓歌": "PIONEER", "谜图": "PIONEER", "齐尔查克": "PIONEER", "寻澜": "PIONEER", "诗怀雅": "WARRIOR", "鞭刃": "WARRIOR", "苍苔": "WARRIOR", "医生": "WARRIOR", "芙兰卡": "WARRIOR", "炎客": "WARRIOR", "摩根": "WARRIOR", "莱欧斯": "WARRIOR", "因陀罗": "WARRIOR", "燧石": "WARRIOR", "达格达": "WARRIOR", "拉普兰德": "WARRIOR", "断崖": "WARRIOR", "烈夏": "WARRIOR", "铎铃": "WARRIOR", "柏喙": "WARRIOR", "战车": "WARRIOR", "幽灵鲨": "WARRIOR", "布洛卡": "WARRIOR", "导火索": "WARRIOR", "星极": "WARRIOR", "铸铁": "WARRIOR", "赤冬": "WARRIOR", "火龙S黑角": "WARRIOR", "羽毛笔": "WARRIOR", "海沫": "WARRIOR", "龙舌兰": "WARRIOR", "奥达": "WARRIOR", "蓝毒": "SNIPER", "白金": "SNIPER", "灰喉": "SNIPER", "四月": "SNIPER", "寒芒克洛丝": "SNIPER", "隐现": "SNIPER", "陨星": "SNIPER", "慑砂": "SNIPER", "截云": "SNIPER", "送葬人": "SNIPER", "奥斯塔": "SNIPER", "阿米娅": "CASTER", "苦艾": "CASTER", "特米米": "CASTER", "雪绒": "CASTER", "天火": "CASTER", "惊蛰": "CASTER", "星源": "CASTER", "蜜蜡": "CASTER", "莱恩哈特": "CASTER", "寒檀": "CASTER", "薄绿": "CASTER", "爱丽丝": "CASTER", "和弦": "CASTER", "戴菲恩": "CASTER", "炎狱炎熔": "CASTER", "蚀清": "CASTER", "阿罗玛": "CASTER", "耶拉": "CASTER", "洛洛": "CASTER", "至简": "CASTER", "折光": "CASTER", "温米": "CASTER", "特克诺": "CASTER", "梅尔": "SUPPORT", "稀音": "SUPPORT", "衡沙": "SUPPORT", "赫默": "MEDIC", "华法琳": "MEDIC", "亚叶": "MEDIC", "锡兰": "MEDIC", "絮雨": "MEDIC", "图耶": "MEDIC", "桑葚": "MEDIC", "蜜莓": "MEDIC", "哈洛德": "MEDIC", "濯尘芙蓉": "MEDIC", "刺玫": "MEDIC", "明椒": "MEDIC", "莎草": "MEDIC", "临光": "TANK", "吽": "TANK", "深律": "TANK", "森西": "TANK", "红": "SPECIAL", "槐琥": "SPECIAL", "卡夫卡": "SPECIAL", "乌有": "SPECIAL", "裁度": "SPECIAL", "雷蛇": "TANK", "深巡": "TANK", "可颂": "TANK", "拜松": "TANK", "火神": "TANK", "石棉": "TANK", "暮落": "TANK", "车尔尼": "TANK", "闪击": "TANK", "暴雨": "TANK", "灰毫": "TANK", "火哨": "TANK", "极光": "TANK", "洋灰": "TANK", "菲莱": "TANK", "普罗旺斯": "SNIPER", "玫拉": "SNIPER", "守林人": "SNIPER", "安哲拉": "SNIPER", "子月": "SNIPER", "熔泉": "SNIPER", "埃拉托": "SNIPER", "承曦格雷伊": "SNIPER", "冰酿": "SNIPER", "空构": "SPECIAL", "崖心": "SPECIAL", "雪雉": "SPECIAL", "杏仁": "SPECIAL", "初雪": "SUPPORT", "巫恋": "SUPPORT", "海霓": "SUPPORT", "真理": "SUPPORT", "格劳克斯": "SUPPORT", "但书": "SUPPORT", "小满": "SUPPORT", "掠风": "SUPPORT", "凯瑟琳": "SUPPORT", "空": "SUPPORT", "海蒂": "SUPPORT", "月禾": "SUPPORT", "九色鹿": "SUPPORT", "夏栎": "SUPPORT", "行箸": "SUPPORT", "凛视": "SUPPORT", "波卜": "SUPPORT", "狮蝎": "SPECIAL", "绮良": "SPECIAL", "食铁兽": "SPECIAL", "见行者": "SPECIAL", "罗宾": "SPECIAL", "霜华": "SPECIAL", "贝娜": "SPECIAL", "风丸": "SPECIAL", "双月": "SPECIAL", "锡人": "SPECIAL", "能天使": "SNIPER", "空弦": "SNIPER", "灰烬": "SNIPER", "黑": "SNIPER", "鸿雪": "SNIPER", "远牙": "SNIPER", "W": "SNIPER", "菲亚梅塔": "SNIPER", "早露": "SNIPER", "提丰": "SNIPER", "迷迭香": "SNIPER", "维什戴尔": "SNIPER", "假日威龙陈": "SNIPER", "莱伊": "SNIPER", "娜仁图亚": "SNIPER", "推进之王": "PIONEER", "风笛": "PIONEER", "嵯峨": "PIONEER", "忍冬": "PIONEER", "琴柳": "PIONEER", "焰尾": "PIONEER", "伺夜": "PIONEER", "缪尔赛思": "PIONEER", "伊内丝": "PIONEER", "伊芙利特": "CASTER", "莫斯提马": "CASTER", "艾雅法拉": "CASTER", "刻俄柏": "CASTER", "霍尔海雅": "CASTER", "逻各斯": "CASTER", "夕": "CASTER", "玛露西尔": "CASTER", "异客": "CASTER", "卡涅利安": "CASTER", "林": "CASTER", "澄闪": "CASTER", "荒芜拉普兰德": "CASTER", "黑键": "CASTER", "妮芙": "CASTER", "烛煌": "CASTER", "灵知": "SUPPORT", "安洁莉娜": "SUPPORT", "铃兰": "SUPPORT", "麦哲伦": "SUPPORT", "浊心斯卡蒂": "SUPPORT", "魔王": "SUPPORT", "淬羽赫默": "SUPPORT", "令": "SUPPORT", "白铁": "SUPPORT", "塑心": "SUPPORT", "傀影": "SPECIAL", "缄默德克萨斯": "SPECIAL", "麒麟R夜刀": "SPECIAL", "弑君者": "SPECIAL", "老鲤": "SPECIAL", "琳琅诗怀雅": "SPECIAL", "温蒂": "SPECIAL", "阿": "SPECIAL", "歌蕾蒂娅": "SPECIAL", "水月": "SPECIAL", "阿斯卡纶": "SPECIAL", "归溟幽灵鲨": "SPECIAL", "多萝西": "SPECIAL", "艾拉": "SPECIAL", "引星棘刺": "SPECIAL", "闪灵": "MEDIC", "夜莺": "MEDIC", "凯尔希": "MEDIC", "流明": "MEDIC", "纯烬艾雅法拉": "MEDIC", "焰影苇草": "MEDIC", "星熊": "TANK", "塞雷娅": "TANK", "瑕光": "TANK", "黍": "TANK", "年": "TANK", "泥岩": "TANK", "斥罪": "TANK", "森蚺": "TANK", "号角": "TANK", "涤火杰西卡": "TANK", "余": "TANK", "山": "WARRIOR", "重岳": "WARRIOR", "银灰": "WARRIOR", "棘刺": "WARRIOR", "仇白": "WARRIOR", "赫德雷": "WARRIOR", "乌尔比安": "WARRIOR", "佩佩": "WARRIOR", "陈": "WARRIOR", "艾丽妮": "WARRIOR", "锏": "WARRIOR", "煌": "WARRIOR", "百炼嘉维尔": "WARRIOR", "史尔特尔": "WARRIOR", "薇薇安娜": "WARRIOR", "维娜·维多利亚": "WARRIOR", "赫拉格": "WARRIOR", "左乐": "WARRIOR", "帕拉斯": "WARRIOR", "耀骑士临光": "WARRIOR", "止颂": "WARRIOR", "圣约送葬人": "WARRIOR", "玛恩纳": "WARRIOR", "暴行": "WARRIOR", "空爆": "SNIPER", "月见夜": "WARRIOR", "猎蜂": "WARRIOR", "杰克": "WARRIOR", "夜魔": "CASTER", "格拉尼": "PIONEER", "斯卡蒂": "WARRIOR"}
\ No newline at end of file
diff --git a/arknights_mower/data/base.json b/arknights_mower/data/base.json
index ff83f2616..8bb90eef9 100644
--- a/arknights_mower/data/base.json
+++ b/arknights_mower/data/base.json
@@ -1,20 +1,23 @@
[
- "central",
- "meeting",
- "room_1_1",
- "room_1_2",
- "room_1_3",
- "dormitory_1",
- "factory",
- "room_2_1",
- "room_2_2",
- "room_2_3",
- "dormitory_2",
- "contact",
- "room_3_1",
- "room_3_2",
- "room_3_3",
- "dormitory_3",
- "train",
- "dormitory_4"
-]
\ No newline at end of file
+ "central",
+ "meeting",
+ "room_1_1",
+ "room_1_2",
+ "room_1_3",
+ "dormitory_1",
+ "factory",
+ "room_2_1",
+ "room_2_2",
+ "room_2_3",
+ "dormitory_2",
+ "contact",
+ "room_3_1",
+ "room_3_2",
+ "room_3_3",
+ "dormitory_3",
+ "train",
+ "dormitory_4",
+ "gaming_1",
+ "gaming_2",
+ "gaming_3"
+]
diff --git a/arknights_mower/data/key_mapping.json b/arknights_mower/data/key_mapping.json
index a88d231ce..26b3b63df 100644
--- a/arknights_mower/data/key_mapping.json
+++ b/arknights_mower/data/key_mapping.json
@@ -111,6 +111,20 @@
"NORMAL",
10008
],
+ "LMTGS_COIN_5801": [
+ "LMTGS_COIN_5801",
+ "LMTGS_COIN_5801",
+ "寻访数据契约",
+ "NORMAL",
+ 10026
+ ],
+ "寻访数据契约": [
+ "LMTGS_COIN_5801",
+ "LMTGS_COIN_5801",
+ "寻访数据契约",
+ "NORMAL",
+ 10026
+ ],
"EPGS_COIN": [
"EPGS_COIN",
"EPGS_COIN",
@@ -391,6 +405,20 @@
"NORMAL",
40001
],
+ "LIMITED_TKT_GACHA_10_5801": [
+ "LIMITED_TKT_GACHA_10_5801",
+ "LIMITED_TKT_GACHA_10_5801",
+ "欢宴良宵寻访凭证",
+ "NORMAL",
+ 40003
+ ],
+ "欢宴良宵寻访凭证": [
+ "LIMITED_TKT_GACHA_10_5801",
+ "LIMITED_TKT_GACHA_10_5801",
+ "欢宴良宵寻访凭证",
+ "NORMAL",
+ 40003
+ ],
"7003": [
"7003",
"TKT_GACHA",
@@ -6754,6 +6782,34 @@
"MATERIAL",
700160
],
+ "p_char_4052_surfer": [
+ "p_char_4052_surfer",
+ "p_char_4052_surfer",
+ "寻澜的信物",
+ "MATERIAL",
+ 700161
+ ],
+ "寻澜的信物": [
+ "p_char_4052_surfer",
+ "p_char_4052_surfer",
+ "寻澜的信物",
+ "MATERIAL",
+ 700161
+ ],
+ "p_char_4172_xingzh": [
+ "p_char_4172_xingzh",
+ "p_char_4172_xingzh",
+ "行箸的信物",
+ "MATERIAL",
+ 700162
+ ],
+ "行箸的信物": [
+ "p_char_4172_xingzh",
+ "p_char_4172_xingzh",
+ "行箸的信物",
+ "MATERIAL",
+ 700162
+ ],
"p_char_103_angel": [
"p_char_103_angel",
"p_char_103_angel",
@@ -8196,6 +8252,34 @@
"MATERIAL",
600103
],
+ "p_char_2026_yu": [
+ "p_char_2026_yu",
+ "p_char_2026_yu",
+ "余的信物",
+ "MATERIAL",
+ 600104
+ ],
+ "余的信物": [
+ "p_char_2026_yu",
+ "p_char_2026_yu",
+ "余的信物",
+ "MATERIAL",
+ 600104
+ ],
+ "p_char_1040_blaze2": [
+ "p_char_1040_blaze2",
+ "p_char_1040_blaze2",
+ "烛煌的信物",
+ "MATERIAL",
+ 600105
+ ],
+ "烛煌的信物": [
+ "p_char_1040_blaze2",
+ "p_char_1040_blaze2",
+ "烛煌的信物",
+ "MATERIAL",
+ 600105
+ ],
"class_p_char_123_fang": [
"class_p_char_123_fang",
"class_p_char_123_fang",
diff --git a/arknights_mower/data/recruit.json b/arknights_mower/data/recruit.json
index 850c45c25..98c0191e8 100644
--- a/arknights_mower/data/recruit.json
+++ b/arknights_mower/data/recruit.json
@@ -381,6 +381,16 @@
"先锋干员"
]
},
+ "char_452_bstalk": {
+ "name": "豆苗",
+ "stars": 4,
+ "tags": [
+ "费用回复",
+ "召唤",
+ "远程位",
+ "先锋干员"
+ ]
+ },
"char_130_doberm": {
"name": "杜宾",
"stars": 4,
@@ -846,6 +856,16 @@
"术师干员"
]
},
+ "char_338_iris": {
+ "name": "爱丽丝",
+ "stars": 5,
+ "tags": [
+ "输出",
+ "资深干员",
+ "远程位",
+ "术师干员"
+ ]
+ },
"char_242_otter": {
"name": "梅尔",
"stars": 5,
@@ -1116,6 +1136,16 @@
"狙击干员"
]
},
+ "char_332_archet": {
+ "name": "空弦",
+ "stars": 6,
+ "tags": [
+ "输出",
+ "高级资深干员",
+ "远程位",
+ "狙击干员"
+ ]
+ },
"char_340_shwaz": {
"name": "黑",
"stars": 6,
diff --git a/arknights_mower/data/recruit_result.json b/arknights_mower/data/recruit_result.json
index 89286cc6c..d6a17d343 100644
--- a/arknights_mower/data/recruit_result.json
+++ b/arknights_mower/data/recruit_result.json
@@ -36,6 +36,7 @@
"char_356_broca",
"char_279_excu",
"char_346_aosta",
+ "char_338_iris",
"char_171_bldsk",
"char_214_kafka",
"char_158_milu",
@@ -68,6 +69,7 @@
"char_440_pinecn",
"char_366_acdrop",
"char_290_vigna",
+ "char_452_bstalk",
"char_130_doberm",
"char_289_gyuki",
"char_193_frostl",
@@ -112,6 +114,7 @@
"char_195_glassb",
"char_343_tknogi",
"char_215_mantic",
+ "char_332_archet",
"char_197_poca",
"char_222_bpipe",
"char_358_lisa",
diff --git a/arknights_mower/models/CONSUME.pkl b/arknights_mower/models/CONSUME.pkl
index aeb1e4909..f21443f84 100644
Binary files a/arknights_mower/models/CONSUME.pkl and b/arknights_mower/models/CONSUME.pkl differ
diff --git a/arknights_mower/models/NORMAL.pkl b/arknights_mower/models/NORMAL.pkl
index 3adbab47c..9d51bd8d7 100644
Binary files a/arknights_mower/models/NORMAL.pkl and b/arknights_mower/models/NORMAL.pkl differ
diff --git a/arknights_mower/models/avatar.pkl b/arknights_mower/models/avatar.pkl
index 1266ec603..3d644fcef 100644
Binary files a/arknights_mower/models/avatar.pkl and b/arknights_mower/models/avatar.pkl differ
diff --git a/arknights_mower/models/operator_room.model b/arknights_mower/models/operator_room.model
index a23cdf0ec..3c2f6d3c4 100644
Binary files a/arknights_mower/models/operator_room.model and b/arknights_mower/models/operator_room.model differ
diff --git a/arknights_mower/models/operator_select.model b/arknights_mower/models/operator_select.model
index 2ada4b6ee..57a0e6222 100644
Binary files a/arknights_mower/models/operator_select.model and b/arknights_mower/models/operator_select.model differ
diff --git a/arknights_mower/models/recruit.pkl b/arknights_mower/models/recruit.pkl
index 06ea7e561..9ecea3dc1 100644
Binary files a/arknights_mower/models/recruit.pkl and b/arknights_mower/models/recruit.pkl differ
diff --git a/arknights_mower/models/recruit_result.pkl b/arknights_mower/models/recruit_result.pkl
index a80a13d2e..ef018cd87 100644
Binary files a/arknights_mower/models/recruit_result.pkl and b/arknights_mower/models/recruit_result.pkl differ
diff --git a/arknights_mower/solvers/base_mixin.py b/arknights_mower/solvers/base_mixin.py
index f2438a1c9..bf5ce83fe 100644
--- a/arknights_mower/solvers/base_mixin.py
+++ b/arknights_mower/solvers/base_mixin.py
@@ -234,18 +234,60 @@ def detect_room(self) -> str:
logger.debug("办公室B205")
return room
+ def adjust_room(self, _room):
+ # 定义屏幕范围
+ screen_min_x = 0
+ screen_max_x = 1920
+
+ # 检查是否有点在屏幕范围内
+ any_point_in_view = any(screen_min_x <= p[0] <= screen_max_x for p in _room)
+
+ if any_point_in_view:
+ logger.debug(
+ f"At least one point of {_room} is within screen range [0, 1920]. No movement needed."
+ )
+ for i in range(4):
+ _room[i, 0] = max(_room[i, 0], 0)
+ _room[i, 0] = min(_room[i, 0], self.recog.w)
+ _room[i, 1] = max(_room[i, 1], 0)
+ _room[i, 1] = min(_room[i, 1], self.recog.h)
+ return _room
+
+ # 如果所有点都超出屏幕范围，则计算需要的移动距离
+ min_x = min(p[0] for p in _room)
+ max_x = max(p[0] for p in _room)
+
+ dx = 0
+ if min_x < screen_min_x:
+ # 左边超出，向右移动
+ dx = screen_min_x - min_x
+ start = (int(self.recog.w * 4 / 5), 540) # 屏幕 4/5 宽度开始，垂直中心
+ logger.debug(f"Moving right by {dx} to bring room into view.")
+ elif max_x > screen_max_x:
+ # 右边超出，向左移动
+ dx = screen_max_x - max_x
+ start = (int(self.recog.w * 1 / 5), 540) # 屏幕 1/5 宽度开始，垂直中心
+ logger.debug(f"Moving left by {-dx} to bring room into view.")
+
+ # 如果需要移动，则移动视图
+ if dx != 0:
+ movement = (dx, 0) # 仅水平移动
+ self.swipe_noinertia(start, movement)
+ # 更新 _room 的所有点位置
+ for i in range(len(_room)):
+ _room[i][0] += dx
+
+ # 返回修正后的 _room
+ return _room
+
def enter_room(self, room):
"""从基建首页进入房间"""
+
for enter_times in range(3):
for retry_times in range(10):
if pos := self.find("control_central"):
- _room = segment.base(self.recog.img, pos)[room]
- for i in range(4):
- _room[i, 0] = max(_room[i, 0], 0)
- _room[i, 0] = min(_room[i, 0], self.recog.w)
- _room[i, 1] = max(_room[i, 1], 0)
- _room[i, 1] = min(_room[i, 1], self.recog.h)
- self.tap(_room)
+ _room = segment.base(self.recog.img, pos, True)[room]
+ self.tap(self.adjust_room(_room))
elif self.detect_room() == room:
return
else:
diff --git a/arknights_mower/utils/config/plan.py b/arknights_mower/utils/config/plan.py
index 034773122..1fb1e8cd6 100644
--- a/arknights_mower/utils/config/plan.py
+++ b/arknights_mower/utils/config/plan.py
@@ -50,6 +50,12 @@ class Plan1(BaseModel):
"办公室"
train: Optional[Facility] = None
"训练室"
+ gaming_1: Optional[Facility] = None
+ "活动室1"
+ gaming_2: Optional[Facility] = None
+ "活动室2"
+ gaming_3: Optional[Facility] = None
+ "活动室3"
dormitory_1: Optional[Facility] = None
dormitory_2: Optional[Facility] = None
dormitory_3: Optional[Facility] = None
@@ -76,6 +82,12 @@ class Task(BaseModel):
"办公室"
train: Optional[list[str]] = None
"训练室"
+ gaming_1: Optional[list[str]] = None
+ "活动室1"
+ gaming_2: Optional[list[str]] = None
+ "活动室2"
+ gaming_3: Optional[list[str]] = None
+ "训练室3"
dormitory_1: Optional[list[str]] = None
dormitory_2: Optional[list[str]] = None
dormitory_3: Optional[list[str]] = None
diff --git a/arknights_mower/utils/segment.py b/arknights_mower/utils/segment.py
index 0b7198f5f..b3433a4b2 100644
--- a/arknights_mower/utils/segment.py
+++ b/arknights_mower/utils/segment.py
@@ -184,6 +184,16 @@ def minus(i: int) -> int:
raise RecognizeError(e)
+def add_gamingroom(base_x1, base_x2, base_y1, base_y2, alpha, room_name, ret):
+ """
+ 在指定区域右边添加一个房间，同时保留原区域。
+ """
+ room_x1 = base_x2 + 259 * alpha # 房间的左边界
+ room_x2 = room_x1 + 458 * alpha # 房间的右边界
+ room_y1, room_y2 = base_y1, base_y2 # 房间的垂直范围与原区域一致
+ ret[room_name] = get_poly(room_x1, room_x2, room_y1, room_y2)
+
+
def base(
img: tp.Image, central: tp.Scope, draw: bool = False
) -> dict[str, tp.Rectangle]:
@@ -201,8 +211,9 @@ def base(
y1 -= 67 * alpha
y2 += 67 * alpha
central = get_poly(x1, x2, y1, y2)
+ # 先计算出中枢位置
ret["central"] = central
-
+ # 根据中枢计算出4个宿舍位置
for i in range(1, 5):
y1 = y2 + 25 * alpha
y2 = y1 + 134 * alpha
@@ -211,10 +222,12 @@ def base(
else:
dormitory = get_poly(x1 + 158 * alpha, x2, y1, y2)
ret[f"dormitory_{i}"] = dormitory
-
+ print(
+ f"Dormitory {i} Length: {abs(ret[f'dormitory_{i}'][2][0] - ret[f'dormitory_{i}'][0][0]) / alpha}"
+ )
x1, y1 = ret["dormitory_1"][0]
x2, y2 = ret["dormitory_1"][2]
-
+ # 根据1号宿舍计算出加工站
x1 = x2 + 419 * alpha
x2 = x1 + 297 * alpha
factory = get_poly(x1, x2, y1, y2)
@@ -222,7 +235,7 @@ def base(
y2 = y1 - 25 * alpha
y1 = y2 - 134 * alpha
- meeting = get_poly(x1 - 158 * alpha, x2, y1, y2)
+ meeting = get_poly(x1 - 158 * alpha, x2 + 158 * alpha, y1, y2)
ret["meeting"] = meeting
y1 = y2 + 25 * alpha
@@ -237,6 +250,36 @@ def base(
train = get_poly(x1, x2, y1, y2)
ret["train"] = train
+ add_gamingroom(
+ ret["factory"][0][0],
+ ret["factory"][2][0],
+ ret["factory"][0][1],
+ ret["factory"][2][1],
+ alpha,
+ "gaming_1",
+ ret,
+ )
+
+ add_gamingroom(
+ ret["contact"][0][0],
+ ret["contact"][2][0],
+ ret["contact"][0][1],
+ ret["contact"][2][1],
+ alpha,
+ "gaming_2",
+ ret,
+ )
+
+ add_gamingroom(
+ ret["train"][0][0],
+ ret["train"][2][0],
+ ret["train"][0][1],
+ ret["train"][2][1],
+ alpha,
+ "gaming_3",
+ ret,
+ )
+
for floor in range(1, 4):
x1, y1 = ret[f"dormitory_{floor}"][0]
x2, y2 = ret[f"dormitory_{floor}"][2]
diff --git "a/ui/public/avatar/\344\275\231.webp" "b/ui/public/avatar/\344\275\231.webp"
new file mode 100644
index 000000000..27e292c1a
Binary files /dev/null and "b/ui/public/avatar/\344\275\231.webp" differ
diff --git "a/ui/public/avatar/\345\257\273\346\276\234.webp" "b/ui/public/avatar/\345\257\273\346\276\234.webp"
new file mode 100644
index 000000000..e4a6d4e21
Binary files /dev/null and "b/ui/public/avatar/\345\257\273\346\276\234.webp" differ
diff --git "a/ui/public/avatar/\347\203\233\347\205\214.webp" "b/ui/public/avatar/\347\203\233\347\205\214.webp"
new file mode 100644
index 000000000..173224ecf
Binary files /dev/null and "b/ui/public/avatar/\347\203\233\347\205\214.webp" differ
diff --git "a/ui/public/avatar/\350\241\214\347\256\270.webp" "b/ui/public/avatar/\350\241\214\347\256\270.webp"
new file mode 100644
index 000000000..700b81ada
Binary files /dev/null and "b/ui/public/avatar/\350\241\214\347\256\270.webp" differ
diff --git a/ui/public/building_skill/bskill_ctrl_train_spd2.webp b/ui/public/building_skill/bskill_ctrl_train_spd2.webp
new file mode 100644
index 000000000..6bb99c40f
Binary files /dev/null and b/ui/public/building_skill/bskill_ctrl_train_spd2.webp differ
diff --git a/ui/public/building_skill/bskill_dorm_sui.webp b/ui/public/building_skill/bskill_dorm_sui.webp
new file mode 100644
index 000000000..573302906
Binary files /dev/null and b/ui/public/building_skill/bskill_dorm_sui.webp differ
diff --git a/ui/public/building_skill/bskill_meet_spd&blacksteel1.webp b/ui/public/building_skill/bskill_meet_spd&blacksteel1.webp
new file mode 100644
index 000000000..d98fb336b
Binary files /dev/null and b/ui/public/building_skill/bskill_meet_spd&blacksteel1.webp differ
diff --git a/ui/public/building_skill/bskill_meet_spd&blacksteel2.webp b/ui/public/building_skill/bskill_meet_spd&blacksteel2.webp
new file mode 100644
index 000000000..95a340fd0
Binary files /dev/null and b/ui/public/building_skill/bskill_meet_spd&blacksteel2.webp differ
diff --git a/ui/public/building_skill/bskill_train_bd.webp b/ui/public/building_skill/bskill_train_bd.webp
new file mode 100644
index 000000000..52f591842
Binary files /dev/null and b/ui/public/building_skill/bskill_train_bd.webp differ
diff --git "a/ui/public/depot/\344\275\231\347\232\204\344\277\241\347\211\251.webp" "b/ui/public/depot/\344\275\231\347\232\204\344\277\241\347\211\251.webp"
new file mode 100644
index 000000000..bd278f199
Binary files /dev/null and "b/ui/public/depot/\344\275\231\347\232\204\344\277\241\347\211\251.webp" differ
diff --git "a/ui/public/depot/\345\257\273\346\276\234\347\232\204\344\277\241\347\211\251.webp" "b/ui/public/depot/\345\257\273\346\276\234\347\232\204\344\277\241\347\211\251.webp"
new file mode 100644
index 000000000..45d612c45
Binary files /dev/null and "b/ui/public/depot/\345\257\273\346\276\234\347\232\204\344\277\241\347\211\251.webp" differ
diff --git "a/ui/public/depot/\346\254\242\345\256\264\350\211\257\345\256\265\345\257\273\350\256\277\345\207\255\350\257\201.webp" "b/ui/public/depot/\346\254\242\345\256\264\350\211\257\345\256\265\345\257\273\350\256\277\345\207\255\350\257\201.webp"
new file mode 100644
index 000000000..34ad36771
Binary files /dev/null and "b/ui/public/depot/\346\254\242\345\256\264\350\211\257\345\256\265\345\257\273\350\256\277\345\207\255\350\257\201.webp" differ
diff --git "a/ui/public/depot/\347\203\233\347\205\214\347\232\204\344\277\241\347\211\251.webp" "b/ui/public/depot/\347\203\233\347\205\214\347\232\204\344\277\241\347\211\251.webp"
new file mode 100644
index 000000000..0c34ab1a7
Binary files /dev/null and "b/ui/public/depot/\347\203\233\347\205\214\347\232\204\344\277\241\347\211\251.webp" differ
diff --git "a/ui/public/depot/\350\241\214\347\256\270\347\232\204\344\277\241\347\211\251.webp" "b/ui/public/depot/\350\241\214\347\256\270\347\232\204\344\277\241\347\211\251.webp"
new file mode 100644
index 000000000..e333581e7
Binary files /dev/null and "b/ui/public/depot/\350\241\214\347\256\270\347\232\204\344\277\241\347\211\251.webp" differ
diff --git a/ui/src/components/PlanEditor.vue b/ui/src/components/PlanEditor.vue
index 8eddba63f..fa646126c 100644
--- a/ui/src/components/PlanEditor.vue
+++ b/ui/src/components/PlanEditor.vue
@@ -114,6 +114,8 @@ const right_side_facility_name = computed(() => {
return '加工站'
} else if (facility.value == 'train') {
return '训练室（仅可安排协助位）'
+ } else if (facility.value.startsWith('gaming')) {
+ return '活动室'
} else {
return '未知'
}
@@ -508,7 +510,6 @@ function set_facility(e) {
-
+
@@ -657,6 +720,12 @@ function set_facility(e) {
width: 160px;
}
+.facility-1 {
+ width: 71px;
+ height: 76px;
+ margin: 2px 3px;
+}
+
.facility-2 {
width: 124px;
height: 76px;
@@ -701,6 +770,13 @@ function set_facility(e) {
margin: 0 auto;
}
+.right_extra_contain{
+ display: flex;
+ flex-direction: column;
+ gap: 4px;
+ padding-top: 80px;
+}
+
.left_box {
display: flex;
flex-direction: column;
diff --git a/ui/src/pages/basement_skill/buffer.json b/ui/src/pages/basement_skill/buffer.json
index 0a29c22ab..cf5f5bf91 100644
--- a/ui/src/pages/basement_skill/buffer.json
+++ b/ui/src/pages/basement_skill/buffer.json
@@ -695,7 +695,7 @@
"cc_tag_durin": {
"termId": "cc.tag.durin",
"termName": "杜林族",
- "description": "包含以下干员\n至简、桃金娘、褐果、杜林",
+ "description": "包含以下干员\n至简、桃金娘、褐果、杜林、特克诺",
"buffer": []
},
"cc_tag_mh": {
diff --git a/ui/src/pages/stage_data/event_data.json b/ui/src/pages/stage_data/event_data.json
index f068a7c5b..edf382036 100644
--- a/ui/src/pages/stage_data/event_data.json
+++ b/ui/src/pages/stage_data/event_data.json
@@ -168,12 +168,12 @@
"key": 11
},
{
- "id": "EP-1",
- "name": "倒悬苍白海上",
+ "id": "OR-1",
+ "name": "一清二白",
"drop": {
"突袭首次掉落": [],
"常规掉落": [
- "盐鳞咸鳞汁",
+ "“生香”",
"酯原料",
"破损装置",
"异铁碎片",
@@ -182,13 +182,13 @@
"源岩"
],
"首次掉落": [
- "盐鳞咸鳞汁",
+ "“生香”",
"至纯源石"
],
"特殊掉落": [],
"额外物资": []
},
- "end": 1734551999,
+ "end": 1739303999,
"周一": 1,
"周二": 1,
"周三": 1,
@@ -199,12 +199,12 @@
"key": 12
},
{
- "id": "EP-2",
- "name": "腿部拆卸疗法",
+ "id": "OR-2",
+ "name": "糖瓜粘",
"drop": {
"突袭首次掉落": [],
"常规掉落": [
- "盐鳞咸鳞汁",
+ "“生香”",
"酯原料",
"破损装置",
"异铁碎片",
@@ -213,13 +213,13 @@
"源岩"
],
"首次掉落": [
- "盐鳞咸鳞汁",
+ "“生香”",
"至纯源石"
],
"特殊掉落": [],
"额外物资": []
},
- "end": 1734551999,
+ "end": 1739303999,
"周一": 1,
"周二": 1,
"周三": 1,
@@ -230,23 +230,27 @@
"key": 13
},
{
- "id": "EP-3",
- "name": "大出血的舞步",
+ "id": "OR-3",
+ "name": "油泼扯面",
"drop": {
"突袭首次掉落": [],
"常规掉落": [
- "盐鳞咸鳞汁",
- "酮凝集",
- "糖"
+ "“生香”",
+ "酯原料",
+ "破损装置",
+ "异铁碎片",
+ "双酮",
+ "代糖",
+ "源岩"
],
"首次掉落": [
- "盐鳞咸鳞汁",
+ "“生香”",
"至纯源石"
],
"特殊掉落": [],
"额外物资": []
},
- "end": 1734551999,
+ "end": 1739303999,
"周一": 1,
"周二": 1,
"周三": 1,
@@ -257,23 +261,23 @@
"key": 14
},
{
- "id": "EP-4",
- "name": "重逢不乏意外",
+ "id": "OR-4",
+ "name": "雪里蕻",
"drop": {
"突袭首次掉落": [],
"常规掉落": [
- "盐鳞咸鳞汁",
- "固源岩",
- "聚酸酯"
+ "“生香”",
+ "异铁",
+ "固源岩"
],
"首次掉落": [
- "盐鳞咸鳞汁",
+ "“生香”",
"至纯源石"
],
"特殊掉落": [],
"额外物资": []
},
- "end": 1734551999,
+ "end": 1739303999,
"周一": 1,
"周二": 1,
"周三": 1,
@@ -284,23 +288,23 @@
"key": 15
},
{
- "id": "EP-5",
- "name": "熄灭过去的灯",
+ "id": "OR-5",
+ "name": "雷公栗",
"drop": {
"突袭首次掉落": [],
"常规掉落": [
- "盐鳞咸鳞汁",
- "糖",
- "固源岩"
+ "“生香”",
+ "装置",
+ "酮凝集"
],
"首次掉落": [
- "盐鳞咸鳞汁",
+ "“生香”",
"至纯源石"
],
"特殊掉落": [],
"额外物资": []
},
- "end": 1734551999,
+ "end": 1739303999,
"周一": 1,
"周二": 1,
"周三": 1,
@@ -311,22 +315,23 @@
"key": 16
},
{
- "id": "EP-6",
- "name": "若退路在燃烧",
+ "id": "OR-6",
+ "name": "胜肉火方",
"drop": {
"突袭首次掉落": [],
"常规掉落": [
- "盐鳞咸鳞汁",
- "糖组"
+ "“生香”",
+ "聚酸酯",
+ "糖"
],
"首次掉落": [
- "盐鳞咸鳞汁",
+ "“生香”",
"至纯源石"
],
"特殊掉落": [],
"额外物资": []
},
- "end": 1734551999,
+ "end": 1739303999,
"周一": 1,
"周二": 1,
"周三": 1,
@@ -337,22 +342,22 @@
"key": 17
},
{
- "id": "EP-7",
- "name": "我的罗盘",
+ "id": "OR-7",
+ "name": "五省盘",
"drop": {
"突袭首次掉落": [],
"常规掉落": [
- "盐鳞咸鳞汁",
- "酮凝集组"
+ "“生香”",
+ "全新装置"
],
"首次掉落": [
- "盐鳞咸鳞汁",
+ "“生香”",
"至纯源石"
],
"特殊掉落": [],
"额外物资": []
},
- "end": 1734551999,
+ "end": 1739303999,
"周一": 1,
"周二": 1,
"周三": 1,
@@ -363,22 +368,22 @@
"key": 18
},
{
- "id": "EP-8",
- "name": "见证，征服，定义",
+ "id": "OR-8",
+ "name": "金玉藏心",
"drop": {
"突袭首次掉落": [],
"常规掉落": [
- "盐鳞咸鳞汁",
- "研磨石"
+ "“生香”",
+ "炽合金"
],
"首次掉落": [
- "盐鳞咸鳞汁",
+ "“生香”",
"至纯源石"
],
"特殊掉落": [],
"额外物资": []
},
- "end": 1734551999,
+ "end": 1739303999,
"周一": 1,
"周二": 1,
"周三": 1,
@@ -389,18 +394,22 @@
"key": 19
},
{
- "id": "EP-ST-1",
- "name": "别了，盐漠",
+ "id": "OR-9",
+ "name": "长寿面",
"drop": {
"突袭首次掉落": [],
- "常规掉落": [],
+ "常规掉落": [
+ "“生香”",
+ "转质盐组"
+ ],
"首次掉落": [
+ "“生香”",
"至纯源石"
],
"特殊掉落": [],
"额外物资": []
},
- "end": 1734551999,
+ "end": 1739303999,
"周一": 1,
"周二": 1,
"周三": 1,
@@ -411,18 +420,19 @@
"key": 20
},
{
- "id": "EP-ST-2",
- "name": "倾泻腐朽的花",
+ "id": "OR-EX-1",
+ "name": "酸",
"drop": {
"突袭首次掉落": [],
"常规掉落": [],
"首次掉落": [
+ "“生香”",
"至纯源石"
],
"特殊掉落": [],
"额外物资": []
},
- "end": 1734551999,
+ "end": 1739303999,
"周一": 1,
"周二": 1,
"周三": 1,
@@ -433,8 +443,8 @@
"key": 21
},
{
- "id": "EP-ST-3",
- "name": "别了，大地",
+ "id": "OR-EX-1 突袭",
+ "name": "酸",
"drop": {
"突袭首次掉落": [],
"常规掉落": [],
@@ -444,7 +454,7 @@
"特殊掉落": [],
"额外物资": []
},
- "end": 1734551999,
+ "end": 1739303999,
"周一": 1,
"周二": 1,
"周三": 1,
@@ -455,18 +465,19 @@
"key": 22
},
{
- "id": "EP-TR-1",
- "name": "海盗基本素养",
+ "id": "OR-EX-2",
+ "name": "甜",
"drop": {
"突袭首次掉落": [],
"常规掉落": [],
"首次掉落": [
+ "“生香”",
"至纯源石"
],
"特殊掉落": [],
"额外物资": []
},
- "end": 1734551999,
+ "end": 1739303999,
"周一": 1,
"周二": 1,
"周三": 1,
@@ -475,5 +486,385 @@
"周六": 1,
"周日": 1,
"key": 23
+ },
+ {
+ "id": "OR-EX-2 突袭",
+ "name": "甜",
+ "drop": {
+ "突袭首次掉落": [],
+ "常规掉落": [],
+ "首次掉落": [
+ "至纯源石"
+ ],
+ "特殊掉落": [],
+ "额外物资": []
+ },
+ "end": 1739303999,
+ "周一": 1,
+ "周二": 1,
+ "周三": 1,
+ "周四": 1,
+ "周五": 1,
+ "周六": 1,
+ "周日": 1,
+ "key": 24
+ },
+ {
+ "id": "OR-EX-3",
+ "name": "苦",
+ "drop": {
+ "突袭首次掉落": [],
+ "常规掉落": [],
+ "首次掉落": [
+ "“生香”",
+ "至纯源石"
+ ],
+ "特殊掉落": [],
+ "额外物资": []
+ },
+ "end": 1739303999,
+ "周一": 1,
+ "周二": 1,
+ "周三": 1,
+ "周四": 1,
+ "周五": 1,
+ "周六": 1,
+ "周日": 1,
+ "key": 25
+ },
+ {
+ "id": "OR-EX-3 突袭",
+ "name": "苦",
+ "drop": {
+ "突袭首次掉落": [],
+ "常规掉落": [],
+ "首次掉落": [
+ "至纯源石"
+ ],
+ "特殊掉落": [],
+ "额外物资": []
+ },
+ "end": 1739303999,
+ "周一": 1,
+ "周二": 1,
+ "周三": 1,
+ "周四": 1,
+ "周五": 1,
+ "周六": 1,
+ "周日": 1,
+ "key": 26
+ },
+ {
+ "id": "OR-EX-4",
+ "name": "辣",
+ "drop": {
+ "突袭首次掉落": [],
+ "常规掉落": [],
+ "首次掉落": [
+ "“生香”",
+ "至纯源石"
+ ],
+ "特殊掉落": [],
+ "额外物资": []
+ },
+ "end": 1739303999,
+ "周一": 1,
+ "周二": 1,
+ "周三": 1,
+ "周四": 1,
+ "周五": 1,
+ "周六": 1,
+ "周日": 1,
+ "key": 27
+ },
+ {
+ "id": "OR-EX-4 突袭",
+ "name": "辣",
+ "drop": {
+ "突袭首次掉落": [],
+ "常规掉落": [],
+ "首次掉落": [
+ "至纯源石"
+ ],
+ "特殊掉落": [],
+ "额外物资": []
+ },
+ "end": 1739303999,
+ "周一": 1,
+ "周二": 1,
+ "周三": 1,
+ "周四": 1,
+ "周五": 1,
+ "周六": 1,
+ "周日": 1,
+ "key": 28
+ },
+ {
+ "id": "OR-EX-5",
+ "name": "咸",
+ "drop": {
+ "突袭首次掉落": [],
+ "常规掉落": [],
+ "首次掉落": [
+ "“生香”",
+ "至纯源石"
+ ],
+ "特殊掉落": [],
+ "额外物资": []
+ },
+ "end": 1739303999,
+ "周一": 1,
+ "周二": 1,
+ "周三": 1,
+ "周四": 1,
+ "周五": 1,
+ "周六": 1,
+ "周日": 1,
+ "key": 29
+ },
+ {
+ "id": "OR-EX-5 突袭",
+ "name": "咸",
+ "drop": {
+ "突袭首次掉落": [],
+ "常规掉落": [],
+ "首次掉落": [
+ "至纯源石"
+ ],
+ "特殊掉落": [],
+ "额外物资": []
+ },
+ "end": 1739303999,
+ "周一": 1,
+ "周二": 1,
+ "周三": 1,
+ "周四": 1,
+ "周五": 1,
+ "周六": 1,
+ "周日": 1,
+ "key": 30
+ },
+ {
+ "id": "OR-EX-6",
+ "name": "鲜",
+ "drop": {
+ "突袭首次掉落": [],
+ "常规掉落": [],
+ "首次掉落": [
+ "“生香”",
+ "至纯源石"
+ ],
+ "特殊掉落": [],
+ "额外物资": []
+ },
+ "end": 1739303999,
+ "周一": 1,
+ "周二": 1,
+ "周三": 1,
+ "周四": 1,
+ "周五": 1,
+ "周六": 1,
+ "周日": 1,
+ "key": 31
+ },
+ {
+ "id": "OR-EX-6 突袭",
+ "name": "鲜",
+ "drop": {
+ "突袭首次掉落": [],
+ "常规掉落": [],
+ "首次掉落": [
+ "至纯源石"
+ ],
+ "特殊掉落": [],
+ "额外物资": []
+ },
+ "end": 1739303999,
+ "周一": 1,
+ "周二": 1,
+ "周三": 1,
+ "周四": 1,
+ "周五": 1,
+ "周六": 1,
+ "周日": 1,
+ "key": 32
+ },
+ {
+ "id": "OR-EX-7",
+ "name": "涩",
+ "drop": {
+ "突袭首次掉落": [],
+ "常规掉落": [],
+ "首次掉落": [
+ "“生香”",
+ "至纯源石"
+ ],
+ "特殊掉落": [],
+ "额外物资": []
+ },
+ "end": 1739303999,
+ "周一": 1,
+ "周二": 1,
+ "周三": 1,
+ "周四": 1,
+ "周五": 1,
+ "周六": 1,
+ "周日": 1,
+ "key": 33
+ },
+ {
+ "id": "OR-EX-7 突袭",
+ "name": "涩",
+ "drop": {
+ "突袭首次掉落": [],
+ "常规掉落": [],
+ "首次掉落": [
+ "至纯源石"
+ ],
+ "特殊掉落": [],
+ "额外物资": []
+ },
+ "end": 1739303999,
+ "周一": 1,
+ "周二": 1,
+ "周三": 1,
+ "周四": 1,
+ "周五": 1,
+ "周六": 1,
+ "周日": 1,
+ "key": 34
+ },
+ {
+ "id": "OR-EX-8",
+ "name": "百味灵明",
+ "drop": {
+ "突袭首次掉落": [],
+ "常规掉落": [],
+ "首次掉落": [
+ "“生香”",
+ "至纯源石"
+ ],
+ "特殊掉落": [],
+ "额外物资": []
+ },
+ "end": 1739303999,
+ "周一": 1,
+ "周二": 1,
+ "周三": 1,
+ "周四": 1,
+ "周五": 1,
+ "周六": 1,
+ "周日": 1,
+ "key": 35
+ },
+ {
+ "id": "OR-EX-8 突袭",
+ "name": "百味灵明",
+ "drop": {
+ "突袭首次掉落": [],
+ "常规掉落": [],
+ "首次掉落": [
+ "至纯源石"
+ ],
+ "特殊掉落": [],
+ "额外物资": []
+ },
+ "end": 1739303999,
+ "周一": 1,
+ "周二": 1,
+ "周三": 1,
+ "周四": 1,
+ "周五": 1,
+ "周六": 1,
+ "周日": 1,
+ "key": 36
+ },
+ {
+ "id": "OR-ST-1",
+ "name": "陈皮菊花茶",
+ "drop": {
+ "突袭首次掉落": [],
+ "常规掉落": [],
+ "首次掉落": [
+ "至纯源石"
+ ],
+ "特殊掉落": [],
+ "额外物资": []
+ },
+ "end": 1739303999,
+ "周一": 1,
+ "周二": 1,
+ "周三": 1,
+ "周四": 1,
+ "周五": 1,
+ "周六": 1,
+ "周日": 1,
+ "key": 37
+ },
+ {
+ "id": "OR-ST-2",
+ "name": "醍醐汤",
+ "drop": {
+ "突袭首次掉落": [],
+ "常规掉落": [],
+ "首次掉落": [
+ "至纯源石"
+ ],
+ "特殊掉落": [],
+ "额外物资": []
+ },
+ "end": 1739303999,
+ "周一": 1,
+ "周二": 1,
+ "周三": 1,
+ "周四": 1,
+ "周五": 1,
+ "周六": 1,
+ "周日": 1,
+ "key": 38
+ },
+ {
+ "id": "OR-ST-3",
+ "name": "须问汤",
+ "drop": {
+ "突袭首次掉落": [],
+ "常规掉落": [],
+ "首次掉落": [
+ "至纯源石"
+ ],
+ "特殊掉落": [],
+ "额外物资": []
+ },
+ "end": 1739303999,
+ "周一": 1,
+ "周二": 1,
+ "周三": 1,
+ "周四": 1,
+ "周五": 1,
+ "周六": 1,
+ "周日": 1,
+ "key": 39
+ },
+ {
+ "id": "OR-TR-1",
+ "name": "翡翠墨玉",
+ "drop": {
+ "突袭首次掉落": [],
+ "常规掉落": [],
+ "首次掉落": [
+ "至纯源石"
+ ],
+ "特殊掉落": [],
+ "额外物资": []
+ },
+ "end": 1739303999,
+ "周一": 1,
+ "周二": 1,
+ "周三": 1,
+ "周四": 1,
+ "周五": 1,
+ "周六": 1,
+ "周日": 1,
+ "key": 40
}
]
\ No newline at end of file
diff --git a/ui/src/stores/plan.js b/ui/src/stores/plan.js
index 2d1fdc84d..279739265 100644
--- a/ui/src/stores/plan.js
+++ b/ui/src/stores/plan.js
@@ -38,6 +38,9 @@ export const usePlanStore = defineStore('plan', () => {
for (let i = 1; i <= 4; ++i) {
facility_operator_limit[`dormitory_${i}`] = 5
}
+ for (let i = 1; i <= 3; ++i) {
+ facility_operator_limit[`gaming_${i}`] = 1
+ }
function list2str(data) {
return data.join(',')
@@ -135,7 +138,19 @@ export const usePlanStore = defineStore('plan', () => {
workaholic.value = str2list(response.data.conf.workaholic)
refresh_trading.value = str2list(response.data.conf.refresh_trading)
refresh_drained.value = str2list(response.data.conf.refresh_drained)
-
+ const gamings = ['gaming_1', 'gaming_2', 'gaming_3']
+ for (const key of gamings) {
+ if (!response.data.plan1[key]) {
+ response.data.plan1[key] = { plans: [] }
+ }
+ }
+ for (const key of gamings) {
+ for (const b of response.data.backup_plans) {
+ if (!b.conf[key]) {
+ b.conf[key] = { plans: [] }
+ }
+ }
+ }
plan.value = fill_empty(response.data.plan1)
backup_plans.value = response.data.backup_plans ?? []