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
ZuoSiZhu
6f0e67c980
fix: use specific matplotlib backend "Agg"
2025-05-25 12:13:38 +08:00
ZuoSiZhu
8a9e30371a
add: post process and plot draw to resource report script.
...
fix: I hate args
fix: allow config name only use
opt: allow no resample rate args
fix: copy mistakes
opt: reduce dpi of plots
Add: action_points , limit record counts for each mode
fix: requirements upd
upd: requirements
2025-05-25 08:19:12 +08:00
LmeSzinc
0d0e4a9ae0
Merge pull request #4829 from LmeSzinc/bug_fix
...
Bug fix
2025-05-24 23:41:10 +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
LmeSzinc
9acdac8089
Chore: cleanup unused assets
2025-05-24 23:08:43 +08:00
travellerse
14ff6ab8ae
Upd: [MAA] Update MaaFight.Series values and options to include DISABLE and AUTO ( #4827 )
2025-05-24 23:07:34 +08:00
0O0o0oOoO00
1a8c94bd68
add: generate resource report script
2025-05-24 20:57:22 +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
2db6f00a78
Merge pull request #4826 from LmeSzinc/bug_fix
...
Bug fix
2025-05-24 00:45:25 +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
7d2ee58fe7
Merge pull request #4822 from LmeSzinc/bug_fix
...
Bug fix
2025-05-23 20:59:20 +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
98108f192c
fix: return some data in the response body to meet protocol requirements
2025-05-23 13:44:44 +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
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 458a169db7
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 634e7ce16b
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 5d7a2d3c58
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
