LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-22 16:29:29 +08:00
Code Activity
Files
07768307f2db64f310c1fc808810d3f422643783
Alas/module
History
0O0o0oOoO00 07768307f2 Merge remote-tracking branch 'LmeSzinc/dev' into dev 
# Conflicts:
#	config/template.json
#	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
2026-05-21 23:41:08 +08:00
..
awaken
…
base
Merge remote-tracking branch 'LmeSzinc/master' into dev
2026-04-18 15:54:19 +08:00
campaign
Merge remote-tracking branch 'LmeSzinc/dev' into dev
2026-05-21 23:41:08 +08:00
coalition
Merge remote-tracking branch 'LmeSzinc/master' into dev
2026-02-06 21:57:03 +08:00
combat
Merge remote-tracking branch 'LmeSzinc/dev' into dev
2026-05-21 23:41:08 +08:00
combat_ui
Upd: Battle UI GildedReverie
2026-05-21 00:35:29 +08:00
commission
Merge remote-tracking branch 'LmeSzinc/dev' into dev
2026-05-21 23:41:08 +08:00
config
Merge remote-tracking branch 'LmeSzinc/dev' into dev
2026-05-21 23:41:08 +08:00
daemon
Fix: [ALAS] Limit Android SDK version when benchmarking Droidcast
2026-03-28 19:09:14 +08:00
daily
…
device
Merge remote-tracking branch 'LmeSzinc/dev' into dev
2026-05-21 23:41:08 +08:00
dorm
Upd: method dorm_food_run
2026-05-11 16:15:33 +08:00
equipment
Merge remote-tracking branch 'LmeSzinc/master' into refactor
2025-10-01 19:43:59 +08:00
event
…
event_hospital
Opt: Reuse screenshots in combat_status
2025-10-24 00:21:41 +08:00
eventstory
Fix: Skip event story in event_20260226_cn
2026-03-06 01:12:54 +08:00
exercise
Merge remote-tracking branch 'LmeSzinc/dev' into dev
2026-05-21 23:41:08 +08:00
freebies
Upd: [EN] POPUP_CONFIRM_WHITE_BATTLEPASS (fixed #5381)
2025-12-12 19:24:41 +08:00
gacha
add: migrate dashboard update logic
2025-09-14 19:25:40 +08:00
game_setting
…
gg_handler
add: migrate power limit and exercise delay
2025-09-14 17:57:06 +08:00
guild
upd: update patched GUILD_DISPATCH_FLEET_UNFILLED for jp
2026-03-06 07:56:33 +08:00
handler
Fix: story option detection pre_process (#5669)
2026-05-20 22:45:04 +08:00
hard
…
log_res
add: migrate dashboard ui
2025-09-14 18:45:47 +08:00
luahook
add: tool of removing inject
2026-05-20 23:37:19 +08:00
map
Merge remote-tracking branch 'LmeSzinc/dev' into dev
2026-05-21 23:41:08 +08:00
map_detection
Add: W16 preparations
2026-01-18 21:27:25 +08:00
meowfficer
…
meta_reward
…
minigame
Fix: Handle popup after enter minigame
2026-03-13 18:49:34 +08:00
notify
…
ocr
Upd: ocr model azur_lane_jp (#5553)
2026-03-26 20:38:38 +08:00
os
Merge remote-tracking branch 'LmeSzinc/master' into dev
2026-02-28 12:16:28 +08:00
os_ash
Merge remote-tracking branch 'LmeSzinc/master' into dev
2026-04-18 15:54:19 +08:00
os_combat
Opt: Reuse screenshots in combat_status
2025-10-24 00:21:41 +08:00
os_handler
Merge remote-tracking branch 'LmeSzinc/master' into dev
2026-02-06 21:57:03 +08:00
os_shop
Merge branch 'master_lme' into dev
2026-04-25 15:09:43 +08:00
private_quarters
feat: pq add aegir (#5423)
2026-01-16 17:08:24 +08:00
raid
Merge remote-tracking branch 'LmeSzinc/master' into dev
2026-02-28 12:16:28 +08:00
research
Merge remote-tracking branch 'LmeSzinc/master' into dev
2026-04-18 15:54:19 +08:00
retire
Merge pull request #5157 from tonyhom/bug_fix/tw/enhance-slot-image
2025-09-25 12:10:39 +08:00
reward
Merge branch 'master_lme' into dev
2026-04-25 15:09:43 +08:00
shipyard
Fix: OCR_COIN from page_main in shipyard_reward (#5176)
2025-10-01 02:42:59 +08:00
shop
Merge remote-tracking branch 'LmeSzinc/master' into dev
2026-04-18 15:54:19 +08:00
shop_event
Add: event shop
2025-10-29 16:17:37 +08:00
sos
…
statistics
Upd: Update new UI 20250814 for server JP, update CN assets
2025-08-21 23:59:59 +08:00
storage
Fix: infinite loop in _handle_use_box_amount when box count insufficient (#5516)
2026-02-19 02:19:08 +08:00
submodule
add: add hook operation tool
2025-10-27 17:20:55 +08:00
support_build
Add dock shortage reminder during support_build
2026-05-08 10:23:16 +08:00
tactical
Upd: [JP] assets REWARD_*.BUTTON (#5644)
2026-05-01 03:04:49 +08:00
template
Upd: Button extract
2026-04-18 03:28:11 +08:00
ui
Merge branch 'master_lme' into dev
2026-04-25 15:09:43 +08:00
ui_white
Upd: [EN] POPUP_CONFIRM_WHITE_BATTLEPASS (fixed #5381)
2025-12-12 19:24:41 +08:00
war_archives
Add: war_archives_20220818_cn and war_archives_20230803_cn (#5660)
2026-05-11 19:26:19 +08:00
webui
fix: unexpected instance startup caused by updating Alas after one click stopping all instances
2026-04-25 18:02:00 +08:00
counter.py
add: base framework of game restart and instance restart
2025-09-02 00:48:40 +08:00
exception.py
Merge remote-tracking branch 'LmeSzinc/dev' into dev
2026-05-21 23:41:08 +08:00
instance_watcher.py
fix: do not create bin/status dir when try to remove status file although this dir has already existed
2025-11-02 01:07:23 +08:00
logger.py
…
logger.pyi
Opt: Remove log output to stdout when using electron
2023-02-08 16:37:11 +08:00
scheduler_watcher.py
fix: circular reference of AzurLaneConfig
2025-09-13 21:58:42 +08:00
server_checker.py
fix: import path of scheduler watcher
2025-10-16 23:13:56 +08:00