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
LmeSzinc
52fd201920 Opt: Use scroll handler in commission 2021-06-26 21:55:01 +08:00
noname94
031633c6c2 Fix: [JP] assets update 2021-06-18 15:19:05 +09:00
Ray
0248baa5a5 Fix: [JP] Meowfficer UI asset update 2021-06-14 00:23:40 +08:00
LmeSzinc
8a8808c563 Fix: [CN] Meowfficer UI asset update 2021-06-13 18:55:50 +08:00
nEEtdo0d
d5db59f3dd Fix: [EN] Meowfficer UI asset update 2021-06-11 01:00:42 -04:00
LmeSzinc
16858b929b Fix: Wrong keywords in urgent_part commission 
Got wrong data in https://azurlane.koumakan.jp/Commissions.
"Aiding Manne Island" and "Aiding Isle of Man" are urgent_part not urgent_book.
 2021-06-09 09:39:09 +08:00
LmeSzinc
127212b204 Add: Do os in daily 2021-04-27 16:27:55 +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
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
5c78502901 Fix: Retry clicking dorm feed cancel 2021-04-06 21:59:25 +08:00
nEEtdo0d
8380129388 Del: Redundant, not cloned/copied. Any update reflected to all references effectively 2021-03-26 22:07:42 -04:00
LmeSzinc
f23e640136 Fix: Student card detection in tactical class 2021-02-26 20:48:57 +08:00
whoamikyo
a0f84696e1 Opt: Few changes to match with new notifications system 2021-02-19 20:01:32 -03:00
whoamikyo
66f9ff53cb Added: added OPsi clear toast notification 2021-02-15 12:39:35 -03:00
whoamikyo
7de1736bf6 Opt: added new toast notifications to daily events 2021-02-11 17:30:56 -03:00
whoamikyo
5a881712d5 Fix: fix jellyfish import 2021-02-11 17:22:29 -03:00
whoamikyo
e856f64606 Opt: Levenshtein replaced by jellyfish 2021-02-11 08:10:43 -03:00
nEEtdo0d
eabede70e1 Fix: Merge latest and resolve conflict in module/campaign/run.py 2021-01-27 15:34:37 -05:00
nEEtdo0d
47ab56713f Opt: Transfer of detection status for hard campaign 
Ensure if already True, does not get overwritten
If SP/AB enabled, their run will do handle_guild and
reset the global configuration when executed
If disabled, reward_when_finished will do so instead
 2021-01-27 15:16:31 -05:00
nEEtdo0d
cc5972365d Opt: Add additional parameter to select ui_click calls during daily 
Transfer detection status to ensure reward_when_finished or
continuing campaign run will execute handle_guild
 2021-01-27 13:50:26 -05:00
LmeSzinc
5ac50e6910 Add: Support auto search 2021-01-28 00:35:15 +08:00
LmeSzinc
c6d5438408 Fix: Cover ENABLE_MAP_FLEET_LOCK in daily hard only, not effect event daily 2021-01-27 14:45:37 +08:00
LmeSzinc
c2f23ab5fd Del: Delete spare fleet 
- Fix: [JP] guild boss setting in GUI
 2021-01-22 17:02:35 +08:00
nEEtdo0d
ac6c82a496 Add: MISSION_POPUP_* assets and handling 
TODO: [CN, TW, JP] may need to replace unless POP_UP_* assets are sufficient
EN may be the only server that has altered pop up for these missions
 2021-01-17 22:23:40 -05:00
LmeSzinc
58cbc8033c Add: Daily OS ash beacon assist 
- TODO: [EN][JP][TW] Replace assets
 2021-01-15 17:41:39 +08:00
nEEtdo0d
ace37b5000 Del: Complete migration of guild, delete original reward module 2021-01-05 19:43:50 -05:00
nEEtdo0d
c95ad651be Opt: Code clean up and formatting 2021-01-05 19:37:08 -05:00
nEEtdo0d
9039788063 Opt: Set flags to configured values when applicable 2021-01-05 19:30:53 -05:00
nEEtdo0d
532e4ae8e4 Opt: Update RewardGuild class source 2021-01-05 17:11:01 -05:00
nEEtdo0d
51fcd234d1 Del: Removed unused import 2021-01-05 15:45:25 -05:00
nEEtdo0d
83807683e4 Del: Removed unused import 2021-01-05 15:20:08 -05:00
nEEtdo0d
9efa4bd1d9 Del: Remove unused import 2021-01-05 14:58:56 -05:00
nEEtdo0d
fc43c1b6cb Opt: Explanatory comment for debugging 2021-01-04 19:30:02 -05:00
nEEtdo0d
958c00568d Opt: Renamed and rearranged methods 2021-01-04 18:17:22 -05:00
nEEtdo0d
c2cefd77cb Opt: info_bar_count instead of ensure_no_infobar to exit loop 2021-01-04 12:06:42 -05:00
nEEtdo0d
f1819c1670 Fix: Call guild_interval_reset() after successful run 2021-01-03 22:15:57 -05:00
nEEtdo0d
44df42ecb0 Fix: Added and renamed assets, removed unused assets 2021-01-03 21:22:46 -05:00
nEEtdo0d
dab1f2375d Opt: Change EXCHANGE_ITEMS to cached_property, reducing 
excessive loading template folder
 2021-01-03 21:07:57 -05:00
nEEtdo0d
75a22785b4 Opt: Code clean up, remove unused variables and methods 2021-01-03 20:54:34 -05:00
nEEtdo0d
3009c1e56d Opt: Re-vamped logistics processing to while definition structure 2021-01-03 20:47:10 -05:00
nEEtdo0d
7a318b89e4 Opt: Determine guild affiliation in logistics 
no dependency to go to lobby
 2021-01-03 18:04:50 -05:00
nEEtdo0d
0d732e8284 Opt: Handle leader and member sidebar, retain consistency in indices 
regardless of which sidebar dealt with
 2021-01-03 17:40:44 -05:00
nEEtdo0d
b6e3222927 Opt: [JP, TW] Clean up dev_tool.button_extract output 
Copied placeholder assets from CN to missing servers
 2021-01-01 15:43:59 -05:00
nEEtdo0d
27afc2d8a7 Add: [CN, JP, TW] Guild asset placeholders, replace before using 
TODO: GUILD_MISSION_*, GUILD_SUPPLY_*, OCR_GUILD_EXCHANGE_INFO if
digit inventory displayed in different line, and GUILD_CHECK
 2021-01-01 15:01:59 -05:00
nEEtdo0d
e9e1dc2503 Fix: Rename variables for consistency among other reward modules 2020-12-31 22:57:52 -05:00
nEEtdo0d
365d7d9ef5 Fix: GUILD_SUPPLY_REWARDS_AZUR asset 2020-12-31 14:36:12 -05:00
nEEtdo0d
f949c8bed1 Opt: Move warning, print processed choice for run for record to look back on 2020-12-31 14:24:39 -05:00
nEEtdo0d
c3ff37956d Fix: Moved load_template_folder from top to right before needed 2020-12-31 13:41:19 -05:00
nEEtdo0d
63e2064f68 Opt: Use index() to retrieve plate_weight 2020-12-31 13:17:42 -05:00
nEEtdo0d
7c997fa9de Opt: Removed debug line 2020-12-30 20:10:45 -05:00
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