From 6e26817e5dda48fe8f8909cc57ff71fb18e12f52 Mon Sep 17 00:00:00 2001
From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com>
Date: Wed, 7 Feb 2024 08:14:05 +0800
Subject: [PATCH] Upd: Map interact assets

---
 .../interact/DUNGEON_COMBAT_INTERACT.2.png    | Bin 0 -> 6399 bytes
 tasks/base/daemon.py                          |   5 ++++
 tasks/combat/assets/assets_combat_interact.py |  23 ++++++++++++------
 3 files changed, 21 insertions(+), 7 deletions(-)
 create mode 100644 assets/share/combat/interact/DUNGEON_COMBAT_INTERACT.2.png

diff --git a/assets/share/combat/interact/DUNGEON_COMBAT_INTERACT.2.png b/assets/share/combat/interact/DUNGEON_COMBAT_INTERACT.2.png
new file mode 100644
index 0000000000000000000000000000000000000000..5e96aa5d2ae82fb2330571788b3028c95ed9c107
GIT binary patch
literal 6399
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
RDbc@CO|^&jt5hDp_#cXZP6q%0

literal 0
HcmV?d00001

diff --git a/tasks/base/daemon.py b/tasks/base/daemon.py
index 86bf70863..537d6e5b5 100644
--- a/tasks/base/daemon.py
+++ b/tasks/base/daemon.py
@@ -59,6 +59,11 @@ class Daemon(RouteBase, DaemonBase, AimDetectorMixin):
         else:
             logger.warning(f'Maatouch contact on {builder.contact}, may cause interruptions')
 
+        STORY_OPTION.set_search_offset((-5, -5, 32, 5))
+        INTERACT_COLLECT.set_search_offset((-5, -5, 32, 5))
+        INTERACT_INVESTIGATE.set_search_offset((-5, -5, 32, 5))
+        INTERACT_TREASURE.set_search_offset((-5, -5, 32, 5))
+
         teleport_confirm = Timer(1, count=5)
         while 1:
             self.device.screenshot()
diff --git a/tasks/combat/assets/assets_combat_interact.py b/tasks/combat/assets/assets_combat_interact.py
index 790440071..5cbe5a27c 100644
--- a/tasks/combat/assets/assets_combat_interact.py
+++ b/tasks/combat/assets/assets_combat_interact.py
@@ -5,13 +5,22 @@ from module.base.button import Button, ButtonWrapper
 
 DUNGEON_COMBAT_INTERACT = ButtonWrapper(
     name='DUNGEON_COMBAT_INTERACT',
-    share=Button(
-        file='./assets/share/combat/interact/DUNGEON_COMBAT_INTERACT.png',
-        area=(753, 419, 781, 441),
-        search=(733, 399, 801, 461),
-        color=(199, 197, 198),
-        button=(750, 411, 997, 448),
-    ),
+    share=[
+        Button(
+            file='./assets/share/combat/interact/DUNGEON_COMBAT_INTERACT.png',
+            area=(753, 419, 781, 441),
+            search=(733, 399, 801, 461),
+            color=(199, 197, 198),
+            button=(750, 411, 997, 448),
+        ),
+        Button(
+            file='./assets/share/combat/interact/DUNGEON_COMBAT_INTERACT.2.png',
+            area=(780, 419, 808, 441),
+            search=(760, 399, 828, 461),
+            color=(199, 197, 198),
+            button=(750, 411, 997, 448),
+        ),
+    ],
 )
 DUNGEON_COMBAT_INTERACT_TEXT = ButtonWrapper(
     name='DUNGEON_COMBAT_INTERACT_TEXT',