LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-17 12:29:29 +08:00
Code Activity
7,388 Commits 12 Branches 0 Tags
f93b3b3db5c94a3ee40afc59cd3ee419eef215b0
Commit Graph

434 Commits

Author SHA1 Message Date
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
LmeSzinc
14870c6807 Fix: ui switches to page_coalition 2023-03-24 05:31:26 +08:00
LmeSzinc
7ecf3ac502 Add: Coalition task 2023-03-24 04:41:13 +08:00
Zuosizhu
aa91c7a814 Merge branch 'master_lme' 
# Conflicts:
#	campaign/Readme.md
#	module/campaign/gems_farming.py
 2023-03-17 00:44:12 +08:00
LmeSzinc
db2055099d Opt: Improve log appearance when changing flagship and vanguard 2023-03-16 22:51:24 +08:00
Zuosizhu
53f44f3ff5 Merge branch 'master_lme' 
# Conflicts:
#	module/config/argument/argument.yaml
#	module/config/config_generated.py
#	module/config/i18n/zh-CN.json
#	module/config/i18n/zh-TW.json
 2023-03-11 16:21:26 +08:00
Zuosizhu
1680a8fd3f Fix: lost 'Event3' in disabling when task is not available 2023-03-08 23:37:53 +08:00
Alexanded
3797402ad1 Opt: Set EnemyPriority to S1_enemy_first in GemsFarming 2023-03-08 07:05:27 +03:00
Alexanded
1bceb5bfbd Add: Disable flagship and vanguard change in GemsFarming 2023-03-03 23:51:49 +03: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
0622d9f89c Fix: Always stopping when task_balancer is on 2023-03-02 21:08:49 +08:00
LmeSzinc
02bf27c2e1 Fix: Disable task balancer before it is being fixed 2023-03-02 20:29:33 +08:00
Zuosizhu
8f2434a50e Opt: Min emotion in GemsFarming. 2023-03-01 19:41:27 +08:00
Zuosizhu
49c980be75 Fix: issue#2311 
(cherry picked from commit 597cee9cb5)
 2023-03-01 16:10:35 +08:00
Zuosizhu
597cee9cb5 Fix: issue#2311 2023-03-01 15:46:09 +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
311c1fc50d Fix: Handle campaign name OCR result started with 0 2023-03-01 12:23:22 +08:00
LmeSzinc
af65f961e2 Refactor: Simplify GemsFarming settings 2023-03-01 00:12:15 +08:00
Zuosizhu
ddc94bf109 Merge branch 'LmeSzinc:master' into master 2023-02-28 01:42:07 +08:00
LmeSzinc
430ee8fea3 Fix: GemsFarming.LowEmotionRetreat no longer requires low emotion 2023-02-28 00:28:34 +08:00
Zuosizhu
d3bf4063f5 Fix: GemsFarming emotion limit to 20, or won't be enough for main 9-14 or event CD 2023-02-27 14:12:45 +08:00
Zuosizhu
88b68e22c0 Fix: Record 0 for pt when not in event 2023-02-25 13:43:50 +08:00