9516 Commits

Author SHA1 Message Date
0O0o0oOoO00
5c9a825b1b opt: pre hook lua func to reduce the frequency of operating lua state 2025-05-23 00:09:43 +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
aff533beee add: lua function args count check 2025-05-22 18:48:51 +08:00
0O0o0oOoO00
f5191c03a1 add: push luahook resource everytime 2025-05-22 17:40:05 +08:00
0O0o0oOoO00
6fa924b02a fix: specify lua status for lambda of REMOVE_HARD_MODE_SHIP_PROPERTIES_LIMIT 2025-05-22 17:13:01 +08:00
0O0o0oOoO00
d4f88e69c1 fix: check args count of Chapter.getConfig 2025-05-22 17:11:47 +08:00
0O0o0oOoO00
ca16e9c324 opt: pre load lua resources 2025-05-22 17:00:53 +08:00
0O0o0oOoO00
0f954b8be8 Reapply "add: called lua func trace"
This reverts commit 458a169db79213b9cf08615b651857d261d848e3.
2025-05-22 16:24:11 +08:00
LmeSzinc
f6e0a0bba2 Fix: skip first ocr in _handle_use_box_amount 2025-05-22 14:21:05 +08:00
0O0o0oOoO00
8e745daf0b fix: use volatile to decorate function flag 2025-05-22 10:34:46 +08:00
ZuoSiZhu
458a169db7 Revert "add: called lua func trace"
This reverts commit 634e7ce16b963640d547fa826ad8295bbf63b43f.
2025-05-22 01:58:24 +08:00
ZuoSiZhu
6959896d37 Revert "fix: disable global ship properties and factor of hook for retirement handler"
This reverts commit 5d7a2d3c58635515a2599a11a2925fd8f69a0a80.
2025-05-22 01:58:23 +08:00
LmeSzinc
367714584b
Merge pull request #4818 from LmeSzinc/bug_fix
Bug fix
2025-05-22 00:35:44 +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
LmeSzinc
f68ef322e2 Fix: clear_any_enemy if no fleet 2 2025-05-21 22:50:34 +08:00
LmeSzinc
c1d2490e5e Fix: set HOMO_STORAGE in SP because too many enemies cover sea grids 2025-05-21 22:25:58 +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
634e7ce16b add: called lua func trace 2025-05-21 19:36:27 +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
0O0o0oOoO00
ffbe374aa7 adj: use var to set crack host and port 2025-05-21 11:46:12 +08:00
LmeSzinc
cb33bd3c75 Dev: convert siren names 2025-05-21 11:45:03 +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 a0d04bc7ec1b5a93c45bbf035a6047973f4320bc.
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 bc1046c79feae884905af70c73858bf423bd9754.
2025-05-21 03:36:05 +08:00
ZuoSiZhu
99ae4c66d4 Add: cheat support for daemon 2025-05-21 03:30:02 +08:00
LmeSzinc
6116d0f42a
Merge pull request #4812 from LmeSzinc/bug_fix
Add: Event A Rose on the High Tower (event_20250520_cn)
2025-05-21 03:18:40 +08:00
LmeSzinc
91b8bf856d Upd: [EN] BUILD_CHECK, it reverts back again (#4811) 2025-05-21 03:15:15 +08:00
Will Wang
74adde06a1
Upd: [EN] Fix malformed Pull Requests link (#4807)
The URL for the Pull Requests link in the English README had an
extra '.com' in the host, causing the link to be broken. This
fix corrects the URL so constributors can reach the PR page correctly.
2025-05-21 03:06:06 +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
6f7605747a Add: chapter BD 2025-05-21 02:56:07 +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
d3ad772a36 Add: chapter B 2025-05-21 01:42:32 +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
LmeSzinc
84cda80ae2 Add: chapter A 2025-05-21 00:26:24 +08:00