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,838 Commits 12 Branches 0 Tags
0c4e1228ea587149d378e87eebb2aaf393d873d3
Commit Graph

120 Commits

Author SHA1 Message Date
LA-DI-DA
1a66d96f92 Merge branch '0O0o0oOoO00-alas/smallkai' into dev 2023-10-11 11:23:13 +08:00
LA-DI-DA
afa68adf00 Add: change ship's attribute 2023-10-11 11:19:21 +08:00
LA-DI-DA
de2c563000 Add: research farming(half-finished) 2023-10-05 14:42:06 +08:00
LA-DI-DA
f08f05089c Add: select event for event auto farming 2023-10-03 21:30:32 +08:00
LA-DI-DA
02a1cfe3fa Add: event auto farming 2023-10-03 12:37:51 +08:00
LA-DI-DA
ae25417a88 Merge branch '0O0o0oOoO00-alas/smallkai' into dev 
# Conflicts:
#	module/config/argument/task.yaml
 2023-09-30 19:46:14 +08:00
LA-DI-DA
e3db31de2e Merge branch 'zuosizhu-alas/20230309' into smallkai-dev 2023-09-30 16:50:09 +08:00
LA-DI-DA
b077bf9719 Add: change ship type for GemsFarming when set C or D map 2023-09-30 16:50:01 +08:00
Zuosizhu
4d4d2377dc Merge branch 'master_lme' 
# Conflicts:
#	module/device/method/droidcast.py
 2023-09-28 18:09:13 +08:00
LA-DI-DA
75a3fc9e25 Merge branch 'zuosizhu-alas/20230309' into dev 
# Conflicts:
#	module/config/argument/task.yaml
#	module/device/device.py
 2023-09-23 22:41:37 +08:00
LA-DI-DA
09f4a227bb Merge branch 'zuosizhu-alas/20230309' into smallkai 
# Conflicts:
#	module/config/argument/task.yaml
 2023-09-23 22:30:37 +08:00
LA-DI-DA
9f449acfb8 Add: more Main 2023-09-22 21:06:52 +08:00
LA-DI-DA
e510aa4536 Add: more Event 2023-09-22 21:03:54 +08:00
LA-DI-DA
0ae82e61ef Add: account's owner login detection 2023-09-22 12:24:08 +08:00
LA-DI-DA
036c4a8850 Add: remark 2023-09-21 13:42:41 +08:00
Zuosizhu
3b27323132 Merge remote-tracking branch 'LmeSzinc/feature' into merged_origin_feature 2023-09-11 20:24:49 +08:00
LmeSzinc
4e6f51ed7c Sync: [SRC] Emulator settings 2023-09-10 15:04:32 +08:00
LA_DI_DA
174ea3530b Add: more option for auto restart when alas get a error 2023-08-27 14:53:24 +08:00
LA-DI-DA
5711665c38 Del: useless small game 2023-08-18 20:34:54 +08:00
LA-DI-DA
f9fd4b41e4 Rewrite small game and shit 2023-07-23 16:06:49 +08:00
LA-DI-DA
b032b8e52b Add shabi small game 2023-07-23 01:39:32 +08:00
LA-DI-DA
d6abebc108 Add something special 2023-07-21 21:14:10 +08:00
LA-DI-DA
d392dadf51 Add something special 2023-07-20 22:37:00 +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
Zuosizhu
7cea084ecb Merge branch 'master_lme' 
# Conflicts:
#	assets/gui/css/alas.css
#	module/config/argument/task.yaml
#	module/config/config_updater.py
 2023-06-22 01:06:48 +08:00
LmeSzinc
093a6efba0 Merge branch 'dev' into feature 
# Conflicts:
#	module/config/argument/task.yaml
 2023-06-17 22:19:05 +08:00
