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,843 Commits 12 Branches 0 Tags
9c0d07ae66bdfd7bb59f7ad47ca62a74b80fd2dc
Commit Graph

456 Commits

Author SHA1 Message Date
LA-DI-DA
9c0d07ae66 Add(tmp): Tempesta and the Fountain of Youth 2023-10-27 15:54:14 +08:00
LA-DI-DA
a65f53b966 Merge branch 'lme-alas/master' into smallkai 
# Conflicts:
#	module/map/assets.py
 2023-10-19 23:00:39 +08:00
LmeSzinc
4969dc01b0 Upd: [CN] Fleet preparation 2023-10-19 22:02:24 +08:00
LmeSzinc
f23c960b97 Fix: Actively clear stuck records in combat 2023-10-14 21:03:58 +08:00
LA-DI-DA
96812cfbdf Fix: condition to change flagship in GemsFarming 2023-10-05 19:29:45 +08:00
LA-DI-DA
3dd8c83253 Fix: exit dock when changing flagship and when GemsFarming is set to normal map 2023-10-01 14:37:39 +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
LA-DI-DA
e92826c90a Bug fix 2023-09-16 21:03:38 +08:00
Zuosizhu
7fdba38b75 Fix: Get value error while creating new enemies 
(cherry picked from commit 41a17dd0d2)
 2023-09-15 08:51:24 +08:00
Zuosizhu
dfa815645d Merge branch 'master_lme' 
# Conflicts:
#	module/campaign/campaign_status.py
#	module/config/argument/args.json
 2023-09-15 08:26:53 +08:00
LmeSzinc
686b7fb921 Fix: Adaptive OCR_OIL to handle black overlay 2023-09-14 22:44:28 +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
LmeSzinc
100ba7a441 Fix: Disable OpsiShop before assets update 2023-09-01 00:54:51 +08:00
LmeSzinc
1a7d74493d Fix: Story stages before A1 2023-08-23 12:46:05 +08:00
Zuosizhu
6550a56b2b Merge branch 'master_lme' 
# Conflicts:
#	module/config/i18n/zh-CN.json
#	module/config/i18n/zh-TW.json
 2023-08-19 09:23:28 +08:00
LmeSzinc
b451096fb8 Add: Handle stories before event maps in chapter BD 2023-08-18 22:23:20 +08:00
LmeSzinc
b3c59c0cca Add: Handle stories before event maps 2023-08-18 13:25:51 +08:00
Zuosizhu
1e1661f4bb Merge branch 'LmeSzinc:master' into 20230309 2023-07-29 22:04:54 +08:00
LmeSzinc
61aca93cfb Add: Stage increase in TSS maps 2023-07-26 19:57:14 +08:00
梦念逍遥
5c054b6b20 Upd: World-spanning Arclight Rerun chapter TSS (#2912) 
* Upd: World-spanning Arclight Rerun chapter TSS

* Upd: addd tss config about MAP_IS_ONE_TIME_STAGE
 2023-07-25 12:35:28 +08:00
Zuosizhu
43b707eb61 Merge branch 'LmeSzinc:master' into 20230309 2023-07-21 00:07:23 +08:00
LmeSzinc
c13651130d Opt: Add fool-proof chapter converts 2023-07-20 23:45:42 +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
LmeSzinc
2f771d8ca5 Refactor: [ALAS] Page class 
Path findings in page class
 2023-07-02 15:24:40 +08:00
Zuosizhu
8b8d8c9b67 Merge branch 'LmeSzinc:master' into 20230309 2023-06-14 22:05:37 +08:00
guoh064
ca5f565626 Add: Campaign_12_4_H (#2768) 
Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
 2023-06-14 12:10:14 +08:00
Zuosizhu
31779bdcd4 Fix: handle retirement when changing GemsFarming ships in Hard event 2023-05-28 14:55:17 +08:00
Zuosizhu
28a42ad03a Fix: HT6 not considered a hard mode in Gems Farming 2023-05-28 00:16:52 +08:00
Zuosizhu
bd04ff6708 Merge branch 'master_lme' 
# Conflicts:
#	README.md
 2023-05-27 23:48:02 +08:00
LmeSzinc
63ff035116 Fix: Handle AUTO_SEARCH_EXIT in emotion withdraw 2023-05-27 21:57:55 +08:00
LmeSzinc
4dd3692318 Fix: [EN] Stage entrance detection 2023-05-27 21:37:29 +08:00
LmeSzinc
e43116d3db Fix: Auto event convert should before stage covert 2023-05-27 21:37:29 +08:00
Zuosizhu
987423a96f Merge branch 'LmeSzinc:master' into 20230309 2023-05-27 20:30:22 +08:00
LmeSzinc
5394c65975 Add: Confluence of Nothingness chapter T 2023-05-27 17:58:31 +08:00
LmeSzinc
f9e9824c55 Fix: Stage entrance extraction in Confluence of Nothingness 2023-05-26 17:34:21 +08:00
Zuosizhu
dba6d7e4e4 Merge branch 'LmeSzinc:master' into 20230309 2023-05-25 13:54:56 +08:00
LmeSzinc
e908fee2cd Fix: Handle random stage OCR error like "1--" and "49X" (#2591) 2023-05-21 22:58:24 +08:00
Zuosizhu
4d1fd01511 Merge branch 'master_lme' 
# Conflicts:
#	assets/jp/gacha/BUILD_CUBE_COUNT.png
#	module/campaign/run.py
#	module/gacha/assets.py
 2023-05-15 17:22:33 +08:00
Karl Whit
6a7c049f9c Fix: Skip hard mode campaign_main when remaining number of times is 0 (#2568) 
Co-authored-by: yypsybs <yux@taizhitech.com>
 2023-05-11 23:35:00 +08:00
Zuosizhu
1666c3e421 Merge branch 'master_lme' 
# Conflicts:
#	campaign/Readme.md
#	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-04-28 01:01:55 +08:00
LmeSzinc
196d687970 Fix: Update map files and UI switches 2023-04-27 22:48:18 +08:00
Zuosizhu
fa276716d1 Merge branch 'master_lme' 
# Conflicts:
#	alas.py
 2023-04-20 01:25:28 +08:00
LmeSzinc
590435f42c Fix: Handle OCR error in campaign_ensure_chapter() due to slow animation 2023-04-15 22:28:08 +08:00
Zuosizhu
32c09b1e0a Merge branch 'master_lme' 2023-04-03 09:32:47 +08:00
guoh064
929f6494e5 Fix: notify_handle AttributeError (#2438) 
* Fix #2436 : object call error
 2023-04-01 11:43:15 +08:00
guoh064
b2c58aa464 Add: Campaign finish notification via Onepush (#2431) 
Co-authored-by: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com>
 2023-03-31 20:57:16 +08:00
Zuosizhu
1e12176684 Fix: Multiple coin ocr in auto search combat 2023-03-28 17:44:16 +08:00
Zuosizhu
f505061384 Merge branch 'master_lme' 
# Conflicts:
#	module/campaign/assets.py
#	module/campaign/campaign_status.py
 2023-03-25 00:05:17 +08:00
LmeSzinc
8c4526b0c0 Fix: Handle appear animation in coalition page (#2397) 2023-03-24 23:18:16 +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