From 2d939057991e7068d1458e945fe1c90d3167a5b5 Mon Sep 17 00:00:00 2001 From: Lancarus Date: Fri, 29 Sep 2023 14:35:05 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E8=82=89?= =?UTF-8?q?=E9=B8=BD=E6=8B=9B=E5=8B=9F=E7=AD=96=E7=95=A5=20fix=20#6068?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resource/roguelike/Mizuki/recruitment.json | 30 +++- resource/roguelike/Phantom/recruitment.json | 140 +++++++++--------- resource/roguelike/Sami/recruitment.json | 59 ++++---- ...Roguelike@StageVerticalBoskyPassageAI6.png | Bin 8782 -> 6397 bytes 4 files changed, 129 insertions(+), 100 deletions(-) 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..95b73f8af1 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,45 +740,52 @@ }, { "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 } ] @@ -1013,7 +1020,7 @@ "name": "纯烬艾雅法拉", "skill": 1, "is_key": true, - "recruit_priority": 799, + "recruit_priority": 801, "promote_priority": 590, "recruit_priority_offsets": [ { @@ -2030,37 +2037,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 +2312,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 +2347,12 @@ { "groups": [ "凯尔希", - "地面阻挡", - "银灰" + "棘刺", + "召唤", + "地面阻挡" ], - "threshold": 2, + "threshold": 1, + "is_less": true, "offset": -300 } ] @@ -2368,8 +2364,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 +3064,9 @@ { "groups": [ "凯尔希", - "近卫", - "重装" + "棘刺", + "召唤", + "地面阻挡" ], "threshold": 1, "is_less": true, @@ -3090,8 +3086,9 @@ { "groups": [ "凯尔希", - "近卫", - "重装" + "棘刺", + "召唤", + "地面阻挡" ], "threshold": 1, "is_less": true, @@ -3108,8 +3105,9 @@ { "groups": [ "凯尔希", - "近卫", - "重装" + "棘刺", + "召唤", + "地面阻挡" ], "threshold": 1, "is_less": true, @@ -3739,7 +3737,9 @@ }, { "groups": [ - "地面阻挡", + "近卫", + "重装", + "召唤", "地面单切" ], "threshold": 2 @@ -3758,4 +3758,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..0b122476e8 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,45 +746,52 @@ }, { "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 } ] @@ -3736,4 +3741,4 @@ "threshold": 1 } ] -} \ No newline at end of file +} diff --git a/resource/template/Sami@Roguelike@StageVerticalBoskyPassageAI6.png b/resource/template/Sami@Roguelike@StageVerticalBoskyPassageAI6.png index 8307fb036e63fc032399e2180946278f4930247f..08f6085e4091498e9b6896f2658982a48056bd55 100644 GIT binary patch literal 6397 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 LNkvXXu0mjfX>M5w literal 8782 zcmV-UBC*|xP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!~g&e!~vBn4jTXfA>&CzK~#8NU7J~t zCFz;hpR@0IGP5dc&FbpK?zYEn8{@I8L4&yA772|Ij6fbh286^{;G)G18YINU2qcgY zAAk?REkYhJ#x`yDQr*?HS5~fPU-|u>I8j|qoO&xF-gvj?|Lku>R{s2N{>8RgZ%3sP zyTglZtT&rjZ&zOO%(}|%T(rphU7f#br5e?0H4Zul*Oas!M*s_PmiN>T#Jj}&EoT4JYv#H-2c&?IQVuaDjgbaBBoDQ z@%djqim!hAB&JuB*lxGXSqmvxZB~?ZY{7_Wa;`jBQ>)hSBIe6^R@u)6mH+Z5|8;wN zaOX8~o_%;ac@-~4FN-=U`^LFwm%m-V8X$HWZNP2CVl`(W%LKXC8pM1xqi(@;a;+Gr zWK52;8^fal(f+8U4PZ8kg-e)+bv|ph8*%g9n{ns6N6|lSMs?4J*))M#pKas(vspa* z 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 Date: Fri, 29 Sep 2023 14:49:47 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=8A=A0=E4=BA=86=E4=B8=AA=E6=8E=A7?= =?UTF-8?q?=E5=88=B6=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resource/roguelike/Phantom/recruitment.json | 12 +++++++++++- resource/roguelike/Sami/recruitment.json | 12 +++++++++++- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/resource/roguelike/Phantom/recruitment.json b/resource/roguelike/Phantom/recruitment.json index 95b73f8af1..15f45bcab2 100644 --- a/resource/roguelike/Phantom/recruitment.json +++ b/resource/roguelike/Phantom/recruitment.json @@ -786,7 +786,17 @@ { "name": "预备干员-重装", "recruit_priority": 460, - "is_alternate": true + "is_alternate": true, + "recruit_priority_offsets": [ + { + "groups": [ + "凯尔希", + "重装" + ], + "threshold": 2, + "offset": -140 + } + ] } ] }, diff --git a/resource/roguelike/Sami/recruitment.json b/resource/roguelike/Sami/recruitment.json index 0b122476e8..3f4d3586dd 100644 --- a/resource/roguelike/Sami/recruitment.json +++ b/resource/roguelike/Sami/recruitment.json @@ -792,7 +792,17 @@ { "name": "预备干员-重装", "recruit_priority": 460, - "is_alternate": true + "is_alternate": true, + "recruit_priority_offsets": [ + { + "groups": [ + "凯尔希", + "重装" + ], + "threshold": 2, + "offset": -140 + } + ] } ] }, From a66b807afce96fcf5ef36282c5a6bdfeabe5ecce Mon Sep 17 00:00:00 2001 From: Lancarus Date: Fri, 29 Sep 2023 15:44:51 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=E5=82=80=E5=BD=B1=E8=82=89=E9=B8=BD?= =?UTF-8?q?=E9=AA=91=E5=A3=AB=E5=AF=B9=E5=86=B3ocr=E6=9B=BF=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resource/tasks.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/resource/tasks.json b/resource/tasks.json index 83539d16a2..02a8eb77f1 100644 --- a/resource/tasks.json +++ b/resource/tasks.json @@ -7103,6 +7103,10 @@ ".*命运的宠儿.*", "“命运的宠儿”" ], + [ + ".*骑士对决.*", + "“骑士对决”" + ], [ "巍峨银.*", "巍峨银凇" From c82c0b7fec8e89391da682bf0d8f872f89f2aea9 Mon Sep 17 00:00:00 2001 From: Lancarus Date: Fri, 29 Sep 2023 19:45:21 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E9=99=8D=E4=BD=8E=E7=83=AD=E6=B0=B4?= =?UTF-8?q?=E5=A3=B6=E5=92=8C=E6=BC=94=E8=AE=B2=E7=A8=BFtemplate=E9=98=88?= =?UTF-8?q?=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resource/tasks.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resource/tasks.json b/resource/tasks.json index 02a8eb77f1..daa898bae4 100644 --- a/resource/tasks.json +++ b/resource/tasks.json @@ -9078,6 +9078,7 @@ "Doc": "base_task", "Doc2": "你的上一次探索突破了至少两层困难，这一次可以获得更多支援——热水壶", "template": "empty.png", + "templThreshold": 0.7, "action": "ClickSelf", "cache": false, "roi": [ @@ -9094,6 +9095,7 @@ "Doc": "base_task", "Doc2": "你的上一次探索突破了至少两层困难，这一次可以获得更多支援—— 5 源石锭", "template": "empty.png", + "templThreshold": 0.7, "action": "ClickSelf", "cache": false, "roi": [