sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-09 18:39:04 +08:00
Code
9,016 Commits 9 Branches 0 Tags 274 MiB
5911a131c6
Commit Graph

416 Commits

Author SHA1 Message Date
Horizon101011
21f5b51ac2 Upd: Modify annotation 2022-09-07 08:46:01 +08:00
Horizon101011
04eb4a794f Fix: Wrong fleet limitation 2022-09-07 08:39:00 +08:00
Horizon101011
b5feeac347 Upd: Retire GemsFarming abandoned flagships 2022-09-06 22:28:04 +08:00
Horizon101011
2369581794 Upd: Add support for commission status 2022-09-06 21:36:35 +08:00
LmeSzinc
f6848817b5 Fix: filter_set_execute on slow PCs 2022-09-04 23:30:53 +08:00
LmeSzinc
d8f4986d64 Merge branch 'master' into dev 2022-09-03 14:59:36 +08:00
LmeSzinc
ab9cb07da0 Fix: Failed to select ships using ONE_CLICK_RETIREMENT because of game bug (#1575) 2022-09-02 14:11:30 +08:00
LmeSzinc
f1ef87ca50 Merge branch 'master' into dev 
# Conflicts:
#	module/device/emulator.py
 2022-09-02 00:13:11 +08:00
LmeSzinc
ba2be55f25 Fix: Failed to select ships using ONE_CLICK_RETIREMENT because of game bug (#1575) 2022-09-01 23:01:24 +08:00
LmeSzinc
59b94395c9 Fix: Handle dock full when taking off equipments 
- Opt: Remove sleep in dock filter set, just meaningless
 2022-08-31 14:12:13 +08:00
Horizon101011
8887993b74 Opt: Add support for choosing certain CV 2022-08-30 00:08:26 +08:00
Horizon101011
81e84d1259 Add: DockScanner 2022-08-29 12:56:01 +08:00
LmeSzinc
0fd6fe9292 Merge branch 'master' into dev 2022-08-15 21:53:17 +08:00
nEEtdo0d
2b21309d71 Upd: re-run button_extract; detected cloned server asset 2022-08-14 12:47:21 -04:00
zhou525
ade663aa83 Add: Ship study new skill. 2022-08-14 23:02:54 +08:00
Horizon101011
07a14849d9 Upd: More accurate asset for enhancement 2022-08-13 19:43:27 +08:00
Horizon101011
070f280821 Upd: Retire assets for all servers 2022-07-28 16:57:09 +08:00
LmeSzinc
1f2163cdcc
Merge pull request #1301 from Horizon101011/dev 
Fix: Skipping ships in battle is not effective
 2022-07-06 20:24:42 +08:00
Horizon101011
00e70c0b6c Fix: Skipping ships in battle is not effective 2022-07-06 11:49:51 +08:00
LmeSzinc
95d5987f1a Upd: [CN] SR_SSR_CONFIRM 2022-06-30 19:03:56 +08:00
hgjazhgj
e779fd7e64 Fix: Misspelling & Line-end spaces 2022-06-25 20:04:45 +08:00
LmeSzinc
c69de7594b Revert "Upd: [JP] DOCK_SELECTED" cause AL revert the changes 
This reverts commit 802dd160
 2022-06-19 21:27:26 +08:00
LmeSzinc
802dd16029 Upd: [JP] DOCK_SELECTED 2022-06-12 01:13:17 +08:00
LmeSzinc
ea9b586f9b Fix: dock_select_one() failed to select ship on slow PCs 2022-06-10 20:20:27 +08:00
LmeSzinc
7df0fd3f11 Fix: Offset of SHIP_CONFIRM in dock_select_confirm() 2022-06-07 23:01:25 +08:00
LmeSzinc
ec32260455 Fix: Confirm dock select (fixed #1048) 2022-06-06 23:43:35 +08:00
LmeSzinc
6b1a6b051e Fix: Confirm dock select (fixed #1048) 2022-06-05 09:38:12 +08:00
nEEtdo0d
3be54837d4 Upd: [EN] *_PASS_NOTICE assets 
Fix: [EN] DOCK_AMOUNT area too wide; re-crop
Fix: [EN] MAP_ARCHIVES text intersects into area; re-crop
Upd: [EN] clarify enhance config description
 2022-05-29 15:10:45 -04:00
nEEtdo0d
77081434af Fix: enhance phase still can be re-entered; match offset condition to ensure exit 2022-05-26 22:58:19 -04:00
LmeSzinc
32f939f2bb Fix: Siren scanning tower and logging device are not detected if they are covered by other fleets 2022-05-16 19:54:51 +08:00
Horizon101011
5252974a71 Fix: Formatted in PEP-8 2022-05-16 00:09:29 +08:00
Horizon101011
771c9167d8 Opt: Use OCR to improve accuracy 2022-05-14 11:02:26 +08:00
Horizon101011
f9a15be768 Merge branch 'dev' of https://github.com/Horizon101011/AzurLaneAutoScript into dev 2022-05-12 03:39:21 +08:00
Horizon101011
36ae64be9f Opt: Retire next time if material is too little 
1、Add a material counter. In attempt stage of enhancement, if available material is less than 3, counter += 1, else counter += 3. This process will run only once during an enhancement. After an enhancement process, check this counter. If it is less than 3, ALAS will retire next time when calling retirement module to avoid frequent enhancement while enhancement material is too little.
2、Moving assets to corresponding position.
 2022-05-12 03:38:29 +08:00
LmeSzinc
8c644c9a4f
Merge pull request #1114 from Horizon101011/dev 
Fix: Handle exception caused by multiple tries without material
 2022-05-10 13:01:34 +08:00
Horizon101011
ef872337cc Fix: Handle exception caused by multiple tries without material 2022-05-10 12:16:33 +08:00
nEEtdo0d
cb1f92d56f Fix: enhance phase re-entered after fallback retire; DOCK_CHECK still detected 2022-05-07 20:23:44 -04:00
Horizon101011
085231f361 Fix: Handle exception caused by multiple tries without material 2022-04-30 18:52:21 +08:00
Horizon101011
386a8660d8 Upd: Add enhancement support for a temporary ship 2022-04-23 23:53:20 +08:00
LmeSzinc
b6a5982db9 Opt: Enhancement clean up 2022-04-23 16:05:03 +08:00
LmeSzinc
f9e9ea856a
Merge branch 'dev' into Iss777 2022-04-23 15:48:33 +08:00
Egor Nats
6eac8ae259 Opt: Imports isorted 2022-04-14 16:37:54 -03:00
LmeSzinc
dda16cf16a Fix: Add retry interval in handle_retirement() (#1005) 
To avoid retiring again after exiting from retire page
 2022-04-14 00:19:27 +08:00
Egor Nats
1ebe64950a Fix: [EN] Revert to old assets 
- Tactical class and Dorm feature still broken, please disable until fix.
 2022-04-12 11:20:34 -03:00
LmeSzinc
a651a753a7 Fix: Retire popup disappeared after clicking it for unknown reason (#1005) 
So retry.
 2022-04-12 19:00:50 +08:00
SaarChaffee
303dd90fdc change CRLF to LF 2022-04-09 23:31:09 +08:00
nEEtdo0d
73ddcd9b7f Upd: [EN] post major app update bulk assets; WIP part 2 2022-04-08 00:57:15 -04:00
nEEtdo0d
96b39a9ea5 Upd: [EN] post major app update bulk assets; WIP part 1 2022-04-07 22:32:24 -04:00
Horizon101011
66a0324e4b Opt: Adjust threshold for ultra fast computer 2022-03-25 22:23:11 +08:00
Horizon101011
29aeb354d1 Fix: Misjudgement caused by lack of offset 2022-03-25 13:42:14 +08:00
Horizon101011
7164cbf4fa Opt: Improve robustness 2022-03-24 17:40:53 +08:00
Horizon101011
3fd1889920 Opt: Add a retrying loop 
Add a retrying loop to slow process speed, which will make more accurate recognition
 2022-03-15 21:48:34 +08:00
Horizon101011
6d99432802 Opt: Use DFA method 2022-03-12 23:35:01 +08:00
Horizon101011
2f5b19949e Opt: Refactor module enhancement 2022-03-12 01:22:31 +08:00
Horizon101011
6ba0a755db Opt: Refactoring logic of ship enhancement 
Using a new judgement logic similar to the state machine. Judge the state according to the appearance and disappearance of enhancement material after some operations, instead of only depending on info_bar. The new logic is more robust, even in poor equipment (simulating by delaying 5s)
 2022-02-23 00:06:11 +08:00
LmeSzinc
17352f4619 Fix: Handle retire SR/SSR confirm when falling back to one-click-retire from enhance (#930) 2022-02-12 20:52:00 +08:00
LmeSzinc
e92579b5f9 Opt: Remove redundant converts from pillow to numpy 2022-01-24 23:43:53 +08:00
LmeSzinc
b37114d505 Opt: Release cached assets 2022-01-24 23:15:47 +08:00
LmeSzinc
65f166ad12 Refactor: Use numpy image cache instead of pillow image 2022-01-23 23:03:55 +08:00
LmeSzinc
50b5b49365 Opt: Faster Switch.set(), replace click-wait with click interval 2022-01-10 20:35:07 +08:00
LmeSzinc
de67f521fb Fix: Retirement retry on slow PCs 2022-01-04 23:06:00 +08:00
LmeSzinc
7171d45fe3 Fix: Missing screenshot before checking SHIP_CONFIRM in old retire 2021-12-22 13:53:34 +08:00
LmeSzinc
ee0dfedc95 Fix: Retry _retirement_choose() if no ship selected 2021-12-21 23:04:38 +08:00
Ala
db721e82a0 Fix: restore filter after retirement finished 2021-12-18 13:58:07 +08:00
Ala
742a17b4c2 Fix: add filter set before retirement 2021-12-17 13:56:27 +08:00
LmeSzinc
d5735604e1 Dev: Uniform comments of generated files 2021-12-07 23:29:33 +08:00
LmeSzinc
9c3f1a2079 Upd: [TW] SR_SSR_CONFIRM in retire 2021-12-04 14:26:30 +08:00
LmeSzinc
67eebaac94 Refactor: Remove redundant dock sorting and favourite setter 2021-11-21 17:16:21 +08:00
LmeSzinc
1e3cdd4c38 Opt: Faster retirement, including click interval clear and less screenshots 
- Rename dock_filter_set_faster to dock_filter_set and remove old dock_filter_set
 2021-11-21 17:16:18 +08:00
nEEtdo0d
069054a40c Upd: re-arrange order, document, and else clause for possible stuck tracing 2021-11-19 17:37:54 -05:00
Cola
ad32ac12da Fix: [JP]Data_Key&Dock_Filter_Confirm assets 2021-11-16 23:06:00 +08:00
nEEtdo0d
2eca1a6f85 Upd: [EN] DOCK_FILTER_CONFIRM asset 2021-11-13 13:33:12 -05:00
nEEtdo0d
a8d4aab9df Upd: dock filter name table after maintenance 2021-11-11 15:10:24 -05:00
nEEtdo0d
c902549ad0 Fix: [EN] Use asset button gif support for POPUP_CONFIRM and POPUP_CANCEL 
TODO: [JP] can make gif equivalents for same assets and adjust retirement to use handle_popup_confirm
 2021-11-10 19:42:56 -05:00
18870
5130531058 Fix: Enhancement failed if EnhanceFilter never been set 
Default value of EnhanceFilter is null, which will transform into None in python.
 2021-10-07 16:47:30 +08:00
LmeSzinc
0e4159c06d Merge branch 'master' into app 2021-10-06 17:04:40 +08:00
Cola
c76954a32a Fix: [JP] Fleet_check asset 2021-10-06 11:37:33 +08:00
LmeSzinc
4f0c07d1df Merge branch 'master' into app 
# Conflicts:
#	module/retire/retirement.py
 2021-09-22 11:38:48 +08:00
Cyumxi
48cecd005f [fix]: Missing button name 2021-09-21 23:02:37 +08:00
LmeSzinc
5ed75c8de5 Merge branch 'master' into app 
# Conflicts:
#	module/config/config.py
#	module/map/fleet.py
#	module/ui/ui.py
 2021-09-17 23:53:15 +08:00
Cola
1310dab61c Fix: [TW] Dock filter confirm asset 2021-09-16 20:44:26 +08:00
LmeSzinc
61cbe75527 Refactor: More accurate exceptions and add friendly advices 2021-09-16 12:09:00 +08:00
LmeSzinc
5dd0459de9 Refactor: Gems farming configs 
- Opt: Avoid clicking AUTO_SEARCH_MAP_OPTION_OFF after ignore low emotion warn
- Opt: Skip map cat attack in auto search
 2021-09-16 03:53:57 +08:00
LmeSzinc
eb045242c3 Refactor: Rename retire configs 
- Fix combat drop screenshot missed because clicking too fast
- Close campaign preparation at start
 2021-09-15 23:33:06 +08:00
LmeSzinc
46d8d2fadb Refactor: Rename main configs 
- Faster chapter selection and page_campaign
- Rename some old Chinglish variables in map info
 2021-09-15 23:32:31 +08:00
Cola
c816d65ce6 Fix: [TW] Equipment assets in gems farming 2021-09-07 19:50:41 +08:00
nEEtdo0d
a81ebf30ab Fix: minor adjust filter button position, add support for extra 2nd row 
Fix: DOCK_FILTER changes color with any filter set now, use DOCK_CHECK instead for page verification on certain actions
 2021-09-03 22:54:50 -04:00
LmeSzinc
0186609844 Fix: Position of dock filters after maintenance 
All filters move up 49px
 2021-09-02 18:38:07 +08:00
Ray
c5dc75a97c Fix:[JP] update os assets 2021-08-22 21:09:22 +08:00
nEEtdo0d
4222760fcc Upd: [EN] Gems farming assets 2021-08-21 17:07:59 -04:00
nEEtdo0d
41c3451772 Upd: [EN] Obscure finish assets 2021-08-21 16:15:22 -04:00
LmeSzinc
0aff9f55ca
Merge pull request #572 from Cyumxi/gems_farming 
Gems farming
 2021-08-15 17:04:58 +08:00
Cyunmi
5afeb14a90 delete debug code 2021-08-15 14:07:58 +08:00
Cyunmi
40a959bfb0 fix: retirement button bug 2021-08-15 04:50:05 +08:00
Cyunmi
0923d7b069 Fix: change HAVE_KEEPED_CV to _have_keeped_cv 2021-08-14 21:17:49 +08:00
Ray
d6a4fa4ced Fix: change check order in _retirement_confirm 
- put handle_popup_confirm after other buttom's checks (#571)
 2021-08-14 13:27:02 +08:00
Ray
c3683a5cb2 Fix: [JP] use SR_SSR_CONFIRM buttom in JP 2021-08-14 13:22:49 +08:00
Cyunmi
0c5b747f37 add cn gui 2021-08-14 04:05:31 +08:00
Cyunmi
e4ed2ba06c ADD equip change when COMMON_CV_NAME == 'ANY' 2021-08-13 18:09:05 +08:00
Cyunmi
6e06e5ab36 ADD COMMON_CV_NAME == 'any' 2021-08-13 17:48:44 +08:00
Cyunmi
88d2d57454 update after merge master 2021-08-13 13:00:19 +08:00
Cyunmi
c1afc6981c Merge branch 'master' into gems_farming 2021-08-13 12:58:56 +08:00
Cyunmi
a0c6028b16 fix retirement rename bug 2021-08-12 21:05:46 +08:00
Cyunmi
79977b840b fix dock_select_one bug 2021-08-12 19:28:57 +08:00
Cyunmi
94e355915e 2. 有一些函数已经改了, 
比如 Template.match_result() Template.match_multi()
现在是返回 Button 对象, 而不是坐标点了
 2021-08-12 18:29:34 +08:00
Cyunmi
e5c9ea54ea clean unuse assert 2021-08-12 08:05:10 +08:00
nEEtdo0d
1951a76d65 Fix: [EN] DOCK_SELECTED, for gems_farming module 2021-08-11 13:16:13 -04:00
Ray
54e27c21c0 Fix: [JP] DOCK_SELECTED asset 2021-08-09 19:50:31 +08:00
Cyunmi
aa4a2d8ef6 Merge branch 'master' into gems_farming 2021-08-09 17:08:25 +08:00
Cyunmi
4c4321777d prepare to merge 2021-08-09 16:50:36 +08:00
Ray
edadb6949c Fix: [JP] retire&gacha assets except DOCK_SELECTED 2021-08-08 17:01:47 +08:00
Ray
f08ce025d8 Fix: [JP] equipment assets 2021-08-08 16:42:28 +08:00
Ray
2b0c3afbe0 Fix: [JP] shipyard assets except RESEARCH_COMPLETE 2021-08-08 15:55:54 +08:00
nEEtdo0d
40e9004808 Fix: [EN] restore previous conditional only for EN, as POPUP_CONFIRM is not the same (uses lowercase and scaling). 
Other servers maintain current handle_popup_confirm methodology
 2021-08-07 19:11:23 -04:00
LmeSzinc
e918a5db97 Merge branch 'gems_farming' into dev 
# Conflicts:
#	module/campaign/campaign_ocr.py
#	module/equipment/equipment.py
#	module/guild/base.py
 2021-07-24 17:33:58 +08:00
nEEtdo0d
0477870c41 Fix: Resolve merge conflict ui/ui.py and ui/assets.py 2021-07-18 10:05:21 -04:00
LmeSzinc
c459a014db Merge branch 'master' into gems_farming 2021-07-18 20:16:44 +08:00
LmeSzinc
2900852dd5 Fix: Reset dock filter if failed to retire any ships 2021-07-16 21:10:31 +08:00
nEEtdo0d
166b486fc7 Add: Navbar module 
Opt: Replace sidebar mechanism to Navbar for equipment and guild modules
 2021-07-10 22:58:11 -04:00
RuaBQ
bdd4105235 Merge remote-tracking branch 'upstream/gems_farming' into gems_farming 2021-07-06 20:24:23 +08:00
RuaBQ
d322f0b528 add Vanguard ship change 2021-07-06 16:48:52 +08:00
RuaBQ
41cae2a646 add emotion ocr 2021-07-06 15:50:17 +08:00
RuaBQ
c4e4c1fec2 每艘 cv 用一个单独的 template 
改变了 retirement 的写法
 2021-07-06 01:14:05 +08:00
RuaBQ
9e0875a274 finish retirement keep one common cv 2021-07-05 02:24:38 +08:00
LmeSzinc
bffc1770cd Del: Replace SR_SSR_CONFIRM with popup_confirm 
- Opt: Skip first screenshot in _retirement_confirm()
 2021-07-04 18:17:57 +08:00
RuaBQ
1bfa5be425 add retire coin assert 2021-07-04 02:21:41 +08:00
RuaBQ
bc05b4cd89 merge equipment change 
add some assert
 2021-06-30 02:15:57 +08:00
RuaBQ
79b7981ca5 add equipment change 2021-06-30 01:24:30 +08:00
LmeSzinc
48d53f6cab Add: Flagship changing 2021-06-29 23:10:13 +08:00
LmeSzinc
7c87bf49e6 Opt: Faster dock filter set 2021-06-29 18:51:31 +08:00
Ray
782868dc3a update enhance asset 2021-05-29 11:25:02 +08:00
Zorachristine
9b67bbd529 Fix: [TW] retire & combat assets 2021-04-25 20:04:52 +08:00
LmeSzinc
78c609122e Fix: Popups during enhance confirm (#417) 2021-04-25 15:39:42 +08:00
nEEtdo0d
a6ab994ba1 Add: Daily Skip assets 
Fix: Retire assets
 2021-04-16 09:44:22 -04:00
noname94
b8e2321140 Fix: [JP] assets fix after font changed 
Many assets with words need fixes after the font changed. This commit is not complete yet.
 2021-04-16 02:47:31 +09:00
LmeSzinc
cb062d61d2 Fix: [CN] Enhancement assets (#388) 2021-03-23 22:30:49 +08:00
Ray
f4331a50a3 update [jp]ENHANCE_CONFIRM buttom asset 2021-03-23 15:06:14 +08:00
Ray
5d46f61c48 update [jp] ENHANCE_RECOMMEND buttom asset 2021-03-23 12:27:54 +08:00
nEEtdo0d
29a707be6b Fix: Recent update altered retire assets, re-cropped new ones 
TODO: Other servers should survey their retire assets
 2021-03-18 13:43:27 -04:00
noname94
b66475fac2 Fix: [JP] RETIRE_APPEAR_n assets fixed 
Current assets do not match the in-game buttons well and break the script sometimes.
 2021-02-13 12:07:33 +09:00
nEEtdo0d
374002eb8a Del: Filter assets all servers, effectively moved to new filter set system 
Fix: Formatting files through IDE
 2021-01-31 20:27:20 -05:00
nEEtdo0d
d2d4e23391 Del: Old switch objects and methods relating to their usage 
Opt: Swap enhancement to adjust to new filter set system
 2021-01-31 19:53:55 -05:00
nEEtdo0d
fc64b2fa48 Add: Asset-less set filter implementation using color count 2021-01-31 19:22:26 -05:00
nEEtdo0d
92caa11686 Fix: [EN] FILTER_INDEX_OTHERS_OFF incorrect asset, replaced 2021-01-14 17:44:43 -05:00
MarioGilera
5b30fc0945 New Enhancement assets 
Needed after 23/12/2020 update.
 2020-12-29 21:46:34 +01:00
ferina8-14
583598fde6 Fix: [JP] add assets for the enhancement module 2020-12-28 03:57:29 +09:00
nEEtdo0d
96d42ea2a2 Fix: [EN] Updated FILTER_INDEX_CA_ON, consistent according to error screen captures 2020-12-23 19:24:03 -05:00
nEEtdo0d
ec7658e887 Fix: [EN] Dock filter assets changed after operation siren update 
TODO: [CN, TW, JP] update FILTER_* and DOCK_FILTER_CONFIRM accordingly
 2020-12-22 22:36:11 -05:00
Ray
4c359e21ac update images 2020-12-17 21:25:40 +08:00
LmeSzinc
b497454edc Opt: Lazy load ambush and enhancement templates 
- Opt: move letter preprocess functions to info_bar.py
 2020-12-16 19:57:57 +08:00
nEEtdo0d
55e2f63e24 Fix: Case in which list is empty, nothing to randomize on. Continue to next iteration. 2020-12-15 23:55:42 -05:00
nEEtdo0d
a1d8fcea99 Opt: New category type '?' allows ALAS to choose random, configurable ship count check 2020-12-15 23:45:11 -05:00
nEEtdo0d
8649e67b92 Opt: Revise enhancement module implementation similarly to ambush.py using templates 2020-12-15 23:18:43 -05:00
LmeSzinc
0e932cad1f Add: [CN] update FILTER_EXTRA_NO_LIMIT_* 2020-11-27 19:38:39 +08:00
nEEtdo0d
e9f7c615fb Fix: Asset change for filter_extra_*, renamed assets by category 
TODO: CN, JP, TW update FILTER_EXTRA_NO_LIMIT_*, JP update FILTER_INDEX_ALL_*
 2020-11-26 16:44:19 -05:00
whoamikyo
d1dd15ceec Added: Taiwan server support 2020-10-26 15:22:13 -03:00
LmeSzinc
b9d09f3d49 Opt: Move module/base/switch.py to module/ui 2020-10-18 21:02:03 +08:00
nEEtdo0d
9e7a0592ee Update: Re-commit enhancement update into solo entry as requested. Update consists of 'Enhance limit to 4 ship checks per category, no restart ship check number in-between method calls. Reduce trapped check handling limit from 6 to 4. Ternary for end_activate_timer based on DEVICE_CONTROL_METHOD' 2020-10-08 23:10:52 -04:00
nEEtdo0d
11cf0f28c7 Update: argparser variations to match all EN, lead will take care of translating to CN properly 
Undo: Enhancement update; will be committed as a separate PR
 2020-10-08 23:10:52 -04:00
nEEtdo0d
fa102d79e3 Update: Adjust Dorm Reward to default collect, feed configurable. Renamed dorm_interval to feed_interval for feed record, added collect_interval for collect_record 
Update: Enhance limit to 4 ship checks per category, no restart ship check number in-between method calls. Reduce trapped check handling limit from 6 to 4. Ternary for end_activate_timer based on DEVICE_CONTROL_METHOD

TODO: Adjust CN dictionary.py and argparser.py based on Dorm Reward update
 2020-10-08 23:10:51 -04:00
noname94
58234e4484 Fix: [JP] add SR_SSR_CONFIRM asset 2020-09-20 10:06:10 +09:00
whoamikyo
e0a7bb5666 Fix: [EN] fix SR_SSR_CONFIRM asset 2020-09-19 15:34:30 -03:00
LmeSzinc
44c653b5d5 Fix: Handle SR/SSR retire confirm 2020-09-17 18:58:26 +08:00
noname94
b40ff1c89a
Fix: set common ship filter when 1-click retiring 2020-09-01 09:12:20 +09:00
nEEtdo0d
23f46879ff Fix: Enhance process able to get trapped in loop if current screenshot doesn't match any condition. If detected, will perform a force check/swipe if applicable. Applied similar concept to both versions of _enhance_choose*. 
Update: Swipe process with additional internal delay and wait_until_stable to ensure image is screen captured at approriate time.

Update: Keep sidebar click index positive otherwise can click back button. Add PRY condition with sidebar only having 3 buttons, disable clicking the Research button as not supported. Maybe in the future.
 2020-08-19 19:29:11 -04:00
nEEtdo0d
8f980db42d Fix: Update warning message method return binary values no room for 3rd value, can modify but having it just warn and move onto the next set and continue is fine as well 
Fix: Timeout error shouldn't occur anymore, so nothing to raise except for specifically KeyError which happens via the globals() reference.

Fix: Reset enhanceable filter per change as some users might have others enabled. Pressing 'All' first will turn them all off and allow only enhanceable to be displayed.
 2020-08-13 21:17:41 -04:00
nEEtdo0d
bb8931f968 Fix: CLEAR_OFF was not updated, synchronizing with similar cut as others. Tested using debug script, appear() evaluates correctly. 2020-08-13 20:47:35 -04:00
nEEtdo0d
4a5e2bf271 Fix: Revert dock filter objects back to using default appear() with no offset, actually often inaccurately determined whether button has appeared as a result more frequently 
Fix: Determined continue statement is the correct behavior as side bar buttons may have changed after swipe, so should be reflected accordingly.

Fix: Updated switch class set to break out of loop if already unknown too many times, originally caused chain of exception which can be confusing to parse

Fix: All filter assets in index category have been updated to smaller comparison area due to mixed results varying from user to user. Using a debug script, to test appear() with no offset seems to be evaluating correctly with them although it also evaluates correctly with original assets.
 2020-08-13 20:30:54 -04:00
nEEtdo0d
e9290c5e4a Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript into enhance_adjustments 2020-08-13 15:02:29 -04:00
whoamikyo
534c8979fe Revert "Merge branch 'master' of https://github.com/whoamikyo/AzurLaneAutoScript" 
This reverts commit d9f73c9ed9, reversing
changes made to 56b140d9e8.
 2020-08-13 15:35:13 -03:00
nEEtdo0d
2355a934dc Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript into enhance_adjustments 2020-08-13 13:47:25 -04:00
nEEtdo0d
25811cf6c9 removed unused line, realized details check needs to happen in while loop and not just beginning due to swipe and change in ships 2020-08-13 13:31:18 -04:00
Kyo
ef96c4bd16
Revert "Opt: added update checker at startup using only batch script " 2020-08-13 14:03:59 -03:00
nEEtdo0d
3db140275f Merge branch 'enhance_adjustments' of https://github.com/nEEtdo0d/AzurLaneAutoScript into enhance_adjustments 2020-08-13 12:56:41 -04:00
nEEtdo0d
1dc84b3280 potential fix for infinite while loop entering and added leeway for dock filter images due to poor cut 2020-08-13 12:56:27 -04:00
nEEtdo0d
3445e2d482 Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2020-08-13 12:53:35 -04:00
whoamikyo
c837a97bd0 Opt: added update checker at startup using only batch script 
- added LmeSzinc Dev branch to updater menu
- removed legacy functions
- others minors optimizations
 2020-08-13 13:46:24 -03:00
nEEtdo0d
23406833de adjust back to using continue rather than immediatly trying to enhance as it might be too fast 2020-08-11 23:22:15 -04:00
nEEtdo0d
8c5a5bdc28 Fix: Fewer tries on swipe to shorten duration 
Added: Implementation of _enhance_choose_simple, simplified version of _enhance_choose, specifically enabled only if enhance_order_string is populated
Updated: help info for enhance_order_string with example input, removed subtext header info.
 2020-08-09 23:16:24 -04:00
LmeSzinc
0717730274 Add: [CN] Enhancement filter assets 2020-08-07 20:47:09 +08:00
nEEtdo0d
375660710f Re-cut FILTER_INDEX_CL_ON, appear method call getting stuck during switch 2020-08-07 06:51:22 -04:00
nEEtdo0d
63f3355f75 INDEX_CL_ON had unique white area that did not always evaluated to true, re-cut image for higher chance of accuracy 2020-08-06 22:34:26 -04:00
nEEtdo0d
f201336031 Modify equipment swipe implementation to allow exit on same ship (Only 1 card is on grid so cannot swipe). Also used bool return values to indicate whether successful. 
Modify enhanacement to use swipe bool mechanic to exit in case of infinite swipe attempts. Never reaching the 'material exhausted' conditional.

Added get_hp() to fleet switch due to possibility of fleet acquiring emergency repair. However in most cases has full HP but the current HP in program belongs to fleet before switch. Thus is parsing an incorrect HP set when deciding to use repair.
 2020-08-06 22:01:02 -04:00
nEEtdo0d
10678660f6 add updated assets.py forgot 2020-08-06 02:25:05 -04:00
nEEtdo0d
70f0619918 fixed compressed bug incorrect string 2020-08-04 22:48:36 -04:00
nEEtdo0d
5dc5f8f053 indentation error 2020-08-04 21:32:28 -04:00
nEEtdo0d
cf7309798d compress implementation to use one dock_filter method, arguments specify exactly which 2020-08-04 21:17:23 -04:00
nEEtdo0d
86f82481d4 enhancement re-work bulk commit, working assets! 2020-08-04 16:33:32 -04:00
LmeSzinc
0a8a90cdb1 Typo: Docstring in assets.py 2020-07-15 23:33:38 +08:00
LmeSzinc
0f26b4ee3c Fix: Retire confirm become slow for no reason 2020-07-13 22:05:08 +08:00
LmeSzinc
58bd5b7e2b Del: Deprecate equip_quit 
- Fix double click on BACK_ARROW when quit equipment on potato pc
 2020-06-29 01:41:48 +08:00
whoamikyo
c8bdb7c0c2 Assets: Added Assets for equipment 
- Minor changes in dev_tools.bat
 2020-06-26 19:25:06 -03:00
LmeSzinc
11b8c50f16 Fix: AUTO_CONFIRM in daily 
- Fix AUTO_CONFIRM in daily preparation
- Fix exercise quit
- Add additional button clicks in ui_click
- Add support to grid_info 'Me'
 2020-06-22 01:02:10 +08:00
LmeSzinc
c083841ed3 Fix: [CN] String in GUI 2020-06-20 19:11:49 +08:00
LmeSzinc
3e63429824 Fix: Enhance get stuck 2020-06-20 04:50:00 +08:00
LmeSzinc
d0867262e2 Optimize: Reuse device instance in the same function 
- Speed up retire confirm
- Set default server to CN
- Improve log appearance of aScreenCap init
 2020-06-16 08:55:44 +08:00
ferina8-14
47adffd1a0 Merge branch 'master' into try_jp 
[JP] copy assets from cn

# Conflicts:
#	module/combat/assets.py
#	module/daemon/assets.py
#	module/handler/assets.py
#	module/retire/assets.py
#	module/reward/assets.py
 2020-06-13 03:29:35 +09:00
ferina8-14
10bbdd1a79 Add: [JP] add jp assets, retire module 2020-06-13 02:52:55 +09:00
kyO The NinjA
ad90d29525 Fix: [EN] Fix Retire assets and AUTOMATION_CONFIRM asset 2020-06-12 00:15:49 -03:00
LmeSzinc
6d6fcc5edb Doc: [CN] Fix mis-introduction in README.md 
- Add tips, when failed to retire ships
 2020-06-01 20:22:04 +08:00
kyO The NinjA
5956fb4700 Add: [EN] Enhance module assets 2020-05-31 23:06:18 -03:00
LmeSzinc
ad5fcc2abc Fix: No ship to enhance 
- When there ship to enhance, but dock full, try one_click_retire
- Fix retire SR ship when using one_click_retire
 2020-06-01 09:25:51 +08:00
LmeSzinc
c6611f19dc Add: Enhance module 2020-06-01 08:20:13 +08:00
kyO The NinjA
5bec616659 Retirement assets 
- Fix asset for morale low
- Create a quick guide to help
 2020-05-28 22:08:21 -03:00
kyO The NinjA
37c6d08775 Localization for EN version 
- Updated assets for EN version
- Created EN dictionary
- Fix Stage OCR recognition Thanks @LmeSzinc
 2020-05-27 10:29:40 -03:00
LmeSzinc
2f1f999ce5 Add: multi-server support 2020-05-25 22:05:42 +08:00
LmeSzinc
fa0a243df1 Refactor: 合并处理消息的类 2020-05-15 14:19:34 +08:00
LmeSzinc
6b56215d71 Fix: 修复地图特效导致的章节名识别错误和进图等待 
- 章节名识别错误时有20次重试的机会
- 进图时不再使用章节图标识别
- 更改了exception文件的位置
 2020-04-25 17:10:22 +08:00
LmeSzinc
007d14c1d7 Fix: 修复和优化 
- 纠正了5-3刷新数据
- 更改出错截图文件名为毫秒时间戳
- 修复了伏击出现时, 仍会识别队伍的情况
- 修复了不开启截图时获得紧急委托时不点击的情况
 2020-04-17 17:19:09 +08:00
LmeSzinc
91e83271a4 Add: 增加了使用一键退役的支持 
- 增加了根据设置选择切换函数的装饰器
- 增加了ADB截图和点击的设置, 默认使用ADB截图, uiautomator2点击
- 更新了assets.py文件, 上次commit忘记了
 2020-04-14 12:26:57 +08:00
LmeSzinc
ad73de92dd Refactor: 抽象出处理确认弹窗的逻辑 
- 删除了一些无用的assets
- 纠正了一些拼写错误
 2020-04-13 23:00:19 +08:00
LmeSzinc
be00742c3c Add: 适配第一章, 修复大量bug 
- 修复处理夜间委托时, 出现递归调用的问题
- 增加红脸出击确认的功能
- 增加了透视识别错误图片保存的开关
- 修复了地图太小时, 透视识别报错的问题
- 修复了相机位于地图外时, 透视识别出错的问题
- 修复了离开退役时, 会连击的问题
- 修复了同时出现低心情和船坞已满弹窗时, 卡住的问题
- 更新了一键退役实装后的安全点击的位置
- 修复了换装滑动失败时, 卡住的问题
- 修复了关闭自动收获后, 出现委托完成的提示是, 进图卡住的问题
- 修复了, 无正在跑的委托时, 报错的问题
 2020-04-11 15:26:42 +08:00
LmeSzinc
2061948ff8 Fix: 修复了退役模块无船可退时进入死循环的问题 
- 退役时会关闭常用舰船的筛选
- 退役数量为0时, 将停止运行
 2020-04-03 14:09:04 +08:00
LmeSzinc
fc0e075422 Fix: 修复停止条件: 如果船坞已满无效的问题 
(其实是没写)
 2020-04-01 12:55:17 +08:00
LmeSzinc
a42aa00864 Add: 适配了活动微层混合D3 
- 修改了GUI的活动图入口
- 修正了UI_MASK文件
- 修改舰队识别, boss识别方式为模板匹配
- 修改当前舰队识别的色相阈值
- 增加了对boss右下角小图标的识别
- 修改了错误格子的修正方法, 若当列格子数量不足, 将被剔除
- 修复了退役后不会快速重新进入战斗的问题
 2020-03-31 14:23:44 +08:00
LmeSzinc
ce4887a4f5 Initial commit 2020-03-29 01:41:34 +08:00