LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-15 23:29:25 +08:00
Code Activity
7,955 Commits 12 Branches 0 Tags
4486c8cff60c95ef3d3f85da3bc65d4a337eb8a4
Commit Graph

418 Commits

Author SHA1 Message Date
Zuosizhu
4486c8cff6 Merge branch 'LmeSzinc:master' into 20230309 2024-04-15 23:25:52 +08:00
LmeSzinc
42af2e479f Chore: [ALAS] Abstract has_cached_image 2024-04-13 02:28:11 +08:00
Zuosizhu
b6e6f60754 Merge branch 'LmeSzinc:master' into 20230309 2024-03-29 07:09:29 +08:00
LmeSzinc
e8909f4d59 Add: UI switches in RPG raid 2024-03-29 02:17:47 +08:00
LmeSzinc
32e4571afc Upd: LOGIN_ANNOUNCE 2024-03-28 23:43:18 +08:00
RilyLC
7a01eadcd2 Upd:[TW]Event:Reflections of the Oasis (#3574) 
Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
 2024-03-21 19:33:21 +08:00
Zuosizhu
f8ce1d0395 Merge branch 'LmeSzinc:master' into 20230309 2024-02-07 01:42:58 +08:00
RilyLC
7968771265 Upd:[TW]Event assets (#3479) 2024-02-07 00:00:41 +08:00
Zuosizhu
73c29c9afd Merge branch 'LmeSzinc:master' into 20230309 2024-02-06 21:00:56 +08:00
LmeSzinc
a8a5f5b888 Upd: [EN][JP] Sync DORMMENU assets 2024-02-06 19:22:22 +08:00
yypsybs
8156a60b0c Upd: Dorm menu assets CN 2024-02-06 19:18:57 +08:00
yypsybs
40825c0a42 Upd: Dorm menu assets CN 2024-02-06 18:56:46 +08:00
Zuosizhu
62712d1864 Merge branch 'LmeSzinc:master' into 20230309 2024-01-31 13:10:56 +08:00
weeswelai
b04b349206 Add: Add raid event Spring Festive Fiasco(raid_20240130) 2024-01-31 10:57:34 +08:00
Zuosizhu
356496af2c Merge branch 'LmeSzinc:master' into 20230309 2024-01-24 00:47:13 +08:00
LmeSzinc
9e135993ce Upd: [EN] ACADEMY_CHECK 2024-01-12 18:00:35 +08:00
Zuosizhu
79956f8b66 Merge branch 'master_lme' 2024-01-11 16:59:27 +08:00
LmeSzinc
944190c46e Upd: [EN] ACADEMY_CHECK 2024-01-06 01:51:48 +08:00
LmeSzinc
6b67c4956d Fix: [ALAS] Scroll methods should all have returns 2024-01-02 03:57:00 +08:00
Zuosizhu
9934be19fe Merge branch 'master_lme' 
# Conflicts:
#	module/config/config.py
#	submodule/AlasFpyBridge/module/config/config.py
 2023-12-29 14:46:10 +08:00
LmeSzinc
94348e7b9f Revert "Upd: [EN] ACADEMY_CHECK" 
Well I hate them changing things back and forth
 2023-12-29 00:21:35 +08:00
Zuosizhu
ecf3c28454 Merge branch 'LmeSzinc:master' into 20230309 2023-12-28 16:05:02 +08:00
LmeSzinc
72197cc822 Fix: DORM_FURNITURE_COUNTDOWN is detected even if it's already purchased 2023-12-23 21:14:15 +08:00
Zuosizhu
8d2c52c94a Merge branch 'master_lme' 
# Conflicts:
#	README.md
 2023-12-22 18:02:19 +08:00
LmeSzinc
432f61b892 Upd: [EN] ACADEMY_CHECK 2023-12-22 02:33:03 +08:00
Zuosizhu
395090785f Merge branch 'LmeSzinc:master' into 20230309 2023-11-24 07:58:05 +08:00
Jiahao Yuan
cdca3237e9 Upd: [JP] Meowfficer assets (#3291) 
* Upd: [CN] Update meowfficer UI

* Upd: Update JP same assets

* Add: Appear MEOWFFICER_BUY_ENTER to ensure UI loading completed

* Upd: Update TW same assets

* Upd: Update meowfficer UI for EN

* Upd: [JP] Meowfficer assets

---------

Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
Co-authored-by: weeswelai <52352067+weeswelai@users.noreply.github.com>
 2023-11-19 18:55:51 +08:00
Zuosizhu
c909df85d3 Merge branch 'LmeSzinc:master' into 20230309 2023-11-18 10:57:36 +08:00
weeswelai
671c14a2fc Upd: Update meowfficer UI for EN 2023-11-17 20:09:55 +08:00
Zuosizhu
7f9c64e284 Merge branch 'LmeSzinc:master' into 20230309 2023-11-10 14:33:24 +08:00
Jiahao Yuan
1d6bf0547f Upd: Dorm UI assets (#3275) 2023-11-10 11:27:44 +08:00
Zuosizhu
8981d103c9 Merge branch 'LmeSzinc:master' into 20230309 2023-11-06 10:08:40 +08:00
RilyLC
a44ffa8c75 Upd: [TW]update dorm assets (#3256) 
Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
 2023-11-03 03:32:15 +08:00
Zuosizhu
8815928c27 Merge branch 'LmeSzinc:master' into 20230309 2023-10-29 07:01:00 +08:00
weeswelai
99fc5e6744 Upd: Update EN‘s assets DORM_INFO 2023-10-29 01:54:13 +08:00
Zuosizhu
2720da3995 Merge branch 'LmeSzinc:master' into 20230309 2023-10-27 18:21:25 +08:00
weeswelai
d0f4d982a9 Upd: Update some part dorm ui for cn, jp, en (#3226) 
* Upd: Update dorm ui for cn, jp, en

* Add: Add specialized FILL ocr, update assets

* Upd: Update OCR_DORM_SLOT height, del en _dorm_food
 2023-10-27 16:53:24 +08:00
Zuosizhu
b842d27611 Merge branch 'master_lme' 
# Conflicts:
#	module/map/assets.py
 2023-10-26 00:04:07 +08:00
appleapple802
d7c748f420 Upd: [TW] Raid event Fight On, Royal Maids! 2023-10-21 15:39:44 +08:00
Zuosizhu
e2f7cd544f Merge branch 'master_lme' 
# Conflicts:
#	module/map/assets.py
 2023-10-20 01:01:54 +08:00
LmeSzinc
4969dc01b0 Upd: [CN] Fleet preparation 2023-10-19 22:02:24 +08:00
Zuosizhu
4d4d2377dc Merge branch 'master_lme' 
# Conflicts:
#	module/device/method/droidcast.py
 2023-09-28 18:09:13 +08:00
yypsybs
369c80d991 Merge branch 'master' into dev-minigame-for-pr 
# Conflicts:
#	module/ui/assets.py
 2023-09-11 10:29:52 +08:00
Zuosizhu
f3af2347e9 Merge branch 'LmeSzinc:master' into 20230309 2023-09-08 08:06:00 +08:00
LmeSzinc
078c6bb606 Revert "Upd: [EN] ACADEMY_CHECK" 
This reverts commit 6f2ea47c
 2023-09-08 01:10:52 +08:00
Zuosizhu
78d8ed1c5b Merge branch 'master_lme' 
# Conflicts:
#	assets/gui/css/light-alas.css
#	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
#	module/webui/app.py
 2023-09-02 17:47:24 +08:00
yypsybs
fd9777940b Merge branch 'master' into dev-minigame-for-pr 
# Conflicts:
#	module/ui/assets.py
 2023-09-01 17:58:39 +08:00
LmeSzinc
6f2ea47c70 Upd: [EN] ACADEMY_CHECK 2023-09-01 01:21:55 +08:00
hephooey
dfce73e8d3 Update tw assets for Frostfall (#3051) 
Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
 2023-08-25 12:38:19 +08:00
Zuosizhu
43b707eb61 Merge branch 'LmeSzinc:master' into 20230309 2023-07-21 00:07:23 +08:00