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,013 Commits 9 Branches 0 Tags 274 MiB
2a30dea456
Commit Graph

249 Commits

Author SHA1 Message Date
LmeSzinc
88ab1e06c3 Fix: Delay task research before PR5 support on each server 2022-07-14 00:57:00 +08:00
LmeSzinc
7b7bcbeee4 Revert "Fix: [JP] Temp fix for game bug on research remain tab (#1227)" 
This reverts commit b5be6454
 2022-07-12 18:47:34 +08:00
LmeSzinc
9b860b88bb Fix: Entered another research accidentally 2022-07-02 14:47:51 +08:00
hgjazhgj
e779fd7e64 Fix: Misspelling & Line-end spaces 2022-06-25 20:04:45 +08:00
railannad
1007c9e6e1 Add: new research preset: S2 457 only 2022-06-22 13:02:07 +08:00
LmeSzinc
b5be6454e6 Fix: [JP] Temp fix for game bug on research remain tab (#1227) 
Research tab cannot expand after game patch.
Revert this commit when game dev fix it
 2022-06-16 20:30:41 +08:00
LmeSzinc
c562a20540 Fix: [JP] Research series detection 2022-06-13 23:07:26 +08:00
LmeSzinc
b67556af86
Merge pull request #1163 from SaiCateDoan/tech2 
Opt: Enforce research when get a low-quality project Ver2
 2022-06-05 13:08:35 +08:00
LmeSzinc
7382ced0d9 Fix: Leftmost research series covered by battle pass info (fixed #1037) 2022-06-05 08:27:11 +08:00
SarContDeli
8f1f7ddd60 Opt: Enforce research when get low-quality research projects 2022-05-30 20:09:20 +08:00
SarContDeli
ee0eb05373 Opt: Optimized composition of filter preset 2022-05-30 19:41:43 +08:00
SarContDeli
793092e3a7 Opt: Use the cube optimized filter when forcing research 2022-05-30 19:40:29 +08:00
railannad
8ccf02c33b Add: more research preset 2022-05-27 23:45:45 +08:00
SarContDeli
0ecd403d70 Fix: Several errors about upload 2022-05-23 12:40:14 +08:00
SarContDeli
dd66c8f289 Opt: Modified the options for all screenshots 2022-05-21 00:53:37 +08:00
SarContDeli
7db5af2a88 Opt: Combined save and upload options 2022-05-20 15:25:32 +08:00
SarContDeli
abf8617fab Fix: Added support for filters that lack reset 2022-05-16 22:30:37 +08:00
SarContDeli
25b3ac58b4 Opt: Changed the implementation of #1119 2022-05-13 14:09:12 +08:00
SarContDeli
632af5d976 Add: new setting makes research more stable 2022-05-12 21:08:38 +08:00
LmeSzinc
b793c1507a Opt: Allow T series research projects (#1099) 2022-05-08 15:17:40 +08:00
Egor Nats
6eac8ae259 Opt: Imports isorted 2022-04-14 16:37:54 -03: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
SaarChaffee
303dd90fdc change CRLF to LF 2022-04-09 23:31:09 +08:00
nEEtdo0d
96b39a9ea5 Upd: [EN] post major app update bulk assets; WIP part 1 2022-04-07 22:32:24 -04:00
LmeSzinc
3a3d97d99d Add: Pre-optimized research filters when using cubes 2022-02-12 00:00:45 +08:00
LmeSzinc
f23e9d0bb2 Fix: Failed to predict series of the second research project on phones 2022-02-09 18:55:19 +08:00
LmeSzinc
e92579b5f9 Opt: Remove redundant converts from pillow to numpy 2022-01-24 23:43:53 +08:00
LmeSzinc
9ae9c63b5f Merge branch 'master' into dev 2022-01-24 00:08:43 +08:00
LmeSzinc
65f166ad12 Refactor: Use numpy image cache instead of pillow image 2022-01-23 23:03:55 +08:00
railzy
f81f76520d Fix: handle research remain 00:00:00 correctly 2022-01-22 22:07:02 +08:00
LmeSzinc
96e7e77c9a Merge branch 'master' into dev 
# Conflicts:
#	module/logger.py
 2022-01-22 18:43:40 +08:00
LmeSzinc
338e32ceb1 Opt: Faster page switching in research receive 2022-01-22 18:41:12 +08:00
Ray
2bffe43481 Fix: research reward when research finished but shows 00:00:00 remain 
#895
 2022-01-22 17:58:19 +08:00
LmeSzinc
8374174d55 Refactor: module/device, separate all screenshot method and control methods 
- Better screenshot and control retries, handle common exceptions
 2022-01-22 17:42:47 +08:00
LmeSzinc
1a0ca67243 Fix: Research preset series_4_blueprint_only 2022-01-11 14:18:15 +08:00
LmeSzinc
ec65cf918b Add: Research filter optimizer and optimized presets 2022-01-08 23:32:07 +08:00
LmeSzinc
94c7363bde Opt: Change research consumption True/False to Always Use/Only 0.5 Hour Researches/Don't Use 2022-01-02 20:36:38 +08:00
hephooey
aef51a8d81 [TW] Temporary fix for project name recognition 
At this moment, OCR fails frequently to identify the G-type and
potentially Q-type projects in Research Academy. It often misses
the initial letter when predicting the name of the projects. Adding
it manually for now.
 2021-12-19 15:25:28 -05:00
hephooey
bdb54fb167 Fix double dashes inside ocr output 
Double or more dashes in OCR predictions like "Q--010-UL" breaks the
logic in check_name because they creates ficticious empty strings after
split by dash. Fix this by manually remove the empty strings
 2021-12-18 14:55:58 -05:00
LmeSzinc
0e00e6f8a5 Fix: Handle research duration reached, but requirements not satisfied 2021-12-18 23:51:30 +08:00
LmeSzinc
d5735604e1 Dev: Uniform comments of generated files 2021-12-07 23:29:33 +08:00
Cola
cffef972b3 Fix: [TW] update assets 2021-11-25 13:34:18 +08:00
Zorachristine
61b248f759 Fix: [TW] research assets 2021-11-20 22:46:36 +08:00
Zorachristine
ba1ae30a04 Fix: [TW] guild, os, research, ui assets 2021-11-20 22:21:06 +08:00
LmeSzinc
88b4fe01b6 Fix: RESEARCH_RUNNING detection 2021-11-15 02:05:35 +08:00
LmeSzinc
ec03b8170d Upd: Optimized research 4 filter 2021-11-10 02:28:41 +08:00
nEEtdo0d
c9d774c3b8 Upd: [EN] RESEARCH_RUNNING 2021-11-01 16:26:55 -04:00
nEEtdo0d
6fc50cafff Upd: [EN] RESEARCH_LAB 2021-10-31 22:17:39 -04:00
LmeSzinc
ae3a28e8e1 Upd: [CN] RESEARCH_LAB 2021-10-30 22:50:13 +08:00
Ray
441bf072f8 Fix: remove asset DURATION_REMAIN 2021-10-29 07:41:53 +08:00
Ray
06d33d2a34 Fix: get research duration remain from page_reward 2021-10-29 07:34:51 +08:00
LmeSzinc
10fc4a7ba8 Upd: Default research and commission filter 
- Allow both hakuryu and hakuryuu in research
 2021-10-25 17:48:01 +08:00
LmeSzinc
32d2dbf8e6 Merge branch 'master' into app 2021-10-24 01:34:25 +08:00
Ray
7f376c23cf Fix: remove resize in get_research_series_jp 2021-10-23 23:18:53 +08:00
Cola
b9adfd0354 Fix: [JP] Typo in get_research_cost_jp 2021-10-22 17:48:00 +08:00
LmeSzinc
abdfbb713a Refactor: Rename auto search configs 
- Refactor device/app configs
- Fix: Research finish detection
 2021-09-15 23:50:30 +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
LmeSzinc
11290af0fa Opt: Emphasize research logs 2021-09-14 17:22:32 +08:00
LmeSzinc
266db577be Add tactical class 2021-09-14 17:09:41 +08:00
LmeSzinc
071eec530a Move commission to a new module, also faster 2021-09-14 14:56:28 +08:00
LmeSzinc
cca5657004 Faster UI switching 2021-09-14 14:56:28 +08:00
LmeSzinc
d3564104bd Delete Argument class, simplify GeneratedConfig 2021-09-14 14:56:25 +08:00
LmeSzinc
36e396367e Drop record save and upload 2021-09-14 14:56:15 +08:00
LmeSzinc
2210ec23e8 Research get duration remain 2021-09-14 14:53:13 +08:00
LmeSzinc
a0d823bcd0 Rename configs in device, and research 2021-09-14 14:43:14 +08:00
LmeSzinc
e69455e386 Opt: Wait items show up, because 2 rows of items use GET_ITEMS_3 now 2021-09-11 12:39:10 +08:00
Ray
ffe9d46dde Fix: [JP] avoid research projects positions bug 2021-08-31 16:00:09 +08:00
LmeSzinc
36df9a7802 Opt: Allow E-2 research projects with no tasks, but JP still remains the same 
- TODO: [JP] Update for new research projects using tech boxes
 2021-08-19 18:04:35 +08:00
LmeSzinc
06904a6ba6 Upd: Research projects data 2021-08-19 18:04:35 +08:00
LmeSzinc
96936943cc Fix: Wrong research_project_started if no research started 2021-08-13 00:59:39 +08:00
LmeSzinc
59a17f59e5 Opt: Return objects instead of index in Filter.apply() 2021-08-07 14:29:34 +08:00
Cola
109d41e15b Fix: [TW] Research_* asset 2021-07-29 22:57:52 +08:00
LmeSzinc
3c7a58c7df Dev: Update research project data extractor and its generated data 2021-07-23 16:01:36 +08:00
LmeSzinc
9725d22892 Opt: Abstract get_research_finished 2021-07-20 07:32:45 +08:00
LmeSzinc
1d58bd48f2 Opt: Revise some research ocr results manually 2021-07-19 21:15:57 +08:00
LmeSzinc
96e388d7ab Fix: Research series detection, because IV was downscaled 
- Fix: Choosing the wrong project after reset
- Opt: Remove info bar handler after starting a research, for faster run
 2021-07-18 19:45:14 +08:00
LmeSzinc
0b1b700b99 Fix: Rework research receive to avoid unknown stuck 2021-07-17 00:40:11 +08:00
LmeSzinc
7884f9463f Opt: Research S4 preset filter according to statistics 2021-07-16 22:31:37 +08:00
nEEtdo0d
4fcb3cc250 Upd: [EN] page_research transitions same as others, now has unique titles across all reshmenu pages after last update 2021-07-15 21:58:21 -04:00
LmeSzinc
127bfcb2c5 Fix: research_receive timeout 2021-07-10 22:50:28 +08:00
LmeSzinc
4de7fc5039 Fix: Timeout in long loop, expand azur stat request timeout 2021-07-10 22:06:16 +08:00
LmeSzinc
fee01691de Fix: Noise in research S2 detection 2021-07-10 20:30:03 +08:00
LmeSzinc
7d996bbbfc Add: Research S4 preset, and notice for research statistics 2021-07-10 18:29:08 +08:00
LmeSzinc
bad926a1a5 Opt: Remove the requirements of drop screenshot in research stats 2021-07-10 17:40:38 +08:00
LmeSzinc
c0b06ccc1d Add: Drop screenshots upload to AzurStats 2021-07-10 15:15:20 +08:00
LmeSzinc
1374fa9007 Dev: Extract research projects in S4 
Some strings are still in chinese, but no negative effects
Shorten ship name August von Parseval
 2021-07-09 14:32:29 +08:00
LmeSzinc
40bef7d014 Add: Research S4 ships, but project haven't extracted 2021-07-08 21:43:19 +08:00
LmeSzinc
201d954790 Dev: Delete redundant research project data 2021-07-08 21:43:19 +08:00
LmeSzinc
b65194f2c1 Fix: Research series IV detection 2021-07-08 21:43:15 +08:00
LmeSzinc
1499b93d3d Fix: Detection of RESEARCH_STOP 2021-05-25 16:55:50 +08:00
noname94
f92234614d Fix: [JP] assets fix 2 after font changed 
Many assets with words need fixes after the font changed. Most functions should work now.
 2021-04-16 13:58:57 +09:00
LmeSzinc
34ea533451 Fix: Simple fix to handle OCR result ID-057-UL 2021-03-31 16:46:27 +08:00
whoamikyo
133d464091 Opt: added toast notification for research 2021-02-20 17:11:26 -03:00
LmeSzinc
16ea207cde Fix: Research reset save research_projects in stage folder not base folder 2020-12-11 22:19:12 +08:00
noname94
13567c7a0d Fix: research project considered unavailable after RESEARCH_START clicked 2020-11-03 19:10:57 +09:00
whoamikyo
d1dd15ceec Added: Taiwan server support 2020-10-26 15:22:13 -03:00
LmeSzinc
075dfd70f9 Merge branch 'master' into dev 2020-09-27 15:47:11 +08:00
LmeSzinc
e97cdea1b3 Fix: Research receive if drop screenshot enabled (#206) 
When drop screenshot enabled, research receive is in page_research, because research stats need research name.
So here needs RESEARCH_FINISHED.
 2020-09-27 15:14:23 +08:00
LmeSzinc
2cd4074f4c Opt: Move filter.py to module.base 
- Fix filter in integer
 2020-09-27 03:04:15 +08:00
noname94
f82b899e12 Opt: reward receiving logic optimization 
To ensure that nothing is pending before exiting page_reward. It also avoids using research_receive() function in RewardResearch class which might be unstable because of too many sleep().
 2020-09-27 03:12:41 +09:00
LmeSzinc
0a266411de Fix: Handle new stage entrance icon 
- Fix in_stage detection on slow pc
 2020-09-18 01:09:59 +08:00
noname94
27939bc854 Opt: [JP] Research logger optmization 2020-09-17 19:59:33 +09:00
noname94
bbdf3e7030 Opt: Remove duplicate methods 
research_select_quit is the same as research_detail_quit.
 2020-09-17 18:26:16 +09:00
noname94
cdd6ae0dbf Opt: [JP] Research optmization 
To make it more reliable especially on slow computers.
 2020-09-17 18:13:48 +09:00
noname94
33033e70f1 Opt: [JP] Research minor optmization 2020-09-17 01:29:04 +09:00
noname94
2da0d472e0 Fix: [JP] Research not working properly in some cases. 
Previous research detail page may not disappear immediately after pressing the DETAIL_NEXT button. Waiting until touch effect to fade should prevent this from breaking the script.
 2020-09-15 11:03:48 +09:00
noname94
d0a76e58ab Fix: [JP] fix a mistake made by correcting code format. 2020-09-09 09:25:56 +09:00
LmeSzinc
8c38ebe563 Opt: Code format 2020-09-07 17:12:26 +08:00
noname94
86ec211930
Add: [JP] Research support (#174) 
* Add: [JP] Research support

* Fix: Clean up

* Fix: Assets clean up
 2020-09-07 14:55:35 +08:00
LmeSzinc
ffa36b0fc2 Opt: Move rgb2gray from to module/base/utils.py 2020-09-03 22:16:16 +08:00
noname94
6cd4541c6f Fix: [JP] assets update 2020-09-02 06:33:25 +09:00
LmeSzinc
f0e2767a7d Fix: Wrong drop screenshot save folder after research receive 2020-08-29 01:38:01 +08:00
LmeSzinc
58707a83ab Fix: Research project classification 
Some research projects still use different suffix, such as Q-002-MI and Q-002-RF
 2020-08-14 06:52:21 +08:00
Kyo
e3f0fb685f
Merge pull request #160 from whoamikyo/master 
Opt: added update checker at startup using only batch script
 2020-08-13 15:43:06 -03: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
LmeSzinc
749af19b4c Fix: Handle research project card shining, which only happens in research statistics 2020-08-14 02:34:06 +08:00
Kyo
ef96c4bd16
Revert "Opt: added update checker at startup using only batch script " 2020-08-13 14:03:59 -03: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
LmeSzinc
b9d18a4bd2 Fix: Research name update 2020-08-12 17:33:35 +08:00
LmeSzinc
9dbbfc5938 Fix: Ignore suffix in research names (#153) 2020-08-12 02:47:42 +08:00
LmeSzinc
e2ba5f7e23 Fix: Research filter preset 2020-08-09 09:50:55 +08:00
whoamikyo
65fe1a98d9 Fix:[EN] fix RESEARCH_PENDING 2020-08-07 08:44:32 -03:00
LmeSzinc
a35e7daad4 Fix: Research pending and research unavailable 
- RESEARCH_PENDING change from detecting "]" to detecting the letter, because the "]" is moving up and down randomly
- Screenshot speed back to normal after research_receive
- Add a max_color checker to RESEARCH_UNAVAILABLE and RESEARCH_START, because RESEARCH_UNAVAILABLE is a translucent item and color is changing according to research rarity
 2020-08-07 19:11:53 +08:00
whoamikyo
011da0fe28 Opt: change sleep for screen_interval in research fix 2020-08-06 12:36:11 -03:00
Kyo
1ee5b7316a
Merge pull request #136 from whoamikyo/master 
Fix: fix research stuck
 2020-08-04 00:22:23 -03:00
whoamikyo
cc5942a6a1 Fix: fix research stuck 2020-08-04 00:21:13 -03:00
LmeSzinc
82ee13f39e Opt: Allow research E-6, still ignore B series and E-2 2020-08-04 02:02:51 +08:00
LmeSzinc
756bb1ae7d Opt: Allow research E-6, still ignore B series and E-2 2020-08-04 02:01:38 +08:00
LmeSzinc
a4706662cb Fix: [EN] Check button of reshmenu goto research 2020-08-02 23:51:36 +08:00
LmeSzinc
2b7b6697e4 Fix: Research detection when screenshot too fast 
- Fix re-clicking projects when reward already received
- Add wait_until_get_items_stable
- [EN] Fix page_reshmenu goto page_research
 2020-08-02 22:14:48 +08:00
nEEtdo0d
247c51286f left out debug print lines, removing 2020-07-30 17:17:28 -04:00
nEEtdo0d
296d8e66b0 fix regexp for durations using two digits namely '12'. It would incorrectly capture only the 1 in C12 and when filtered did not match the duration attribute as a result thus was not filtered correctly. If there are double digits using decimal places (12.5) then the regexp will need to be updated again but for time being this works for properly for 12 hour filters 2020-07-30 17:13:34 -04:00
whoamikyo
1bab5f193c Fix: [EN] fix RESEARCH_UNAVAILABLE asset 2020-07-30 16:55:28 -03:00
LmeSzinc
f75b21deda Fix: Research name detection on light background 2020-07-30 02:25:40 +08:00
LmeSzinc
4bc3631bf1 Fix: Research start too fast to detect 2020-07-28 23:48:01 +08:00
nEEtdo0d
714a12e637 Moved scan procedure into for loop so that priority is re-calculated after a reset click. Added timeout=3 to ensure_no_info_bar calls as a means of delay and provide more opportunity for self.device.screenshot to acquire updated images 2020-07-27 15:05:50 -04:00
LmeSzinc
ad556cd5ba Fix: ship attribute in ResearchProject 
- ship attribute in research project is overwritten by next output item
 2020-07-26 17:32:31 +08:00
LmeSzinc
b588beb02b Fix: Handle build-in string in research priority 2020-07-23 06:57:04 +08:00
LmeSzinc
8f73cc20fa Fix: No research project satisfies current filter 2020-07-21 23:09:51 +08:00
LmeSzinc
9e1b25bd39 Fix: Failed to detect research finished because of a game bug 
Finished research should be auto-focused to the center, but sometimes didn't, due to an unknown game bug.
 2020-07-21 04:38:39 +08:00
LmeSzinc
657445d59f Fix: Mission rewards checks wrong page if research reward disabled 2020-07-20 18:51:56 +08:00
LmeSzinc
1a585cc979 Add: Research projects save screenshot before refresh 2020-07-19 18:26:29 +08:00
LmeSzinc
a87d882c61 Fix: Choose next research if resources not enough 2020-07-19 18:15:32 +08:00
whoamikyo
61a48e254a Fix: fix research_check 2020-07-18 19:34:45 -03:00
whoamikyo
0c9605e5d3 Assets: [EN] added RESEARCH_FINISHED asset 2020-07-18 15:23:16 -03:00
whoamikyo
64fde6425d Assets: [EN] added assets for research module 2020-07-18 05:10:08 -03:00
LmeSzinc
fa434e9664 Opt: Faster research select 2020-07-17 21:08:06 +08:00
LmeSzinc
567c4a790a Add: Research to GUI 
- Opt: Faster page switch in reward
 2020-07-17 09:28:11 +08:00
LmeSzinc
618ca784da Add: Research module 2020-07-17 05:32:22 +08:00