LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-15 21:09:25 +08:00
Code Activity
Files
fbe58bd32953e09cba540c22b1d1919d89288feb
Alas/module
History
xhqss fbe58bd329 Merge branch 'refs/heads/master_lme' 
# Conflicts:
#	module/campaign/gems_farming.py
#	module/device/method/adb.py
#	module/device/screenshot.py
2024-07-26 10:28:26 +08:00
..
base
Merge branch 'master_lme'
2024-07-12 10:14:43 +08:00
campaign
Merge branch 'refs/heads/master_lme'
2024-07-26 10:28:26 +08:00
coalition
Merge branch 'refs/heads/lme-alas/master' into dev
2024-07-06 19:17:11 +08:00
combat
Reverts test code in commit ea68f68d
2024-06-28 03:23:28 +08:00
commission
Fix: Handle random white background at page_main in commission receive
2024-06-05 02:49:17 +08:00
config
Merge branch 'refs/heads/master_lme'
2024-07-26 10:28:26 +08:00
daemon
Merge branch 'refs/heads/master_lme'
2024-07-26 10:28:26 +08:00
daily
Upd: [CN] Support UI in 2024.05.21
2024-05-23 01:16:41 +08:00
device
Merge branch 'refs/heads/master_lme'
2024-07-26 10:28:26 +08:00
dorm
Add: Quick collection of coins and loves in the Dorm. (#3837)
2024-07-03 22:27:22 +08:00
equipment
Fix: shit in Daily
2024-07-20 15:30:59 +08:00
event
…
exercise
Fix: dock_filter_set() got an unexpected keyword argument 'wait_loading' while using DockNew. DockNew inherited UI, which is not the origin purpose. Forced using old method in order to run away from shit of air111. Todo: fix gl unstable errors
2024-07-20 15:30:44 +08:00
freebies
Upd: [JP] Mail assets
2024-07-26 03:01:04 +08:00
gacha
Merge branch 'refs/heads/lme-alas/master' into dev
2024-06-22 20:31:35 +08:00
game_setting
Reverts test code in commit ea68f68d
2024-06-28 03:23:28 +08:00
gg_handler
Fix: Cvl to bc/bb with common bb problem about Nevada
2024-07-20 15:31:37 +08:00
guild
Upd: [TW] BATTLE_STATUS_CF (#3975)
2024-07-11 23:00:16 +08:00
handler
Merge branch 'refs/heads/master_lme'
2024-07-26 10:28:26 +08:00
hard
Fix: dock_filter_set() got an unexpected keyword argument 'wait_loading' while using DockNew. DockNew inherited UI, which is not the origin purpose. Forced using old method in order to run away from shit of air111. Todo: fix gl unstable errors
2024-07-20 15:30:44 +08:00
log_res
Fix: Cvl to bc/bb with common bb problem about Nevada
2024-07-20 15:31:37 +08:00
map
Merge branch 'refs/heads/master_lme'
2024-07-26 10:28:26 +08:00
map_detection
Pref: Reuse image array to improve memory performance
2024-06-05 01:15:41 +08:00
meowfficer
Fix: Handle MEOWFFICER_TRAIN_EVALUATE in _meow_skip_lock() (#3917)
2024-06-27 22:20:09 +08:00
meta_reward
Del: unused DOSSIER_REWARD_NOTICE.png
2023-09-09 08:53:51 +08:00
minigame
Fix: No redundant click of NEW_YEAR_CHALLENGE_CHOOSING
2023-09-28 16:26:20 +08:00
notify
Opt: [ALAS] Lazy import onepush
2024-04-28 17:12:03 +08:00
ocr
Fix: Add atomic OCR method on client side
2024-05-09 18:51:52 +08:00
os
Fix: syntax error in operation_siren.py
2024-07-06 20:36:29 +08:00
os_ash
Merge branch 'master_lme'
2024-05-23 02:31:29 +08:00
os_combat
Merge branch 'refs/heads/lme-alas/master' into dev
2024-06-22 20:31:35 +08:00
os_handler
Merge branch 'master_lme' into AlasGGdev
2024-06-28 16:01:16 +08:00
os_shop
Merge branch 'refs/heads/lme-alas/master'
2024-07-18 23:11:37 +08:00
raid
Merge branch 'LmeSzinc:master' into 20230309
2024-03-29 07:09:29 +08:00
research
Add: Series 7 filter
2024-07-12 00:24:36 +08:00
retire
Merge branch 'refs/heads/master_lme'
2024-07-26 10:28:26 +08:00
reward
Fix: Expand search area of MISSION_MULTI and MISSION_SINGLE
2024-06-26 19:02:36 +08:00
shipyard
Revert "Fix: [TW] Keep SHIPYARD_SERIES_SELECT_CHECK in series 6"
2024-07-19 12:27:34 +08:00
shop
Merge branch 'refs/heads/lme-alas/master' into dev
2024-06-22 20:31:35 +08:00
sos
Pref: Reuse image array to improve memory performance
2024-06-05 01:15:41 +08:00
statistics
Revert "Del: Remove AzurStats upload"
2024-07-17 12:59:55 +08:00
storage
Add: Siren templates in chapter A
2023-08-18 22:29:25 +08:00
submodule
Chore: [ALAS] Move func methods to the Alas class
2024-05-30 13:34:24 +08:00
tactical
Merge branch 'refs/heads/lme-alas/master' into dev
2024-06-22 20:31:35 +08:00
template
Add: Chapter SP
2024-07-26 02:46:17 +08:00
ui
Merge branch 'refs/heads/lme-alas/master'
2024-07-18 23:11:37 +08:00
ui_white
Upd: [JP] POPUP_CANCEL_WHITE and POPUP_CONFIRM_WHITE
2024-07-26 02:53:15 +08:00
war_archives
Add: War Archives The Way Home in the Night
2024-03-11 22:57:37 +08:00
webui
Merge branch 'refs/heads/lme-alas/master' into dev
2024-06-22 20:31:35 +08:00
exception.py
Fix: set gemsfarming's ship filter to default after this task is set to campaign_main
2024-05-25 19:43:00 +08:00
logger.py
Sync: [SRC] Sync alas changes
2023-09-10 15:04:32 +08:00
logger.pyi
…
server_checker.py
…