LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-21 05:19:28 +08:00
Code Activity
7,900 Commits 12 Branches 0 Tags
8ecebef114c970b9fc2b461e18071683a6a15e4f
Commit Graph

5507 Commits

Author SHA1 Message Date
LA-DI-DA
8ecebef114 Add: higher priority option for OpsiHazard1Leveling 2023-11-11 12:31:58 +08:00
LA-DI-DA
03f56ac4f0 Merge branch 'zuosizhu-alas/master' 2023-11-10 16:54:55 +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
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
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
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
alexan-ded
7eb02e1ed9 Upd: [EN] EQUIPMENT_OPEN 2023-10-27 07:35:19 +08:00
Zuosizhu
b842d27611 Merge branch 'master_lme' 
# Conflicts:
#	module/map/assets.py
 2023-10-26 00:04:07 +08:00
LA-DI-DA
527d067e3f Fix: unstoppable loop of entering strategic search setting page when opsi_hazard1_leveling 2023-10-25 00:27:30 +08:00
下面我簡單喵兩句
dcb0c5eca7 Upd: [TW] handler assets (#3219) 2023-10-23 16:08:36 +08:00
LmeSzinc
fb3d736bbb Fix: [JP] SUBMARINE_BAR 2023-10-22 21:51:52 +08:00
LmeSzinc
6b88d338b5 Merge remote-tracking branch 'origin/dev' into dev 2023-10-22 19:04:05 +08:00
hephooey
12c3dfd159 [tw] Update WITHDRAW asset (#3217) 2023-10-22 16:14:17 +08:00
LA-DI-DA
dc69ce0d79 Merge branch 'zuosizhu-alas/20230309' into smallkai 
# Conflicts:
#	module/map/assets.py
 2023-10-22 12:07:37 +08:00
LmeSzinc
c6c0af7be9 Fix: Screenshot interval is not extended in daemon and guild combat 2023-10-21 21:35:17 +08:00
appleapple802
d7c748f420 Upd: [TW] Raid event Fight On, Royal Maids! 2023-10-21 15:39:44 +08:00
appleapple802
c5bd99ff4c Upd: [TW] map and handler assets 2023-10-21 12:34:05 +08:00
Zuosizhu
9e31b5eb43 Merge branch 'master_lme' 
# Conflicts:
#	module/map/assets.py
 2023-10-20 22:44:25 +08:00
Zuosizhu
12e8a83005 Opt: Allow to set opsifleet in opsistronghold 2023-10-20 09:06:27 +08:00
LmeSzinc
e8340df57c Upd: [EN] _fleet_sidebar 2023-10-20 01:11:59 +08:00
LmeSzinc
c5efe8e380 Upd: [EN] AUTO_SEARCH_SET_* 2023-10-20 01:09:01 +08:00
LmeSzinc
d2302836ec Upd: [EN] Fleet preparation 2023-10-20 01:02:47 +08:00
Zuosizhu
e2f7cd544f Merge branch 'master_lme' 
# Conflicts:
#	module/map/assets.py
 2023-10-20 01:01:54 +08:00