1
0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-09 18:39:04 +08:00
Commit Graph

253 Commits

Author SHA1 Message Date
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
Ray
505d34f2bb Fix: [JP] META_CHECK asset 2021-09-18 14:29:20 +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
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
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
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
Cola
6d30da59f6 Fix: [TW] Dorm_Feed_Cancel&Ambush asset 2021-07-21 11:07:33 +08:00
nEEtdo0d
0477870c41 Fix: Resolve merge conflict ui/ui.py and ui/assets.py 2021-07-18 10:05:21 -04: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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
whoamikyo
67448aa3a4 FIx: [EN] fix RESEARCH_CHECK asset 2020-07-30 17:09:54 -03: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
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
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
ferina8-14
0b94fade90 Add: [JP] add jp assets, ui module 2020-06-13 02:54:19 +09: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
LmeSzinc
ae94260ff8 Add: 支持App控制, 支持自动登录
- 修复了12-4地图信息的错误
2020-04-10 14:18:10 +08:00
LmeSzinc
8eab19ab04 Refactor: 统一了模板的写法
- 修复了没有阵容锁定选项时会卡住的问题
- 修复了非周回时频繁报Arrive with unexpected result的问题
- 清理了一些无用的asset
2020-04-09 16:30:40 +08:00
LmeSzinc
7523847fac Add: 增加了挂委托的功能 2020-04-06 19:01:22 +08:00
LmeSzinc
1921142369 Add: 收菜模块, 收食堂小卖部和任务
- 独立出处理物品掉落和舰娘掉落的方法
2020-03-31 14:23:44 +08:00
LmeSzinc
ce4887a4f5 Initial commit 2020-03-29 01:41:34 +08:00