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
8,538 Commits 9 Branches 0 Tags 274 MiB
5ab18b27fd
Commit Graph

350 Commits

Author SHA1 Message Date
nEEtdo0d
e920738c24 Opt: Remove debug logs, additional error checking for select methods 2020-12-30 19:19:22 -05:00
nEEtdo0d
c184f1abc4 Fix: Missing assets.py update from previous commit 2020-12-30 19:12:21 -05:00
nEEtdo0d
fa9b3ab257 Opt: Remove unused assets, rename assets 2020-12-30 19:11:04 -05:00
nEEtdo0d
6405e2563f Opt: Revamped less OCR dependency, use ItemGrid and stats_basic assets 
to scan for exchangable items

Fix: Rename assets, variables, and etc.
 2020-12-30 19:00:58 -05:00
nEEtdo0d
2c8e8355b0 Opt: Reset resource_cost rather than resource_weight, to skip altogether 2020-12-29 19:28:10 -05:00
nEEtdo0d
d44e231845 Opt: Add comment description 2020-12-29 19:14:00 -05:00
nEEtdo0d
5f78d71e0d Add: Allow specification of resources and parts via configuration 
Add: Interval configuration for guild
 2020-12-29 19:05:51 -05:00
nEEtdo0d
2f5b72be2c Opt: Update log text, display even column spacing format 2020-12-29 16:24:13 -05:00
nEEtdo0d
15a8aeaf9c Fix: Unspecified parts will have their weight reset to ensure put in priority back 
Opt: Renamed 'item' to 'resource'
 2020-12-29 16:13:18 -05:00
nEEtdo0d
8707ec5b81 Opt: Expanded selection of exchange items by both resource and grade part 2020-12-29 15:46:11 -05:00
nEEtdo0d
96a335763d Merge remote-tracking branch 'origin/master' into guild_reward 2020-12-29 13:18:37 -05:00
LmeSzinc
c788e2366d Fix: Daily hard stops if STOP_IF_MAP_REACH was set 
- Opt: Goto page_campaign_menu to reset daily list
 2020-12-30 00:24:07 +08:00
nEEtdo0d
f31dca614e Opt: Check for affiliation in lobby rather than logistics 
Fix: Clarify Reward Guild text
 2020-12-29 11:10:53 -05:00
nEEtdo0d
fbbcff37a0 Add: [EN] Add Reward loop check for page Guild, only Logistics is supported 
TODO: [CN, TW, JP] Add equivalent argparser updates
 2020-12-29 01:19:21 -05:00
nEEtdo0d
ca99dbb860 Add: page_guild 
Opt: Guild confirm text
 2020-12-29 00:04:35 -05:00
nEEtdo0d
7e81cb85d1 Opt: Optimized away from relying on configuration to determine guild affiliation 
Renamed assets, added new asset GUILD_MISSION_REWARDS_*
 2020-12-28 23:47:52 -05:00
nEEtdo0d
3d09e001a4 Fix: Updated asset to exclude potential overflow from first line 
Lowered letter color after trial/error, 'oil' often read as 'oi'
 2020-12-28 22:23:17 -05:00
nEEtdo0d
8ea10a90d5 Add: Reward Guild, initial working draft for all actions in the Logistics page 
Able to accept mission, collect guild rewards, and contribute resources
Not currently implemented in Reward loop, tested each independently

Operations page development postponed, fairly complex to automate

TODO: [CN, TW, JP] replace assets as needed
 2020-12-27 22:48:55 -05:00
noname94
093c5e8b3e Fix: stuck in retreat confirmation on potato pcs 
and remove duplicate GET_ITEMS_1 in handler assets
 2020-12-27 11:55:52 +09:00
nEEtdo0d
4df372353b Fix: [EN] Shrunk MAP_ARCHIVES, location of star conflicts for this server 
Opt: [EN] Copy MEOWFFICER_TRAIN_CLICK_SAFE_AREA to server
 2020-12-26 17:49:47 -05:00
nEEtdo0d
bcf7557ef1 Fix: Reduce time getting a meowfficer by multi-click 
Fix: Fill queue sometimes too fast, wait additional fractional second before proceeding
 2020-12-24 21:23:27 -05:00
LmeSzinc
54a1a7609e Fix: Assets for sos signal and commission notice 
- Other server don't need to replace these, they should be the same among servers.
 2020-12-22 18:39:58 +08:00
