From c4ad646185e290ae807412e902f5a558abcf6ac1 Mon Sep 17 00:00:00 2001 From: ArthurKun <16458204+ArthurKun21@users.noreply.github.com> Date: Sun, 31 Mar 2024 04:24:18 +0800 Subject: [PATCH] Fix close Button (#1780) * lower priority of the close * increase close area detection --------- Co-authored-by: arthur <16458204+ArthurKun021@users.noreply.github.com> --- .../fate_grand_automata/scripts/entrypoints/AutoBattle.kt | 2 +- .../github/fate_grand_automata/scripts/locations/Locations.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/src/main/java/io/github/fate_grand_automata/scripts/entrypoints/AutoBattle.kt b/scripts/src/main/java/io/github/fate_grand_automata/scripts/entrypoints/AutoBattle.kt index 2e4a81591..f0ff465a8 100644 --- a/scripts/src/main/java/io/github/fate_grand_automata/scripts/entrypoints/AutoBattle.kt +++ b/scripts/src/main/java/io/github/fate_grand_automata/scripts/entrypoints/AutoBattle.kt @@ -186,10 +186,10 @@ class AutoBattle @Inject constructor( { isInResult() } to { result() }, { isInDropsScreen() } to { dropScreen() }, { isInOrdealCallOutOfPodsScreen() } to { ordealCallOutOfPods() }, - { isInInterludeEndScreen() } to { locations.interludeCloseClick.click() }, { isInQuestRewardScreen() } to { questReward() }, { isInSupport() } to { support() }, { isRepeatScreen() } to { repeatQuest() }, + { isInInterludeEndScreen() } to { locations.interludeCloseClick.click() }, { withdraw.needsToWithdraw() } to { withdraw.withdraw() }, { needsToStorySkip() } to { skipStory() }, { isFriendRequestScreen() } to { skipFriendRequestScreen() }, diff --git a/scripts/src/main/java/io/github/fate_grand_automata/scripts/locations/Locations.kt b/scripts/src/main/java/io/github/fate_grand_automata/scripts/locations/Locations.kt index 167c79179..25a650434 100644 --- a/scripts/src/main/java/io/github/fate_grand_automata/scripts/locations/Locations.kt +++ b/scripts/src/main/java/io/github/fate_grand_automata/scripts/locations/Locations.kt @@ -29,7 +29,7 @@ class Locations @Inject constructor( val ordealCallOutOfPodsClick = Location(-2, 1124).xFromCenter() val interludeCloseClick = Location(-399, 1125).xFromCenter() - val interludeEndScreenClose = Region(-509, 1089, 219, 72).xFromCenter() + val interludeEndScreenClose = Region(-515, 1080, 230, 90).xFromCenter() val menuScreenRegion = (if (isWide)