LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-17 17:09:27 +08:00
Code Activity
Files
90c881fda0f2254cb5e6706fc776bce228eaa3a4
Alas/module
History
xhqss 90c881fda0 Merge branch 'master_lme' into dev 
# Conflicts:
#	module/coalition/coalition.py
#	module/config/argument/args.json
#	module/ui/assets.py
2025-10-17 00:30:43 +08:00
..
auto_login
…
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 branch 'master_lme' into dev
2025-10-17 00:30:43 +08:00
cloud_phone
fix: call Restart after phone restarted
2025-05-18 21:38:31 +08:00
coalition
Merge branch 'master_lme' into dev
2025-10-17 00:30:43 +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 branch 'master_lme' into dev
2025-10-17 00:30:43 +08:00
daemon
Add: cheat support for daemon
2025-05-21 03:30:02 +08:00
daily
…
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 branch 'master_lme' into dev
2025-10-17 00:30:43 +08:00
freebies
Upd: [JP] SUPPLY_PACK_CHECK
2025-10-14 22:05:26 +08:00
gacha
Fix: Shop and Gacha
2025-09-01 19:46:40 +08:00
game_setting
…
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
…
log_res
…
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
…
research
Merge branch 'master_lme' into brocore_dev
2025-07-25 11:46:23 +08:00
research_farming
…
retire
Merge remote-tracking branch 'Lme/master' into dev
2025-10-12 11:28:13 +08:00
reward
Fix: reward weekly undetected (#5215)
2025-10-14 19:07:40 +08:00
shipyard
Fix: shipyard no ocr_coin
2025-10-12 16:29:24 +08:00
shop
Fix: medal shop
2025-10-12 16:18:32 +08:00
shop_event
…
sos
…
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
…
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 branch 'master_lme' into dev
2025-10-17 00:30:43 +08:00
ui_white
…
war_archives
Add: war_archives_20231026_cn (#5221)
2025-10-16 19:46:24 +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