diff --git a/ArknightsGameResource b/ArknightsGameResource index 9826fca7..14bdfe15 160000 --- a/ArknightsGameResource +++ b/ArknightsGameResource @@ -1 +1 @@ -Subproject commit 9826fca7f304b5f3e39bd42f4406a27b1015bf2c +Subproject commit 14bdfe1593c6e20f06648ec46d03f24fe3215b03 diff --git a/arknights_mower/data/agent.json b/arknights_mower/data/agent.json index 2b895e04..d0da6549 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/key_mapping.json b/arknights_mower/data/key_mapping.json index 845e17e1..d18599f5 100644 --- a/arknights_mower/data/key_mapping.json +++ b/arknights_mower/data/key_mapping.json @@ -377,20 +377,6 @@ "NORMAL", 40001 ], - "LINKAGE_TKT_GACHA_10_5401": [ - "LINKAGE_TKT_GACHA_10_5401", - "LINKAGE_TKT_GACHA_10_5401", - "好好吃饭寻访凭证", - "NORMAL", - 40003 - ], - "好好吃饭寻访凭证": [ - "LINKAGE_TKT_GACHA_10_5401", - "LINKAGE_TKT_GACHA_10_5401", - "好好吃饭寻访凭证", - "NORMAL", - 40003 - ], "7003": [ "7003", "TKT_GACHA", @@ -1194,56 +1180,56 @@ "randomDiamondShd_1", "罗德岛迎春红包", "CONSUME", - 60111 + 60112 ], "罗德岛迎春红包": [ "randomDiamondShd_1", "randomDiamondShd_1", "罗德岛迎春红包", "CONSUME", - 60111 + 60112 ], "randomDiamondShd_2": [ "randomDiamondShd_2", "randomDiamondShd_2", "庆典礼盒", "CONSUME", - 60112 + 60113 ], "庆典礼盒": [ "randomDiamondShd_2", "randomDiamondShd_2", "庆典礼盒", "CONSUME", - 60112 + 60113 ], "randomMaterial_siesta2": [ "randomMaterial_siesta2", "randomMaterial_siesta2", "峯联贸易物流补给", "CONSUME", - 60113 + 60114 ], "峯联贸易物流补给": [ "randomMaterial_siesta2", "randomMaterial_siesta2", "峯联贸易物流补给", "CONSUME", - 60113 + 60114 ], "randomMaterial_leith2": [ "randomMaterial_leith2", "randomMaterial_leith2", "查访补给", "CONSUME", - 60114 + 60115 ], "查访补给": [ "randomMaterial_leith2", "randomMaterial_leith2", "查访补给", "CONSUME", - 60114 + 60115 ], "2001": [ "2001", @@ -6607,6 +6593,34 @@ "MATERIAL", 700154 ], + "p_char_487_bobb": [ + "p_char_487_bobb", + "p_char_487_bobb", + "波卜的信物", + "MATERIAL", + 700155 + ], + "波卜的信物": [ + "p_char_487_bobb", + "p_char_487_bobb", + "波卜的信物", + "MATERIAL", + 700155 + ], + "p_char_4162_cathy": [ + "p_char_4162_cathy", + "p_char_4162_cathy", + "凯瑟琳的信物", + "MATERIAL", + 700156 + ], + "凯瑟琳的信物": [ + "p_char_4162_cathy", + "p_char_4162_cathy", + "凯瑟琳的信物", + "MATERIAL", + 700156 + ], "p_char_103_angel": [ "p_char_103_angel", "p_char_103_angel", @@ -7965,6 +7979,20 @@ "MATERIAL", 600097 ], + "p_char_1019_siege2": [ + "p_char_1019_siege2", + "p_char_1019_siege2", + "维娜·维多利亚的信物", + "MATERIAL", + 600098 + ], + "维娜·维多利亚的信物": [ + "p_char_1019_siege2", + "p_char_1019_siege2", + "维娜·维多利亚的信物", + "MATERIAL", + 600098 + ], "class_p_char_123_fang": [ "class_p_char_123_fang", "class_p_char_123_fang", @@ -10092,5 +10120,19 @@ "高级材料提货券", "CONSUME", 30201 + ], + "SINGLE_55_0_1_GACHA": [ + "SINGLE_55_0_1_GACHA", + "SINGLE_55_0_1_GACHA", + "未致蒙尘寻访凭证", + "NORMAL", + 40003 + ], + "未致蒙尘寻访凭证": [ + "SINGLE_55_0_1_GACHA", + "SINGLE_55_0_1_GACHA", + "未致蒙尘寻访凭证", + "NORMAL", + 40003 ] } \ No newline at end of file diff --git a/arknights_mower/models/CONSUME.pkl b/arknights_mower/models/CONSUME.pkl index e8055130..e58e667f 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 cb42f08d..6cbf0aa3 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 744ea149..a2b699a0 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 5aa9be85..a499786f 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 fe556955..28595200 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 53d8bb6c..55b476ea 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 e62757f5..3a2cfb87 100644 Binary files a/arknights_mower/models/recruit_result.pkl and b/arknights_mower/models/recruit_result.pkl differ diff --git a/ui/public/building_skill/bskill_dorm_unfull.webp b/ui/public/building_skill/bskill_dorm_unfull.webp new file mode 100644 index 00000000..a50835bb Binary files /dev/null and b/ui/public/building_skill/bskill_dorm_unfull.webp differ diff --git a/ui/public/building_skill/bskill_ws_cost.webp b/ui/public/building_skill/bskill_ws_cost.webp new file mode 100644 index 00000000..d2ba798f Binary files /dev/null and b/ui/public/building_skill/bskill_ws_cost.webp differ diff --git a/ui/public/building_skill/bskill_ws_p7.webp b/ui/public/building_skill/bskill_ws_p7.webp new file mode 100644 index 00000000..bb4d8518 Binary files /dev/null and b/ui/public/building_skill/bskill_ws_p7.webp differ diff --git a/ui/public/building_skill/trade_ord_spd&par1.webp b/ui/public/building_skill/trade_ord_spd&par1.webp new file mode 100644 index 00000000..ac736c6e Binary files /dev/null and b/ui/public/building_skill/trade_ord_spd&par1.webp differ diff --git a/ui/public/building_skill/trade_ord_spd&par2.webp b/ui/public/building_skill/trade_ord_spd&par2.webp new file mode 100644 index 00000000..0e14bc6b Binary files /dev/null and b/ui/public/building_skill/trade_ord_spd&par2.webp differ diff --git "a/ui/public/depot/\345\207\257\347\221\237\347\220\263\347\232\204\344\277\241\347\211\251.webp" "b/ui/public/depot/\345\207\257\347\221\237\347\220\263\347\232\204\344\277\241\347\211\251.webp" new file mode 100644 index 00000000..a3405b80 Binary files /dev/null and "b/ui/public/depot/\345\207\257\347\221\237\347\220\263\347\232\204\344\277\241\347\211\251.webp" differ diff --git "a/ui/public/depot/\346\234\252\350\207\264\350\222\231\345\260\230\345\257\273\350\256\277\345\207\255\350\257\201.webp" "b/ui/public/depot/\346\234\252\350\207\264\350\222\231\345\260\230\345\257\273\350\256\277\345\207\255\350\257\201.webp" new file mode 100644 index 00000000..80acbe69 Binary files /dev/null and "b/ui/public/depot/\346\234\252\350\207\264\350\222\231\345\260\230\345\257\273\350\256\277\345\207\255\350\257\201.webp" differ diff --git "a/ui/public/depot/\346\263\242\345\215\234\347\232\204\344\277\241\347\211\251.webp" "b/ui/public/depot/\346\263\242\345\215\234\347\232\204\344\277\241\347\211\251.webp" new file mode 100644 index 00000000..ea5c4125 Binary files /dev/null and "b/ui/public/depot/\346\263\242\345\215\234\347\232\204\344\277\241\347\211\251.webp" differ diff --git "a/ui/public/depot/\347\273\264\345\250\234\302\267\347\273\264\345\244\232\345\210\251\344\272\232\347\232\204\344\277\241\347\211\251.webp" "b/ui/public/depot/\347\273\264\345\250\234\302\267\347\273\264\345\244\232\345\210\251\344\272\232\347\232\204\344\277\241\347\211\251.webp" new file mode 100644 index 00000000..a39e4ec2 Binary files /dev/null and "b/ui/public/depot/\347\273\264\345\250\234\302\267\347\273\264\345\244\232\345\210\251\344\272\232\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 5f0fccf9..b16c5d78 100644 --- a/ui/src/components/PlanEditor.vue +++ b/ui/src/components/PlanEditor.vue @@ -188,7 +188,6 @@ function drop_facility(target, event) { // 1. 更新当前 current_plan 表 swap(source, target, current_plan.value) - console.log(current_plan.value) // 2. 更新所有副表和主表（除当前表以外） const allPlans = ['main', ...backup_plans.value] diff --git a/ui/src/pages/basement_skill/skill.json b/ui/src/pages/basement_skill/skill.json index 48b5edd6..d8e1ccc4 100644 --- a/ui/src/pages/basement_skill/skill.json +++ b/ui/src/pages/basement_skill/skill.json @@ -1,4 +1,125 @@ [ + { + "key": 345, + "name": "凯瑟琳", + "span": 3, + "child_skill": [ + { + "skill_key": 0, + "skill_level": 0, + "phase_level": "精0 1级", + "skillname": "工效模范·α", + "buffer": false, + "buffer_des": [], + "des": "进驻加工站加工<@cc.kw>任意类材料时，副产品的产出概率提升<@cc.vup>50%", + "roomType": "加工站", + "buffCategory": "FUNCTION", + "skillIcon": "bskill_ws_p2", + "buffColor": "#e3eb00", + "textColor": "#333333" + }, + { + "skill_key": 0, + "skill_level": 1, + "phase_level": "精2 1级", + "skillname": "工效模范·β", + "buffer": false, + "buffer_des": [], + "des": "进驻加工站加工<@cc.kw>任意类材料时，副产品的产出概率提升<@cc.vup>50%；如果<@cc.kw>白铁进驻在宿舍，则额外提升<@cc.vup>10%", + "roomType": "加工站", + "buffCategory": "FUNCTION", + "skillIcon": "bskill_ws_p7", + "buffColor": "#e3eb00", + "textColor": "#333333" + }, + { + "skill_key": 1, + "skill_level": 0, + "phase_level": "精2 1级", + "skillname": "自动化流水线", + "buffer": false, + "buffer_des": [], + "des": "进驻加工站加工<@cc.kw>任意类材料时，心情消耗为<@cc.kw>4以上的配方全部<@cc.vup>-2心情消耗", + "roomType": "加工站", + "buffCategory": "FUNCTION", + "skillIcon": "bskill_ws_cost", + "buffColor": "#e3eb00", + "textColor": "#333333" + } + ] + }, + { + "key": 344, + "name": "波卜", + "span": 2, + "child_skill": [ + { + "skill_key": 0, + "skill_level": 0, + "phase_level": "精0 1级", + "skillname": "倾听者", + "buffer": false, + "buffer_des": [], + "des": "进驻宿舍时，该宿舍内所有干员的心情每小时恢复<@cc.vup>+0.15（同种效果取最高）", + "roomType": "宿舍", + "buffCategory": "RECOVERY", + "skillIcon": "bskill_dorm_all2", + "buffColor": "#21cdcb", + "textColor": "#ffffff" + }, + { + "skill_key": 1, + "skill_level": 0, + "phase_level": "精2 1级", + "skillname": "倾谈者", + "buffer": false, + "buffer_des": [], + "des": "进驻宿舍时，该宿舍内所有干员的心情每小时恢复<@cc.vup>+0.2；同时该宿舍每有<@cc.kw>1名心情未满的干员，则恢复效果额外<@cc.vup>+0.01（同种效果取最高）", + "roomType": "宿舍", + "buffCategory": "RECOVERY", + "skillIcon": "bskill_dorm_unfull", + "buffColor": "#21cdcb", + "textColor": "#ffffff" + } + ] + }, + { + "key": 343, + "name": "维娜·维多利亚", + "span": 2, + "child_skill": [ + { + "skill_key": 0, + "skill_level": 0, + "phase_level": "精0 1级", + "skillname": "外贸决议·α", + "buffer": false, + "buffer_des": [], + "des": "进驻贸易站时，订单获取效率<@cc.vup>+30%", + "roomType": "贸易站", + "buffCategory": "OUTPUT", + "skillIcon": "trade_ord_spd&par1", + "buffColor": "#0075a9", + "textColor": "#ffffff" + }, + { + "skill_key": 0, + "skill_level": 1, + "phase_level": "精2 1级", + "skillname": "外贸决议·β", + "buffer": true, + "buffer_des": [ + "cc_g_glasgow" + ], + "des": "进驻贸易站时，订单获取效率<@cc.vup>+30%；当前贸易站内存在<$cc.g.glasgow><@cc.kw>格拉斯哥帮干员时，订单获取效率额外<@cc.vup>+10%", + "roomType": "贸易站", + "buffCategory": "OUTPUT", + "skillIcon": "trade_ord_spd&par2", + "buffColor": "#0075a9", + "textColor": "#ffffff" + } + ] + }, { "key": 342, "name": "莱欧斯", diff --git a/ui/src/pages/stage_data/event_data.json b/ui/src/pages/stage_data/event_data.json index 0d53287c..bb2b0068 100644 --- a/ui/src/pages/stage_data/event_data.json +++ b/ui/src/pages/stage_data/event_data.json @@ -84,7 +84,7 @@ "key": 5 }, { - "id": "SK-6", + "id": "SK-5", "name": "碳条", "drop": "", "end": -1, @@ -168,12 +168,380 @@ "key": 11 }, { - "id": "DT-1", - "name": "源石虫农家乐", + "id": "VEC-01", + "name": "拳拳生风", "drop": { "突袭首次掉落": [], "常规掉落": [ - "今日食谱", + "胜绩积分" + ], + "首次掉落": [ + "胜绩积分" + ], + "特殊掉落": [], + "额外物资": [] + }, + "end": 1728590399, + "周一": 1, + "周二": 1, + "周三": 1, + "周四": 1, + "周五": 1, + "周六": 1, + "周日": 1, + "key": 12 + }, + { + "id": "VEC-02", + "name": "低温征兆", + "drop": { + "突袭首次掉落": [], + "常规掉落": [ + "胜绩积分" + ], + "首次掉落": [ + "胜绩积分" + ], + "特殊掉落": [], + "额外物资": [] + }, + "end": 1728590399, + "周一": 1, + "周二": 1, + "周三": 1, + "周四": 1, + "周五": 1, + "周六": 1, + "周日": 1, + "key": 13 + }, + { + "id": "VEC-03", + "name": "重荷", + "drop": { + "突袭首次掉落": [], + "常规掉落": [ + "胜绩积分" + ], + "首次掉落": [ + "胜绩积分" + ], + "特殊掉落": [], + "额外物资": [] + }, + "end": 1728590399, + "周一": 1, + "周二": 1, + "周三": 1, + "周四": 1, + "周五": 1, + "周六": 1, + "周日": 1, + "key": 14 + }, + { + "id": "VEC-04", + "name": "巨锤与锐枪", + "drop": { + "突袭首次掉落": [], + "常规掉落": [ + "胜绩积分" + ], + "首次掉落": [ + "胜绩积分" + ], + "特殊掉落": [], + "额外物资": [] + }, + "end": 1728590399, + "周一": 1, + "周二": 1, + "周三": 1, + "周四": 1, + "周五": 1, + "周六": 1, + "周日": 1, + "key": 15 + }, + { + "id": "VEC-05", + "name": "刻骨铭心", + "drop": { + "突袭首次掉落": [], + "常规掉落": [ + "胜绩积分" + ], + "首次掉落": [ + "胜绩积分" + ], + "特殊掉落": [], + "额外物资": [] + }, + "end": 1728590399, + "周一": 1, + "周二": 1, + "周三": 1, + "周四": 1, + "周五": 1, + "周六": 1, + "周日": 1, + "key": 16 + }, + { + "id": "VEC-06", + "name": "远方来袭", + "drop": { + "突袭首次掉落": [], + "常规掉落": [ + "胜绩积分" + ], + "首次掉落": [ + "胜绩积分" + ], + "特殊掉落": [], + "额外物资": [] + }, + "end": 1728590399, + "周一": 1, + "周二": 1, + "周三": 1, + "周四": 1, + "周五": 1, + "周六": 1, + "周日": 1, + "key": 17 + }, + { + "id": "VEC-07", + "name": "赤红的冰", + "drop": { + "突袭首次掉落": [], + "常规掉落": [ + "胜绩积分" + ], + "首次掉落": [ + "胜绩积分" + ], + "特殊掉落": [], + "额外物资": [] + }, + "end": 1728590399, + "周一": 1, + "周二": 1, + "周三": 1, + "周四": 1, + "周五": 1, + "周六": 1, + "周日": 1, + "key": 18 + }, + { + "id": "VEC-08", + "name": "思绪之隙", + "drop": { + "突袭首次掉落": [], + "常规掉落": [ + "胜绩积分" + ], + "首次掉落": [ + "胜绩积分" + ], + "特殊掉落": [], + "额外物资": [] + }, + "end": 1728590399, + "周一": 1, + "周二": 1, + "周三": 1, + "周四": 1, + "周五": 1, + "周六": 1, + "周日": 1, + "key": 19 + }, + { + "id": "VEC-SP01", + "name": "丛林巅峰", + "drop": { + "突袭首次掉落": [], + "常规掉落": [], + "首次掉落": [ + "胜绩积分" + ], + "特殊掉落": [], + "额外物资": [] + }, + "end": 1728590399, + "周一": 1, + "周二": 1, + "周三": 1, + "周四": 1, + "周五": 1, + "周六": 1, + "周日": 1, + "key": 20 + }, + { + "id": "VEC-SP02", + "name": "狂徒围攻", + "drop": { + "突袭首次掉落": [], + "常规掉落": [], + "首次掉落": [ + "胜绩积分" + ], + "特殊掉落": [], + "额外物资": [] + }, + "end": 1728590399, + "周一": 1, + "周二": 1, + "周三": 1, + "周四": 1, + "周五": 1, + "周六": 1, + "周日": 1, + "key": 21 + }, + { + "id": "VEC-SP03", + "name": "巫术纠缠", + "drop": { + "突袭首次掉落": [], + "常规掉落": [], + "首次掉落": [ + "胜绩积分" + ], + "特殊掉落": [], + "额外物资": [] + }, + "end": 1728590399, + "周一": 1, + "周二": 1, + "周三": 1, + "周四": 1, + "周五": 1, + "周六": 1, + "周日": 1, + "key": 22 + }, + { + "id": "VEC-SP04", + "name": "盾阵隘口", + "drop": { + "突袭首次掉落": [], + "常规掉落": [], + "首次掉落": [ + "胜绩积分" + ], + "特殊掉落": [], + "额外物资": [] + }, + "end": 1728590399, + "周一": 1, + "周二": 1, + "周三": 1, + "周四": 1, + "周五": 1, + "周六": 1, + "周日": 1, + "key": 23 + }, + { + "id": "VEC-SP05", + "name": "伙友之影", + "drop": { + "突袭首次掉落": [], + "常规掉落": [], + "首次掉落": [ + "胜绩积分" + ], + "特殊掉落": [], + "额外物资": [] + }, + "end": 1728590399, + "周一": 1, + "周二": 1, + "周三": 1, + "周四": 1, + "周五": 1, + "周六": 1, + "周日": 1, + "key": 24 + }, + { + "id": "VEC-SP06", + "name": "酒厂英豪", + "drop": { + "突袭首次掉落": [], + "常规掉落": [], + "首次掉落": [ + "胜绩积分" + ], + "特殊掉落": [], + "额外物资": [] + }, + "end": 1728590399, + "周一": 1, + "周二": 1, + "周三": 1, + "周四": 1, + "周五": 1, + "周六": 1, + "周日": 1, + "key": 25 + }, + { + "id": "VEC-SP07", + "name": "异质聚群", + "drop": { + "突袭首次掉落": [], + "常规掉落": [], + "首次掉落": [ + "胜绩积分" + ], + "特殊掉落": [], + "额外物资": [] + }, + "end": 1728590399, + "周一": 1, + "周二": 1, + "周三": 1, + "周四": 1, + "周五": 1, + "周六": 1, + "周日": 1, + "key": 26 + }, + { + "id": "VEC-SP08", + "name": "炮火泥潭", + "drop": { + "突袭首次掉落": [], + "常规掉落": [], + "首次掉落": [ + "胜绩积分" + ], + "特殊掉落": [], + "额外物资": [] + }, + "end": 1728590399, + "周一": 1, + "周二": 1, + "周三": 1, + "周四": 1, + "周五": 1, + "周六": 1, + "周日": 1, + "key": 27 + }, + { + "id": "GO-1", + "name": "仇怨残余", + "drop": { + "突袭首次掉落": [], + "常规掉落": [ + "“我反对！”", "酯原料", "破损装置", "异铁碎片", @@ -182,13 +550,13 @@ "源岩" ], "首次掉落": [ - "今日食谱", + "“我反对！”", "至纯源石" ], "特殊掉落": [], "额外物资": [] }, - "end": 1726430399, + "end": 1729627199, "周一": 1, "周二": 1, "周三": 1, @@ -196,15 +564,15 @@ "周五": 1, "周六": 1, "周日": 1, - "key": 12 + "key": 28 }, { - "id": "DT-2", - "name": "雨林解毒炖汤", + "id": "GO-2", + "name": "痼疾缠身", "drop": { "突袭首次掉落": [], "常规掉落": [ - "今日食谱", + "“我反对！”", "酯原料", "破损装置", "异铁碎片", @@ -213,13 +581,13 @@ "源岩" ], "首次掉落": [ - "今日食谱", + "“我反对！”", "至纯源石" ], "特殊掉落": [], "额外物资": [] }, - "end": 1726430399, + "end": 1729627199, "周一": 1, "周二": 1, "周三": 1, @@ -227,26 +595,30 @@ "周五": 1, "周六": 1, "周日": 1, - "key": 13 + "key": 29 }, { - "id": "DT-3", - "name": "黄金萝卜", + "id": "GO-3", + "name": "议会公决", "drop": { "突袭首次掉落": [], "常规掉落": [ - "今日食谱", - "聚酸酯", - "固源岩" + "“我反对！”", + "酯原料", + "破损装置", + "异铁碎片", + "双酮", + "代糖", + "源岩" ], "首次掉落": [ - "今日食谱", + "“我反对！”", "至纯源石" ], "特殊掉落": [], "额外物资": [] }, - "end": 1726430399, + "end": 1729627199, "周一": 1, "周二": 1, "周三": 1, @@ -254,26 +626,53 @@ "周五": 1, "周六": 1, "周日": 1, - "key": 14 + "key": 30 + }, + { + "id": "GO-4", + "name": "酒精与安慰剂", + "drop": { + "突袭首次掉落": [], + "常规掉落": [ + "“我反对！”", + "固源岩", + "聚酸酯" + ], + "首次掉落": [ + "“我反对！”", + "至纯源石" + ], + "特殊掉落": [], + "额外物资": [] + }, + "end": 1729627199, + "周一": 1, + "周二": 1, + "周三": 1, + "周四": 1, + "周五": 1, + "周六": 1, + "周日": 1, + "key": 31 }, { - "id": "DT-4", - "name": "烤串与预言", + "id": "GO-5", + "name": "废铁与铆钉", "drop": { "突袭首次掉落": [], "常规掉落": [ - "今日食谱", + "“我反对！”", "异铁", - "糖" + "装置" ], "首次掉落": [ - "今日食谱", + "“我反对！”", "至纯源石" ], "特殊掉落": [], "额外物资": [] }, - "end": 1726430399, + "end": 1729627199, "周一": 1, "周二": 1, "周三": 1, @@ -281,26 +680,26 @@ "周五": 1, "周六": 1, "周日": 1, - "key": 15 + "key": 32 }, { - "id": "DT-5", - "name": "会饮图", + "id": "GO-6", + "name": "“晚饭宣言”", "drop": { "突袭首次掉落": [], "常规掉落": [ - "今日食谱", + "“我反对！”", "酮凝集", - "装置" + "糖" ], "首次掉落": [ - "今日食谱", + "“我反对！”", "至纯源石" ], "特殊掉落": [], "额外物资": [] }, - "end": 1726430399, + "end": 1729627199, "周一": 1, "周二": 1, "周三": 1, @@ -308,25 +707,25 @@ "周五": 1, "周六": 1, "周日": 1, - "key": 16 + "key": 33 }, { - "id": "DT-6", - "name": "海鲜拼盘", + "id": "GO-7", + "name": "锈王冠", "drop": { "突袭首次掉落": [], "常规掉落": [ - "今日食谱", - "聚酸酯组" + "“我反对！”", + "固源岩组" ], "首次掉落": [ - "今日食谱", + "“我反对！”", "至纯源石" ], "特殊掉落": [], "额外物资": [] }, - "end": 1726430399, + "end": 1729627199, "周一": 1, "周二": 1, "周三": 1, @@ -334,25 +733,25 @@ "周五": 1, "周六": 1, "周日": 1, - "key": 17 + "key": 34 }, { - "id": "DT-7", - "name": "健康零食", + "id": "GO-8", + "name": "战火重铸之剑", "drop": { "突袭首次掉落": [], "常规掉落": [ - "今日食谱", - "炽合金" + "“我反对！”", + "凝胶" ], "首次掉落": [ - "今日食谱", + "“我反对！”", "至纯源石" ], "特殊掉落": [], "额外物资": [] }, - "end": 1726430399, + "end": 1729627199, "周一": 1, "周二": 1, "周三": 1, @@ -360,25 +759,25 @@ "周五": 1, "周六": 1, "周日": 1, - "key": 18 + "key": 35 }, { - "id": "DT-8", - "name": "罗德岛大食堂", + "id": "GO-9", + "name": "英雄的落幕", "drop": { "突袭首次掉落": [], "常规掉落": [ - "今日食谱", - "褐素纤维" + "“我反对！”", + "半自然溶剂" ], "首次掉落": [ - "今日食谱", + "“我反对！”", "至纯源石" ], "特殊掉落": [], "额外物资": [] }, - "end": 1726430399, + "end": 1729627199, "周一": 1, "周二": 1, "周三": 1, @@ -386,11 +785,11 @@ "周五": 1, "周六": 1, "周日": 1, - "key": 19 + "key": 36 }, { - "id": "DT-TR-1", - "name": "美食指南", + "id": "GO-ST-1", + "name": "历史的航向", "drop": { "突袭首次掉落": [], "常规掉落": [], @@ -400,7 +799,7 @@ "特殊掉落": [], "额外物资": [] }, - "end": 1726430399, + "end": 1729627199, "周一": 1, "周二": 1, "周三": 1, @@ -408,6 +807,50 @@ "周五": 1, "周六": 1, "周日": 1, - "key": 20 + "key": 37 + }, + { + "id": "GO-ST-2", + "name": "童话的结局", + "drop": { + "突袭首次掉落": [], + "常规掉落": [], + "首次掉落": [ + "至纯源石" + ], + "特殊掉落": [], + "额外物资": [] + }, + "end": 1729627199, + "周一": 1, + "周二": 1, + "周三": 1, + "周四": 1, + "周五": 1, + "周六": 1, + "周日": 1, + "key": 38 + }, + { + "id": "GO-TR-1", + "name": "物资难题", + "drop": { + "突袭首次掉落": [], + "常规掉落": [], + "首次掉落": [ + "至纯源石" + ], + "特殊掉落": [], + "额外物资": [] + }, + "end": 1729627199, + "周一": 1, + "周二": 1, + "周三": 1, + "周四": 1, + "周五": 1, + "周六": 1, + "周日": 1, + "key": 39 } ] \ No newline at end of file