From 5d6768ba8023ef7e8c4892d91d2b7bbdd4e99318 Mon Sep 17 00:00:00 2001 From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com> Date: Mon, 1 Jan 2024 21:47:37 +0800 Subject: [PATCH] Upd: Full template of CLICK_PRESERVATION --- .../share/rogue/path/CLICK_PRESERVATION.2.png | Bin 0 -> 10954 bytes tasks/rogue/assets/assets_rogue_path.py | 23 ++++++++++++------ tasks/rogue/entry/path.py | 2 +- 3 files changed, 17 insertions(+), 8 deletions(-) create mode 100644 assets/share/rogue/path/CLICK_PRESERVATION.2.png diff --git a/assets/share/rogue/path/CLICK_PRESERVATION.2.png b/assets/share/rogue/path/CLICK_PRESERVATION.2.png new file mode 100644 index 0000000000000000000000000000000000000000..81b3fd56ce5ba7ff57b1562ba34ab2f36eb36abf GIT binary patch literal 10954 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 Nzh|OdbocSg{{w$BaUlQz literal 0 HcmV?d00001 diff --git a/tasks/rogue/assets/assets_rogue_path.py b/tasks/rogue/assets/assets_rogue_path.py index 4dbce64ff..facd37a9a 100644 --- a/tasks/rogue/assets/assets_rogue_path.py +++ b/tasks/rogue/assets/assets_rogue_path.py @@ -164,13 +164,22 @@ CLICK_NIHILITY = ButtonWrapper( ) CLICK_PRESERVATION = ButtonWrapper( name='CLICK_PRESERVATION', - share=Button( - file='./assets/share/rogue/path/CLICK_PRESERVATION.png', - area=(65, 340, 88, 405), - search=(45, 320, 108, 425), - color=(31, 34, 44), - button=(65, 340, 88, 405), - ), + share=[ + Button( + file='./assets/share/rogue/path/CLICK_PRESERVATION.png', + area=(65, 340, 88, 405), + search=(45, 320, 108, 425), + color=(31, 34, 44), + button=(65, 340, 88, 405), + ), + Button( + file='./assets/share/rogue/path/CLICK_PRESERVATION.2.png', + area=(150, 345, 200, 395), + search=(130, 325, 220, 415), + color=(71, 75, 85), + button=(150, 345, 200, 395), + ), + ], ) CLICK_REMEMBRANCE = ButtonWrapper( name='CLICK_REMEMBRANCE', diff --git a/tasks/rogue/entry/path.py b/tasks/rogue/entry/path.py index 310b0db96..d676d4917 100644 --- a/tasks/rogue/entry/path.py +++ b/tasks/rogue/entry/path.py @@ -59,7 +59,7 @@ class RoguePathHandler(RogueUI): } # Path list is sliding, expand search area for b in buttons.values(): - b.load_search(area_pad_around(b.area, pad=(-100, -5, -100, -5))) + b.load_search(area_pad_around(b.area, pad=(-150, -5, -150, -5))) return buttons @cached_property