LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-21 22:49:30 +08:00
Code Activity
7,922 Commits 12 Branches 0 Tags
d0599ffeb36d64bfda3eace249ddd6f0a2c9e61b
Commit Graph

7922 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
LA-DI-DA
d0599ffeb3 Merge branch '0O0o0oOoO00-alas/smallkai' into dev 2023-10-29 12:18:18 +08:00
LA-DI-DA
bdf1a336c6 Add: discord link 2023-10-29 12:13:42 +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
LA-DI-DA
20fa2920de Revert "Fix(for tmp): overjump of chapter" 
This reverts commit 3a7eb659a2.
 2023-10-29 11:58:28 +08:00
Zuosizhu
8815928c27 Merge branch 'LmeSzinc:master' into 20230309 2023-10-29 07:01:00 +08:00
LmeSzinc
8103019464 Merge pull request #3239 from LmeSzinc/dev 
Add: Tempesta and the Fountain of Youth (event_20231026_cn)
 2023-10-29 02:12:58 +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
cc220c23ba Add: Event sp 2023-10-29 01:53:21 +08:00
LmeSzinc
9fefff7890 Add: Event maps 2023-10-29 01:33:46 +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
caeab82f98 Merge branch '0O0o0oOoO00-alas/smallkai' into dev 2023-10-27 21:13:38 +08:00
LA-DI-DA
3a7eb659a2 Fix(for tmp): overjump of chapter 2023-10-27 21:11:35 +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
alexan-ded
7eb02e1ed9 Upd: [EN] EQUIPMENT_OPEN 2023-10-27 07:35:19 +08:00
LA-DI-DA
17e1f4c2f1 Add: exit when under maintenance 2023-10-26 17:22:52 +08:00
Zuosizhu
b842d27611 Merge branch 'master_lme' 
# Conflicts:
#	module/map/assets.py
 2023-10-26 00:04:07 +08:00
LA-DI-DA
87d42927e1 Merge branch '0O0o0oOoO00-alas/smallkai' into dev 2023-10-25 09:50:17 +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
LmeSzinc
0bbfea6bd0 Fix: Remove lock files before git reset 2023-10-23 22:24:58 +08:00
下面我簡單喵兩句
dcb0c5eca7 Upd: [TW] handler assets (#3219) 2023-10-23 16:08:36 +08:00
LmeSzinc
7b7a4aa8d1 Merge pull request #3218 from LmeSzinc/dev 
Bug fix
 2023-10-22 21:58:07 +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
a577cab199 Merge branch '0O0o0oOoO00-alas/smallkai' into dev 2023-10-22 12:11:30 +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
LmeSzinc
91bd309e7a Merge pull request #3214 from appleapple802/dev 
Upd: [TW] assets and Raid event Fight On, Royal Maids!
 2023-10-21 21:05:15 +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
d878f53eb7 Merge pull request #3207 from LmeSzinc/dev 
Bug fix
 2023-10-20 01:13:54 +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
LmeSzinc
b8f89def7d Fix: Submarine hard satisfied button 2023-10-20 00:40:05 +08:00
LmeSzinc
0c93da2373 Upd: Sync FLEET_PREPARATION_CHECK 2023-10-20 00:03:28 +08:00
LmeSzinc
bfea966cb8 Upd: [JP] AUTO_SEARCH_SET_* 2023-10-20 00:03:28 +08:00