Skip to content

Commit

Permalink
10/9 更新
Browse files Browse the repository at this point in the history
  • Loading branch information
Shawnsdaddy committed Oct 9, 2024
1 parent 91b03c7 commit a3e851d
Show file tree
Hide file tree
Showing 22 changed files with 690 additions and 85 deletions.
2 changes: 1 addition & 1 deletion ArknightsGameResource
2 changes: 1 addition & 1 deletion arknights_mower/data/agent.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
["芬", "梅", "宴", "砾", "孑", "吽", "红", "空", "黑", "W", "夕", "林", "令", "阿", "黍", "年", "山", "陈", "锏", "煌", "夜刀", "黑角", "杜林", "香草", "翎羽", "卡缇", "斑点", "炎熔", "芙蓉", "梓兰", "夜烟", "远山", "卡达", "深靛", "布丁", "流星", "红云", "白雪", "松果", "酸糖", "铅踝", "跃跃", "讯使", "红豆", "豆苗", "杜宾", "缠丸", "霜叶", "慕斯", "刻刀", "芳汀", "石英", "暗索", "末药", "清流", "褐果", "角峰", "泡泡", "露托", "古米", "坚雷", "地灵", "伊桑", "阿消", "维荻", "微风", "凛冬", "贾维", "青枳", "红隼", "苇草", "野鬃", "极境", "万顷", "夜半", "渡桥", "晓歌", "谜图", "鞭刃", "苍苔", "医生", "炎客", "摩根", "燧石", "断崖", "烈夏", "铎铃", "柏喙", "战车", "星极", "铸铁", "赤冬", "海沫", "奥达", "蓝毒", "白金", "灰喉", "四月", "隐现", "陨星", "慑砂", "截云", "苦艾", "雪绒", "天火", "惊蛰", "星源", "蜜蜡", "寒檀", "薄绿", "和弦", "蚀清", "耶拉", "洛洛", "至简", "折光", "温米", "梅尔", "稀音", "衡沙", "赫默", "亚叶", "锡兰", "絮雨", "图耶", "桑葚", "蜜莓", "刺玫", "明椒", "莎草", "临光", "深律", "森西", "槐琥", "乌有", "雷蛇", "深巡", "可颂", "拜松", "火神", "石棉", "暮落", "闪击", "暴雨", "灰毫", "火哨", "极光", "洋灰", "玫拉", "子月", "熔泉", "冰酿", "空构", "崖心", "雪雉", "杏仁", "初雪", "巫恋", "海霓", "真理", "但书", "小满", "掠风", "海蒂", "月禾", "夏栎", "凛视", "狮蝎", "绮良", "罗宾", "霜华", "贝娜", "风丸", "双月", "锡人", "空弦", "灰烬", "鸿雪", "远牙", "早露", "提丰", "莱伊", "风笛", "嵯峨", "琴柳", "焰尾", "伺夜", "异客", "澄闪", "黑键", "妮芙", "灵知", "铃兰", "魔王", "白铁", "塑心", "傀影", "老鲤", "温蒂", "水月", "艾拉", "闪灵", "夜莺", "流明", "星熊", "瑕光", "泥岩", "斥罪", "森蚺", "号角", "重岳", "银灰", "棘刺", "仇白", "佩佩", "左乐", "止颂", "暴行", "空爆", "猎蜂", "杰克", "夜魔", "巡林者", "12F", "玫兰莎", "泡普卡", "米格鲁", "克洛丝", "安赛尔", "格雷伊", "杰西卡", "安比尔", "清道夫", "桃金娘", "断罪者", "罗小黑", "休谟斯", "嘉维尔", "苏苏洛", "调香师", "蛇屠箱", "深海色", "波登可", "白面鸮", "诗怀雅", "芙兰卡", "莱欧斯", "因陀罗", "达格达", "幽灵鲨", "布洛卡", "导火索", "羽毛笔", "龙舌兰", "送葬人", "奥斯塔", "阿米娅", "特米米", "爱丽丝", "戴菲恩", "阿罗玛", "华法琳", "哈洛德", "卡夫卡", "车尔尼", "守林人", "安哲拉", "埃拉托", "九色鹿", "食铁兽", "见行者", "能天使", "迷迭香", "伊内丝", "刻俄柏", "逻各斯", "麦哲伦", "多萝西", "凯尔希", "塞雷娅", "赫德雷", "艾丽妮", "赫拉格", "帕拉斯", "玛恩纳", "月见夜", "格拉尼", "斯卡蒂", "安德切尔", "史都华德", "艾丝黛尔", "罗比菈塔", "德克萨斯", "齐尔查克", "拉普兰德", "莱恩哈特", "炎狱炎熔", "濯尘芙蓉", "普罗旺斯", "格劳克斯", "菲亚梅塔", "维什戴尔", "娜仁图亚", "推进之王", "缪尔赛思", "伊芙利特", "莫斯提马", "艾雅法拉", "霍尔海雅", "玛露西尔", "卡涅利安", "安洁莉娜", "淬羽赫默", "歌蕾蒂娅", "阿斯卡纶", "焰影苇草", "乌尔比安", "史尔特尔", "薇薇安娜", "正义骑士号", "历阵锐枪芬", "火龙S黑角", "寒芒克洛丝", "承曦格雷伊", "假日威龙陈", "浊心斯卡蒂", "麒麟R夜刀", "琳琅诗怀雅", "归溟幽灵鲨", "涤火杰西卡", "百炼嘉维尔", "耀骑士临光", "圣约送葬人", "缄默德克萨斯", "纯烬艾雅法拉", "THRM-EX", "泰拉大陆调查团", "Lancet-2", "Castle-3", "PhonoR-0", "Friston-3", "U-Official"]
["芬", "梅", "宴", "砾", "孑", "吽", "红", "空", "黑", "W", "夕", "林", "令", "阿", "黍", "年", "山", "陈", "锏", "煌", "夜刀", "黑角", "杜林", "香草", "翎羽", "卡缇", "斑点", "炎熔", "芙蓉", "梓兰", "夜烟", "远山", "卡达", "深靛", "布丁", "流星", "红云", "白雪", "松果", "酸糖", "铅踝", "跃跃", "讯使", "红豆", "豆苗", "杜宾", "缠丸", "霜叶", "慕斯", "刻刀", "芳汀", "石英", "暗索", "末药", "清流", "褐果", "角峰", "泡泡", "露托", "古米", "坚雷", "地灵", "伊桑", "阿消", "维荻", "微风", "凛冬", "贾维", "青枳", "红隼", "苇草", "野鬃", "极境", "万顷", "夜半", "渡桥", "晓歌", "谜图", "鞭刃", "苍苔", "医生", "炎客", "摩根", "燧石", "断崖", "烈夏", "铎铃", "柏喙", "战车", "星极", "铸铁", "赤冬", "海沫", "奥达", "蓝毒", "白金", "灰喉", "四月", "隐现", "陨星", "慑砂", "截云", "苦艾", "雪绒", "天火", "惊蛰", "星源", "蜜蜡", "寒檀", "薄绿", "和弦", "蚀清", "耶拉", "洛洛", "至简", "折光", "温米", "梅尔", "稀音", "衡沙", "赫默", "亚叶", "锡兰", "絮雨", "图耶", "桑葚", "蜜莓", "刺玫", "明椒", "莎草", "临光", "深律", "森西", "槐琥", "乌有", "雷蛇", "深巡", "可颂", "拜松", "火神", "石棉", "暮落", "闪击", "暴雨", "灰毫", "火哨", "极光", "洋灰", "玫拉", "子月", "熔泉", "冰酿", "空构", "崖心", "雪雉", "杏仁", "初雪", "巫恋", "海霓", "真理", "但书", "小满", "掠风", "海蒂", "月禾", "夏栎", "凛视", "波卜", "狮蝎", "绮良", "罗宾", "霜华", "贝娜", "风丸", "双月", "锡人", "空弦", "灰烬", "鸿雪", "远牙", "早露", "提丰", "莱伊", "风笛", "嵯峨", "琴柳", "焰尾", "伺夜", "异客", "澄闪", "黑键", "妮芙", "灵知", "铃兰", "魔王", "白铁", "塑心", "傀影", "老鲤", "温蒂", "水月", "艾拉", "闪灵", "夜莺", "流明", "星熊", "瑕光", "泥岩", "斥罪", "森蚺", "号角", "重岳", "银灰", "棘刺", "仇白", "佩佩", "左乐", "止颂", "暴行", "空爆", "猎蜂", "杰克", "夜魔", "巡林者", "12F", "玫兰莎", "泡普卡", "米格鲁", "克洛丝", "安赛尔", "格雷伊", "杰西卡", "安比尔", "清道夫", "桃金娘", "断罪者", "罗小黑", "休谟斯", "嘉维尔", "苏苏洛", "调香师", "蛇屠箱", "深海色", "波登可", "白面鸮", "诗怀雅", "芙兰卡", "莱欧斯", "因陀罗", "达格达", "幽灵鲨", "布洛卡", "导火索", "羽毛笔", "龙舌兰", "送葬人", "奥斯塔", "阿米娅", "特米米", "爱丽丝", "戴菲恩", "阿罗玛", "华法琳", "哈洛德", "卡夫卡", "车尔尼", "守林人", "安哲拉", "埃拉托", "凯瑟琳", "九色鹿", "食铁兽", "见行者", "能天使", "迷迭香", "伊内丝", "刻俄柏", "逻各斯", "麦哲伦", "多萝西", "凯尔希", "塞雷娅", "赫德雷", "艾丽妮", "赫拉格", "帕拉斯", "玛恩纳", "月见夜", "格拉尼", "斯卡蒂", "安德切尔", "史都华德", "艾丝黛尔", "罗比菈塔", "德克萨斯", "齐尔查克", "拉普兰德", "莱恩哈特", "炎狱炎熔", "濯尘芙蓉", "普罗旺斯", "格劳克斯", "菲亚梅塔", "维什戴尔", "娜仁图亚", "推进之王", "缪尔赛思", "伊芙利特", "莫斯提马", "艾雅法拉", "霍尔海雅", "玛露西尔", "卡涅利安", "安洁莉娜", "淬羽赫默", "歌蕾蒂娅", "阿斯卡纶", "焰影苇草", "乌尔比安", "史尔特尔", "薇薇安娜", "正义骑士号", "历阵锐枪芬", "火龙S黑角", "寒芒克洛丝", "承曦格雷伊", "假日威龙陈", "浊心斯卡蒂", "麒麟R夜刀", "琳琅诗怀雅", "归溟幽灵鲨", "涤火杰西卡", "百炼嘉维尔", "耀骑士临光", "圣约送葬人", "缄默德克萨斯", "纯烬艾雅法拉", "THRM-EX", "泰拉大陆调查团", "维娜·维多利亚", "Lancet-2", "Castle-3", "PhonoR-0", "Friston-3", "U-Official"]
86 changes: 64 additions & 22 deletions arknights_mower/data/key_mapping.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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
]
}
Binary file modified arknights_mower/models/CONSUME.pkl
Binary file not shown.
Binary file modified arknights_mower/models/NORMAL.pkl
Binary file not shown.
Binary file modified arknights_mower/models/avatar.pkl
Binary file not shown.
Binary file modified arknights_mower/models/operator_room.model
Binary file not shown.
Binary file modified arknights_mower/models/operator_select.model
Binary file not shown.
Binary file modified arknights_mower/models/recruit.pkl
Binary file not shown.
Binary file modified arknights_mower/models/recruit_result.pkl
Binary file not shown.
Binary file added ui/public/building_skill/bskill_dorm_unfull.webp
Binary file not shown.
Binary file added ui/public/building_skill/bskill_ws_cost.webp
Binary file not shown.
Binary file added ui/public/building_skill/bskill_ws_p7.webp
Binary file not shown.
Binary file added ui/public/building_skill/trade_ord_spd&par1.webp
Binary file not shown.
Binary file added ui/public/building_skill/trade_ord_spd&par2.webp
Binary file not shown.
Binary file added ui/public/depot/凯瑟琳的信物.webp
Binary file not shown.
Binary file added ui/public/depot/未致蒙尘寻访凭证.webp
Binary file not shown.
Binary file added ui/public/depot/波卜的信物.webp
Binary file not shown.
Binary file not shown.
1 change: 0 additions & 1 deletion ui/src/components/PlanEditor.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
121 changes: 121 additions & 0 deletions ui/src/pages/basement_skill/skill.json
Original file line number Diff line number Diff line change
@@ -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": "莱欧斯",
Expand Down
Loading

0 comments on commit a3e851d

Please sign in to comment.