LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-20 22:19:30 +08:00
Code Activity
Files
1be62c9c8f15be192fce55bd9f9fd21ae597c9ff
Alas/module
History
LA_DI_DA 1be62c9c8f Merge branch '0O0o0oOoO00-alas/smallkai' into dev 
# Conflicts:
#	module/config/argument/args.json
2024-04-27 16:01:37 +08:00
..
auto_login
Add: one click login
2023-12-22 21:06:25 +08:00
base
Merge branch 'LmeSzinc:master' into 20230309
2024-04-15 23:25:52 +08:00
campaign
Merge branch '0O0o0oOoO00-alas/smallkai' into dev
2024-04-27 16:01:37 +08:00
coalition
Merge branch 'master_lme'
2023-10-20 01:01:54 +08:00
combat
Merge branch 'zuosizhu-alas/20230309' into smallkai
2023-10-27 19:28:33 +08:00
commission
Fix: Slow OCR is detected as commission flashing bug
2024-01-12 18:29:25 +08:00
config
Merge branch '0O0o0oOoO00-alas/smallkai' into dev
2024-04-27 16:01:37 +08:00
daemon
Merge branch 'master_lme'
2024-04-10 12:22:40 +08:00
daily
Revert "Upd: Flagship changing (#3556)"
2024-04-27 12:58:56 +08:00
device
Merge branch '0O0o0oOoO00-alas/smallkai' into dev
2024-04-27 16:01:37 +08:00
dorm
Fix: Chain call minitouch in dorm
2024-04-15 19:20:52 +08:00
equipment
Merge branch 'zuosizhu-alas/20230309' into smallkai
2024-04-27 15:56:34 +08:00
event
Fix: lack of setting emotion for auto event
2023-10-03 22:08:52 +08:00
exercise
Revert "Upd: Flagship changing (#3556)"
2024-04-27 12:58:56 +08:00
extract_account
Add: switch account
2023-12-20 22:26:36 +08:00
freebies
Upd: Assets for entering supply pack
2023-07-14 00:31:52 +08:00
gacha
Fix: Dashboard won't refresh after gacha when using gacha tickets(PR =9)
2024-04-13 11:54:12 +08:00
game_setting
Add: Game settings extraction (#1685)
2022-10-01 16:08:45 +08:00
gg_handler
Merge branch '0O0o0oOoO00-alas/smallkai' into dev
2024-01-12 12:23:22 +08:00
guild
Opt: Remove meaningless sleep from stone age
2024-04-20 02:50:12 +08:00
handler
Merge branch '0O0o0oOoO00-alas/smallkai' into dev
2024-04-27 16:01:37 +08:00
hard
Revert "Upd: Flagship changing (#3556)"
2024-04-27 12:58:56 +08:00
log_res
commit stashed for GG
2023-02-16 04:01:18 +08:00
map
Merge branch '0O0o0oOoO00-alas/smallkai' into dev
2024-04-27 16:01:37 +08:00
map_detection
Add: 15图开荒/周回 (#3563)
2024-04-19 01:29:17 +08:00
meowfficer
Upd:[TW]Update Meowfficer assets (#3341)
2023-12-08 18:02:31 +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
ocr
Opt: Patch pkg_resources for faster startup
2024-04-15 18:43:42 +08:00
os
Merge branch 'zuosizhu-alas/20230309' into smallkai
2024-04-27 15:56:34 +08:00
os_ash
Merge branch '0O0o0oOoO00-alas/smallkai' into dev
2024-01-02 23:10:49 +08:00
os_combat
Merge branch 'lme-alas/master' into smallkai
2023-10-19 23:00:39 +08:00
os_handler
Merge branch 'zuosizhu-alas/20230309' into smallkai
2024-04-27 15:56:34 +08:00
raid
Merge branch 'LmeSzinc:master' into 20230309
2024-03-29 07:09:29 +08:00
research
Fix: [JP] GameTooManyClickError in research_detect()
2023-12-14 00:55:58 +08:00
research_farming
Fix: wrong click when checking ship's experience
2023-10-11 15:03:09 +08:00
retire
Revert "Upd: Flagship changing (#3556)"
2024-04-27 12:58:56 +08:00
reward
Refactor: [ALAS] Page class
2023-07-02 15:24:40 +08:00
shipyard
[TW]Fix ash beacons and shipyard (#2999)
2023-08-11 19:06:10 +08:00
shop
Merge branch '0O0o0oOoO00-alas/smallkai' into dev
2024-04-27 16:01:37 +08:00
sos
Del: [CN][EN][JP] Disable SOS task
2023-06-08 16:49:57 +08:00
statistics
Fix: Limit text length when logging upload errors (#3242)
2023-11-01 01:48:42 +08:00
storage
Add: Siren templates in chapter A
2023-08-18 22:29:25 +08:00
submodule
Opt: No raw command textarea in FpyBenchmark
2023-05-09 14:40:24 +08:00
tactical
Merge branch '20230309' into smallkai
2024-04-11 22:12:34 +08:00
template
Fix: Duplicated SheffieldIdol template
2024-04-26 04:01:06 +08:00
ui
Merge branch 'dev-revert-gemsfarming'
2024-04-20 15:16:09 +08:00
war_archives
Add: War Archives The Way Home in the Night
2024-03-11 22:57:37 +08:00
webui
Merge branch '0O0o0oOoO00-alas/smallkai' into dev
2024-04-27 16:01:37 +08:00
exception.py
Add: account's owner login detection
2023-09-22 12:24:08 +08:00
logger.py
Sync: [SRC] Sync alas changes
2023-09-10 15:04:32 +08:00
logger.pyi
Opt: Remove log output to stdout when using electron
2023-02-08 16:37:11 +08:00
notify.py
添加了类型判断，Onepush中某些中间件并不会返回Response而是返回NoneType(比如Discord)
2023-01-06 00:44:10 +08:00
server_checker.py
Fix: incorrect place of exit when server is under maintenance
2023-11-20 22:40:22 +08:00