LA-DI-DA
23152493b1
Add: pick out auto research farming from more alas
2024-07-07 11:53:00 +08:00
LA_DI_DA
7b81250ec9
Merge branch 'zuosizhu-alas/20230309' into smallkai
...
# Conflicts:
# campaign/Readme.md
# module/config/argument/args.json
2024-04-27 15:56:34 +08:00
Zuosizhu
8fd3c7eedd
Merge branch 'master_lme_to_merge'
...
# Conflicts:
# assets/cn/equipment/FLEET_DETAIL_CHECK.png
# assets/en/equipment/FLEET_DETAIL_CHECK.png
# assets/jp/equipment/FLEET_DETAIL_CHECK.png
# assets/tw/equipment/FLEET_DETAIL_CHECK.png
# deploy/docker/requirements.txt
# deploy/git.py
# module/campaign/gems_farming.py
# module/equipment/assets.py
# module/equipment/equipment_change.py
# requirements-in.txt
# requirements.txt
2024-04-27 13:00:39 +08:00
LmeSzinc
bfb9bd0d61
Fix: Convert stage names in event_20240425_cn
2024-04-26 04:07:31 +08:00
Zuosizhu
4486c8cff6
Merge branch 'LmeSzinc:master' into 20230309
2024-04-15 23:25:52 +08:00
LmeSzinc
42af2e479f
Chore: [ALAS] Abstract has_cached_image
2024-04-13 02:28:11 +08:00
mulaikurisu
4f60d70f9b
Merge remote-tracking branch 'zuosizhu-alas/20230309' into smallkai
...
# Conflicts:
# module/config/argument/args.json
2024-01-31 18:27:04 +08:00
Zuosizhu
356496af2c
Merge branch 'LmeSzinc:master' into 20230309
2024-01-24 00:47:13 +08:00
somegituser
d29f93c1c1
add: wararchive Dreamwaker's Butterfly & Mirror Involution
...
新增作战档案: 蝶海梦花&镜位螺旋
2024-01-23 14:05:05 +08:00
LA-DI-DA
824b353f3d
Merge branch 'zuosizhu-alas/20230309' into smallkai
...
# Conflicts:
# module/config/argument/args.json
2023-11-24 17:00:55 +08:00
Zuosizhu
395090785f
Merge branch 'LmeSzinc:master' into 20230309
2023-11-24 07:58:05 +08:00
LmeSzinc
8a8fcaf56f
Add: Chapter T
2023-11-24 00:45:23 +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
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
Zuosizhu
526d26e6c6
Merge branch 'LmeSzinc:master' into 20230309
2023-10-19 22:53:32 +08:00
LmeSzinc
f23c960b97
Fix: Actively clear stuck records in combat
2023-10-14 21:03:58 +08:00
LA-DI-DA
e92826c90a
Bug fix
2023-09-16 21:03:38 +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
1a7d74493d
Fix: Story stages before A1
2023-08-23 12:46:05 +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
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
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
bd04ff6708
Merge branch 'master_lme'
...
# Conflicts:
# README.md
2023-05-27 23:48:02 +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
f9e9824c55
Fix: Stage entrance extraction in Confluence of Nothingness
2023-05-26 17:34:21 +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
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
2bc586ce57
Merge branch 'master_lme'
...
# Conflicts:
# module/campaign/campaign_event.py
# module/campaign/campaign_status.py
2023-03-04 03:11:41 +08:00
Bookbug
45373c52b8
Fix: TaskBalancer malfunctioning caused by ocr failure ( #2295 )
...
* Fix: Cannot OCR coin when using auto search(#2289 )
* Merge TaskBalancer into StopCondition
* Add: Avoid zero OCR in coin
* Restruct function due to operator precedence
* Merge bug_fix into coin_autocheck
* Fix: Dumb error caused by no parameter
* Fix: Minor bugs
2023-03-03 22:19:07 +08:00
Zuosizhu
45b5e90d82
Fix: Failure in u2 restart
2023-02-25 00:13:17 +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
LmeSzinc
d191d16649
Opt: Re-organise CalculateEmotion and IgnoreLowEmotionWarn
2023-02-18 01:19:04 +08:00
Zuosizhu
40321ee906
Revert "Merge branch 'mydev' into master"
...
This reverts commit 1b615ab99c081eb1a6ba
2023-02-17 11:35:09 +08:00
MengNianxiaoyao
63022fc8f3
Fix: Not writing config after a campaign
2023-02-11 20:53:37 +08:00
Zuosizhu
ccc82cfe36
Fix: Reduce config write. Finished
2023-02-10 19:36:36 +08:00
Zuosizhu
d8bd81be88
Fix: Reduce config write. Part2
2023-02-10 18:51:03 +08:00
Zuosizhu
abc9639732
Fix: Dashboard bug in revert, noob me.
2023-02-10 15:25:17 +08:00
Zuosizhu
d6f0b32462
Revert "Fix: Temporary Fix Logging. Fxxk Noob Manjuu"
...
This reverts commit b3992cab1f
2023-02-10 14:08:03 +08:00
Zuosizhu
b3992cab1f
Fix: Temporary Fix Logging. Fxxk Noob Manjuu
2023-02-10 01:31:05 +08:00
