From 8c6cb6de902a083178ac6db12f38645a024ea406 Mon Sep 17 00:00:00 2001 From: 0O0o0oOoO00 <11174151+0o0o0oooo00@users.noreply.github.com> Date: Fri, 13 Mar 2026 10:44:35 +0800 Subject: [PATCH] Revert "Add: hide_in_upper_left option for combat manual" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit was manually merged into this repository earlier, and later guoh064 merged this commit into LmeSzinc’s repository. This reverts commit 13aba919a2c9f4708afb4f45e33c900f57a4d9e8. --- assets/cn/combat/my_MOVE_LEFT_UP.png | Bin 7048 -> 0 bytes module/combat/combat_manual.py | 43 --------------------------- module/combat/my_assets.py | 7 ----- 3 files changed, 50 deletions(-) delete mode 100644 assets/cn/combat/my_MOVE_LEFT_UP.png delete mode 100644 module/combat/my_assets.py diff --git a/assets/cn/combat/my_MOVE_LEFT_UP.png b/assets/cn/combat/my_MOVE_LEFT_UP.png deleted file mode 100644 index 93a4efff58688d5b40adc95a6b7e47f8dad1c4d3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7048 zcmeI1e^3hlUm%{eeYQ1ZqM6= zyVE8Cm1_JQj8l_3SR3=hIFdLTI|-r{p+sjwX-w6cfr4$?6eEa3D;A}F_YM#eJ1H~G zADy|I;k|d?_j$hW^L*atedl&~IWH%3s`3dXf*@0ES(X9>iG|(hwkgr@D}C;=CI+*zT=MN8cR9)2)%ZhHjq_jR?mHX#`Yt_F|DR!lI#5&s&pKNGPJ(Ck$wrAgu z_7BY-{A0uVjhSHXJGCDtto=m`a+{44t1jN|%-EeBpVS@wc6WW_-oaCMb|;&*mb{*u zbm|R%$p<})lLjyKZ){X;xm1DcUu?+rE1x+T*mULdUkbk84S+MKr@+c9UpXXZl7g}eLPrkIQFy+cmT{%hao|GYAHZrrYvYjw2@ zM7D*`$jGy0WQ-t#pboz9%DLqi(q}i9tauZfk^kH_qvB{zMgH`bf@Z8}p}Tt3Q`xEq zvGylwk{-`I|3PQxp5}Kq?>JdEt!@)K5Yx0c{b17SBTc>EuTIv?nSHmby`iQ3x%AS) z18Xa+Q7cdGEKFPA6puMNXGBlZRBF;4Z`Ee0ot>t$Jzamgxq6E$cxX`UPYv#iTJ(zX zl5_#r8X;@z08G*50o^f97<}U+7Qrn@(&|)Fh<5@l*1d_Y)4UoY!pG z{ttG}(Dar=^M96IN6s`Q=T$2&_HF*x`CiW_js36wJZWcCyZZD4%``*>|x{LDL-la#TY4|bkSogCjD z-LTFh9Dm{9B4k$g+Iy3XM#X~duQv4b_0+a@44E%?_fD3AzPIbIB?Vz=SMacei|pAn zE4Wn*CpdsA;P%22N079|0WZU@0}|>0F5Y9tdh5?&D9@R(AL{Ic-J1bQ`K%2-uwp|_ zA-iE6YvQoQi^U8^KnkPz_N5$0zR3sQc3dCYPH|*SNXLn!RJzIOeT|>Ak`#^LknCCdL$-* zd&GINL|DTDMApZ9C0_8LvL@pY$|W;~!FhBfKDXCyAC>or!xSJ7b%61zH7Y{wcB{vF zh?2DeiVO$zNDr|P-UR9bAPVI^7Fa8QN18WQf@4Shz2&~LP&yo|24%nvO+~n>X55mQ zHhbQvhm63*yS*VV2z#8R#5*6t8W)>96G~@nAkckOcbxS|?jd7nWw+B7fi0KAvsuiT zygtndEYH!Qu7flgDV78{t2Z(@rE_q&k>n`csdaJ&qmI>cTHP2an@5xw4+~@|D6Zn6 zj>7>s1HtKV(y7*HZnGG$|2wBtIO>q%D&P}gEy}7ILZuDQ z$Qwh$bRb$ru2d)xl7-pO89u;Bg0D~z%FLK7fy$nv({^~EI7VVDj0B)4LF#FOq&22O zLPKjQn$kT>7-?dRy}y&%7-sgzyp5)`QfWl$^IYLz}Kuvj^&w_&2BNJ Qk7N^@HOEr-gEgD}4N)^I@Bjb+ diff --git a/module/combat/combat_manual.py b/module/combat/combat_manual.py index 345671d68..fb1f30191 100644 --- a/module/combat/combat_manual.py +++ b/module/combat/combat_manual.py @@ -86,46 +86,3 @@ class CombatManual(ModuleBase): return True return False - - -from module.combat.my_assets import * - - -class CombatManual(CombatManual): - def handle_combat_stand_still_upper_left(self, auto): - """ - Args: - auto (str): Combat auto mode. - - Returns: - bool: If executed - """ - - if auto != 'hide_in_upper_left': - return False - - self.device.long_click(my_MOVE_LEFT_UP, duration=(1.5, 3.5)) - return True - - def handle_combat_manual(self, auto): - """ - Args: - auto (str): Combat auto mode. - - Returns: - bool: If executed - """ - if self.manual_executed or not self.auto_mode_checked: - return False - - if self.handle_combat_stand_still_in_the_middle(auto): - self.manual_executed = True - return True - if self.handle_combat_stand_still_bottom_left(auto): - self.manual_executed = True - return True - if self.handle_combat_stand_still_upper_left(auto): - self.manual_executed = True - return True - - return False diff --git a/module/combat/my_assets.py b/module/combat/my_assets.py deleted file mode 100644 index b0a9600cf..000000000 --- a/module/combat/my_assets.py +++ /dev/null @@ -1,7 +0,0 @@ -from module.base.button import Button -from module.base.template import Template - -# This file was automatically generated by dev_tools/button_extract.py. -# Don't modify it manually. - -my_MOVE_LEFT_UP = Button(area={'cn': (101, 539, 136, 574), 'en': (101, 539, 136, 574), 'jp': (101, 539, 136, 574), 'tw': (101, 539, 136, 574)}, color={'cn': (255, 255, 255), 'en': (255, 255, 255), 'jp': (255, 255, 255), 'tw': (255, 255, 255)}, button={'cn': (101, 539, 136, 574), 'en': (101, 539, 136, 574), 'jp': (101, 539, 136, 574), 'tw': (101, 539, 136, 574)}, file={'cn': './assets/cn/combat/my_MOVE_LEFT_UP.png', 'en': './assets/cn/combat/my_MOVE_LEFT_UP.png', 'jp': './assets/cn/combat/my_MOVE_LEFT_UP.png', 'tw': './assets/cn/combat/my_MOVE_LEFT_UP.png'})