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,388 Commits 9 Branches 0 Tags 274 MiB
7b9edcaf37
Commit Graph

456 Commits

Author SHA1 Message Date
LmeSzinc
f0426236c8 Upd: [EN] REWARD_* assets 2022-08-19 00:09:44 +08:00
LmeSzinc
e8bfd08eba Merge branch 'bug_fix' into dev 
# Conflicts:
#	module/config/config_generated.py
 2022-08-04 21:18:04 +08:00
Zorachristine
e2a55e1b58 Fix: [TW] DORM_INFO 2022-08-04 20:01:23 +08:00
LmeSzinc
a4cfe89476 Fix: Handle skin and item expired (fixed #1309) 2022-08-01 00:39:27 +08:00
LmeSzinc
e7b9615f10 Fix: Handle battle pass PURCHASE_POPUP at main page 2022-08-01 00:30:53 +08:00
LmeSzinc
f7d50a5306 Fix: Shinano event may be detected as raid 2022-07-17 01:20:25 +08:00
LmeSzinc
1205b716c2 Upd: OS_CHECK for all servers 2022-07-14 18:53:11 +08:00
LmeSzinc
96e4e75854 Fix: Ignore swipe distance check in SOS 
fix when sos maps haven't fully unlocked
 2022-07-09 13:19:06 +08:00
LmeSzinc
e4904c977f Fix: Mis-detect GET_SHIP after clicking MAIN_GOTO_CAMPAIGN (fixed #1231) 2022-07-09 13:03:48 +08:00
LmeSzinc
c58e7a8359 Fix: [JP] EXCHANGE_CHECK is detected when goto page_supply_pack 2022-07-02 16:16:25 +08:00
LmeSzinc
1f1141a1f5 Fix: Clicked GET_SHIP when exiting page_meowfficer (#1273) 
- Rename MEOWFFICER_GOTO_DORM to MEOWFFICER_GOTO_DORMMENU for clarity
 2022-07-02 16:06:24 +08:00
chpkq
91ce67cf23 Upd: [TW] shipyard daily 2022-07-02 01:53:25 +08:00
LmeSzinc
d9b5392b58 Upd: [EN][JP] RAID_CHECK 2022-07-01 03:02:29 +08:00
LmeSzinc
858be97b2e
Merge pull request #1271 from Zorachristine/master 
Fix: [TW] raid_check assets
 2022-06-30 22:28:42 +08:00
LmeSzinc
c6a4c13038 Add: Support PT limit in Raid 
- Fix: Disable RAID_FLEET_PREPARATION at startup
- TODO: EN and JP need to update IRIS_OCR_PT
 2022-06-30 22:26:54 +08:00
Zorachristine
7794e2ad74 Fix: [TW] raid_check assets 2022-06-30 22:20:10 +08:00
LmeSzinc
a1d1e0695d Fix: Check rotation if ui unrecognised 2022-06-13 01:24:04 +08:00
LmeSzinc
ee9cffbb2f Add: Scrolling medal shop list 2022-06-05 23:54:01 +08:00
LmeSzinc
d51fc8f3eb Fix: Shop module quick fix except the new medal shop 
- Fix: Cannot detect AMOUNT_MAX in core shop
- Todo: All servers need to update SHOP_MEDAL_SWIPE_END and SHOP_MERIT_SWIPE_END
 2022-06-03 03:20:55 +08:00
nEEtdo0d
f1e5420cc8 Fix: [EN] move os monthly reset check to top; clashes with reset ticket popup confirm 
Add: explicit return bool for ui_page_main_popups
 2022-05-29 15:49:28 -04:00
LmeSzinc
6d18798f2c Opt: Add UI switch details in log 2022-05-16 22:33:03 +08:00
Zorachristine
98de926afc Fix:[TW] RAID_CHECK assets 2022-05-05 22:01:30 +08:00
LmeSzinc
b3a85f9ba5 Fix: Handle popups after exiting from page_tactical to page_reward (#1018) 2022-04-17 19:52:21 +08:00
Egor Nats
6eac8ae259 Opt: Imports isorted 2022-04-14 16:37:54 -03:00
Egor Nats
1101d01a0d Fix: [EN] Fixed Dorm stuck after XP screen 2022-04-14 13:33:28 -03:00
LmeSzinc
a21fce7788 Fix: Lower the threshold of DORM_INFO to 0.75 2022-04-14 00:46:36 +08:00
nEEtdo0d
e57309d888 Upd: [EN] additional post update assets 
Add: restore select partial commits; 1e13eab, c3c0ba4, 1cc28f5
 2022-04-12 22:55:49 -04:00
Egor Nats
2166bf9066 Fix: [EN] Fix Tactical Class and Dorm Feature. 2022-04-12 13:21:08 -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
LmeSzinc
987b7b7b4e Fix: Handle game freeze at the first retreat after client start 2022-04-12 18:17:48 +08:00
nEEtdo0d
6f7699b0d5 Upd: gem farming module assets (#1003) 2022-04-10 17:34:40 -04:00
LmeSzinc
c7f62b8b19 Fix: Increase UI search range to 30px 2022-04-11 02:31:20 +08:00
SaarChaffee
303dd90fdc change CRLF to LF 2022-04-09 23:31:09 +08:00
nEEtdo0d
7779bc7672 Upd: [EN] remaining post major update assets 
Upd: [EN] adopt same style as other servers for MAIN_GOTO*

TODO: other uncommon assets updated when available; debug tactical class, stuck frequently
 2022-04-08 19:09:08 -04:00
Zorachristine
4b0ade4801 Upd: [TW] MAIN_GOTO_* assets 2022-04-08 19:30:57 +08:00
Zorachristine
ebdf4fa6a3 Upd: [TW] TACTICAL_CLASS_CANCEL & DORM_INFO 2022-04-08 19:05:13 +08:00
LmeSzinc
1e13eaba08 Del: Redundant assets WAR_ARCHIVES_GOTO_CAMPAIGN 2022-04-08 17:37:15 +08:00
LmeSzinc
c3c0ba4443 Upd: [CN] CAMPAIGN_MENU_GOTO_CAMPAIGN to handle random shifting (#993) 2022-04-08 17:31:56 +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
LmeSzinc
71e325e1a2 Upd: [JP] DORM_INFO 2022-04-07 20:46:28 +08:00
LmeSzinc
9720cec0c6 Fix: Exit from OpSi exchange shop 2022-04-01 00:09:18 +08:00
LmeSzinc
8d25e709c3 Fix: Handle battle pass notice 2022-03-31 21:32:34 +08:00
LmeSzinc
7979d8e7c7 Opt: handle OpSi monthly reset for quality of life 2022-03-31 21:32:34 +08:00
LmeSzinc
af3e402c49 Fix: Handle monthly pass notice 2022-03-31 21:32:17 +08:00
LmeSzinc
095eec9a92 Fix: Handle login at startup (#976) 2022-03-20 16:34:31 +08:00
LmeSzinc
40396b21fe Fix: [EN] Move MEOWFFICER_CHECK to upper-left to be compatible with meow_menu_close() 2022-03-20 16:25:34 +08:00
LmeSzinc
dbfbd294ff Fix: Confirm unknown ui page; 5 seconds timeout (#956) 2022-03-07 22:18:10 +08:00
LmeSzinc
526d85bf14 Merge branch 'dev' 2022-03-07 20:32:55 +08:00
railzy
16c4a72f90 Upd: [JP] assets for meta reward 2022-03-07 11:57:58 +08:00
LmeSzinc
7e0cd13410 Opt: Increase speed in meowfficer module by reusing screenshots 
- Fix: Page transaction and ui_additional() run at the same time in ui_goto()
 2022-03-06 20:47:29 +08:00
LmeSzinc
3bfa8d00ed Fix: Scroll disappear when trying to drag it 
A random issue in commission scanning
 2022-03-01 23:20:24 +08:00
Zorachristine
12badf6c35 Upd: [TW] supply_pack assets 2022-02-21 21:28:08 +08:00
nEEtdo0d
6e82e6800e Add: [EN] meta_reward assets 2022-02-15 19:31:23 -05:00
LmeSzinc
9266f3b3fc Add: Receive META rewards (#863) 2022-02-12 23:05:23 +08:00
LmeSzinc
f891689bee Fix: Increase interval of GET_SHIP to stagger clicks 2022-02-07 23:28:36 +08:00
LmeSzinc
ef173788a5 Merge branch 'dev' 
# Conflicts:
#	module/meowfficer/assets.py
 2022-02-06 12:31:54 +08:00
Zorachristine
20aee8fdf7 Fix: [TW] BATTLE_PASS_CHECK & OCR_GUILD_EXCHANGE_LIMIT assets 2022-02-05 10:11:08 +08:00
LmeSzinc
893dc62afb Opt: [CN] Handle user agreement in pure image detection 
- Add image_color_button()
- Remove unused assets in login
 2022-02-02 19:44:58 +08:00
LmeSzinc
df310b9d09 Opt: Remove unnecessary use of drags, fallback to swipe+click if drag is a must 2022-02-01 21:49:57 +08:00
LmeSzinc
b54b2fe036 Merge branch 'master' into dev 2022-01-28 21:32:35 +08:00
LmeSzinc
e037b2040b Upd: [EN] Joint Battle Mystery Investigation assets 2022-01-28 01:47:51 +08:00
LmeSzinc
e92579b5f9 Opt: Remove redundant converts from pillow to numpy 2022-01-24 23:43:53 +08:00
LmeSzinc
65f166ad12 Refactor: Use numpy image cache instead of pillow image 2022-01-23 23:03:55 +08:00
LmeSzinc
ec4fec4f6d Opt: Remove STAGE_SHOWN_WAIT for faster 2022-01-10 23:54:02 +08:00
LmeSzinc
50b5b49365 Opt: Faster Switch.set(), replace click-wait with click interval 2022-01-10 20:35:07 +08:00
LmeSzinc
84f5e86077 Fix: Hunt zone view re-enabled by game 
- Fix: Validate switch status
 2022-01-10 01:27:03 +08:00
LmeSzinc
394bc195af Upd: [CN] META_CHECK 2022-01-05 18:12:36 +08:00
LmeSzinc
3c483885e1 Revert "Fix: Add counter to retry timer for slower retries on slow PCs", increase retry interval instead 
This reverts commit e0bb6123
 2021-12-24 00:25:25 +08:00
Cola
850c93d31d Fix: [JP] Battle pass & os fleets assets 2021-12-10 19:00:01 +08:00
LmeSzinc
d5735604e1 Dev: Uniform comments of generated files 2021-12-07 23:29:33 +08:00
nEEtdo0d
bc9eb2f6d8 Add: ui_additional handling for shipyard and meta lab as can be routed from confirm click 2021-12-03 22:56:03 -05:00
nEEtdo0d
04e89faa08 Add: [EN] battle pass assets 2021-12-03 09:46:27 -05:00
LmeSzinc
ff7c875f3f Add: Collect battle pass rewards 2021-12-03 17:32:10 +08:00
Ray
f4805a8ff1 Upd: [JP] assets for guild operations & weekly... 
free pack & TEMPLATE_CRIMSON_ECHOES
TODO:
- GUILD_MISSION_NEW
 2021-11-30 22:39:33 +08:00
nEEtdo0d
32e24814b6 Add: [EN] assets to support weekly free supply pack purchasing 2021-11-29 22:46:28 -05:00
LmeSzinc
9d3917677e Add: Buy free weekly supplies pack 2021-11-27 15:23:13 +08:00
Zorachristine
ba1ae30a04 Fix: [TW] guild, os, research, ui assets 2021-11-20 22:21:06 +08:00
julystone
08f13bc2b3 Fix[tw]: Asserts replace RESHMENU_GOTO_RESEARCH 2021-11-19 16:33:43 +08:00
LmeSzinc
5e2d5d7444 Upd: [EN] CAMPAIGN_CHECK.gif 
Use "hapter" instead of "Chapter", because letter "C" may be outside
 2021-11-13 17:31:51 +08:00
LmeSzinc
593855f629 Upd: [EN] CAMPAIGN_CHECK.gif for W14 2021-11-09 00:14:08 +08:00
nEEtdo0d
62a950c539 Fix: [EN] re-cut to not overlap with BUILD_SUBMIT_ORDERS 2021-11-06 11:00:40 -04:00
nEEtdo0d
75d6203b9a Fix: [EN] PLAYER_CHECK page has no GOTO_MAIN, only BACK_ARROW 2021-11-03 20:48:15 -04:00
LmeSzinc
a964f4e068 Merge branch 'master' into app 2021-10-23 14:53:06 +08:00
Zorachristine
3b8083ec0c Fix: [TW] MAIN_GOTO_RAID.BUTTON asset reset 2021-10-22 18:34:40 +08:00
LmeSzinc
6bf5f9fa92 Add: TaskHoardingDuration and CloseGameDuringWait (#643) 2021-10-18 21:36:22 +08:00
LmeSzinc
1481a9b582 Fix: Compatible with FLEET_2, SUBMARINE set 
- Add Story handler to ui_additional
 2021-10-16 11:46:32 +08:00
nEEtdo0d
616b66564e Merge branch 'master' into app 
# Migrate handle vote popup check from app to master as common code
# [TW] MAIN_GOTO_RAID asset
 2021-10-15 16:27:39 -04:00
Zorachristine
5ea1fa372c Fix: [TW] MAIN_GOTO_RAID.BUTTON asset for now 2021-10-15 22:56:01 +08:00
LmeSzinc
1a683b02a4 Merge branch 'master' into app 2021-10-15 21:22:41 +08:00
Zorachristine
f3f815df1e Upd:[TW] Raid_SURUGA assets 2021-10-15 18:59:27 +08:00
nEEtdo0d
d9cec4134e Add: war archives support for app 2021-10-10 23:38:10 -04: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
38f55a3a26 Merge branch 'master' into app 
# Conflicts:
#	module/config/config.py
#	module/reward/reward.py
 2021-09-30 21:26:25 +08:00
LmeSzinc
98f1657476 Upd: REWARD_GOTO_MAIN 2021-09-30 20:06:56 +08:00
LmeSzinc
b0f6798596 Merge branch 'master' into app 
# Conflicts:
#	module/reward/assets.py
 2021-09-30 16:09:42 +08:00
LmeSzinc
e01b2d49e8 Upd: Reward assets for all servers and add EXP 2021-09-30 16:05:04 +08:00
LmeSzinc
e1f6df02bd Opt: Faster switch between page_event and page_campaign 
- Fix: Unable to run dev_tools because task not bind
 2021-09-26 17:11:22 +08:00
LmeSzinc
4fd1147a40 Opt: Remove ensure main after task finishes 
- Clear offset of GOTO_MAIN to avoid clicking outside of screen
 2021-09-20 17:30:29 +08:00
LmeSzinc
8db4dd628b Fix: Clicking outside of screen in GOTO_MAIN 2021-09-20 09:02:54 +08:00
LmeSzinc
f71a151678 Merge branch 'master' into app 
# Conflicts:
#	module/campaign/gems_farming.py
#	module/config/config.py
 2021-09-19 23:34:30 +08:00
Ray
505d34f2bb Fix: [JP] META_CHECK asset 2021-09-18 14:29:20 +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
LmeSzinc
61cbe75527 Refactor: More accurate exceptions and add friendly advices 2021-09-16 12:09: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
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
nEEtdo0d
0d1c9729e4 Add: META_CHECK into ui_additional_page_reward, enter via popup skill at max level 2021-09-14 18:21:06 -04: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
b19fd32cc5 Scroll next and prev page 2021-09-14 14:56:25 +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
nEEtdo0d
63722cb342 Fix: [EN] GOTO_MAIN with no appear call defaults to .BUTTON position, can fail to transition for some pages in this case 2021-09-03 23:09:32 -04:00
LmeSzinc
2777f00584 Add: Obscure finish in OS fully auto 2021-08-22 00:16:40 +08:00
Cola
cf55dcd119 Fix: [TW] Shop module asset 2021-08-12 19:16:27 +08:00
Ray
bb04db4e1e Fix: [JP] SHOP&BUILD&ACADEMY assets 2021-08-08 23:33:54 +08:00
Ray
2b0c3afbe0 Fix: [JP] shipyard assets except RESEARCH_COMPLETE 2021-08-08 15:55:54 +08:00
LmeSzinc
b220d4d8ea Upd: [CN] Assets for shop module, but still having issues in guild shop 2021-08-08 00:41:21 +08:00
LmeSzinc
772bf15f62 Merge branch 'master' into dev 
# Conflicts:
#	module/ui/assets.py
 2021-08-07 14:32:31 +08:00
Ray
847b5376b5 Fix: [JP] SHIPYARD_CHECK asset 2021-08-07 13:55:32 +08:00
Cola
109d41e15b Fix: [TW] Research_* asset 2021-07-29 22:57:52 +08:00
Ray
943dc8bb2e Fix: [JP] MEOWFFICER_INFO & guild boss assets 2021-07-26 16:01:25 +08:00
LmeSzinc
63de5be652 Fix: Conflicts among branches 
- [CN][TW] Fix option name
- Change ButtonGrids.buttons() to ButtonGrids.buttons
 2021-07-24 17:53:45 +08: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
e416b92f7a Fix: Resolve merge conflict ui/assets.py 2021-07-23 10:21:26 -04:00
LmeSzinc
2e74d619a2
Merge pull request #539 from nEEtdo0d/quick_fix 
Fix: [EN] change MEOWFFICER_CHECK asset
 2021-07-23 21:26:38 +08:00
LmeSzinc
4fbfdc7ba2 Revert "Opt: Remove code for DOA commissions to avoid errors in the future" 
This reverts commit 2e05de02
 2021-07-23 16:17:09 +08:00
Cola
6d30da59f6 Fix: [TW] Dorm_Feed_Cancel&Ambush asset 2021-07-21 11:07:33 +08:00
nEEtdo0d
75cd81e7a1 Upd: commented with explanation 2021-07-18 10:07:44 -04: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
nEEtdo0d
e2ab0b4a0d Fix: [EN] change to different asset for MEOWFFICER_INFO delayed appearance 2021-07-17 21:18:43 -04:00
LmeSzinc
b3f42bfd7e Upd: [CN] SHIPYARD_CHECK 2021-07-16 21:41:43 +08:00
LmeSzinc
444eb56be1
Merge pull request #531 from nEEtdo0d/quick_fix 
Fix: [EN] stuck in research/shipyard after popup_confirm
 2021-07-16 19:26:52 +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
nEEtdo0d
b28027f135 Fix: [EN] use normal appear for innate interval option 2021-07-12 22:25:23 -04:00
nEEtdo0d
e6bd972188 Fix: [EN] stuck in shipyard with research popup_confirm 2021-07-12 22:19:59 -04:00
nEEtdo0d
5a26228082 Add: [EN] page support shipyard 
TODO: [CN, JP, TW] update SHIPYARD_CHECK for respective server
 2021-07-12 22:11:44 -04: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
nEEtdo0d
c1f299137b Add: [EN] shop related pages support 
TODO: [CN, TW, JP] replace with respective for their server
 2021-07-10 22:52:29 -04:00
LmeSzinc
5931c01a49 Merge branch 'master' into gems_farming 2021-07-10 15:47:33 +08:00
LmeSzinc
1bb93d3d1c Upd: Button extract 2021-07-10 10:56:11 +08:00
cola228
717b7a84f9
Merge branch 'master' into Fix-TW]-Tatical_Check,Auto_Search_Menu-update,add-Meowfficer_Info 2021-07-10 00:18:16 +08:00
Ray
83e2189ffd Upd: [JP] SURUGA_* and MEOWFFICER_INFO assets 2021-07-09 23:09:23 +08:00
Cola
81fe29efab Update 2021-07-09 22:41:50 +08:00
LmeSzinc
292c5d12be Merge branch 'master' into gems_farming 2021-07-09 14:53:14 +08:00
LmeSzinc
f00adbfc76 Upd: [CN] MEOWFFICER_INFO assets 2021-07-09 13:39:46 +08:00
LmeSzinc
214e0f4ab9
Merge pull request #515 from nEEtdo0d/update_assets 
Add: [EN] raid, meowfficer, 2x book, and auto search assets
 2021-07-09 13:36:11 +08:00
Cola
22ace76fbc Fix: [TW] Meowfficer buying not working 2021-07-09 11:31:29 +08:00
nEEtdo0d
3a2c473f69 Add: [EN] meowfficer comf-forts info handling for page_meowfficer 2021-07-08 16:09:07 -04:00
LmeSzinc
97980d1681 Fix: Able to do over scrolling 2021-06-29 23:01:44 +08:00
LmeSzinc
9405165b94 Add: Scroll handler 2021-06-26 21:48:16 +08:00
noname94
7ebe6fc361 Add: [JP] assets update 2021-05-12 10:57:36 +09:00
nEEtdo0d
990e9365c5 Fix: [EN] ui page assets changed after update 2021-04-22 16:33:47 -04: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
nEEtdo0d
94efd9d85d Fix: [CN, TW, JP] OS_CHECK asset 2021-04-09 10:49:36 -04:00
nEEtdo0d
fb1bf1165e Fix: OS Ash Daily Assist page transitions 2021-04-09 01:16:37 -04:00
Zorachristine
b9e4df458b Fix: [TW] exercise and campaign assets 2021-03-15 23:33:31 +08:00
Ray
fb7e62593c update jp ui assets 2021-01-26 14:22:01 +08:00
LmeSzinc
614bf0fb22 Upd: [CN] page_guild assets 2021-01-18 16:57:18 +08:00
LmeSzinc
e6c8e6fcc8
Merge pull request #304 from nEEtdo0d/update_asset 
Fix: Assets, InfoGuild, and RewardGuild
 2021-01-18 16:10:06 +08:00
nEEtdo0d
1e5894c544 Add: [EN, TW, JP] OS_CHECK for page_os. 
TODO: [TW, JP] Replace may be needed, CN and TW might be same
 2021-01-17 20:33:20 -05:00
nEEtdo0d
c1b9cc6c40 Add: [EN, TW, JP] UI switches for page_os, replace not needed 2021-01-17 20:06:01 -05:00
nEEtdo0d
e3b34c42a9 Fix: Adjust handle_guild various circumstances 
Add: handle_guild_popup_cancel check for ui_additional_page_reward
 2021-01-16 15:36:44 -05:00
LmeSzinc
717420aa6a Fix: Handle guild popups 2021-01-15 22:32:06 +08:00
LmeSzinc
dc9b49b67b Add: UI switches for page_os 2021-01-15 17:38:06 +08: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
c398d7422e Fix: Resolve merge conflicts with page.py, new page page_guild 
Merge remote-tracking branch 'origin/master' into guild_reward

# Conflicts:
#	module/ui/page.py
 2021-01-01 10:51:52 -05:00
LmeSzinc
f7a7c1866e Del: Old UI page links, since TW is updated 2021-01-01 17:50:54 +08:00
Zorachristine
abc8188331 Add: [TW] Campaign menu and SOS 2021-01-01 14:44:28 +08:00
nEEtdo0d
5628774d70 Merge remote-tracking branch 'origin/master' into guild_reward 2020-12-30 12:04:13 -05:00
ferina8-14
1b4b78d2c0 Fix: [JP] CAMPAIGN_MENU_GOTO_EVENT asset 2020-12-30 16:52:49 +09:00
nEEtdo0d
96a335763d Merge remote-tracking branch 'origin/master' into guild_reward 2020-12-29 13:18:37 -05:00
whoamikyo
c173135cf9 Fix: [EN] fixed CAMPAIGN_MENU_GOTO_EVENT asset 2020-12-29 13:38:29 -03:00
nEEtdo0d
a415faa8f5 Merge remote-tracking branch 'origin/master' into guild_reward 2020-12-29 10:05:34 -05:00
LmeSzinc
604c86d0ed Add: CAMPAIGN_MENU_GOTO_EVENT and links of page_event 
- TODO: [EN][JP] Add CAMPAIGN_MENU_GOTO_EVENT.png and CAMPAIGN_MENU_GOTO_EVENT.BUTTON.png These assets only need to add once, don't need to update according to events
 2020-12-29 19:32:16 +08:00
nEEtdo0d
ca99dbb860 Add: page_guild 
Opt: Guild confirm text
 2020-12-29 00:04:35 -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
LmeSzinc
d563f0f835 Fix: [TW] missing definition of page_campaign_menu (#274) 2020-12-23 16:04:56 +08:00
nEEtdo0d
074ef40700 Fix: [EN] RESHMENU_CHECK incorrect as result of operation siren update 2020-12-22 17:49:23 -05:00
nEEtdo0d
2df03a5996 Fix: [CN, EN] War Archives page transitions and assets 2020-12-22 17:15:56 -05:00
nEEtdo0d
537003a132 Opt: [EN] Expand assets area in page_campaign_menu 2020-12-22 16:23:39 -05:00
nEEtdo0d
06039b654b Opt: Update EN assets for page switching after release of operation siren 2020-12-22 15:23:26 -05:00
noname94
d1b5a83485 Fix: [JP] assets fixed 
CAMPAIGN_MENU_GOTO_DAILY and CAMPAIGN_MENU_GOTO_EXERCISE was missing in assets.py
 2020-12-23 03:59:55 +09:00
noname94
cc497ce146 Fix: [JP] assets for the latest update 
4169ffb84d, 635e18e579 and 8b7a46b2c8
 2020-12-23 03:18:36 +09:00
LmeSzinc
c6b57c939d Opt: [CN] Expand assets area in page_campaign_menu 2020-12-22 19:12:02 +08:00
LmeSzinc
ffed7a8fd2 Fix: Add page_campaign_menu to supported pages 2020-12-22 19:00:21 +08:00
LmeSzinc
4169ffb84d Fix: Page switching after the release of operation siren (#265) 
- EN and JP need to replace the assets.
- Assets starts with CAMPAIGN_GOTO_, don't need to be replaced. They will be deleted in the future.
- page_campaign don't goto page_daily, page_exercise, page_archives now, although the game can.
- Page related to events still remain the same. Replace them when event released.
 2020-12-22 18:38:12 +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
8285c0a604 Fix: Increase click interval to avoid entering furniture shop when entering page_dorm 2020-12-02 18:26:09 +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
LmeSzinc
7a85ceda34 Opt: More logs for debugging 2020-11-23 21:48:31 +08:00
noname94
3349e14000 Add: [JP] meowfficer assets added 2020-11-20 22:26:26 +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
whoamikyo
d1dd15ceec Added: Taiwan server support 2020-10-26 15:22:13 -03: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
572bd3e4c9 Add: [CN] DORM_TROPHY_CONFIRM 2020-09-30 16:47:16 +08:00
noname94
ffe0dfcdac Add: [JP] DORM_TROPHY_CONFIRM asset added 2020-09-30 12:07:08 +09:00
whoamikyo
eed273bc07 Fix: fix dorm trophy confirm popup 2020-09-29 22:55:18 -03:00
whoamikyo
22772b1367 Add: [EN] added DORM_FEED_CANCEL asset 2020-09-29 00:15:38 -03:00
noname94
81641cddc2 Add: [JP] added dorm assets 2020-09-29 02:45:32 +09:00
whoamikyo
b638aa8959 Add: [EN] Added Dorm assets 2020-09-27 23:10:52 -03:00
LmeSzinc
9446d5f526 Fix: Different back arrow in page_dorm and page_meowfficer 2020-09-27 03:04:15 +08:00
LmeSzinc
6defbbefc3 Add: page_dorm 2020-09-26 03:20:09 +08:00
LmeSzinc
d103191d21 Typo: meow_choose 2020-09-14 18:31:33 +08:00
noname94
6cd4541c6f Fix: [JP] assets update 2020-09-02 06:33:25 +09: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
14c3966874 Add: Game stuck handler 
- Add ensure game running when running alas functions
 2020-08-01 17:53:00 +08:00
Kyo
662063a4ad
Merge pull request #132 from whoamikyo/master 
FIx: [EN]  fix RESEARCH_CHECK asset
 2020-07-30 17:10:30 -03:00
whoamikyo
67448aa3a4 FIx: [EN] fix RESEARCH_CHECK asset 2020-07-30 17:09:54 -03:00
LmeSzinc
9f299f6981 Fix: Research popup at page_reward 
page_reward is the same as page_main, will show research popups and daily sign reward
 2020-07-30 23:37:11 +08:00
LmeSzinc
f9b589e974 Fix: [JP] Asset CAMPAIGN_GOTO_EVENT 2020-07-29 23:47:00 +08:00
whoamikyo
61a48e254a Fix: fix research_check 2020-07-18 19:34:45 -03:00
whoamikyo
64fde6425d Assets: [EN] added assets for research module 2020-07-18 05:10:08 -03:00
LmeSzinc
92c9090ec8 Add: page_research and page_reshmenu 2020-07-17 05:28:28 +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
0cc2fe2946 Fix: OCR in campaign, commission, daily, hard, fleet, raid, oil 
- Add Digit OCR
 2020-07-15 03:39:04 +08:00
LmeSzinc
623349575e Fix: Trying to fix MemoryError when finding ui route 2020-07-12 03:21:44 +08:00
LmeSzinc
3c2698b64e Fix: Research popup in page_main 2020-07-12 03:11:22 +08:00
LmeSzinc
dff0454894 Fix: Failed to detect DAILY_ENTER_CHECK 2020-07-10 02:23:18 +08:00
whoamikyo
929fec75cb Assets:[EN] added PLAYER_CHECK 2020-06-29 15:52:41 -03:00
LmeSzinc
5982e44dd7 Add: Delete sensitive info in log images 2020-06-30 02:42:36 +08:00
whoamikyo
9094665efb Update assets.py 2020-06-27 08:14:24 -03:00
whoamikyo
c8bdb7c0c2 Assets: Added Assets for equipment 
- Minor changes in dev_tools.bat
 2020-06-26 19:25:06 -03:00
whoamikyo
3feca9be9a Added update support to Gitee on alas.bat 
Asset: Updated asset MAIN_GOTO_RAID.BUTTON
 2020-06-25 13:35:07 -03:00
LmeSzinc
593fcb4a32 Fix: ui_current unrecognised after raid 
- Fix ui_ensure stop without error
- Fix log string for callable expected_end
 2020-06-25 11:03:44 +08:00
whoamikyo
0518e71d68 Added button GOTO_RAID 2020-06-24 17:46:26 -03:00
LmeSzinc
1150041049 Add: Raid and Raid daily 
- Increase interval of login_confirm
 2020-06-24 17:10:57 +08:00
LmeSzinc
b4a72d9be7 Fix: Retry timer for potato pc 2020-06-24 10:32:49 +08:00
LmeSzinc
03a78b835e Fix: Catch errors and show info 
- No attribute ui_current, if start from unsupported page
- ModuleNotFoundError, if map file not exists
- ModuleNotFoundError, if run daily_ab on SP map
 2020-06-23 00:26:05 +08: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
80646b260f Fix: Infinite click on switch when switch is unknown 
- Increase ui retry interval for potato device
 2020-06-17 01:11:24 +08:00
ferina8-14
0b94fade90 Add: [JP] add jp assets, ui module 2020-06-13 02:54:19 +09:00
LmeSzinc
0206a6480d Add: Fleet settings check 
- Delete option do_not_use in fleet_2 and fleet_3
- Exit if receive wrong settings
 2020-06-03 02:39:03 +08:00
LmeSzinc
125a490aca Fix: Timer for ui_click 2020-06-03 00:14:30 +08:00
kyO The NinjA
6eabcf6a35 Fix: [EN] Relogin is now working 
Optimize: [EN] GUI improved
 2020-05-31 04:48:22 -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
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
1203585771 Fix: 修复SP进图 2020-05-07 13:55:00 +08:00
LmeSzinc
1c2db1ec26 Add: 增加战术学院收获 
- 修复委托收获时可能卡住的问题
 2020-05-05 17:27:19 +08:00