1
0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-16 02:29:29 +08:00
Commit Graph

6743 Commits

Author SHA1 Message Date
ZuoSiZhu
331f6629d0 fix: word mistake 2025-06-08 03:06:44 +08:00
ZuoSiZhu
733b20a6db fix: unexpected restarts caused by do_inject 2025-06-08 02:48:37 +08:00
ZuoSiZhu
573582a452 fix: color of icon stop_all change with style 2025-06-08 02:15:31 +08:00
ZuoSiZhu
dc1db0f0b4 adj: remove PushEverytime in Hook, set to auto update instead 2025-06-08 01:44:32 +08:00
0O0o0oOoO00
45ac6bdf45 Merge remote-tracking branch 'LmeSzinc/master' into dev
# Conflicts:
#	module/retire/assets.py
#	module/retire/dock.py
2025-06-05 23:53:43 +08:00
0O0o0oOoO00
de575966b9 add: add one click to stop all running instance which is mis-deleted when merging MoreAlas 2025-06-03 13:48:42 +08:00
dragonheart107
4172356a9a Upd: [EN] DOCK_SELECTED (#4850) 2025-05-30 22:09:46 +08:00
guoh064
bea88a6280 tmp: [JP] asset SUPPLY_PACK_CHECK (#4849) 2025-05-30 22:04:16 +08:00
LmeSzinc
4e7e2444d5 Fix: handle appear animation of AUTO_SEARCH after enabling clear mode 2025-05-29 23:28:38 +08:00
LmeSzinc
f5a201a793 Fix: Handle slow popups from last retirement when entering dock filter 2025-05-29 23:06:07 +08:00
LmeSzinc
dcc86a8b02 Fix: EQUIP_CONFIRM_2 may be detected as popup confirm
causing early stop of _retirement_confirm()
2025-05-29 23:05:13 +08:00
LmeSzinc
6d7e43974a Fix: handle game tips that infos skin feature when entering dock 2025-05-29 22:48:01 +08:00
guoh064
fe44724016 tmp: [JP] asset DOCK_CHECK 2025-05-29 22:29:54 +08:00
0O0o0oOoO00
110960ac69 fix: skip to check resource and inject when RestartEverytime of hook is false 2025-05-28 11:45:12 +08:00
0O0o0oOoO00
a9849e156f fix: add main4-6 and event4-6 to gg list 2025-05-28 11:39:06 +08:00
LmeSzinc
14be031a32 Fix: expand search area of BOX_USE to handle box amount < 5 2025-05-28 02:12:00 +08:00
LmeSzinc
498c5db8ca Fix: disassemble should end with DISASSEMBLE_POPUP_CONFIRM clicked 2025-05-28 02:09:40 +08:00
LmeSzinc
8426330813 Fix: [TW] Keep disassemble as before 2025-05-27 00:00:53 +08:00
LmeSzinc
03dd7b6a65 Fix: retirement confirm should end with EQUIP_CONFIRM_2 2025-05-25 20:10:36 +08:00
LmeSzinc
532a9f3ef8 Fix: disassemble no longer shows GET_ITEMS 2025-05-25 20:09:41 +08:00
xhqss
0339fe9dcc Merge branch 'master_lme' into dev
# Conflicts:
#	module/event_hospital/assets.py
2025-05-25 15:18:10 +08:00
0O0o0oOoO00
60a6262ee7 adj: adjust upload dir of luahook 2025-05-25 13:08:58 +08:00
LmeSzinc
7b2bee4ba7 Fix: [TW] handle clue popup with text only (#4819) 2025-05-24 23:36:12 +08:00
LmeSzinc
4a625e8990 Fix: TEMPLATE_MOONLIT_OVERTURE is not defined in assets 2025-05-24 23:12:01 +08:00
0O0o0oOoO00
2b832b9bb3 fix: switch gemsfarming to 15-1 when event limit is reached 2025-05-24 17:55:12 +08:00
0O0o0oOoO00
7a8f898936 fix: fix merge mistake of event shop 2025-05-24 12:05:52 +08:00
LmeSzinc
8d61802fd1 Fix: continuously check rotation on unknown UI (#4729) 2025-05-24 00:42:13 +08:00
travellerse
56a010366c Add: [CN] Server 冬月计划 长弓计划 2025-05-24 00:34:21 +08:00
LmeSzinc
1bbd26c2b4 Fix: Inconsistent map_allow_submarine after choosing fleet_2 (#4824) 2025-05-24 00:29:03 +08:00
LmeSzinc
c893762a39 Fix: GET_SHIP should ruled by click_timer in commission_receive 2025-05-24 00:21:42 +08:00
LmeSzinc
0abb1fdff7 Fix: Avoid clicking GET_SHIP after dismiss MEOWFFICER_BUY 2025-05-24 00:17:52 +08:00
LmeSzinc
a136b7d229 Fix: sync check function to ZONEMODE_REPEAT and MERCHANT_STOP (#4810) 2025-05-24 00:03:18 +08:00
LmeSzinc
c4189ee9e1 Upd: [TW] hospital assets (#4819) 2025-05-23 20:57:31 +08:00
LmeSzinc
d955267ded Pref: Exit use box loop before checking scroll at_bottom 2025-05-23 15:43:45 +08:00
LmeSzinc
a42235e3ad Fix: equipment disassemble should endswith EQUIP_CONFIRM_2 clicked 2025-05-23 15:37:06 +08:00
0O0o0oOoO00
b72b81a997 fix: use short connections when requesting Luahook functionality 2025-05-23 15:25:16 +08:00
LmeSzinc
ad5de4e2ed Fix: handle StorageFull when using box 2025-05-23 15:24:21 +08:00
0O0o0oOoO00
f7e7407310 opt: merge logic to reduce duplicate resource push 2025-05-23 10:37:03 +08:00
ZuoSiZhu
5f3f9ddf81 opt: make enhancing ships steps independent to reduce frequency of crack calls 2025-05-23 01:29:39 +08:00
xhqss
791f4bfd5a Merge branch 'master' into dev 2025-05-23 00:03:44 +08:00
0O0o0oOoO00
eb8f5dc086 add: do_crack_op_on_func decorator for tmp switch luahook functions 2025-05-23 00:01:32 +08:00
0O0o0oOoO00
6d46a747d3 del: remove do_crack_op in handle_retirement to avoid high-frequency function switches 2025-05-22 22:44:36 +08:00
0O0o0oOoO00
f5191c03a1 add: push luahook resource everytime 2025-05-22 17:40:05 +08:00
LmeSzinc
f6e0a0bba2 Fix: skip first ocr in _handle_use_box_amount 2025-05-22 14:21:05 +08:00
ZuoSiZhu
6959896d37 Revert "fix: disable global ship properties and factor of hook for retirement handler"
This reverts commit 5d7a2d3c58.
2025-05-22 01:58:23 +08:00
LmeSzinc
06fc46147f Upd: Battle UI Seaside 2025-05-22 00:30:26 +08:00
LmeSzinc
2b6adb6576 Fix: _meow_skip_popup_after_locking exits at MEOWFFICER_TRAIN_START 2025-05-22 00:30:26 +08:00
霞飛
7e3dff9ea5 Feat(eventstory): start game when it is not running (#4817)
* feat: start game when it is not running

* fix: remove useless import
2025-05-21 23:45:47 +08:00
LmeSzinc
efec0dbd4d Fix: Wait until amount number appears 2025-05-21 23:44:58 +08:00
LmeSzinc
242b964981 Upd: [JP] BOX assets (#4814) 2025-05-21 23:44:58 +08:00