diff --git a/resource/roguelike/Mizuki/recruitment.json b/resource/roguelike/Mizuki/recruitment.json index c953541108..b5a4f3b170 100644 --- a/resource/roguelike/Mizuki/recruitment.json +++ b/resource/roguelike/Mizuki/recruitment.json @@ -658,7 +658,8 @@ "name": "月见夜", "skill": 1, "recruit_priority": 466, - "is_key": true + "is_key": true, + "is_start": true }, { "name": "拉普兰德", @@ -870,11 +871,28 @@ { "name": "单奶", "opers": [ + { + "name": "纯烬艾雅法拉", + "skill": 1, + "recruit_priority": 742, + "promote_priority": 450, + "is_key": true, + "recruit_priority_offsets": [ + { + "groups": [ + "单奶", + "群奶" + ], + "threshold": 2, + "offset": -300 + } + ] + }, { "name": "蜜莓", "skill": 1, "recruit_priority": 741, - "promote_priority": 0, + "promote_priority": 350, "is_key": true, "recruit_priority_offsets": [ { @@ -1063,6 +1081,7 @@ "recruit_priority": 635, "promote_priority": 0, "is_key": true, + "is_start": true, "recruit_priority_offsets": [ { "groups": [ @@ -1353,6 +1372,7 @@ "recruit_priority": 511, "promote_priority": 0, "is_key": true, + "is_start": true, "recruit_priority_offsets": [ { "groups": [ @@ -1667,6 +1687,7 @@ "recruit_priority": 625, "promote_priority": 0, "is_key": true, + "is_start": true, "recruit_priority_offsets": [ { "groups": [ @@ -1972,6 +1993,7 @@ "name": "史都华德", "skill": 1, "is_key": true, + "is_start": true, "recruit_priority": 462, "promote_priority": 0 }, @@ -2036,6 +2058,7 @@ "name": "克洛丝", "skill": 1, "is_key": true, + "is_start": true, "recruit_priority": 488, "promote_priority": 0 }, @@ -2087,6 +2110,7 @@ "name": "梓兰", "skill": 1, "is_key": true, + "is_start": true, "recruit_priority": 323, "promote_priority": 0 } @@ -3221,4 +3245,4 @@ "threshold": 1 } ] -} \ No newline at end of file +} diff --git a/resource/roguelike/Phantom/recruitment.json b/resource/roguelike/Phantom/recruitment.json index 7d63b27d35..15f45bcab2 100644 --- a/resource/roguelike/Phantom/recruitment.json +++ b/resource/roguelike/Phantom/recruitment.json @@ -36,7 +36,7 @@ "skill": 3, "alternate_skill": 2, "recruit_priority": 650, - "promote_priority": 932, + "promote_priority": 982, "is_key": true, "recruit_priority_offsets": [ { @@ -410,15 +410,13 @@ { "groups": [ "凯尔希", - "近卫", - "重装", - "情报官", - "挡人先锋" + "棘刺", + "地面阻挡" ], "threshold": 1, "is_less": true, "offset": -300, - "Doc": "地面阻挡≤1时，玛恩纳的招募优先级-500" + "Doc": "地面阻挡≤1时，的招募优先级-500" } ] } @@ -449,7 +447,7 @@ "重装" ], "threshold": 2, - "offset": -300 + "offset": -120 } ] }, @@ -492,7 +490,7 @@ "近卫" ], "threshold": 2, - "offset": -300 + "offset": -200 } ] }, @@ -511,7 +509,7 @@ "重装" ], "threshold": 2, - "offset": -250 + "offset": -120 } ] }, @@ -527,7 +525,7 @@ "重装" ], "threshold": 2, - "offset": -300 + "offset": -120 } ] }, @@ -587,6 +585,7 @@ "recruit_priority_offsets": [ { "groups": [ + "凯尔希", "重装" ], "threshold": 2, @@ -598,10 +597,11 @@ "name": "泡泡", "skill": 2, "recruit_priority": 597, - "promote_priority": 270, + "promote_priority": 400, "recruit_priority_offsets": [ { "groups": [ + "凯尔希", "重装" ], "threshold": 2, @@ -639,7 +639,6 @@ "name": "斑点", "skill": 1, "recruit_priority": 625, - "promote_priority": 0, "is_key": true, "is_start": true, "recruit_priority_offsets": [ @@ -663,10 +662,11 @@ "recruit_priority_offsets": [ { "groups": [ + "凯尔希", "重装" ], "threshold": 1, - "offset": -200 + "offset": -300 } ] }, @@ -724,7 +724,7 @@ "name": "石棉", "skill": 2, "recruit_priority": 615, - "promote_priority": 300, + "promote_priority": 400, "is_start": true, "recruit_priority_offsets": [ { @@ -740,46 +740,63 @@ }, { "name": "暮落", - "skill": 2 + "skill": 2, + "promote_priority": 350 }, { "name": "车尔尼", - "skill": 2 + "skill": 2, + "promote_priority": 350 }, { "name": "可颂", - "skill": 2 + "skill": 2, + "promote_priority": 350 }, { "name": "拜松", - "skill": 2 + "skill": 2, + "promote_priority": 350 }, { "name": "闪击", - "skill": 2 + "skill": 2, + "promote_priority": 350 }, { "name": "吽", - "skill": 2 + "skill": 2, + "promote_priority": 350 }, { "name": "暴雨", - "skill": 2 + "skill": 2, + "promote_priority": 350 }, { "name": "角峰", - "skill": 2 + "skill": 2, + "promote_priority": 350 }, { "name": "坚雷", - "skill": 2 + "skill": 2, + "promote_priority": 350 }, { "name": "预备干员-重装", - "skill": 0, "recruit_priority": 460, - "promote_priority": 0, - "is_alternate": true + "is_alternate": true, + "recruit_priority_offsets": [ + { + "groups": [ + "凯尔希", + "重装" + ], + "threshold": 2, + "offset": -140 + } + ] } ] }, @@ -1013,7 +1030,7 @@ "name": "纯烬艾雅法拉", "skill": 1, "is_key": true, - "recruit_priority": 799, + "recruit_priority": 801, "promote_priority": 590, "recruit_priority_offsets": [ { @@ -2030,37 +2047,10 @@ "name": "术师", "opers": [ { - "name": "澄闪", - "skill": 3, - "alternate_skill": 2, - "is_key": true, - "recruit_priority": 635, - "promote_priority": 810, - "recruit_priority_offsets": [ - { - "groups": [ - "术师" - ], - "threshold": 1, - "offset": -120 - } - ] + "name": "澄闪" }, { - "name": "艾雅法拉", - "skill": 2, - "is_key": true, - "recruit_priority": 640, - "promote_priority": 801, - "recruit_priority_offsets": [ - { - "groups": [ - "术师" - ], - "threshold": 1, - "offset": -120 - } - ] + "name": "艾雅法拉" }, { "name": "莫斯提马", @@ -2332,9 +2322,23 @@ "name": "史尔特尔", "skill": 3, "alternate_skill": 1, - "recruit_priority": 980, + "recruit_priority": 950, "promote_priority": 990, - "is_key": true + "is_key": true, + "recruit_priority_offsets": [ + { + "groups": [ + "凯尔希", + "棘刺", + "召唤", + "地面阻挡" + ], + "threshold": 1, + "is_less": true, + "offset": -350, + "Doc": "地面阻挡≤1时，史尔特尔的招募优先级-350" + } + ] } ] }, @@ -2353,10 +2357,12 @@ { "groups": [ "凯尔希", - "地面阻挡", - "银灰" + "棘刺", + "召唤", + "地面阻挡" ], - "threshold": 2, + "threshold": 1, + "is_less": true, "offset": -300 } ] @@ -2368,8 +2374,7 @@ "is_start": true, "alternate_skill": 1, "recruit_priority": 710, - "promote_priority": 900, - "promote_priority_when_team_full": 1000, + "promote_priority": 950, "recruit_priority_offsets": [ { "groups": [ @@ -3069,8 +3074,9 @@ { "groups": [ "凯尔希", - "近卫", - "重装" + "棘刺", + "召唤", + "地面阻挡" ], "threshold": 1, "is_less": true, @@ -3090,8 +3096,9 @@ { "groups": [ "凯尔希", - "近卫", - "重装" + "棘刺", + "召唤", + "地面阻挡" ], "threshold": 1, "is_less": true, @@ -3108,8 +3115,9 @@ { "groups": [ "凯尔希", - "近卫", - "重装" + "棘刺", + "召唤", + "地面阻挡" ], "threshold": 1, "is_less": true, @@ -3739,7 +3747,9 @@ }, { "groups": [ - "地面阻挡", + "近卫", + "重装", + "召唤", "地面单切" ], "threshold": 2 @@ -3758,4 +3768,4 @@ "threshold": 2 } ] -} \ No newline at end of file +} diff --git a/resource/roguelike/Sami/recruitment.json b/resource/roguelike/Sami/recruitment.json index f2ad29907f..3f4d3586dd 100644 --- a/resource/roguelike/Sami/recruitment.json +++ b/resource/roguelike/Sami/recruitment.json @@ -86,17 +86,13 @@ { "groups": [ "凯尔希", - "重装", "召唤", - "近卫", - "情报官", - "挡人先锋", - "其他地面" + "地面阻挡" ], - "threshold": 1, + "threshold": 0, "is_less": true, "offset": -350, - "Doc": "地面阻挡≤1时，玛恩纳的招募优先级-350" + "Doc": "地面阻挡<1时，玛恩纳的招募优先级-350" } ] } @@ -457,7 +453,7 @@ "重装" ], "threshold": 2, - "offset": -300 + "offset": -120 } ] }, @@ -500,7 +496,7 @@ "近卫" ], "threshold": 2, - "offset": -300 + "offset": -200 } ] }, @@ -519,7 +515,7 @@ "重装" ], "threshold": 2, - "offset": -250 + "offset": -120 } ] }, @@ -535,7 +531,7 @@ "重装" ], "threshold": 2, - "offset": -300 + "offset": -120 } ] }, @@ -595,6 +591,7 @@ "recruit_priority_offsets": [ { "groups": [ + "凯尔希", "重装" ], "threshold": 2, @@ -606,10 +603,11 @@ "name": "泡泡", "skill": 2, "recruit_priority": 597, - "promote_priority": 270, + "promote_priority": 400, "recruit_priority_offsets": [ { "groups": [ + "凯尔希", "重装" ], "threshold": 2, @@ -647,7 +645,6 @@ "name": "斑点", "skill": 1, "recruit_priority": 625, - "promote_priority": 0, "is_key": true, "is_start": true, "recruit_priority_offsets": [ @@ -671,10 +668,11 @@ "recruit_priority_offsets": [ { "groups": [ + "凯尔希", "重装" ], "threshold": 1, - "offset": -200 + "offset": -300 } ] }, @@ -732,7 +730,7 @@ "name": "石棉", "skill": 2, "recruit_priority": 615, - "promote_priority": 300, + "promote_priority": 400, "is_start": true, "recruit_priority_offsets": [ { @@ -748,46 +746,63 @@ }, { "name": "暮落", - "skill": 2 + "skill": 2, + "promote_priority": 350 }, { "name": "车尔尼", - "skill": 2 + "skill": 2, + "promote_priority": 350 }, { "name": "可颂", - "skill": 2 + "skill": 2, + "promote_priority": 350 }, { "name": "拜松", - "skill": 2 + "skill": 2, + "promote_priority": 350 }, { "name": "闪击", - "skill": 2 + "skill": 2, + "promote_priority": 350 }, { "name": "吽", - "skill": 2 + "skill": 2, + "promote_priority": 350 }, { "name": "暴雨", - "skill": 2 + "skill": 2, + "promote_priority": 350 }, { "name": "角峰", - "skill": 2 + "skill": 2, + "promote_priority": 350 }, { "name": "坚雷", - "skill": 2 + "skill": 2, + "promote_priority": 350 }, { "name": "预备干员-重装", - "skill": 0, "recruit_priority": 460, - "promote_priority": 0, - "is_alternate": true + "is_alternate": true, + "recruit_priority_offsets": [ + { + "groups": [ + "凯尔希", + "重装" + ], + "threshold": 2, + "offset": -140 + } + ] } ] }, @@ -3736,4 +3751,4 @@ "threshold": 1 } ] -} \ No newline at end of file +} diff --git a/resource/tasks.json b/resource/tasks.json index 8acc9c1922..f80f762754 100644 --- a/resource/tasks.json +++ b/resource/tasks.json @@ -7103,6 +7103,10 @@ ".*命运的宠儿.*", "“命运的宠儿”" ], + [ + ".*骑士对决.*", + "“骑士对决”" + ], [ "巍峨银.*", "巍峨银凇" @@ -9074,6 +9078,7 @@ "Doc": "base_task", "Doc2": "你的上一次探索突破了至少两层困难，这一次可以获得更多支援——热水壶", "template": "empty.png", + "templThreshold": 0.7, "action": "ClickSelf", "cache": false, "roi": [ @@ -9090,6 +9095,7 @@ "Doc": "base_task", "Doc2": "你的上一次探索突破了至少两层困难，这一次可以获得更多支援—— 5 源石锭", "template": "empty.png", + "templThreshold": 0.7, "action": "ClickSelf", "cache": false, "roi": [ diff --git a/resource/template/Sami@Roguelike@StageVerticalBoskyPassageAI6.png b/resource/template/Sami@Roguelike@StageVerticalBoskyPassageAI6.png index 8307fb036e..08f6085e40 100644 Binary files a/resource/template/Sami@Roguelike@StageVerticalBoskyPassageAI6.png and b/resource/template/Sami@Roguelike@StageVerticalBoskyPassageAI6.png differ