LmeSzinc
5c13dcdfa4 Opt: ENABLE_FAST_FORWARD in daily hard 2020-12-21 17:27:19 +08:00
LmeSzinc
2e05de02f1 Opt: Remove code for DOA commissions to avoid errors in the future 2020-12-15 15:55:06 +08:00
LmeSzinc
aa49f439f1 Add: [CN] Assets for meowfficer training 2020-12-07 19:54:38 +08:00
LmeSzinc
a0d59bae07 Opt: Merge all confirm buttons in meowfficer into handle_meow_popup_confirm() 
- Opt: Formatting code in module/reward/meowfficer.py
 2020-12-07 19:43:19 +08:00
nEEtdo0d
19a36b3cba Fix: correct asset name 2020-12-06 14:19:41 -05:00
nEEtdo0d
6d37c2497f Fix: Removed unused and fixed name of asset 2020-12-06 12:48:15 -05:00
nEEtdo0d
caeb5d8c50 Opt: Buy tab to Meowfficer tab as there are two options now 
Add: configurations to enable collect/train meowofficer, disabled by default

TODO: CN, TW, JP will need to update asset equivalents for their server
 2020-12-06 12:25:45 -05:00
nEEtdo0d
8177472beb Fix: Re-vamped implementation with fewer screen transitions and checks 2020-12-06 11:40:42 -05:00
nEEtdo0d
64f675c782 Add: Get one trained meowfficier, special circumstance on sunday collect and queue all 2020-12-05 09:34:12 -05:00
LmeSzinc
805a25e01e Fix: Avoid exit page_archives when receiving data key 2020-12-04 17:37:21 +08:00
whoamikyo
2d99148abf Fix: [EN] DOA event comission name added 2020-11-26 14:55:59 -03:00
LmeSzinc
0a9082d24b Fix: Data key reward exit in page_archive, causing _reward_mission running in wrong page 2020-11-27 00:50:43 +08:00
LmeSzinc
56f5a49095 Fix: DOA commission 
DOA commissions are different everyday, use pink color to detect instrad of the name
- Add: handle game tips in page_commission
 2020-11-27 00:47:07 +08:00
noname94
11e7f73f51
Add: [JP] DOAXVV commission name added 2020-11-26 21:40:05 +09:00
LmeSzinc
b0a7f5863c Fix: Handle DOA collabration daily commission 2020-11-26 16:41:22 +08:00
LmeSzinc
d37e9ba4b0 Opt: Code formatting 2020-11-21 11:14:43 +08:00
noname94
3349e14000 Add: [JP] meowfficer assets added 2020-11-20 22:26:26 +09:00
LmeSzinc
c5b7bdefb7 Fix: Too many clicks when having too many wrong coins and loves in dorm 2020-11-09 00:35:34 +08:00
LmeSzinc
5da772ec4c Add: [CN] GUI translation and assets update in data key collect 2020-11-05 15:59:24 +08:00
LmeSzinc
1ebcbec607 Opt: Less warning in data key receive 
- Continue receiving if in 29/30
- Delete record_executed_since and record_save in RewardDataKey class, because it's for dailies
 2020-11-05 15:53:26 +08:00
nEEtdo0d
0b7cd86014 Opt: convert data key from daily to reward, use DigitCounter instead 
TODO: CN, JP, TW update respective argparser and DATA_KEY_COLLECTED image
 2020-11-04 10:22:57 -05:00
nEEtdo0d
55c0b4ecfe Merge remote-tracking branch 'origin/master' into data_key_collect 2020-11-04 09:26:27 -05:00
noname94
7ef3f70cdd Opt: [JP] Tesseract replaced by cnocr in commission 2020-11-04 13:39:22 +09:00
nEEtdo0d
1752a1a2c4 Merge remote-tracking branch 'origin/master' into data_key_collect 2020-11-02 13:53:15 -05:00
noname94
d82f80e67f Opt: Skip dorm collecting when nothing to collect. 2020-11-02 17:52:42 +09:00
nEEtdo0d
b4f3300e2b Add: page_archives and route 
Opt: Use ui_ensure for page transitions
 2020-11-01 12:27:59 -05:00
