LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-17 10:09:28 +08:00
Code Activity
Files
31c99d895373ebed3e3097e11fc6ab2c41347f62
Alas/module
History
Zuosizhu 31c99d8953 Merge remote-tracking branch 'Lme/master' into dev 
# Conflicts:
#	module/campaign/os_run.py
#	module/config/argument/args.json
#	module/os/operation_siren.py
#	module/retire/assets.py
#	module/shop/shop_reward.py
#	module/shop/ui.py
#	module/ui/assets.py
2025-10-12 11:28:13 +08:00
..
auto_login
Merge the remaining functions in MoreAlas
2025-04-24 23:30:50 +08:00
awaken
Merge branch 'master_lme' into brocore_dev
2025-07-25 11:46:23 +08:00
base
Merge remote-tracking branch 'LmeSzinc/master' into dev
2025-06-17 13:19:30 +08:00
campaign
Merge remote-tracking branch 'Lme/master' into dev
2025-10-12 11:28:13 +08:00
cloud_phone
fix: call Restart after phone restarted
2025-05-18 21:38:31 +08:00
coalition
Merge remote-tracking branch 'Lme/master' into dev
2025-10-12 11:28:13 +08:00
combat
Merge remote-tracking branch 'Lme/master' into dev
2025-10-12 11:28:13 +08:00
combat_ui
Upd: Battle UI Ninja
2025-09-27 00:56:18 +08:00
commission
Add: ui_goto_event for event 20221124 cn and event 20250724 cn
2025-07-29 17:31:37 +08:00
config
Merge remote-tracking branch 'Lme/master' into dev
2025-10-12 11:28:13 +08:00
daemon
Add: cheat support for daemon
2025-05-21 03:30:02 +08:00
daily
Merge remote-tracking branch 'lme/master' into dev
2025-02-28 11:01:23 +08:00
device
Merge remote-tracking branch 'Lme/master' into dev
2025-10-12 11:28:13 +08:00
dorm
Pref: dorm_feed_quit should reuse screenshot
2025-05-19 02:53:10 +08:00
equipment
Merge remote-tracking branch 'Lme/master' into dev
2025-10-12 11:28:13 +08:00
event
…
event_hospital
Upd: assets
2025-10-12 01:28:32 +08:00
eventstory
Upd: REWARD_GOT JP + EN asset (#5037)
2025-08-16 03:27:13 +08:00
exercise
Merge remote-tracking branch 'Lme/master' into dev
2025-10-12 11:28:13 +08:00
freebies
Upd: [EN] UI, ShopUI, Freebies assets (#5202)
2025-10-10 21:20:18 +08:00
gacha
Fix: Shop and Gacha
2025-09-01 19:46:40 +08:00
game_setting
Reverts test code in commit ea68f68d
2024-06-28 03:23:28 +08:00
gg_handler
Fix: GGHandler won't restart game if Hook enabled
2025-07-06 00:51:46 +08:00
guild
Merge remote-tracking branch 'Lme/master' into dev
2025-10-12 11:28:13 +08:00
handler
Merge remote-tracking branch 'Lme/master' into dev
2025-10-12 11:28:13 +08:00
hard
Merge remote-tracking branch 'lme/master' into dev
2025-02-28 11:01:23 +08:00
log_res
Merge branch 'master_lme' into dev
2025-03-28 00:23:16 +08:00
luahook
add: luahook api retry
2025-10-04 18:46:47 +08:00
map
Merge remote-tracking branch 'Lme/master' into dev
2025-10-12 11:28:13 +08:00
map_detection
Fix: Fixup submarine spawn point on init scan (#5117)
2025-09-22 04:29:46 +08:00
meowfficer
Fix: _meow_skip_popup_after_locking exits at MEOWFFICER_TRAIN_START
2025-05-22 00:30:26 +08:00
meta_reward
Merge pull request #4890 from dragonheart107/assets
2025-06-18 18:26:29 +08:00
minigame
Fix: enter minigame ended at minigame menu (#4758)
2025-05-19 01:48:29 +08:00
notify
Fix: [ALAS] Hide traceback of notify
2025-05-12 23:08:27 +08:00
ocr
Revert "Upd: [JP] digit ocr '1' mistaken as 'L'"
2025-08-31 01:30:01 +08:00
os
Merge remote-tracking branch 'Lme/master' into dev
2025-10-12 11:28:13 +08:00
os_ash
Merge branch 'master_of_lme' into dev
2025-09-01 16:07:45 +08:00
os_combat
Merge branch 'Lme/master' into dev
2025-09-13 23:04:47 +08:00
os_handler
Merge branch 'Lme/master' into dev
2025-08-25 23:46:48 +08:00
os_shop
Merge branch 'master_lme' into dev
2025-05-21 04:17:08 +08:00
private_quarters
fix: pq stuck when unknown ui
2025-08-15 11:23:25 +08:00
raid
Merge the remaining functions in MoreAlas
2025-04-24 23:30:50 +08:00
research
Merge branch 'master_lme' into brocore_dev
2025-07-25 11:46:23 +08:00
research_farming
Merge branch 'master_lme' into dev
2025-03-28 00:23:16 +08:00
retire
Merge remote-tracking branch 'Lme/master' into dev
2025-10-12 11:28:13 +08:00
reward
Upd: [TW] assets for _reward_wait_mission_list
2025-07-10 02:41:31 +08:00
shipyard
Merge remote-tracking branch 'Lme/master' into dev
2025-10-12 11:28:13 +08:00
shop
Merge remote-tracking branch 'Lme/master' into dev
2025-10-12 11:28:13 +08:00
shop_event
Add: Commission Event Shop
2025-02-23 10:55:41 +08:00
sos
Pref: Reuse image array to improve memory performance
2024-06-05 01:15:41 +08:00
statistics
Upd: Update new UI 20250814 for server JP, update CN assets
2025-08-21 23:59:59 +08:00
storage
Fix: Handle slow get items popup after disassemble (#5015)
2025-08-15 19:32:27 +08:00
submodule
Add: Tools to do event story
2025-03-10 23:02:16 +08:00
tactical
Merge branch 'master_of_lme' into dev
2025-09-01 16:07:45 +08:00
template
Add: Chapter SP
2025-09-13 02:57:37 +08:00
ui
Merge remote-tracking branch 'Lme/master' into dev
2025-10-12 11:28:13 +08:00
ui_white
Merge branch 'master_lme'
2025-01-19 15:59:20 +08:00
war_archives
Add: war_archives_20220428_cn
2025-07-24 21:31:08 +08:00
webui
fix: prevent infinite instance restart loop
2025-07-18 13:33:22 +08:00
exception.py
Merge branch 'feature/more' into dev
2025-05-18 22:03:42 +08:00
logger.py
…
logger.pyi
…
server_checker.py
fix: conflict between exit when server is under maintenance and instance restart
2025-07-17 17:14:36 +08:00