From 0bd94ebecc6df55ff9ea2f8739a958009684eaa7 Mon Sep 17 00:00:00 2001
From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com>
Date: Thu, 20 Jul 2023 15:33:59 +0800
Subject: [PATCH] Upd: ENTRANCE_CHECKED in forgotten hall

---
 .../share/forgotten_hall/ENTRANCE_CHECKED.png | Bin 6070 -> 5973 bytes
 .../assets/assets_forgotten_hall.py           |   8 ++++----
 tasks/forgotten_hall/ui.py                    |   6 ++++++
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/assets/share/forgotten_hall/ENTRANCE_CHECKED.png b/assets/share/forgotten_hall/ENTRANCE_CHECKED.png
index b0dd8ac2dd38d26d79bab5846d2a169c7121a6af..80a67e69782d89088338dff972c6a0bdab403918 100644
GIT binary patch
delta 631
zcmV--0*L*#FV!xvz6x4`Nkl<Zc-rjTF-u!f7zW^TFCw@|nn5$Ene43gA4EaB3U<&A
zc6PD;g3zTpiUqp}l?GIBvq*KTb*ZEKRd8tf4;pGthbTs?#df>;JVQ8~oZ(Bp>E*lU
zhO;3HFbRL~I3>BLa&&a;pU&^?eb!n4007!`<Rhjh$<fibdmbJcd8V%b007*Kmbs{M
ze}8{&ZmwRhkByB@PEKC0Kekre+uOUlyS=@=%gf7^N=0h{0079JEIV0Qc~>fxipAo_
z#%7kCWZCKE=V_Lm?(BRj7K=SSJ*%tlv+UGA1^|Bmzzu0m>P#jkp3ly{3Lz{mzOC1P
zv^HDc)$8AvmKH+@GczwMl~GLv001Dr0XT*brlwvD4Go>0ovp8bXfztF{YK;G+S=Oj
z@$vBR$n^BIjsgGxkm~>(LWten-3to~ot>RqTbs4o#}GmYNv&4f+S=^u>Z(?&g+d`s
zuWo+@0{{R(9s_U)Ar1~cou6N5Hk$_rUz*KkjPdaBYnrC>^RG*#l6C?B0C1O%oYZ+W
z*DaU(lO%~T#Mq26IX`cvX<9CqFRug}{{jF2aElz>0ls+URg8b`#28~+R0aS5fV>9a
z<c@qB|9Thz001s@<gMWLNpHL@>v{wl003)%+y~(HH$2BAxpC>&Q_uha0Ng3fTfxa4
z>vo2~0002wJ^+UhLX7eHG&tNN6$1bO@TleP4sa+Go{W!=_x1IMkX$C=_UIdBU;qFB
z9zp;f7#OHl-?Y}}=f6Dg3;+PYeWVZQx3rS5@h`I>3kLxn@Lzrd009600|2%BqrM_v
ROep{W002ovPDHLkV1gGlB~1VT

delta 733
zcmV<30wVp@F19bQz6x67Nkl<Zc-rjUu}UjT7zgm3F%}j=DhmrmQrW8b0%Aa{EMj3L
zHiv^CXh7REHsS+ZPGg~1tk|oqg{6)71~z#F$?o1_4olDnxOdI(SA^N@7Q0OK=bQN^
z%d;U1Ckc}<3wVEk|EJL0SO4eFpFGdYvWzi?5UQ%Gsw#xPUzGkymt|R|L9f^Q{p*)m
z2LJ$=K&|G!`sU_lp69Qxuiw*e8dp`7l5qN6Sy}0JyQUlf06+k4n6fNSPfw4Ij)ucw
zx7+RYdMW4@MUe(6`rhB)KRi6l&CQ*iotbX{0005Fkve~!&f($V`T6<d<KxcG&ieZL
zcpW&)viJA*r>Cds>FML+<4&hzz5xILCRS|jtA`L`jN9AW2L}fsgo}%d;cz&feuu;1
z<>h5j6nlGn8yg$-qG$jB00iKMDT*S5u)Djvy1M%D@o{~9{rUNsZjDBxtE;QGx3{&m
zwf+75EX#kSUjP6A0l1Mu2(4DDD2mzH*^`r#R;zV)cXxAhlkVQ$-sX8eGcz+74BG8>
z-3rT;0{{RBz|E6({KgoUmzVqfeo+)JFE3?TR#o-<{2W5)_xtnn^P|zI?i6jx0RR9d
zQ-hme)u$Y#WV^Vyn8syUW?5DgMT~J_VWDmZ9b<nKfB^siCRVd6z~hJg*6DX@YAVJ!
zo|97mmVN;M00iKs`f}(|UF^-Wtj@r7NRCbaS^xk5CN=<n3B%)s-#YzfdS3wm0Pq6>
z@b}Yw(`CIh+8hG_0FX7h3D%dCTW8(z(3@()e;=?77ytl30B)js$8TAdsl)U5AU#tQ
zMV(HQWnTaQ00Fp>QU|P*b<47Bx7%A=Tj|`R@n=+h0RRBVe#{c+5W>>Z(qJ%1m*2Z#
zr5tQaFaQ9+#QF(Muu>hkJ`yR$STBJdFaN3r1Ct>Ommd6={sjO4|NjF3RDB<9)gnr>
P00000NkvXXu0mjfdtGR%

diff --git a/tasks/forgotten_hall/assets/assets_forgotten_hall.py b/tasks/forgotten_hall/assets/assets_forgotten_hall.py
index 9a375e392..4cec7cb3d 100644
--- a/tasks/forgotten_hall/assets/assets_forgotten_hall.py
+++ b/tasks/forgotten_hall/assets/assets_forgotten_hall.py
@@ -37,10 +37,10 @@ ENTRANCE_CHECKED = ButtonWrapper(
     name='ENTRANCE_CHECKED',
     share=Button(
         file='./assets/share/forgotten_hall/ENTRANCE_CHECKED.png',
-        area=(62, 662, 80, 680),
-        search=(42, 642, 100, 700),
-        color=(160, 162, 162),
-        button=(62, 662, 80, 680),
+        area=(55, 632, 71, 650),
+        search=(35, 612, 91, 670),
+        color=(156, 156, 157),
+        button=(55, 632, 71, 650),
     ),
 )
 EXIT_CONFIRM = ButtonWrapper(
diff --git a/tasks/forgotten_hall/ui.py b/tasks/forgotten_hall/ui.py
index d298b69cb..363a1767d 100644
--- a/tasks/forgotten_hall/ui.py
+++ b/tasks/forgotten_hall/ui.py
@@ -91,6 +91,12 @@ class DraggableStageList(DraggableList):
     def is_row_selected(self, button: OcrResultButton, main: ModuleBase) -> bool:
         return main.appear(ENTRANCE_CHECKED)
 
+    def load_rows(self, main: ModuleBase):
+        if not main.appear(FORGOTTEN_HALL_CHECK):
+            logger.info('Not in forgotten hall, skip load_rows()')
+            return
+        return super().load_rows(main=main)
+
 
 STAGE_LIST = DraggableStageList("ForgottenHallStageList", keyword_class=ForgottenHallStage,
                                 ocr_class=ForgottenHallStageOcr, search_button=OCR_STAGE,