LmeSzinc
0c37354ed5 Opt: List tasks instead of collapsing them in submodules 2023-06-17 22:11:19 +08:00
LmeSzinc
ab8c24c2ed Merge branch 'master' into feature 2023-06-12 00:43:49 +08:00
Zuosizhu
1acc700629 Merge branch 'LmeSzinc:master' into 20230309 2023-06-10 02:53:17 +08:00
LmeSzinc
bfc020621e Del: Remove task SOS 2023-06-08 23:25:37 +08:00
Zuosizhu
53cfc78a11 Merge branch 'LmeSzinc:master' into 20230309 2023-04-28 20:50:44 +08:00
LmeSzinc
ea9b198205 Merge branch 'master' into feature 2023-04-28 01:15:50 +08:00
LmeSzinc
391be3ce51 Gui: Move down CoalitionSp in event daily tasks 2023-04-28 00:52:38 +08:00
Zuosizhu
cacc828f08 Merge branch 'master_lme' 
# Conflicts:
#	config/template.json
#	module/config/argument/args.json
#	module/config/argument/argument.yaml
#	module/config/config_generated.py
#	module/config/i18n/zh-CN.json
#	module/exercise/assets.py
#	module/exercise/exercise.py
 2023-04-12 15:25:30 +08:00
LmeSzinc
89d3d82925 Merge branch 'master' into feature 2023-04-12 13:01:56 +08:00
LmeSzinc
37f932688e Opt: Move down task Coalition since the event is over 2023-04-11 22:21:08 +08:00
LmeSzinc
9acade6432 Merge branch 'master' into feature 2023-03-25 00:40:27 +08:00
Zuosizhu
fb67ae3ab7 Merge branch 'master_lme' 
# Conflicts:
#	config/template.json
#	module/campaign/campaign_event.py
#	module/config/argument/args.json
#	module/config/argument/menu.json
#	module/config/argument/task.yaml
#	module/config/config_manual.py
#	module/config/config_updater.py
#	module/config/i18n/en-US.json
#	module/config/i18n/ja-JP.json
#	module/config/i18n/zh-CN.json
#	module/config/i18n/zh-TW.json
 2023-03-24 16:33:37 +08:00
LmeSzinc
68c18d0cb5 Opt: Split Event group into Event and Event Daily 2023-03-23 23:42:42 +08:00
LmeSzinc
13bd97725a Add: Configs for task Coalition 2023-03-23 23:31:28 +08:00
LmeSzinc
97e5476d19 Merge branch 'master' into dev 2023-03-19 18:27:20 +08:00
Zuosizhu
147c0a5214 Merge branch 'master_lme' 
# Conflicts:
#	config/template.json
#	module/campaign/gems_farming.py
#	module/config/argument/args.json
#	module/config/argument/argument.yaml
#	module/config/config_generated.py
#	module/config/i18n/en-US.json
#	module/config/i18n/ja-JP.json
#	module/config/i18n/zh-CN.json
#	module/config/i18n/zh-TW.json
 2023-03-01 14:26:11 +08:00
LmeSzinc
af65f961e2 Refactor: Simplify GemsFarming settings 2023-03-01 00:12:15 +08:00
LmeSzinc
41f8ac6be6 Refactor: Move emulator settings to restart 2023-02-27 21:16:09 +08:00
Zuosizhu
b072baa596 Merge branch 'master_lme' 
# Conflicts:
#	config/template.json
#	module/config/argument/args.json
#	module/config/argument/argument.yaml
#	module/config/config_generated.py
#	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/retire/retirement.py
 2023-02-20 12:35:43 +08:00
SarContDeli
d024f11bbb Opt: Adjust the option arrangement of the task 2023-02-19 20:56:13 +08:00
LmeSzinc
b63cf43568 Opt: Re-organise retire settings 2023-02-18 00:48:40 +08:00
Zuosizhu
40321ee906 Revert "Merge branch 'mydev' into master" 
This reverts commit 1b615ab99c, reversing
changes made to 081eb1a6ba.
 2023-02-17 11:35:09 +08:00
MengNianxiaoyao
d85074fc45 Fix: config bug 2023-02-12 22:26:12 +08:00