LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-19 11:09:29 +08:00
Code Activity
7,741 Commits 12 Branches 0 Tags
4e69b65533c8800fbf49924a64f55ce9fdf79f8a
Commit Graph

395 Commits

Author SHA1 Message Date
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
Tipsy Fisher
f30c265a62 Merge branch 'LmeSzinc:master' into dev-minigame-for-pr 2023-07-17 16:00:25 +08:00
xzjjasper
c892b3be22 Fix: [TW] SHOP_CHECK 2023-07-16 16:23:58 +08:00
Zuosizhu
0935b58ede Merge branch 'master_lme' 
# Conflicts:
#	module/campaign/gems_farming.py
#	module/exercise/exercise.py
#	module/ui/ui.py
 2023-07-15 20:26:12 +08:00
xzjjasper
065d4a8bce Upd: [TW] assets of shop module 2023-07-14 12:03:38 +08:00
Tipsy Fisher
a962b13343 Merge branch 'LmeSzinc:master' into dev-minigame-for-pr 2023-07-14 10:59:13 +08:00
LmeSzinc
77cea4d7dd Upd: [CN][EN][JP] Assets of page_munition 2023-07-14 00:31:55 +08:00
LmeSzinc
85bea51b60 Upd: Assets for entering supply pack 2023-07-14 00:31:52 +08:00
yypsybs
28cae91564 Opt: minigame 
Opt: minigame multi language assets
Opt: minigame multi language i18n
Opt: minigame config
Fix: minigame-stuck when max ticket
 2023-07-11 18:00:03 +08:00
yypsybs
c0b9045909 Add: minigame 2023-07-04 10:06:44 +08:00
LmeSzinc
e045d14d3d Fix: Navigating to Odin in shipyard (#2611) 2023-07-02 16:56:05 +08:00
LmeSzinc
945598f552 Add: [ALAS] Returns in Scroll.set() 2023-07-02 15:28:39 +08:00
LmeSzinc
2f771d8ca5 Refactor: [ALAS] Page class 
Path findings in page class
 2023-07-02 15:24:40 +08:00
Zuosizhu
68a2ba7c12 Merge branch 'LmeSzinc:master' into 20230309 2023-07-01 20:57:27 +08:00
Bookbug
e3d902a650 Add: [JP] Raid assets of Reflections of the Oasis (#2822) 2023-07-01 14:47:52 +08:00
Zuosizhu
b34d2afc1a Merge branch 'LmeSzinc:master' into 20230309 2023-06-30 19:51:52 +08:00
LmeSzinc
b3f1461e37 Upd: [EN] Raid assets of Reflections of the Oasis 2023-06-30 16:16:24 +08:00
LmeSzinc
2c39f195f8 Add: [CN] Raid assets of Reflections of the Oasis 2023-06-30 16:05:15 +08:00
Zuosizhu
1acc700629 Merge branch 'LmeSzinc:master' into 20230309 2023-06-10 02:53:17 +08:00
LmeSzinc
f71d6d0a69 Upd: [EN] ACADEMY_CHECK 2023-06-10 02:41:03 +08:00
Zuosizhu
0aeed89b72 Merge branch 'LmeSzinc:master' into 20230309 2023-05-30 12:31:00 +08:00
LmeSzinc
ccb26acd99 Fix: Comment links of page_raid temporarily 
since this event shares the same title with raid
 2023-05-28 19:56:07 +08:00
Zuosizhu
9a908c3757 Merge branch 'LmeSzinc:master' into 20230309 2023-05-16 22:08:54 +08:00
LmeSzinc
4f761b1e6f Upd: ALAS framework updates 2023-05-16 09:11:46 +08:00