1
0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-18 22:19:27 +08:00
Commit Graph

118 Commits

Author SHA1 Message Date
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 1b615ab99c, reversing
changes made to 081eb1a6ba.
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
Zuosizhu
25db60cc16 Fix: Duplicated codes.Add shop coins to dashboard. Need for i18n 2023-02-07 20:24:53 +08:00
MengNianxiaoyao
f760a99812 Feature: Dashboard update for further features 2023-02-04 11:23:26 +08:00
LmeSzinc
61986a7f4c Refactor: Map names convert 2023-01-11 01:00:19 +08:00
LmeSzinc
38c694ad3b Fix: PT limit not working in GemsFarming 2023-01-09 21:08:57 +08:00
LmeSzinc
3e1a223dc5 Opt: Auto choose event or main chapters from GemsFarming 2023-01-05 21:27:35 +08:00
LmeSzinc
f309402062 Fix: Task balance is not working in loop stages (fixed #1920) 2022-11-29 21:18:11 +08:00
LmeSzinc
59183aeff1 Fix: Oil limit too low 2022-11-29 21:15:51 +08:00
LmeSzinc
1cb7ae25e6 Add: Loop stage support 2022-11-25 16:37:48 +08:00
LmeSzinc
803c3749aa Add: The Alchemist and the Archipelago of Secrets chapter TH 2022-11-25 01:58:05 +08:00
LmeSzinc
e0feea2366 Add: The Alchemist and the Archipelago of Secrets chapter T 2022-11-24 22:24:20 +08:00
LmeSzinc
5c70364353 Refactor: Abstract CampaignStatus class and fix task balancer in Raid 2022-10-30 14:49:04 +08:00
Bookbug
b26b6c97d1 Add: TaskBalancer (#1509)
* CoinManagement added, but malfunction

* CoinManagement added, but malfunction

* CoinManagement:Translation complete

* CoinManagement:ready for testing

* CoinManagement:ready for testing

* CoinControl: Almost done, needs optimization/fix

* Add: CoinControl, done with full test.

* Add: TaskBalancer(experimental)

* Add: TaskBalancer(experimental)

* Remove legacy codes

* Upt: Reform codes(Experimental)

* Add:Task Balancer(Experimental)

* Add:Task Balancer(Experimental)

* Upt: config.py

* Fix: Default value of CheckInterval

* Upd: Minor translation adjustment

* Upd: Minor translation adjustment

* Upd: Revert the enable button and remove the CheckInterval

* Fix: minor translation

* Fix: additional trigger message caused by legacy code

* Add: User-defined delay interval

* Opt: Translation and default value of CoinLimit; Remove user-defined CheckInterval; Reform task sorting logic
2022-08-24 23:44:49 +08:00
LmeSzinc
f3f6d19a1f Add: Event Operation Convergence (event_20220818_cn) 2022-08-18 23:51:30 +08:00
LmeSzinc
3f28d59e35 Fix: Remove spaces in stage name 2022-07-30 18:16:19 +08:00
LmeSzinc
206b546eb1 Opt: Auto convert chapter A/B/C/D to T/HT 2022-07-15 01:51:04 +08:00
LmeSzinc
3a38f803f6 Fix: Stage auto increase to SP4 but event doesn't have SP4 2022-06-20 02:17:58 +08:00
LmeSzinc
d683db6647 Fix: Close auto search menu if map achievement is set 2022-06-19 16:33:38 +08:00
LmeSzinc
a4bc79302d Fix: Cannot detect remain data key at auto search menu 2022-06-12 18:06:37 +08:00
LmeSzinc
ebd6872358 Fix: Convert stage name to string 2022-06-07 00:58:07 +08:00
LmeSzinc
f28d0c0c29 Fix: Clear click record on each battle and each campaign (fixed #447) 2022-06-05 08:35:21 +08:00
LmeSzinc
562365afe6 Opt: Lower the priority of task OpsiMeowfficerFarming 2022-05-02 16:32:04 +08:00
Egor Nats
6eac8ae259 Opt: Imports isorted 2022-04-14 16:37:54 -03:00
LmeSzinc
ea8a200fbc Opt: Faster stage detection
Time cost reduced from 200ms to 40ms
2022-04-06 19:29:46 +08:00
LmeSzinc
0190d4fbe1 Add: Virtual Tower (event_20220324_cn) 2022-03-24 19:20:02 +08:00
LmeSzinc
e5492da3eb Opt: Close auto search menu and retreat at campaign start to reduce user mistakes 2022-03-20 16:55:05 +08:00
LmeSzinc
dbfbd294ff Fix: Confirm unknown ui page; 5 seconds timeout (#956) 2022-03-07 22:18:10 +08:00
LmeSzinc
e47e613638 Add: Event PT and time limit
- Fix: Auto update events in GemsFarming
2022-02-11 22:52:36 +08:00