1
0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-22 12:59:28 +08:00
Commit Graph

5621 Commits

Author SHA1 Message Date
LA-DI-DA
fad620fe32 Adj: switch account thread 2023-12-24 13:56:05 +08:00
LA-DI-DA
2ce7041bdd Fix: style of switch account 2023-12-24 13:52:27 +08:00
LA-DI-DA
e674005ef5 Fix: switch account config watcher 2023-12-24 13:09:51 +08:00
LA-DI-DA
e10569d805 Fix: sync settings of account switch 2023-12-23 16:24:25 +08:00
LA-DI-DA
891cdc9794 Merge branch '0O0o0oOoO00-alas/smallkai' into dev 2023-12-23 11:09:52 +08:00
LA-DI-DA
c45954c4b0 Merge branch 'zuosizhu-alas/20230309' into smallkai-dev
# Conflicts:
#	module/device/device.py
2023-12-23 11:07:19 +08:00
Zuosizhu
ac2b891229 Merge branch 'LmeSzinc:master' into 20230309 2023-12-23 09:15:12 +08:00
LmeSzinc
f9340f1326 Fix: Accidentally entered dorm manage and shop 2023-12-23 00:50:25 +08:00
LmeSzinc
4512b9ece0 Upd: Siren templates 2023-12-23 00:38:13 +08:00
weeswelai
56fe530310 Add: Buy time-limited furniture in dorm. 2023-12-23 00:32:30 +08:00
LA-DI-DA
85c03c063c Add: account data file check 2023-12-22 21:06:41 +08:00
LA-DI-DA
2e08b76ff1 Add: one click login 2023-12-22 21:06:25 +08:00
LA-DI-DA
d7b597f09e Add: status switch for switch 2023-12-22 20:40:42 +08:00
Zuosizhu
8d2c52c94a Merge branch 'master_lme'
# Conflicts:
#	README.md
2023-12-22 18:02:19 +08:00
LA-DI-DA
175e295ba9 Opt: account switch 2023-12-22 15:46:09 +08:00
LmeSzinc
432f61b892 Upd: [EN] ACADEMY_CHECK 2023-12-22 02:33:03 +08:00
LmeSzinc
1f3260d8a7 Add: Event entrance of Light-Chasing Sea of Stars (event_20231221_cn) 2023-12-21 23:33:32 +08:00
RilyLC
ed2a244891 Upd:[TW]Event:Parallel Superimposition (#3361)
Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
2023-12-21 21:51:48 +08:00
LA-DI-DA
76c856c250 Add: support of is_loop 2023-12-21 19:48:00 +08:00
LA-DI-DA
c1b9023e76 Add: support of time_limit == 0 2023-12-21 19:31:42 +08:00
LA-DI-DA
812dda048f Rft: account switch 2023-12-21 13:38:34 +08:00
LA-DI-DA
c272cdc0c3 Add: config saved notify 2023-12-21 12:48:52 +08:00
LA-DI-DA
0014580e45 Add: ./config/account.yaml file check 2023-12-21 12:48:25 +08:00
LA-DI-DA
fd94a7c0f7 Fix: bind checkbox and self.enable_switch config 2023-12-21 12:47:37 +08:00
LA-DI-DA
1673a9d61d Add: switch account 2023-12-20 22:26:36 +08:00
LA-DI-DA
1d2ce5db7f Fix: server key check for OTHERS_LOGIN_NOTIFY_SERVER 2023-12-19 20:04:00 +08:00
Zuosizhu
bb50753c29 Merge branch 'master_lme'
# Conflicts:
#	module/device/device.py
2023-12-16 00:39:48 +08:00
LA-DI-DA
74c123dd06 Add: others' login check for jp 2023-12-15 23:19:57 +08:00
LmeSzinc
10486b8b60 Dev: [ALAS] Show function calls on errors 2023-12-14 21:21:40 +08:00
LmeSzinc
6bc87a9227 Fix: Rapid training triggers too many click between 2 buttons (#3349) 2023-12-14 19:26:44 +08:00
LmeSzinc
ed9921799e Upd: [JP] SUBMARINE_MOVE_* 2023-12-14 19:16:23 +08:00
LmeSzinc
7090f9e5ad Fix: [JP] GameTooManyClickError in research_detect() 2023-12-14 00:55:58 +08:00
LmeSzinc
638ccb5c7c Fix: [ALAS] Retry check_mumu_app_keep_alive() 2023-12-09 18:09:34 +08:00
RilyLC
14847de755 Upd:[TW]Update Meowfficer assets (#3341)
Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
2023-12-08 18:02:31 +08:00
LmeSzinc
a37438bd02 Fix: [ALAS] Checkbox cannot be dynamically updated 2023-12-07 22:35:36 +08:00
LmeSzinc
208a6e9b61 Refactor: Use collections.Counter instead of poor implementation 2023-12-07 02:22:42 +08:00
RilyLC
1da39e500e Upd:[TW]Event:The Ninja Scrolls: Azur Flash (#3323)
Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
2023-11-30 16:13:57 +08:00
SamBillon
8ad4497d2b Upd: Description of StopCondition.StageIncrease (#3310) 2023-11-30 16:13:25 +08:00
LA-DI-DA
1e41b28aa3 Merge branch '0O0o0oOoO00-alas/smallkai' into dev 2023-11-24 17:04:42 +08:00
LA-DI-DA
824b353f3d Merge branch 'zuosizhu-alas/20230309' into smallkai
# Conflicts:
#	module/config/argument/args.json
2023-11-24 17:00:55 +08:00
Zuosizhu
395090785f Merge branch 'LmeSzinc:master' into 20230309 2023-11-24 07:58:05 +08:00
LmeSzinc
8a8fcaf56f Add: Chapter T 2023-11-24 00:45:23 +08:00
LmeSzinc
530128ea49 Add: Event entrance of The Ninja Scrolls: Azur Flash (event_20231123_cn) 2023-11-24 00:43:34 +08:00
RilyLC
f7461e3ad1 Upd:[TW]Event:Northern Overture Rerun (#3306) 2023-11-23 22:41:47 +08:00
LmeSzinc
eb27b88006 Merge pull request #3295 from weeswelai/ui_update_20231116
Upd: [CN] Update assets which have been omitted
2023-11-23 22:04:28 +08:00
ATH733
0efe9e3e43 Upd: Regex for merit shop (#3305) 2023-11-23 22:01:48 +08:00
LA-DI-DA
657d716ed5 Adjust 2023-11-22 16:19:40 +08:00
LA-DI-DA
eb6dcf3d98 Merge branch 'smallkai-dev' into smallkai 2023-11-22 14:45:05 +08:00
weeswelai
6090e9bcea Fix: Skip meow lock popup 2023-11-22 00:26:24 +08:00
LA-DI-DA
0f49d925a8 Fix: incorrect place of exit when server is under maintenance 2023-11-20 22:40:22 +08:00