LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-18 16:29:29 +08:00
Code Activity
9,546 Commits 12 Branches 0 Tags
bbbd15540193e6dbb23d2c18ef8b5cafde0127cf
Commit Graph

6723 Commits

Author SHA1 Message Date
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
LmeSzinc
c226228d98 Upd: [EN] EQUIP_CONFIRM_2 2025-05-21 23:22:23 +08:00
0O0o0oOoO00
5d7a2d3c58 fix: disable global ship properties and factor of hook for retirement handler 2025-05-21 21:03:59 +08:00
0O0o0oOoO00
1053aa427e fix: merge mistake of stop barrier 2025-05-21 14:07:57 +08:00
0O0o0oOoO00
8748eb237c fix: add event4-6 to scheduler 2025-05-21 14:02:07 +08:00
0O0o0oOoO00
16fa913b69 fix: merge mistake of more event 2025-05-21 13:17:53 +08:00
ZuoSiZhu
9b14a26dae fix: Dock merge error 2025-05-21 11:58:47 +08:00
ZuoSiZhu
78112d5e2b fix: Entrance of event_20250520 2025-05-21 09:31:48 +08:00
ZuoSiZhu
609e466be6 Reapply "Pref: [ALAS] faster get_bbox()" 
This reverts commit a0d04bc7ec.
 2025-05-21 04:28:29 +08:00
ZuoSiZhu
dee0c1484f Merge branch 'master_lme' into dev 
# Conflicts:
#	campaign/Readme.md
#	module/base/utils.py
#	module/coalition/assets.py
#	module/config/argument/args.json
#	module/config/i18n/en-US.json
#	module/config/i18n/ja-JP.json
#	module/config/i18n/zh-CN.json
#	module/config/i18n/zh-TW.json
#	module/handler/login.py
#	module/retire/dock.py
#	module/retire/enhancement.py
#	module/shop/shop_reward.py
 2025-05-21 04:17:08 +08:00
ZuoSiZhu
a54650be0a opt: switch position of DockNew and DockOld for easier merge 2025-05-21 03:55:42 +08:00
ZuoSiZhu
a0d04bc7ec Revert "Pref: [ALAS] faster get_bbox()" 
This reverts commit bc1046c79f.
 2025-05-21 03:36:05 +08:00
ZuoSiZhu
99ae4c66d4 Add: cheat support for daemon 2025-05-21 03:30:02 +08:00
LmeSzinc
91b8bf856d Upd: [EN] BUILD_CHECK, it reverts back again (#4811) 2025-05-21 03:15:15 +08:00
LmeSzinc
8a52877333 Add: chapter SP 2025-05-21 03:02:53 +08:00
LmeSzinc
1178c43d9a Fix: Check strategy options with green tick instead of mean color (#4810) 2025-05-21 03:01:58 +08:00
LmeSzinc
14b4820523 Upd: [EN] BOX assets 2025-05-21 02:52:39 +08:00
LmeSzinc
9c83c0bbc3 Chore: Move BOX_ITEM_* to EQUIP_CONFIRM 
to be reused in retirement and enhancement
 2025-05-21 02:25:28 +08:00
LmeSzinc
3c5eea5fb0 Fix: Keep untracked enemies if MAP_HAS_MOVABLE_NORMAL_ENEMY 2025-05-21 01:48:29 +08:00
LmeSzinc
4bacd2b1f1 Fix: Equipments now get auto disassembled when you use boxes 
- TODO: [EN][JP][TW] update box assets
 2025-05-21 01:41:06 +08:00
LmeSzinc
653601aa4f Chore: Add MAP_CLEAR_PERCENTAGE_SHORT 2025-05-21 00:45:32 +08:00