nEEtdo0d
420c0feded Fix: Resolve merge conflict with master 2020-11-01 10:47:17 -05:00
Zorachristine
99915561e6 修復TW服的後勤及後宅點擊並新增TW繁中Alas介面 2020-11-01 19:11:59 +08:00
nEEtdo0d
f4acb8c960 Add: added daily data key collect 
- CN, JP, TW need to replace DATA_KEY_COLLECTED, can optionally replace DATA_KEY_COLLECT
 2020-10-31 22:04:00 -04:00
whoamikyo
92eb569eb2 Opt: changed exercise order, now will be first in daily loop 2020-10-28 19:50:13 -03:00
whoamikyo
d1dd15ceec Added: Taiwan server support 2020-10-26 15:22:13 -03:00
LmeSzinc
d5e3479591 Merge branch 'master' into dev 2020-10-22 14:40:06 +08:00
LmeSzinc
0ad206c69b Fix: Avoid clicking MEOWFFICER_BUY multiple times 2020-10-21 20:00:52 +08:00
LmeSzinc
df0c33c72c Opt: Switch class 
- Add offset argument, rename is_choice to is_selector
 2020-10-20 15:44:32 +08:00
LmeSzinc
b9d09f3d49 Opt: Move module/base/switch.py to module/ui 2020-10-18 21:02:03 +08:00
LmeSzinc
39bb1b9826 Add: Config cover and recover 2020-10-18 20:47:03 +08:00
LmeSzinc
e52f5432b3 Fix: Handle game loading after TACTICAL_CLASS_START appears 2020-10-17 20:17:12 +08:00
LmeSzinc
2a2e09e005 Fix: Avoid drop-down menu in android, when zoom out dorm 2020-10-13 12:13:11 +08:00
LmeSzinc
a0558bfa69 Fix: Detection of pending commissions (#221) 
- Fix: Change COMMISSION_HAS_PENDING to a larger area, and count pixels, because it's not a static area
- Add image_color_count()
 2020-10-11 17:49:14 +08:00
LmeSzinc
73d44b0130 Fix: CLose DORM_INFO if it was't handled in ui_ensure() 
- Opt: Minor code formatting in dorm.py
 2020-10-09 12:25:44 +08:00
nEEtdo0d
9f39f7403e Fix: Dorm reward re-implemented as requested by LmeSzinc 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
LmeSzinc
a90d0fc111 Fix: Close trophies info in dorm receive 2020-10-08 14:37:39 +08:00
LmeSzinc
23cd6563cf Fix: Stop dorm feed if not having enough food 2020-10-04 18:57:30 +08:00
noname94
7da01d2d68 Fix: FOOD ButtonGrid area fix 
FOOD buttons should not contain the corners
 2020-10-02 00:58:43 +09:00
noname94
81641cddc2 Add: [JP] added dorm assets 2020-09-29 02:45:32 +09:00
LmeSzinc
24f3dfe489 Fix: Remain count in meowfficer reward 2020-09-28 16:15:43 +08:00
whoamikyo
b638aa8959 Add: [EN] Added Dorm assets 2020-09-27 23:10:52 -03:00
LmeSzinc
4ed1a79f1e Add: Dorm reward 
- Dorm reward use minitouch, ignores control method settings
- Merge oil reward and mission reward into "General"
 2020-09-27 17:28:00 +08:00
LmeSzinc
0e631f1c62 Add: ensure_time handles string such as '10, 40' 2020-09-27 16:08:48 +08:00
LmeSzinc
075dfd70f9 Merge branch 'master' into dev 2020-09-27 15:47:11 +08:00
noname94
235f3e045f Opt: reward receiving logic optimization again again 2020-09-27 12:08:28 +09:00
noname94
3ad9073a35 Opt: reward receiving logic optimization again 2020-09-27 11:57:11 +09:00
noname94
f03e87c8d5 Opt: minor optimization 2020-09-27 10:19:31 +09:00
noname94
5d4d5dd06a Fix: might be infinite loop if we couldn't start a new research 
my mistake, sorry
 2020-09-27 10:01:58 +09:00
LmeSzinc
80ea891f0b Add: DigitCounter to detect such as '14/15' 2020-09-27 03:21:44 +08:00
LmeSzinc
9446d5f526 Fix: Different back arrow in page_dorm and page_meowfficer 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
noname94
9b07722064 Fix: confirm the book is correctly selected in tactical class 2020-09-25 00:47:18 +09:00
LmeSzinc
d103191d21 Typo: meow_choose 2020-09-14 18:31:33 +08:00
LmeSzinc
b4cd58090d Typo: OCR_MEOWDDICER_COINS 2020-09-06 00:45:10 +08:00
LmeSzinc
9a6a18150a Fix: Stuck timer after script sleep 2020-08-29 17:40:51 +08:00
LmeSzinc
a528835f5b Fix: Formation switching 2020-08-28 15:01:34 +08:00
LmeSzinc
401d2f6135 Fix: Too fast to click commission list switch 
- Fix: Switch clicking at the button of current status
 2020-08-27 01:55:21 +08:00
LmeSzinc
aa613d3381 Merge branch 'dev' 2020-08-25 01:31:31 +08:00
LmeSzinc
b88c81a22a Fix: Meowfficer unable to buy free one when no enough money 2020-08-24 12:18:21 +08:00
LmeSzinc
36bf3acfef Merge branch 'master' into dev 2020-08-22 01:49:37 +08:00
LmeSzinc
2ecb696e57 Fix: Reward interval during campaign attack 2020-08-21 22:59:08 +08:00
whoamikyo
09d3f695de Revert "Revert "Merge branch 'dev' of https://github.com/LmeSzinc/AzurLaneAutoScript into dev"" 
This reverts commit ac9303012c.
 2020-08-18 20:48:14 -03:00
whoamikyo
ac9303012c Revert "Merge branch 'dev' of https://github.com/LmeSzinc/AzurLaneAutoScript into dev" 
This reverts commit bdc5aa0720, reversing
changes made to 6ee7a62edf.
 2020-08-18 20:47:27 -03:00
LmeSzinc
6603a9e58a Merge branch 'master' into dev 2020-08-18 05:10:58 +08:00
LmeSzinc
5a37294fcd Opt: Random reward interval 
- reward_interval now can accept time range
- Lower global random simulation factor to 3
- Add option to stop game during reward interval
 2020-08-18 05:07:45 +08:00
LmeSzinc
5cb7cb6e8a Opt: Detection area to merge commission list 2020-08-18 03:45:15 +08:00
whoamikyo
f093ba1802 Fix: [EN] MEOWFFICER_BUY_SKIP asset 2020-08-17 07:13:08 -03:00
whoamikyo
4243ed3e8f Add: [EN] Mewoffice assets 2020-08-14 05:54:08 -03:00
LmeSzinc
7fc72b5416 Add: Buy meowfficer, disabled by default 2020-08-14 12:05:17 +08:00
LmeSzinc
f97c8e1880 Add: Option to cancel tactical class if no book satisfied (#138) 2020-08-10 15:49:53 +08:00
LmeSzinc
4cc9c0481a Fix: Mis-click HOME when skipping story 
- Fix daily hard when fleet lock disabled
 2020-08-03 16:28:22 +08:00
LmeSzinc
295849d216 Add: Handle commission list flashing bug 2020-08-02 22:42:20 +08:00
nEEtdo0d
a57ccd2a8b move major_comm genre missions to back of dictionary since genre searching is done linearly. This collides with another genre as a result and misnaming its proper genre. 2020-07-29 19:50:27 -04:00
LmeSzinc
bb32201875 Fix: Fleet auto method in daily 2020-07-30 01:38:38 +08:00
LmeSzinc
7ee8b497a0 Add: Event daily SP 2020-07-28 19:45:38 +08:00
LmeSzinc
96c6562f44 Fix: commission_start_click (#120) 2020-07-26 19:01:46 +08:00
LmeSzinc
5f84095144 Fix: [JP] ocr result with space 2020-07-25 16:34:12 +08:00
LmeSzinc
f57c75ded7 Fix: Handle info_bar when get ship in Launch Ceremony commissions 2020-07-23 16:55:38 +08:00
whoamikyo
46649099aa Opt: Removed unnecessary string convert 2020-07-22 23:31:58 -03:00
whoamikyo
1369246708 Fix: [EN] Fix commission case sentive due poor OCR 2020-07-22 23:12:07 -03:00
LmeSzinc
ebf305b57a Fix: Handle info_bar when get ship in Launch Ceremony commissions 2020-07-22 19:14:44 +08:00
whoamikyo
dc128af848 Fix: [EN] Minor fix in commission dictionary 2020-07-21 14:51:28 -03:00
LmeSzinc
b379ed283f Opt: Receive research in page_reward if save_get_items disabled 2020-07-21 04:46:48 +08:00
Erik
dab64a016b
Merge pull request #80 from LmeSzinc/master 
Fix: Revert template.ini
Add: Sync new feature among 3 servers
Fix: Commission mis-drop the last one
- Don't know why some old code is back after merge
Opt: Exercise logic in easiest_than_exp
Fix: Mission rewards checks wrong page if research reward disabled
 2020-07-20 13:50:32 -03:00
LmeSzinc
3b4aacada0 Fix: Commission mis-drop the last one 
- Don't know why some old code is back after merge
 2020-07-20 20:47:56 +08:00
LmeSzinc
657445d59f Fix: Mission rewards checks wrong page if research reward disabled 2020-07-20 18:51:56 +08:00
whoamikyo
bc7b8175db Opt: added battle logic for A maps in ISSS event 
Fix: [EN] minor fix in commission dictionary
 2020-07-20 02:15:36 -03:00
Erik
0c9dc07b50
Opt: pyocr requirements is now JP only (#78) 
* Fix: Wrong daily executed count

* Opt: Stop swiping commission list if already reached bottom

* Fix: Config in template.ini for chapter CD

* Fix: Classroom no book chose

* Fix: Choose next research if resources not enough

* Add: Research projects save screenshot before refresh

* Fix: Commission mis-drop the last one

* Opt: pyocr requirements is now JP only

Co-authored-by: LmeSzinc
 2020-07-19 13:48:18 -03:00
Erik
c9326db227
Fix: Config in template.ini for chapter CD (#77) 
* Fix: Wrong daily executed count

* Opt: Stop swiping commission list if already reached bottom

* Fix: Config in template.ini for chapter CD

Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
 2020-07-19 02:37:00 -03:00
LmeSzinc
cf02f60773 Fix: wrong attribute name in tactical class 2020-07-18 23:44:04 +08:00
LmeSzinc
e423fa08eb Add: Able to attack chapter CD for event daily bonus 2020-07-18 23:37:51 +08:00
LmeSzinc
6f8eba803d Del: Tactical class night 
- Fix classroom stuck when no books satisfied
 2020-07-18 23:02:44 +08:00
LmeSzinc
79b00ba8a1 Fix: Loop call between event_daily_ab and reward 2020-07-18 17:35:01 +08:00
whoamikyo
34eabced26 Merge branch 'nightly' of https://github.com/whoamikyo/AzurLaneAutoScript into nightly 2020-07-17 16:37:34 -03:00
whoamikyo
f80ef4d39d Fix: fix commission filter to match with newer OCR 2020-07-17 16:37:30 -03:00
LmeSzinc
bef59381d5 Fix: Research receive in reward 2020-07-17 11:08:23 +08:00
LmeSzinc
567c4a790a Add: Research to GUI 
- Opt: Faster page switch in reward
 2020-07-17 09:28:11 +08:00
LmeSzinc
0bb163d890 Opt: page_reward goto page_main 2020-07-17 03:32:18 +08:00
LmeSzinc
0a8a90cdb1 Typo: Docstring in assets.py 2020-07-15 23:33:38 +08:00
LmeSzinc
fa3eff638f Typo: Docstring in ocr 2020-07-15 15:50:58 +08:00
ferina8-14
06cce7fbce Add: [JP] add ocr (using tesseract command) 2020-07-15 14:22:11 +09:00
LmeSzinc
3e463f15b7 Merge branch 'master' into dev 2020-07-15 04:38:51 +08:00
LmeSzinc
0cc2fe2946 Fix: OCR in campaign, commission, daily, hard, fleet, raid, oil 
- Add Digit OCR
 2020-07-15 03:39:04 +08:00
LmeSzinc
a181484e5b Fix: Increase retry interval in commission start for slow device 2020-07-14 03:42:01 +08:00
LmeSzinc
b7a89bf8b0 Fix: Get items more than 2 rows in research 2020-07-14 01:56:50 +08:00
whoamikyo
90f7f02664 Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript into LmeSzinc-master 2020-07-12 15:53:13 -03:00
LmeSzinc
3c2698b64e Fix: Research popup in page_main 2020-07-12 03:11:22 +08:00
whoamikyo
ca7eef52ea Fix: [EN] Fix EN filters 2020-07-09 11:43:25 -03:00
LmeSzinc
1e79fd5386 Fix: Handle info_bar when get ship in Launch Ceremony commissions 2020-07-06 04:10:53 +08:00
LmeSzinc
3a32f87da5 Fix: Skip story when receiving mission reward 2020-06-30 07:22:12 +08:00
LmeSzinc
56a10cdea6 Fix: enable_mission_reward not working 2020-06-30 07:15:19 +08:00
LmeSzinc
22203ccb7b Add: Run daily as a part of reward, disabled by default 2020-06-29 00:07:06 +08:00
whoamikyo
c8bdb7c0c2 Assets: Added Assets for equipment 
- Minor changes in dev_tools.bat
 2020-06-26 19:25:06 -03:00
whoamikyo
c735df79b9 Add: Added new update check 
- @LmeSzinc made another update check with proxy support, I just add a github token support because github api has a limit of 60 requests per hour for unauthenticated requests.
 2020-06-21 13:17:23 -03:00
whoamikyo
08fa859163 20200620.04 
Map: added camera_data_spawn_point on 6-4
 2020-06-20 16:23:17 -03:00
whoamikyo
2961d5a827 Fix: [EN] Added new commission filter 2020-06-19 23:43:38 -03:00
whoamikyo
7a431f90a8 Enhancement: Made major enhancements on Easy_Install-V2.bat 2020-06-19 05:29:39 -03:00
whoamikyo
edc3a936d4 Fix: [EN] fix commission filter 2020-06-19 03:31:03 -03:00
whoamikyo
aadfb2e00b Fix: [EN] Some tweaks on commission dictionary 2020-06-19 00:45:48 -03:00
whoamikyo
26a321a916 initial commit 2020-06-16 00:30:50 -03:00
ferina8-14
0a1b1ea121 Add: [JP] add jp assets 2020-06-13 03:41:21 +09: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
9714b6bb1e Add: [JP] add jp assets, reward module 2020-06-13 02:53:29 +09:00
kyO The NinjA
ae88a57eba Fix: [EN] Fix Miss detect lines as characters in Commission module 2020-06-08 07:54:21 -03:00
kyO The NinjA
95ca113562 Add: Map 11-4 support, Columbia farm is real 
Add: Suport to Rank B
 2020-06-08 03:16:00 -03:00
LmeSzinc
141599c883 Fix: Now will only run commissions with priority > 0 2020-06-06 22:42:32 +08:00
LmeSzinc
3c35974bbe Fix: add new day check to reward_loop 
- Fix emotion reduce when calculating recover
 2020-06-06 21:53:31 +08:00
LmeSzinc
83afdafccb Fix: Commission not found 
- Add commission_swipe_to_top, because switching daily/urgent won't reset commission list now
 2020-06-05 18:10:48 +08:00
kyO The NinjA
2c3919c2e1 Revert "Optimization: [EN] changed translator" 
This reverts commit 68fbe6801e.
 2020-06-03 13:51:54 -03:00
kyO The NinjA
68fbe6801e Optimization: [EN] changed translator 2020-06-03 13:49:58 -03:00
Erik
8924d2369a
Merge pull request #11 from LmeSzinc/master 
Add: dev_tools item statistics and doc
 2020-06-03 05:16:11 -03:00
LmeSzinc
30e11c6caf Fix: Re-check all timeout timer 
- Fix tactical class get stuck when skill level reach to max.
 2020-06-03 05:06:51 +08:00
kyO The NinjA
bfb4c71aa1 Fix: [EN] Fix wrong filter in commission module, the commission Aiding Manne Island is categorized incorrectly in wiki 2020-06-01 21:25:32 -03:00
kyO The NinjA
2a301be4ef Fix: [EN] Fix commission reward stuck 2020-06-01 15:13:34 -03:00
LmeSzinc
f406022da0 Fix: [EN] commission classification 2020-06-01 08:51:28 +08:00
kyO The NinjA
12ec4ce55d Add: [EN] hard-coded package_name in argparse_en, because there's only one Azurlane in EN thanks @LmeSzinc 
Add: [EN] development_en.md
 2020-05-30 15:55:59 -03:00
kyO The NinjA
c491fe7ec5 Add: [EN] New B2 battle logic thanks @justtesting 
Add: [EN] New C1 battle logic
Add: [EN] New B3 battle logic
Add: [EN] New D3 battle logic
Add: [EN] New assets
 2020-05-30 05:41:06 -03:00
kyO The NinjA
0b8fe315f8 Quick guide update 2020-05-30 01:24:37 -03:00
kyO The NinjA
b12d8f299c Add: [EN] Assets updated 
Fix: [EN] A3 and C3 of the event Iris of Light and Dark Rerun
Optimize: [EN] commission filter, expect many mistakes yet
Optimize: [EN] added some tips on GUI
Add: [EN] New assets for Tactical Class, this module should work now
 2020-05-30 01:09:51 -03:00
kyO The NinjA
1fc34e3320 [EN] Commission dictionary optimization 2020-05-29 16:05:55 -03:00
kyO The NinjA
09bd560e83 [EN] Commission dictionary optimization 2020-05-29 15:59:18 -03:00
kyO The NinjA
0498176a32 Merge branch 'master' of https://github.com/whoamikyo/AzurLaneAutoScript 2020-05-29 14:36:07 -03:00
kyO The NinjA
fe6815d20a [EN] Localization progress 
- Some GUI optimizations
- Minor fix in Quick Guide
 2020-05-29 14:34:43 -03:00
Erik
1a369a68b7
Merge pull request #4 from LmeSzinc/master 
Fix: using old api in Screen size check
 2020-05-29 14:06:09 -03:00
LmeSzinc
3702b1c6da Fix: [CN] unknown commission genre 
- add server validation on commission module
 2020-05-29 16:33:16 +08:00
kyO The NinjA
86a12455b9 COMMISSION_HAS_PENDING asset updated 2020-05-29 00:11:52 -03:00
kyO The NinjA
916e797b34 New assets 
- New assets
- New parameters for EN event maps
- New tips GUI
 2020-05-28 18:37:17 -03:00
kyO The NinjA
10b53f80ba Localization for EN version 
- Updated assets for EN version
- Created EN dictionary
- Fix Stage OCR recognition Thanks @LmeSzinc
 2020-05-27 10:32:05 -03:00
LmeSzinc
2f1f999ce5 Add: multi-server support 2020-05-25 22:05:42 +08:00
LmeSzinc
47c4afdaae Fix: 修复7-2三站拣垃圾 2020-05-18 17:59:38 +08:00
LmeSzinc
3eaa5c9bd8 Fix: 修复战术学院技能点太快检测不到书本的问题 2020-05-17 00:22:45 +08:00
LmeSzinc
d8683d4b95 Fix: 修复战术学院技能学满时卡住的问题 2020-05-15 14:20:40 +08:00
LmeSzinc
fa0a243df1 Refactor: 合并处理消息的类 2020-05-15 14:19:34 +08:00
LmeSzinc
43b359464f Fix: 修复战术学院收获 2020-05-07 09:45:43 +08:00
LmeSzinc
65de042dd3 Add: 增加挂机收菜模式 2020-05-06 23:53:25 +08:00
LmeSzinc
1c2db1ec26 Add: 增加战术学院收获 
- 修复委托收获时可能卡住的问题
 2020-05-05 17:27:19 +08:00
LmeSzinc
61aa7d8340 Fix: 修复截图速度过慢时出现的问题 
当使用像以下结构的代码时, 需要增加触发计数
否则当截图耗时大于计时器触发时间时, 会触发错误的结果
if self.appear(MAIN_CHECK):
    if confirm_timer.reached():
        pass
    else:
        confirm_timer.reset()
 2020-04-28 14:37:13 +08:00
LmeSzinc
152e0431e5 Fix: 修复委托过多时找不到委托的问题 2020-04-26 15:40:14 +08:00
LmeSzinc
bea05d396e Add: 适配复刻苍红的回响AB图 
- 开荒模式移动至出击设置
- 增加开荒模式自动启用, 无脑开就完事了
- 将透视识别参数放到了config里, 这样就可以用地图config覆盖了
- 适配小地图模式, 参数抄A1就行了
- 修复了章节名OCR的识别位置
- 修复了开荒会把BOSS当作精英打问题
- 增加战斗中的剧情跳过
- 注释掉了截图和点击的retry
- 增加了捕捉目标点超出移动范围
 2020-04-24 15:26:11 +08:00
LmeSzinc
70936f4f39 Add: 适配第二章 
- 修复了不开启周回模式时, 会在出击界面开启自动的问题
- 修复了多打一战后, 打完BOSS不判定当前出击结束的问题
- 增加掉落新船时锁定的功能
- 增加了地图不支持周回模式时, 跳过周回检查的功能
  周回模式的选项可以无脑开了
- 修改透视识别报warning为info
  因为低级图地图小降低了检测的阈值, 导致需要纠正错误有点多
- 减少了战斗准备页面的多余点击
- 减少了挂委托时的多余点击
 2020-04-14 17:32:26 +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
5b3dc4ec85 Fix: 修复一些bug 
- 修复了删除空列时, 边缘仍然存在, 导致网格定位出错的问题
- 修复了在边缘外有错误的内部线时, 会把边缘删除的问题
- 调整了一图的边缘识别参数
- 修复了紧急委托过多时, 会触发同一按钮点击过多停止的问题
  委托列表拖动方式从 拖动-点击 改为 拖拽抖动
  独立出random_rectangle_vector函数
  增加random_line_segments函数
- 更改: 索敌时默认使用地图权重
- 修复了收菜获取物品过多时会卡住的问题
- 写死了1-1的相机移动, 防止因为地图太小导致透视识别错误
 2020-04-13 18:49:28 +08:00
LmeSzinc
be00742c3c Add: 适配第一章, 修复大量bug 
- 修复处理夜间委托时, 出现递归调用的问题
- 增加红脸出击确认的功能
- 增加了透视识别错误图片保存的开关
- 修复了地图太小时, 透视识别报错的问题
- 修复了相机位于地图外时, 透视识别出错的问题
- 修复了离开退役时, 会连击的问题
- 修复了同时出现低心情和船坞已满弹窗时, 卡住的问题
- 更新了一键退役实装后的安全点击的位置
- 修复了换装滑动失败时, 卡住的问题
- 修复了关闭自动收获后, 出现委托完成的提示是, 进图卡住的问题
- 修复了, 无正在跑的委托时, 报错的问题
 2020-04-11 15:26:42 +08:00
LmeSzinc
012a4decbb Add: 更多收菜的触发条件 
- 在主线图时, 出现委托完成的红点, 会触发收菜
- 完成每日任务时, 会触发收菜
- 执行收菜设置时, 会触发收菜
 2020-04-10 15:19:02 +08:00
LmeSzinc
cae9762b65 Fix: 解决领完任务还会完成新的任务的问题, 修复困难图 
- 给之前修的一堆bug擦屁股
- 修复了舰队不上满的时, 会触发低血量撤退的问题
 2020-04-08 12:18:58 +08:00
LmeSzinc
59756c4f2c Optimize: 优化7-2, 增加索敌条件筛选 
- 每个索敌函数都支持了条件筛选, 打BOSS除外
- 7-2会打更多的大型
- 去除了挂委托时多次的重置列表操作
- 修复了没有伏击时还是按照有伏击寻路的问题
- 优化了寻路距离的log显示
 2020-04-07 13:53:44 +08:00
LmeSzinc
87554793d3 Fix: 修复了一堆bug 
- 修复了上一场战斗的队伍位置信息会保留到下一场战斗的问题
- 修复了领取大量任务时, 不会等待的问题
- 修复了不计算BOSS队心情消耗的问题
- 增加了碰磁BOSS所有刷新点的方法
- 修复了没有检测到BOSS时停滞的问题
- 修复了处理夜间委托
- 修复了丢失地图信息补全不起作用的问题
- 修复了换装滑动失败后, 陷入死循环的问题
- 删除了微层混合AB图的一些多余逻辑
- 7-2现在会优先捡全部问号了, 不需要先捡附近的来减少行走距离.
 2020-04-07 11:20:38 +08:00
LmeSzinc
7523847fac Add: 增加了挂委托的功能 2020-04-06 19:01:22 +08:00
LmeSzinc
c2f74dda79 Add: 增加了收菜模块的设置 
- 增加了出击后定时回港收菜的功能
- 支持收食堂, 小卖部, 任务, 委托, 科研, 未支持委托派遣, 挂科研, 学技能
- 合并了收菜模块的文件
- 修正了收菜模块资源名称的拼写错误
 2020-04-01 22:40:21 +08:00
LmeSzinc
1921142369 Add: 收菜模块, 收食堂小卖部和任务 
- 独立出处理物品掉落和舰娘掉落的方法
 2020-03-31 14:23:44 +08:00