diff --git a/resource/roguelike/Sami/autopilot/亡者行军.json b/resource/roguelike/Sami/autopilot/亡者行军.json index 2c0222687b..f1ddcce552 100644 --- a/resource/roguelike/Sami/autopilot/亡者行军.json +++ b/resource/roguelike/Sami/autopilot/亡者行军.json @@ -66,8 +66,8 @@ }, { "groups": [ - "焰苇", - "提丰" + "益达", + "焰苇" ], "location": [ 7, diff --git a/resource/roguelike/Sami/autopilot/巍峨银凇.json b/resource/roguelike/Sami/autopilot/巍峨银凇.json index 53092e2563..f45d1c6a2b 100644 --- a/resource/roguelike/Sami/autopilot/巍峨银凇.json +++ b/resource/roguelike/Sami/autopilot/巍峨银凇.json @@ -136,7 +136,7 @@ "direction": "up", "condition": [ 1, - 52 + 20 ] }, { @@ -156,9 +156,8 @@ }, { "groups": [ - "狙击", - "盾法", "高台输出", + "盾法", "辅助", "其他高台" ], @@ -252,23 +251,6 @@ 52 ] }, - { - "groups": [ - "地面阻挡", - "处决者", - "地刺", - "其他地面" - ], - "location": [ - 9, - 6 - ], - "direction": "up", - "condition": [ - 10, - 52 - ] - }, { "groups": [ "地面阻挡", diff --git a/resource/roguelike/Sami/autopilot/深寒造像.json b/resource/roguelike/Sami/autopilot/深寒造像.json index 7a4ed4a300..e27c10a77e 100644 --- a/resource/roguelike/Sami/autopilot/深寒造像.json +++ b/resource/roguelike/Sami/autopilot/深寒造像.json @@ -104,6 +104,7 @@ "盾法", "高台输出", "辅助", + "狙击", "其他高台" ], "location": [ @@ -149,13 +150,27 @@ "益达" ], "location": [ - 7, + 8, 5 ], - "direction": "right", + "direction": "left", "condition": [ 20, - 105 + 30 + ] + }, + { + "groups": [ + "益达" + ], + "location": [ + 6, + 6 + ], + "direction": "up", + "condition": [ + 20, + 30 ] }, { @@ -231,6 +246,23 @@ }, { "groups": [ + "重装", + "地面阻挡", + "炮灰" + ], + "location": [ + 11, + 6 + ], + "direction": "up", + "condition": [ + 20, + 105 + ] + }, + { + "groups": [ + "无人机", "处决者", "地面阻挡", "炮灰" @@ -257,7 +289,7 @@ ], "direction": "left", "condition": [ - 20, + 24, 105 ] }, @@ -273,7 +305,7 @@ ], "direction": "left", "condition": [ - 20, + 24, 105 ] }, @@ -292,22 +324,6 @@ 105 ] }, - { - "groups": [ - "重装", - "地面阻挡", - "炮灰" - ], - "location": [ - 11, - 6 - ], - "direction": "up", - "condition": [ - 20, - 105 - ] - }, { "groups": [ "无人机" diff --git a/resource/roguelike/Sami/autopilot/混乱的表象.json b/resource/roguelike/Sami/autopilot/混乱的表象.json index 74d38c6139..76baf3e017 100644 --- a/resource/roguelike/Sami/autopilot/混乱的表象.json +++ b/resource/roguelike/Sami/autopilot/混乱的表象.json @@ -46,6 +46,16 @@ ], "direction": "down" }, + { + "groups": [ + "益达" + ], + "location": [ + 6, + 6 + ], + "direction": "left" + }, { "groups": [ "玛恩纳" @@ -71,6 +81,7 @@ }, { "groups": [ + "重装", "地面阻挡", "处决者", "其他地面", @@ -84,8 +95,21 @@ }, { "groups": [ - "高台输出", + "浊心斯卡蒂", + "单奶", + "群奶", + "召唤" + ], + "location": [ + 7, + 6 + ], + "direction": "left" + }, + { + "groups": [ "狙击", + "高台输出", "辅助", "其他高台" ], @@ -95,6 +119,19 @@ ], "direction": "left" }, + { + "groups": [ + "炮灰", + "处决者", + "障碍物", + "其他地面" + ], + "location": [ + 3, + 5 + ], + "direction": "right" + }, { "groups": [ "地面阻挡", @@ -154,6 +191,17 @@ 4 ], "direction": "left" + }, + { + "groups": [ + "奶", + "高台输出" + ], + "location": [ + 9, + 2 + ], + "direction": "left" } ] -} +} \ No newline at end of file diff --git a/resource/roguelike/Sami/autopilot/禁区.json b/resource/roguelike/Sami/autopilot/禁区.json index ea0dbfdc8f..dbcb559531 100644 --- a/resource/roguelike/Sami/autopilot/禁区.json +++ b/resource/roguelike/Sami/autopilot/禁区.json @@ -75,7 +75,8 @@ { "groups": [ "凯尔希", - "单奶" + "单奶", + "高台输出" ], "location": [ 5, diff --git a/resource/tasks.json b/resource/tasks.json index 48ea84e548..2cbe1a3a6d 100644 --- a/resource/tasks.json +++ b/resource/tasks.json @@ -15454,30 +15454,8 @@ "Sami@Roguelike@FoldartalUseOnStage": { "cache": false, "action": "ClickSelf", - "template": [ - "Sami@Roguelike@FoldartalUseOnGambling.png", - "Sami@Roguelike@FoldartalUseOnWindAndRain.png", - "Sami@Roguelike@FoldartalUseOnEmergencyTransportation.png", - "Sami@Roguelike@FoldartalUseOnCombatDps.png", - "Sami@Roguelike@FoldartalUseOnMysteriousPresage.png", - "Sami@Roguelike@FoldartalUseOnEmergencyDps.png", - "Sami@Roguelike@FoldartalUseOnDreadfulFoe-5.png", - "Sami@Roguelike@FoldartalUseOnFerociousPresage.png", - "Sami@Roguelike@FoldartalUseOnEncounter.png", - "Sami@Roguelike@FoldartalUseOnTrader.png" - ], - "templThreshold": [ - 0.7, - 0.7, - 0.7, - 0.7, - 0.7, - 0.7, - 0.7, - 0.7, - 0.7, - 0.7 - ], + "template": "empty.png", + "maxTimes": 10, "roi": [ 429, 111, @@ -15486,8 +15464,7 @@ ] }, "Sami@Roguelike@FoldartalUseOnStageBattle": { - "cache": false, - "action": "ClickSelf", + "baseTask": "Sami@Roguelike@FoldartalUseOnStage", "template": [ "Sami@Roguelike@FoldartalUseOnCombatDps.png", "Sami@Roguelike@FoldartalUseOnEmergencyDps.png", @@ -15497,49 +15474,28 @@ 0.7, 0.7, 0.7 - ], - "roi": [ - 429, - 111, - 844, - 477 ] }, "Sami@Roguelike@FoldartalUseOnStageBoss": { - "cache": false, - "action": "ClickSelf", + "baseTask": "Sami@Roguelike@FoldartalUseOnStage", "template": [ "Sami@Roguelike@FoldartalUseOnDreadfulFoe-5.png" ], "templThreshold": [ 0.7 - ], - "roi": [ - 429, - 111, - 844, - 477 ] }, "Sami@Roguelike@FoldartalUseOnStageEncounter": { - "cache": false, - "action": "ClickSelf", + "baseTask": "Sami@Roguelike@FoldartalUseOnStage", "template": [ "Sami@Roguelike@FoldartalUseOnEncounter.png" ], "templThreshold": [ 0.7 - ], - "roi": [ - 429, - 111, - 844, - 477 ] }, "Sami@Roguelike@FoldartalUseOnStageGambling": { - "cache": false, - "action": "ClickSelf", + "baseTask": "Sami@Roguelike@FoldartalUseOnStage", "template": [ "Sami@Roguelike@FoldartalUseOnGambling.png", "Sami@Roguelike@FoldartalUseOnWindAndRain.png", @@ -15551,17 +15507,10 @@ 0.7, 0.7, 0.7 - ], - "roi": [ - 429, - 111, - 844, - 477 ] }, "Sami@Roguelike@FoldartalUseOnStageSkipBattle": { - "cache": false, - "action": "ClickSelf", + "baseTask": "Sami@Roguelike@FoldartalUseOnStage", "template": [ "Sami@Roguelike@FoldartalUseOnCombatDps.png", "Sami@Roguelike@FoldartalUseOnEmergencyDps.png", @@ -15571,28 +15520,15 @@ 0.7, 0.7, 0.7 - ], - "roi": [ - 429, - 111, - 844, - 477 ] }, "Sami@Roguelike@FoldartalUseOnStageTrader": { - "cache": false, - "action": "ClickSelf", + "baseTask": "Sami@Roguelike@FoldartalUseOnStage", "template": [ "Sami@Roguelike@FoldartalUseOnTrader.png" ], "templThreshold": [ 0.7 - ], - "roi": [ - 429, - 111, - 844, - 477 ] }, "Sami@Roguelike@GamePass": {}, @@ -16333,8 +16269,12 @@ "Sami@Roguelike@StageSafeHouseAI6", "Sami@Roguelike@StageBoons", "Sami@Roguelike@StageBoonsAI6", + "Sami@Roguelike@StageCombatDps", + "Sami@Roguelike@StageCombatDpsAI6", + "Sami@Roguelike@StageFerociousPresage", "Sami@Roguelike@StageEmergencyTransportation", "Sami@Roguelike@StageEmergencyTransportationAI6", + "Sami@Roguelike@StageMysteriousPresage", "Sami@Roguelike@StageGambling", "Sami@Roguelike@StageGamblingAI6", "Sami@Roguelike@StageProphecy", @@ -16343,12 +16283,8 @@ "Sami@Roguelike@StageEncounterAI6", "Sami@Roguelike@StageWindAndRain", "Sami@Roguelike@StageWindAndRainAI6", - "Sami@Roguelike@StageMysteriousPresage", - "Sami@Roguelike@StageFerociousPresage", "Sami@Roguelike@StageDreadfulFoe", "Sami@Roguelike@StageDreadfulFoe-5", - "Sami@Roguelike@StageCombatDps", - "Sami@Roguelike@StageCombatDpsAI6", "Sami@Roguelike@StageEmergencyDps", "Sami@Roguelike@StageEmergencyDpsAI6", "Sami@Roguelike@CloseCollectionClose", @@ -16356,6 +16292,7 @@ "Sami@Roguelike@StageEncounterSpecialClose", "Sami@Roguelike@TraderRandomShopping", "Sami@Roguelike@StageTraderLeave", + "Sami@Roguelike@StageEncounterOptions#next", "Sami@Roguelike@DropsFlag", "Sami@Roguelike@StartUpThemes#next", "Sami@Roguelike@ClickToDrops" @@ -18212,4 +18149,4 @@ "Stop" ] } -} \ No newline at end of file +}