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

303 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
Horizon101011
70987e1712 Fix: Retire get stuck if nothing can be retired (#2837) 2023-07-04 18:34:24 +08:00
Zuosizhu
8b8d8c9b67 Merge branch 'LmeSzinc:master' into 20230309 2023-06-14 22:05:37 +08:00
LmeSzinc
4aeb859153 Fix: Retire confirm end at EQUIP_CONFIRM cause game is slow to process 2023-06-14 12:25:34 +08:00
guoh064
6dde835ce1 Upd: [JP] DOCK_SELECTED (#2750) 2023-06-11 01:41:02 +08:00
Zuosizhu
1acc700629 Merge branch 'LmeSzinc:master' into 20230309 2023-06-10 02:53:17 +08:00
LmeSzinc
166fa65ecc Upd: [EN] DOCK_SELECTED 2023-06-08 23:54:48 +08:00
Zuosizhu
1b2e230274 Merge branch 'LmeSzinc:master' into 20230309 2023-06-08 21:43:02 +08:00
LmeSzinc
454e308702 Upd: [CN][TW] DOCK_SELECTED (#2729) 2023-06-08 16:33:31 +08:00
LmeSzinc
89511847b1 Del: Remove OneClickRetire.RetireAmount since amount can no longer be limited 2023-06-08 15:36:16 +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
LmeSzinc
f77f273329 Fix: Handle random OCR error on Downes' hair 2023-05-13 21:34:17 +08:00
Zuosizhu
b5256e8570 Fix: Lost status instructions in ship scanner 2023-03-28 17:22:45 +08:00
Zuosizhu
8606f2af24 Merge branch 'master_lme' 
# Conflicts:
#	README.md
#	module/retire/assets.py
#	module/retire/scanner.py
 2023-03-28 16:50:00 +08:00
Horizon101011
3e47c8a4f3 Fix: New ship status 'in_event_fleet' 2023-03-27 21:56:01 +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
806e15934f Fix: Lower threshold in StatusScanner 2023-03-19 22:38:42 +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
a0e00fc74d Upd: Add EN to server_support_quick_retire_setting_fallback 2023-03-01 00:12:19 +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
9ce0755d31 Merge pull request #2297 from kmou424/sync-python-exe 
Fix: sync python executable with python 3.7 slim image
 2023-02-27 23:51:50 +08:00
Zuosizhu
58082e29e0 Merge branch 'LmeSzinc:master' into master 2023-02-27 14:18:41 +08:00
nEEtdo0d
a61e9b5e62 Fix: [EN] DOCK_AMOUNT position shift; frequent inaccurate read 
Upd: [EN] RETIRE_SETTING_* assets
 2023-02-26 14:45:00 -05:00
LmeSzinc
b9d2b264a1 Upd: EQUIP_CONFIRM 2023-02-26 20:53:56 +08:00
Zuosizhu
db8aede987 Feature: Change flagship and vanguard in Event hard mode when GemsFarming 2023-02-24 18:37:14 +08:00
LmeSzinc
2d98ef73f2 Add: Re-add RetireAmount 2023-02-19 21:04:29 +08:00
LmeSzinc
b63cf43568 Opt: Re-organise retire settings 2023-02-18 00:48:40 +08:00
LmeSzinc
f5f093c67f Opt: Remove OpsiAshBeacon.AshAttack since it should always be True 2023-02-17 23:50:30 +08:00
LmeSzinc
ca3581a715 Upd: Dock filter grids 2023-02-16 22:06:56 +08:00
LmeSzinc
0690d6094e Opt: Treat too many state transitions as GameStuckError to catch logs 2023-01-28 17:14:34 +08:00
LmeSzinc
5566626d6f Fix: Deque index out of range in state_enhance_check state 2023-01-16 22:25:24 +08:00
LmeSzinc
93d75ed8f9 Fix: Handle port not found in port_goto() 2023-01-04 20:30:52 +08:00
LmeSzinc
e07e319ab2 Fix: Missing offset from ONE_CLICK_RETIREMENT 2022-12-29 22:26:34 +08:00
LmeSzinc
ed390eadf7 Fix: Missing offset of IN_RETIREMENT_CHECK 2022-12-29 20:28:34 +08:00
LmeSzinc
9fa06ffc28 Fix: [EN] Temp fix on dock_selected, EN has no selected info in dock 2022-12-10 23:28:32 +08:00
LmeSzinc
901830e35c Merge pull request #1971 from LmeSzinc/bug_fix 
Bug fix
 2022-12-09 23:03:28 +08:00
LmeSzinc
b99d978935 Fix: [EN] Update retire assets (#1967) 2022-12-09 23:00:16 +08:00
LmeSzinc
98fc87e57a Fix: [EN] Missing DOCK_CHECK offset 2022-12-09 21:42:14 +08:00
Horizon101011
cfc822d194 Merge pull request #1968 from Horizon101011/dev 
Fix: Threshold adjust for TEMPLATE_FLEET_4
 2022-12-09 18:49:54 +08:00
Horizon101011
28deb5d422 Fix: Threshold adjust for TEMPLATE_FLEET_4 
For server JP
 2022-12-09 18:44:08 +08:00
bookbug666
0cdc4cfff0 Unlock server restrictions, update assets.py 2022-12-06 00:05:31 +08:00
nEEtdo0d
96cb4aa4e1 Upd: handle_popup_* signature with custom offset; refactor dirty patches 
Upd: SHOP_BUY_CONFIRM_VOUCHER to handle_popup_confirm for server transparency
 2022-12-02 16:32:39 -05:00
LmeSzinc
102ffbd0fd Fix: Instant click on AUTO_SEARCH_MAP_OPTION_* after RETIRE_APPEAR_1 2022-11-30 12:26:54 +08:00
Horizon101011
129cbcad92 Merge branch 'bug_fix' into dockScanner 2022-11-14 09:56:42 +08:00
Horizon101011
34c81e8376 Fix: Should keep none flagship if one_click_retire failed 2022-11-14 09:55:55 +08:00
Horizon101011
d363077de7 Fix: Return None if results cached 2022-11-13 13:26:49 +08:00
Horizon101011
11b8564368 Fix: Return None if results cached 2022-11-13 13:07:46 +08:00
LmeSzinc
a56a45de65 Opt: Add retry when getting dock_selected 2022-11-13 02:12:17 +08:00
LmeSzinc
7a6da54abe Opt: Faster click in _retirement_confirm() 2022-11-11 03:12:21 +08:00