LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-21 14:39:32 +08:00
Code Activity
7,968 Commits 12 Branches 0 Tags
0f49d925a8dfca004abcbef50432ff75ea37ec5b
Commit Graph

5564 Commits

Author SHA1 Message Date
LA-DI-DA
0f49d925a8 Fix: incorrect place of exit when server is under maintenance 2023-11-20 22:40:22 +08:00
LA-DI-DA
c262bbd4af Merge branch '0O0o0oOoO00-alas/smallkai' into dev 
# Conflicts:
#	module/campaign/gems_farming.py
 2023-11-19 23:38:47 +08:00
LA-DI-DA
b05dc58c11 Merge branch 'zuosizhu-alas/20230309' into smallkai 2023-11-19 23:34:44 +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
weeswelai
3308be9a7e Upd: Update TW same assets 2023-11-17 20:03:22 +08:00
weeswelai
c66fdddbf4 Add: Appear MEOWFFICER_BUY_ENTER to ensure UI loading completed 2023-11-17 20:00:32 +08:00
weeswelai
8202516552 Upd: Update JP same assets 2023-11-17 19:57:08 +08:00
weeswelai
037f471a21 Upd: [CN] Update meowfficer UI 2023-11-17 19:43:02 +08:00
Zuosizhu
94c5fb4858 Merge branch 'LmeSzinc:master' into 20230309 2023-11-17 08:01:26 +08:00
RilyLC
d84010bfb1 Fix:[TW]support server_support_status_fleet in campaign\gems_farming (#3285) 
* Fix:[TW]support server_support_status_fleet in campaign\gems_farming

* Fix:[TW]ship scan asset

* Fix:[TW]remove server_support in retirement and gems_farming

---------

Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
 2023-11-15 18:28:47 +08:00
LA-DI-DA
ab502f0e77 Fix: wrong command name in gg handler 2023-11-11 15:58:40 +08:00
LA-DI-DA
a935f7e416 Fix: checking ship's experience that were overwritten in the previous merge 2023-11-11 13:38:25 +08:00
LA-DI-DA
649f4819ef Merge branch '0O0o0oOoO00-alas/smallkai' into dev 2023-11-10 16:57:59 +08:00
LA-DI-DA
03f56ac4f0 Merge branch 'zuosizhu-alas/master' 2023-11-10 16:54:55 +08:00
LA-DI-DA
5faa7eb4d6 Add: click fleet advice when preparing hard mode map 2023-11-10 16:22:47 +08:00
Zuosizhu
7f9c64e284 Merge branch 'LmeSzinc:master' into 20230309 2023-11-10 14:33:24 +08:00
LmeSzinc
3ce8665f0f Fix: Collect coins and loves in dorm 2023-11-10 12:00:30 +08:00
LmeSzinc
1dad0031f1 Add: Argument scaling in Template.match_multi() 2023-11-10 12:00:08 +08:00
Jiahao Yuan
114ffbdc9b Upd: campaign (#3274) 2023-11-10 11:28:11 +08:00
Jiahao Yuan
1d6bf0547f Upd: Dorm UI assets (#3275) 2023-11-10 11:27:44 +08:00
hephooey
99a4478563 [TW]: Update WITHDRAW and IN_MAP assets (#3276) 2023-11-10 10:53:29 +08:00
kahojyun
a236144eae Upd: [JP] MEOWFFICER_GOLD/PURPLE_CHECK (#3259) 2023-11-10 00:14:52 +08:00
LA-DI-DA
c95825269b Merge branch '0O0o0oOoO00-alas/smallkai' into dev 2023-11-09 19:03:13 +08:00
LA-DI-DA
02691fc408 Rmv: remove ship in GemsFarming when in hard mode 2023-11-09 19:01:33 +08:00
guoh064
4ae8438338 Upd: [JP] RETIRE_COIN (#3267) 2023-11-09 15:35:31 +08:00
Zuosizhu
8981d103c9 Merge branch 'LmeSzinc:master' into 20230309 2023-11-06 10:08:40 +08:00
LmeSzinc
eda63d72f8 Refactor: Config update callback 2023-11-03 03:34:23 +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
LmeSzinc
56aad58f0e Fix: Enlarge search area of submarine_hunt (#3250) 2023-11-01 02:48:18 +08:00
LmeSzinc
1d1d20fef9 Fix: Validate datetime instead of using regex (#3252) 2023-11-01 02:40:02 +08:00
LmeSzinc
e3e72f02cf Fix: Limit text length when logging upload errors (#3242) 2023-11-01 01:48:42 +08:00
LmeSzinc
d3c8221e14 Fix: Unknown stage name should not be considered as any chapter 2023-11-01 01:36:52 +08:00
LmeSzinc
ab014c86a7 Fix: handle story skip in emotion withdraw 2023-10-29 23:10:49 +08:00
LA-DI-DA
d0599ffeb3 Merge branch '0O0o0oOoO00-alas/smallkai' into dev 2023-10-29 12:18:18 +08:00
LA-DI-DA
7ea587b1cf Adj: disable to lock to latest event 2023-10-29 12:09:36 +08:00
LA-DI-DA
5a8182256e Merge branch 'zuosizhu-alas/20230309' into smallkai 
# Conflicts:
#	module/config/argument/args.json
#	module/config/argument/override.yaml
 2023-10-29 12:03:28 +08:00
LA-DI-DA
5326fe7940 Revert "Add(tmp): Tempesta and the Fountain of Youth" 
This reverts commit 9c0d07ae
 2023-10-29 11:59:30 +08:00
Zuosizhu
8815928c27 Merge branch 'LmeSzinc:master' into 20230309 2023-10-29 07:01:00 +08:00
LmeSzinc
f4277912cb Fix: Stage name convert 2023-10-29 01:58:31 +08:00
weeswelai
99fc5e6744 Upd: Update EN‘s assets DORM_INFO 2023-10-29 01:54:13 +08:00
LmeSzinc
75a58f5640 Opt: [ALAS] Turn type lock to type state 2023-10-28 22:03:47 +08:00
LmeSzinc
f7cf9e3bd2 Add: [ALAS] stored and state widgets 2023-10-28 22:03:45 +08:00
LmeSzinc
74e631f431 Add: Event entrance of Tempesta and the Fountain of Youth (event_20231026_cn) 2023-10-28 21:01:26 +08:00
LA-DI-DA
b6fe697e66 Merge branch '0O0o0oOoO00-alas/smallkai' into dev 
# Conflicts:
#	module/config/argument/args.json
 2023-10-27 19:34:40 +08:00
LA-DI-DA
153dbdd79e Merge branch 'zuosizhu-alas/20230309' into smallkai 
# Conflicts:
#	campaign/Readme.md
 2023-10-27 19:28:33 +08:00
Zuosizhu
2720da3995 Merge branch 'LmeSzinc:master' into 20230309 2023-10-27 18:21:25 +08:00
LmeSzinc
3b0ac0917a Merge pull request #3231 from LmeSzinc/dev 
Bug fix
 2023-10-27 17:29:17 +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
LA-DI-DA
9c0d07ae66 Add(tmp): Tempesta and the Fountain of Youth 2023-10-27 15:54:14 +08:00