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

1012 Commits

Author SHA1 Message Date
LmeSzinc
ec5f0f92a6 Upd: [EN] MOB_MOVE_CANCEL 2024-06-28 09:12:18 +08:00
sui-feng-cb
5ffd84a61e Merge branch 'master' of LmeSzinc 2024-06-28 03:15:29 +08:00
LmeSzinc
c45c80c147 Add: [EN] Assets for coalition_20240627 2024-06-28 03:00:47 +08:00
LmeSzinc
7fba50035c Upd: [EN] Assets for page_coalition 2024-06-28 02:42:38 +08:00
sui-feng-cb
938ba056e3 Merge branch 'master' of LmeSzinc 2024-06-27 17:51:35 +08:00
guoh064
aa2e985fe8 Feature: Gear code for GemsFarming 2024-06-26 19:32:28 +08:00
霞飛
0b97b40c46
Feature: New OpsiShop. (#3086) 
* feat: New OpsiShop

* fix: use AdaptiveScroll

* feat: scan counter

* perf: calculate y value
 2024-06-17 11:24:40 +08:00
SevCrane
f05b61ed8e Merge remote-tracking branch 'LmeSzinc:master' 2024-06-13 11:45:38 +08:00
LmeSzinc
b5a9816782 Fix: Re-crop OPSI IN_MAP, leave letters only (#3871) 2024-06-11 23:56:31 +08:00
LmeSzinc
863458a23a Fix: Trying to handle books empty (#3753) 2024-06-11 23:38:43 +08:00
SevCrane
162ec3d14d AlasGG 2024-06-06 00:27:00 +08:00
SevCrane
3cb29a9a37 Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2024-06-05 23:53:03 +08:00
SevCrane
5e482958f6 AlasGG 2024-06-05 23:20:28 +08:00
Air111
1e793295e8 Fix: mob move optimization 2024-06-03 00:04:42 +08:00
Air111
fdf28b2032 Fix: update offset and EN assets of rewards 2024-05-27 00:33:24 +08:00
LmeSzinc
234fd8d00a Upd: MISSION_NOTICE_WHITE 2024-05-24 15:59:56 +08:00
LmeSzinc
e2bf7e2997 Upd: [EN] UI assets 2024-05-24 02:33:40 +08:00
LmeSzinc
f5f2112442 Upd: [CN][EN][JP] Dock favourite assets 2024-05-23 01:42:19 +08:00
LmeSzinc
ecfd5d50bf Upd: [CN] Support UI in 2024.05.21 2024-05-23 01:16:41 +08:00
LmeSzinc
339530c5d3 Add: Chapter B 2024-05-23 01:16:41 +08:00
LmeSzinc
a79562aebc Add: Chapter AC 2024-05-22 02:29:23 +08:00
LmeSzinc
ffe2a213ca Fix: Handle idle page 2024-05-22 01:44:45 +08:00
LmeSzinc
36f786ca53 Upd: [EN][JP] Assets in page_reward 2024-05-22 01:15:18 +08:00
LmeSzinc
7a45fed67f Fix: Duplicated SheffieldIdol template 2024-04-26 04:01:06 +08:00
LmeSzinc
fbf7bc02c6 Add: Heart-Linking Harmony chapter SP 2024-04-26 02:45:10 +08:00
guoh064
6f030373f6
Upd: asset FLEET_DETAIL_CHECK (#3674) 2024-04-24 09:03:49 +08:00
Air111
2507b0fa6b
Upd: Flagship changing (#3556) 
* Upd: Flagship changing asset

* Upd: Equipment enter

* Upd: Fleet detail check

* Refactor: equipment changing

* Upd: asset exercise/EQUIP_ENTER

* Refactor: rename equipment functions

* Fix: avoid GameTooManyClickError when EQUIPMENT_SCROLL disappears

* Upd: [CN] assets EQUIP_1/2/3

* Fix: skip first screenshot in equipment.py
 2024-04-19 01:40:40 +08:00
guoh064
27693a6762
Add: 15图开荒/周回 (#3563) 
* Add: W15 maps extracted

* Add: template for Special Carrier in W15

* Add: method mob_move

* Fix: MapDetectionError in strategy mob move

* Fix: adjacent grid judge condition

* Fix: should focus on location before moving

* Fix: should update view before further operation

* Fix: wait for STRATEGY_OPENED after executing mob move

* Fix: offset for assets in _mob_move()

* Opt: judge if movable before moving camera

* Add: W15 mechanism

* Opt: Rename Special Carrier asset name

* Fix: offset for MOB_MOVE_1/MOB_MOVE_2

* Fix: separate MOB_MOVE_1 and MOB_MOVE_2

* Fix: should use appear_then_click in strategy_mob_move_enter

* Fix: function import in campaign_15_base.py

* Fix: missing assets import

* Fix: missing offset in strategy_mob_move_cancel()

* Fix: should move only once in a campaign

* Temp: modify special carrier filter string to 3E

* Fix: missing self. before 'moved' variable

* Revert "Fix: missing self. before 'moved' variable"

This reverts commit 00f70e0ab55e422898cb90c5d5e54d4e7c989511.

* Revert "Fix: should move only once in a campaign"

This reverts commit b588f5bb07dfc4511f39fa0797fbe160f356d604.

* Fix: force goto special carrier

* Fix: missing return True in battle function

* Fix: enlarge offset of MOB_MOVE_ICON

* Fix: typo in campaing_15_3

* Fix: update view after moving mob

* Fix: should use full_scan_movable since mob moved

* Fix: missing map_data_init() in campaign_15_4.py

* Fix: battle 4 should be done by mob fleet

* Revert "Fix: battle 4 should be done by mob fleet"

This reverts commit 0e2af1ec817b7bc89fe123f03a33ea9ad955973f.

* Fix: should switch to fleet_1 after battle_3

* Add: battle function when using clear mode

* Fix: missing import

* Fix: colliding Config class

* Fix: Config.when should contain all cases

* Opt: pick ammo after third battle in clear mode of 15-4

* Del: old assets CarrierSpecial

* Fix: remake of CarrierSpecial template

* Add: UI mask for W15

* Fix: missing ASSETS import

* Fix: change full_scan_movable() to predict()

* Fix: predict should be done after each move

* Opt: camera_data in W15

* Del: remove predict

* Add: map info process after mob move

* Add: support for multi bosses in _expected_end() for W15

* Opt: show map after moving

* Del: remove redundant import in fleet.py

* Opt: using clear_chosen_enemy() instead of goto() directly

* Fix: should first take screenshot before strategy enter/confirm/cancel

* Add: asset TEMPLATE_SIREN_BOSS

* Opt: Handle first stages of BOSS as Siren in 15-3/15-4

* Fix: missing override map_data

* Add: ignore is_boss prediction for siren boss in 15-3/15-4

* Fix: should not use decorator Config with battle_x functions

* Opt: camera data in 15-4

* Opt: directly overwrite map info into original map_data

* Fix: missing indent block in campaign_15_4.py

* Fix: expect 15-3/15-4 first bosses as siren

* Revert "Add: ignore is_boss prediction for siren boss in 15-3/15-4"

This reverts commit 1104631f92e5df0672dce8c7acaa1eb122731746.

* Revert "Add: asset TEMPLATE_SIREN_BOSS"

This reverts commit a29d6b6b9bfb9d79963adb404ce2091cbfafb810.

* Revert "Add: support for multi bosses in _expected_end() for W15"

This reverts commit 8d357abe5bab79a643e23e8513cefa87d31cb3e8.

* Del: redundent map config

* Fix: recover boss grids

* Del: redundant clear_siren()

* Del: redundant clear_siren() in battle_6

* Add: template for mob move icon

* Opt: enlarge reinforcement fleet mask area for W15

* Opt: method _mob_move

* Upd: TEMPLATE_MOB_MOVE_ICON

* Fix: should have cool time between clicks of grid

* Revert "Upd: TEMPLATE_MOB_MOVE_ICON"

This reverts commit b3f2dcbc88dbe166470905f33d041b91c2192f57.

* Upd: TEMPLATE_MOB_MOVE_ICON

* Upd: TEMPLATE_MOB_MOVE_ICON

* Upd: predict_mob_move_icon

* Fix: 15-2 camera spawn point

* Fix: should update view using self.device.image

* Revert "Upd: TEMPLATE_MOB_MOVE_ICON"

This reverts commit 92a12596a8f271ec64e249ecb58779d9b64ecea6.

* Del: redundant assets MOB_MOVE_ICON.png

* Fix: using map_is_clear_mode to get real value of clear mode

* Opt: check mob_movable before moving

* Opt: Refactor _mob_move

* Fix: camera_sight in W15

* Opt: move sight to further point in _mob_move
 2024-04-19 01:29:17 +08:00
霞飛
09fe301597
fix: ship template assets bit error (#3618) 2024-04-09 11:23:16 +08:00
ygrzxc
7d574dde8b
Add: Change the designated vanguard combination (#3520) 
* Add: Change the designated vanguard combination

* Add: Change the designated vanguard combination

* Add: Change the designated vanguard combination

* Add: Change the designated vanguard combination

* Add: Change the designated vanguard combination

* Add: Change the designated vanguard combination

* Add: Translation for change the designated vanguard combination

* Add: Translation for change the designated vanguard combination

* Upd:Update dev's args.json

* Upd:Update dev's args.json

* Upd:Reduce template image size and Implement function

* Upd:Reduce template image size and Implement function

* Upd:Reduce template image size and Implement function

---------

Co-authored-by: y y <jaxvuav@163.com>
 2024-04-08 22:49:30 +08:00
LmeSzinc
df408fad9d Upd: [EN] DORM_FEED_ENTER 2024-04-05 17:48:34 +08:00
guoh064
894e0c4c82
Opt: reset dorm view before dorm_collect (#3510) 2024-04-03 23:42:20 +08:00
guoh064
555fb2ad29 Upd: Assets FORMATION to adapt to W15 2024-04-03 17:24:40 +08:00
LmeSzinc
de1bcde054 Upd: [EN] BATTLE_PREPARATION 2024-03-29 09:23:46 +08:00
LmeSzinc
c98a5a7ad9 Upd: [EN] BATTLE_PREPARATION 
it's 5 frames now - -
 2024-03-29 03:23:20 +08:00
LmeSzinc
fe223d70bf Fix: Swapped RPG_RAID_EASY and RPG_RAID_NORMAL 2024-03-29 03:21:10 +08:00
LmeSzinc
e8909f4d59 Add: UI switches in RPG raid 2024-03-29 02:17:47 +08:00
LmeSzinc
32e4571afc Upd: LOGIN_ANNOUNCE 2024-03-28 23:43:18 +08:00
LmeSzinc
0a59b8efb5 Add: Chapter SP 2024-03-02 03:34:24 +08:00
guoh064
56a93de7b0
Upd: [CN, EN, JP] dorm asset DORM_RED_DOT (#3506) 2024-02-23 21:59:15 +08:00
LmeSzinc
a8a5f5b888 Upd: [EN][JP] Sync DORMMENU assets 2024-02-06 19:22:22 +08:00
weeswelai
b04b349206 Add: Add raid event Spring Festive Fiasco(raid_20240130) 2024-01-31 10:57:34 +08:00
LmeSzinc
9e135993ce Upd: [EN] ACADEMY_CHECK 2024-01-12 18:00:35 +08:00
LmeSzinc
944190c46e Upd: [EN] ACADEMY_CHECK 2024-01-06 01:51:48 +08:00
LmeSzinc
94348e7b9f Revert "Upd: [EN] ACADEMY_CHECK" 
Well I hate them changing things back and forth
 2023-12-29 00:21:35 +08:00
LmeSzinc
f9340f1326 Fix: Accidentally entered dorm manage and shop 2023-12-23 00:50:25 +08:00
LmeSzinc
4512b9ece0 Upd: Siren templates 2023-12-23 00:38:13 +08:00
weeswelai
56fe530310 Add: Buy time-limited furniture in dorm. 2023-12-23 00:32:30 +08:00
LmeSzinc
432f61b892 Upd: [EN] ACADEMY_CHECK 2023-12-22 02:33:03 +08:00
LmeSzinc
8a8fcaf56f Add: Chapter T 2023-11-24 00:45:23 +08:00
weeswelai
19a9d93aa8 Upd: Update EN meowfficer assets 2023-11-18 14:37:43 +08:00
weeswelai
671c14a2fc Upd: Update meowfficer UI for EN 2023-11-17 20:09:55 +08:00
Jiahao Yuan
1d6bf0547f
Upd: Dorm UI assets (#3275) 2023-11-10 11:27:44 +08:00
LmeSzinc
5eee8f35a7 Upd: [EN] CAMPAIGN_CHECK in W15 2023-11-04 18:43:13 +08:00
weeswelai
99fc5e6744 Upd: Update EN‘s assets DORM_INFO 2023-10-29 01:54:13 +08:00
weeswelai
d0f4d982a9
Upd: Update some part dorm ui for cn, jp, en (#3226) 
* Upd: Update dorm ui for cn, jp, en

* Add: Add specialized FILL ocr, update assets

* Upd: Update OCR_DORM_SLOT height, del en _dorm_food
 2023-10-27 16:53:24 +08:00
alexan-ded
7eb02e1ed9 Upd: [EN] EQUIPMENT_OPEN 2023-10-27 07:35:19 +08:00
LmeSzinc
e8340df57c Upd: [EN] _fleet_sidebar 2023-10-20 01:11:59 +08:00
LmeSzinc
c5efe8e380 Upd: [EN] AUTO_SEARCH_SET_* 2023-10-20 01:09:01 +08:00
LmeSzinc
d2302836ec Upd: [EN] Fleet preparation 2023-10-20 01:02:47 +08:00
LmeSzinc
0c93da2373 Upd: Sync FLEET_PREPARATION_CHECK 2023-10-20 00:03:28 +08:00
LmeSzinc
ec7facb7c1 Upd: Strategy open&close&switch 2023-10-19 22:42:53 +08:00
LmeSzinc
4969dc01b0 Upd: [CN] Fleet preparation 2023-10-19 22:02:24 +08:00
LmeSzinc
44197dba56 Upd: [EN] RETIRE_COIN (#3124) 2023-10-14 21:45:49 +08:00
LmeSzinc
28c52ac7b2
Merge pull request #2840 from yypsybs/dev-minigame-for-pr 
Add: minigame
 2023-09-25 18:49:25 +08:00
LmeSzinc
550798bdbb
Merge pull request #2996 from guoh064/meta_reward 
Add: Dossier Meta Reward Receive
 2023-09-25 18:29:46 +08:00
Tipsy Fisher
78a7830f36
Merge branch 'LmeSzinc:master' into dev-minigame-for-pr 2023-09-22 10:19:02 +08:00
LmeSzinc
9a7c79732f Fix: [EN] Update AUTO_SEARCH_MENU_*.BUTTON.png 2023-09-22 02:28:01 +08:00
Tipsy Fisher
15f930a6a4
Merge branch 'LmeSzinc:master' into dev-minigame-for-pr 2023-09-20 18:32:09 +08:00
LmeSzinc
802c1b6a08 Fix: Handle STORY_CLOSE after B3 2023-09-15 21:37:56 +08:00
Tipsy Fisher
dcf5075926
Merge branch 'LmeSzinc:master' into dev-minigame-for-pr 2023-09-15 09:55:03 +08:00
LmeSzinc
b52da42d71 Add: TEMPLATE_SIREN_Zuiho 2023-09-15 02:37:23 +08:00
LmeSzinc
16ecea7163 Add: Effulgence Before Eclipse chapter AC 2023-09-15 01:49:53 +08:00
Tipsy Fisher
c2551f5c8e
Merge branch 'LmeSzinc:master' into dev-minigame-for-pr 2023-09-15 01:07:00 +08:00
LmeSzinc
7627a40bee Upd: [EN] AUTO_SEARCH_MENU_CONTINUE and AUTO_SEARCH_MENU_EXIT 2023-09-15 00:03:33 +08:00
LmeSzinc
c204aca18e Fix: Story skip 2023-09-14 23:32:18 +08:00
yypsybs
369c80d991 Merge branch 'master' into dev-minigame-for-pr 
# Conflicts:
#	module/ui/assets.py
 2023-09-11 10:29:52 +08:00
guoh064
8a3ed1dcf8 Del: unused DOSSIER_REWARD_NOTICE.png 2023-09-09 08:53:51 +08:00
guoh064
f12e04a277 Del: redundant assets in meta_reward.py 2023-09-09 08:52:04 +08:00
LmeSzinc
078c6bb606 Revert "Upd: [EN] ACADEMY_CHECK" 
This reverts commit 6f2ea47c
 2023-09-08 01:10:52 +08:00
yypsybs
fd9777940b Merge branch 'master' into dev-minigame-for-pr 
# Conflicts:
#	module/ui/assets.py
 2023-09-01 17:58:39 +08:00
LmeSzinc
63c879f90c Upd: [EN] PAUSE and PAUSE_DOUBLE_CHECK 2023-09-01 02:16:05 +08:00
LmeSzinc
6f2ea47c70 Upd: [EN] ACADEMY_CHECK 2023-09-01 01:21:55 +08:00
Tipsy Fisher
0e5bebd25f
Merge branch 'LmeSzinc:master' into dev-minigame-for-pr 2023-08-19 15:47:51 +08:00
LmeSzinc
24f29391a0 Add: Siren templates in SP 2023-08-19 02:34:19 +08:00
LmeSzinc
68571e67d9 Add: Siren templates in chapter A 2023-08-18 22:29:25 +08:00
LmeSzinc
b451096fb8 Add: Handle stories before event maps in chapter BD 2023-08-18 22:23:20 +08:00
LmeSzinc
b3c59c0cca Add: Handle stories before event maps 2023-08-18 13:25:51 +08:00
Tarin_Chan
ae7d801187
updata EN box button (fix#3015) (#3017) 
* Add files via upload

* Add files via upload

* Add files via upload

* Delete assets.py

* Add files via upload

* Add files via upload

* Add files via upload

---------

Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
 2023-08-15 18:40:55 +08:00
Tipsy Fisher
8cbffecd0f
Merge branch 'LmeSzinc:master' into dev-minigame-for-pr 2023-08-15 09:18:13 +08:00
Tarin_Chan
9d7b0de26e
Update EN box button (#3015) 
* Add files via upload

* Add files via upload

* Add files via upload

* Delete assets.py

* Add files via upload
 2023-08-14 20:22:51 +08:00
guoh064
a3af072035
Merge branch 'dev' into meta_reward 2023-08-12 14:29:31 +08:00
Tipsy Fisher
78259e8037
Merge branch 'LmeSzinc:master' into dev-minigame-for-pr 2023-08-12 12:22:10 +08:00
guoh064
e74df69b29 Add: Dossier Meta Reward Receive 2023-08-12 09:02:21 +08:00
霞飛
30600ae68a
fix: shop confirm amount buttom (#3001) 2023-08-11 19:05:52 +08:00
yypsybs
cbd8bac236 Opt: Choose minigame by scroll 2023-08-08 00:03:41 +08:00
guoh064
dd7b454459 Rev: Old Dossier Meta Reward(LmeSzinc#2544) 2023-08-07 17:33:51 +08:00
Tipsy Fisher
1e0f45e189
Merge branch 'LmeSzinc:master' into dev-minigame-for-pr 2023-08-07 09:32:50 +08:00
LmeSzinc
073d11cf89 Fix: get_research_series() (#2975) 2023-08-06 17:40:43 +08:00
Alexan-ded
c2a6c1a389
Upd: [EN] DISASSEMBLE_CANCEL (#2978) 
* Upd: [EN] DISASSEMBLE_CANCEL

* Upd: [EN] DISASSEMBLE_CONFIRM
 2023-08-06 15:23:37 +08:00
yypsybs
89e40134b4 Merge branch 'master' into dev-minigame-for-pr 2023-08-04 11:53:54 +08:00
LmeSzinc
d389f75c5f Add: handle_map_walk_speedup() 2023-08-03 22:59:37 +08:00
Tipsy Fisher
6fca29e79c
Merge branch 'LmeSzinc:master' into dev-minigame-for-pr 2023-07-21 00:07:41 +08:00
LmeSzinc
c2f744c5ff Upd: [JP] SERIES_DETAIL (#2900) 2023-07-20 22:35:28 +08:00
Tipsy Fisher
a962b13343
Merge branch 'LmeSzinc:master' into dev-minigame-for-pr 2023-07-14 10:59:13 +08:00
LmeSzinc
044038254a Upd: Shop module 
- Assume TW is unchanged
 2023-07-14 01:43:19 +08:00
LmeSzinc
77cea4d7dd Upd: [CN][EN][JP] Assets of page_munition 2023-07-14 00:31:55 +08:00
LmeSzinc
85bea51b60 Upd: Assets for entering supply pack 2023-07-14 00:31:52 +08:00
yypsybs
28cae91564 Opt: minigame 
Opt: minigame multi language assets
Opt: minigame multi language i18n
Opt: minigame config
Fix: minigame-stuck when max ticket
 2023-07-11 18:00:03 +08:00
Tarin_Chan
b9e5134464
Fix: add RAID_REWARDS.png to fix raid reward problem (#2829) 
* Add files via upload

* Update raid.py

更改了逻辑
特别感谢Alas群 莱森·何Horizon101011 的帮助

* Update raid.py

趁没人看见修点丢人bug

---------

Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
 2023-07-02 15:38:44 +08:00
nEEtdo0d
e88ae341f1 Upd: [EN] various assets for server; war_archive, os_ash, template, and handler 2023-06-30 18:00:33 -04:00
nEEtdo0d
096a5d394a Upd: [EN] shop swipe end on gift shop label 2023-06-30 17:58:31 -04:00
nEEtdo0d
e0f79d13ca Add: Gorizia raid ex ocr clause and remain asset 2023-06-30 17:38:52 -04:00
LmeSzinc
b3f1461e37 Upd: [EN] Raid assets of Reflections of the Oasis 2023-06-30 16:16:24 +08:00
iceynano
ffe3988e72
Fix: Error caused by empty build queue (#2816) 
* Fix: Error caused by empty build queue

* feat: add BUILD_QUEUE_EMPTY assets

* fix: use image_color_count() for identify images

* chore: remove useless asset

* fix: Avoid info_bar and use appear()

---------

Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
Co-authored-by: SaarChaffee <saarchaffee@qq.com>
 2023-06-30 15:32:41 +08:00
lwhzbyz
055260a23c
Fix asset for SHOP_SELECT_PR1 (#2771) 2023-06-15 02:08:09 +08:00
lwhzbyz
1789d8a7bd
Bug fix: Guild shop PR SELECT (#2740) 
* Change SHOP_SELECT_PR for all servers.

* Change SHOP_SELECT_PR for all servers.

---------

Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
 2023-06-11 01:40:48 +08:00
LmeSzinc
f71d6d0a69 Upd: [EN] ACADEMY_CHECK 2023-06-10 02:41:03 +08:00
LmeSzinc
ac30c3b65a Upd: [EN][JP] BATTLE_STATUS_CF, EXP_INFO_CF 2023-06-10 01:39:23 +08:00
LmeSzinc
e94a54daed Upd: [CN] BATTLE_STATUS_CF, EXP_INFO_CF 2023-06-09 00:19:01 +08:00
LmeSzinc
202f271782 Upd: [EN] SHOP_PROTOTYPE_SWIPE_END 2023-06-08 23:59:17 +08:00
LmeSzinc
166fa65ecc Upd: [EN] DOCK_SELECTED 2023-06-08 23:54:48 +08:00
LmeSzinc
d98f04d5bf Add: Siren templates 2023-05-27 18:56:49 +08:00
LmeSzinc
f9e9824c55 Fix: Stage entrance extraction in Confluence of Nothingness 2023-05-26 17:34:21 +08:00
LmeSzinc
dd8824ecd2 Upd: [EN] Shop swipe ends 2023-05-26 01:37:28 +08:00
LmeSzinc
ee6602a1fe Upd: BATTLE_STATUS_* 2023-05-26 00:55:35 +08:00
LmeSzinc
c6df09e170 Upd: EXP_INFO_* and the exercise one 2023-05-25 21:45:19 +08:00
guoh064
a26e15675e Add: TEMPLATE_META_DOCK_RED_DOT for other servers 2023-05-07 22:21:20 +08:00
LmeSzinc
ed02e89bc0 Opt: Code formatting 2023-04-11 22:08:38 +08:00
Alexan-ded
22494ea996
Fix: MEOWFFICER_FEED_CANCEL click fails (#2428) 
* Fix: MEOWFFICER_FEED_CANCEL click fails

* Upd: [EN] MEOWFFICER_FEED_CANCEL
 2023-03-31 00:20:20 +08:00
LmeSzinc
8c4526b0c0 Fix: Handle appear animation in coalition page (#2397) 2023-03-24 23:18:16 +08:00
LmeSzinc
cfd167dcf6 Upd: [EN] MEOWFFICER_FEED_CONFIRM 2023-03-24 22:59:41 +08:00
LmeSzinc
663d9d6799 Upd: [EN][JP] COALITION_REWARD_CONFIRM 2023-03-24 14:08:05 +08:00
LmeSzinc
14870c6807 Fix: ui switches to page_coalition 2023-03-24 05:31:26 +08:00
LmeSzinc
4eadbe1f80 Upd: [EN] Coalition assets 2023-03-24 05:01:48 +08:00
LmeSzinc
7ecf3ac502 Add: Coalition task 2023-03-24 04:41:13 +08:00
LmeSzinc
25c7380684 Add: UI switches in coalition battles 2023-03-24 03:06:46 +08:00
LmeSzinc
0c26b7a001 Upd: [EN] MISSION_OVERVIEW_CHECK 2023-03-17 00:49:43 +08:00
LmeSzinc
89c36597b2 Add: Emergency module development daily 2023-03-17 00:34:02 +08:00
LmeSzinc
ac379b0143 Upd: [EN][JP] FLEET_*_ADVICE 2023-03-11 01:58:39 +08:00
LmeSzinc
cb1d4f24d3 Opt: Raise error when user running a hard mode but haven't prepared the fleets 2023-03-10 23:10:19 +08:00
Alexanded
26885555e1 Upd: [EN] FLEET_CHECK 2023-03-10 00:08:18 +03:00
nEEtdo0d
671581010f Upd: [EN] war archive templates; allowing to war archive task to locate the event campaign 2023-02-26 14:45:47 -05:00
nEEtdo0d
27085dbcfd Upd: [EN] DORM_FURNITURE_CONFIRM, ACTION_POINT_REMAIN_OS 2023-02-26 14:45:24 -05:00
nEEtdo0d
a61e9b5e62 Fix: [EN] DOCK_AMOUNT position shift; frequent inaccurate read 
Upd: [EN] RETIRE_SETTING_* assets
 2023-02-26 14:45:00 -05:00
LmeSzinc
db0431994c Fix: Handle another STORY_SKIP (#2284) 2023-02-24 21:25:36 +08:00
LmeSzinc
29bcd00590 Add: Revelations of Dust chapter AC 2023-02-23 22:15:39 +08:00
LmeSzinc
8c7781c541 Upd: [EN] Swap STRATEGIC_SEARCH_SUBMIT ON/OFF 
No idea why AL swapped them but we just follow
 2023-02-19 20:41:58 +08:00
LmeSzinc
01e71513a2 Fix: Use template matching on MAP_AMBUSH_ATTACK and MAP_AMBUSH_EVADE 2023-02-18 16:38:08 +08:00
LmeSzinc
b02069fd7f Fix: Handle game tips when entering mewofficer enhance 2023-02-14 00:21:32 +08:00
LmeSzinc
305ba80c7d Fix: Check meowfficer level before enhancing (#2211) 2023-02-14 00:11:36 +08:00
Alexan-ded
88738a83ff
UPD: [EN] AUTO_SEARCH_SET_ALL, AUTO_SEARCH_SET_STANDBY (#2193) 2023-02-01 11:26:25 +08:00
LmeSzinc
c3ee7c442e Refactor: enemy_searching_appear() using template matching 2023-01-29 14:48:56 +08:00
LmeSzinc
2472ccbdc2
Merge pull request #2096 from bookbug666/event_checker 
Add: Auto disable event task when no event (#1396)
 2023-01-29 14:42:58 +08:00
LmeSzinc
b968cff33c
Merge pull request #2165 from nEEtdo0d/raid_ex 
Add: Raid EX Support
 2023-01-29 14:40:38 +08:00
nEEtdo0d
539ec00f09 Add: support automate raid ex mode 2023-01-28 12:19:02 -05:00
LmeSzinc
ee710904a9 Fix: Delay task Dorm according to number of ships in dorm (fixed #2119) 2023-01-28 18:11:28 +08:00
LmeSzinc
e60fae44cc Fix: Limit button area of LOGIN_ANNOUNCE (#1779) 2023-01-28 16:29:44 +08:00
bookbug666
76ed84264f Merge branch 'dev' into event_checker 2023-01-25 00:53:07 +08:00
nEEtdo0d
ac14857d32 Upd: [EN] shipyard fate assets 2023-01-22 22:33:57 -05:00
LmeSzinc
29512403f0 Upd: [EN] BATTLE_PREPARATION adding another "Sortie" 2023-01-19 17:01:03 +08:00
LmeSzinc
9305de5f20 Upd: [EN] BATTLE_PREPARATION adding "Sortie" 2023-01-19 03:02:31 +08:00
LmeSzinc
d6d6d70570 Upd: [EN] Temp fix on BATTLE_PREPARATION due to poor i18n 2023-01-19 02:23:46 +08:00
LmeSzinc
0f4a9ca485 Upd: [EN] KUYBYSHEY raid assets 2023-01-19 00:37:55 +08:00
LmeSzinc
186e3305ad Upd: [JP] BATTLE_PREPARATION 
cause JP has a bad localization, they dont know the difference between 击 and 擊
 2023-01-18 23:17:49 +08:00
LmeSzinc
55020f2752 Upd: BEACON_REWARD to handle poor english on buttons (#2109) 2023-01-13 23:45:41 +08:00
bookbug666
4332fbee7c Merge branch 'dev' into event_checker 2023-01-13 23:05:03 +08:00
nEEtdo0d
87179d6c09 Upd: [EN] QUIT_* assets; post maintenance font change 2023-01-12 22:57:14 -05:00
bookbug666
1e8f0052b3 Merge branch 'dev' into event_checker 2023-01-12 09:23:52 +08:00
bookbug666
1a963adfa3 Add offsets when checking events;Replace all temp assets with EN version. 2023-01-12 09:23:37 +08:00
LmeSzinc
fa5dd91696 Upd: [EN] Assets of OpSi monthly bosses (#2032) 2023-01-06 20:46:23 +08:00
LmeSzinc
332f6b87d3 Merge branch 'master' into dev 2023-01-01 17:17:53 +08:00
LmeSzinc
951592b9f2 Upd: [EN] Another MAIL_EMPTY 2023-01-01 17:04:39 +08:00
LmeSzinc
c8818e3fb5 Merge branch 'bug_fix' into dev 2022-12-31 22:56:18 +08:00
LmeSzinc
b8bddfeb47 Fix: Handle guild commander change mails 2022-12-31 22:49:04 +08:00
LmeSzinc
ed25ce48ae Fix: Add support to 150% scaling combat joystick 2022-12-29 20:56:36 +08:00
LmeSzinc
09f69f5938 Upd: BACK_ARROW for template matching 2022-12-29 18:04:30 +08:00
LmeSzinc
ffbac284dd Refactor: info_bar_count() for poor image quality 2022-12-29 17:50:49 +08:00
LmeSzinc
8baf402b1f Upd: OS_ADAPTABILITY_* for all servers 2022-12-23 20:24:14 +08:00
LmeSzinc
0a598247ab Add: Siren templates 2022-12-23 16:12:58 +08:00
LmeSzinc
cacf51784e Upd: [EN] OpSi auto search buttons 2022-12-18 02:01:38 +08:00
LmeSzinc
12c2d4e53e Fix: [EN] Update FLEET_* in OpSi 2022-12-16 21:42:36 +08:00
LmeSzinc
e5b06b3726 Upd: [EN] EQUIP_CONFIRM in equipment module 2022-12-12 18:00:44 +08:00
nEEtdo0d
4be37e3596 Add: [EN] asset update for strategic search (#1948) 2022-12-11 23:53:52 -05:00
LmeSzinc
b99d978935 Fix: [EN] Update retire assets (#1967) 2022-12-09 23:00:16 +08:00
LmeSzinc
cb2abd107f Merge branch 'master' into dev 2022-12-07 01:50:32 +08:00
LmeSzinc
2168329e07 Fix: [EN] Confirm button in SOS signal search list 
- Re-arrange SOS templates
 2022-12-07 01:38:57 +08:00
nEEtdo0d
96cb4aa4e1 Upd: handle_popup_* signature with custom offset; refactor dirty patches 
Upd: SHOP_BUY_CONFIRM_VOUCHER to handle_popup_confirm for server transparency
 2022-12-02 16:32:39 -05:00
nEEtdo0d
bc3376e191 Fix: merge LmeSzinc/dev into branch, resolve conflicts 2022-11-29 15:04:47 -05:00
nEEtdo0d
629addada4 Add: Opsi voucher monthly task support 2022-11-26 23:44:38 -05:00
LmeSzinc
b86e244039 Upd: [EN] GET_ITEMS_1_RYZA 2022-11-25 05:01:48 +08:00
LmeSzinc
1687133d46 Upd: [EN] GET_ITEMS_1_RYZA 2022-11-25 04:27:56 +08:00
LmeSzinc
e0feea2366 Add: The Alchemist and the Archipelago of Secrets chapter T 2022-11-24 22:24:20 +08:00
nEEtdo0d
9a2d16a3d2 Add: [EN] MAIL_EMPTY (#1774) 2022-11-14 15:06:07 -05:00
nEEtdo0d
3b37e4afa0 Add: shop module support voucher shop (os supply / exchange) 2022-11-14 12:00:13 -05:00
nEEtdo0d
19e3e8d111 Fix: [EN] SWITCH_1_NORMAL asset change on game update 2022-11-14 10:11:13 -05:00
LmeSzinc
383b8893c2 Merge branch 'master' into dev 2022-11-02 00:22:03 +08:00
nEEtdo0d
6f61f1e828 Upd: [EN] asset update for ship scan (#1776) 2022-10-30 11:59:32 -04:00
nEEtdo0d
167d2d4b92 Add: [EN] TEMPLATE_SWIRLING_CHERRY_BLOSSOMS (#1780) 
Upd: [EN] EQUIP_[1-3]; position changed with addition of augment slot
 2022-10-28 10:45:30 -04:00
LmeSzinc
b81b6d809c Upd: [EN] ALBION_RAID_HARD 2022-10-28 20:00:54 +08:00
LmeSzinc
2edde3b50e Upd: [EN] RAID_CHECK 2022-10-28 03:19:44 +08:00
LmeSzinc
e847f76256 Merge branch 'master' into dev 
# Conflicts:
#	module/config/i18n/en-US.json
#	module/config/i18n/ja-JP.json
#	module/config/i18n/zh-CN.json
 2022-10-28 03:09:41 +08:00
LmeSzinc
ff99d80b5a Upd: [EN] ALBION raid assets 2022-10-28 02:54:09 +08:00
nEEtdo0d
27fabf7b9f Add: [EN] asset support for ship scan (#1776) 2022-10-27 01:13:39 -04:00
LmeSzinc
bb61f2f9b6
Merge branch 'dev' into mail_reward 2022-10-23 17:03:32 +08:00
LmeSzinc
2960bf068f Merge branch 'master' into dev 2022-10-23 16:56:53 +08:00
nEEtdo0d
840eb4dc7f Mov: re-factor relevant modules and assets into freebies 2022-10-19 21:04:43 -04:00
nEEtdo0d
50e831fa3a Mov: reward mail support to separate module 
Del: MAIL_CLICK_SAFE_AREA, MAIL_COLLECT sufficient as substitute
 2022-10-16 01:01:15 -04:00
LmeSzinc
7c2238ba1f Upd: [EN] USE_DATA_KEY 2022-10-15 23:55:27 +08:00
LmeSzinc
6968e77cc7 Upd: [EN] ASH_POPUP_CHECK 2022-10-14 12:25:05 +08:00
nEEtdo0d
590145616f Upd: mail delete steps now optional; default does not delete 
Add: MAIL_CLICK_SAFE_AREA, MAIL_ENTER for all servers
 2022-10-12 22:37:33 -04:00
nEEtdo0d
72de603826 Add: reward module routine collect mail items; filter based on displayed icon 2022-10-08 16:56:39 -04:00
nEEtdo0d
109e8645d9 Upd: alter commit (c153b23); reduce to single asset in conditions with minimal offset, asset cut should be server transparent (#1527) 2022-10-04 00:25:42 -04:00
nEEtdo0d
c153b23663 Fix: is_in_map detect for stronghold visual fog (#1527) 
Fix: os_globe_goto_map handle visual fog globe button (#1527)

TODO: [CN, TW, JP] equivalent *_FOG asset; enter stronghold and step on swamp / poison-looking tile to trigger fog state
 2022-10-03 00:48:46 -04:00
LmeSzinc
b8d022ab53 Fix: Collect exploration rewards that are ignored by auto search 2022-10-02 17:10:38 +08:00
LmeSzinc
73a3bf4220 Upd: [CN][EN] BEACON_LIST 2022-09-25 18:01:35 +08:00
LmeSzinc
cc922d798e Fix: [EN] Unable to detect META skill list 2022-09-25 02:39:45 +08:00
LmeSzinc
81fd195560 Upd: [EN] INFO_BAR_* 2022-09-23 01:22:57 +08:00
LmeSzinc
ef15adbd32 Upd: [EN] RAPID_TRAINING (#1648) 2022-09-20 01:56:20 +08:00
LmeSzinc
7b2e8636fc Add: Siren templates in chapter BD 2022-09-16 22:06:13 +08:00
LmeSzinc
dd7e5fd961 Add: Siren templates in chapter AC 2022-09-16 00:31:17 +08:00
zhou525
5c6e97957a Fix: [EN]dossier begin fail 2022-09-13 22:19:33 +08:00
LmeSzinc
0bd2cf389b
Merge pull request #1615 from zhou525/pr_1574_bugfix 
Fix: OneHitMode and call AshBeaconTask time conflicts
 2022-09-11 22:02:15 +08:00
zhou525
fa1e5190e0 Fix OneHitMode and call AshBeaconTask time conflicts 2022-09-11 20:46:48 +08:00
LmeSzinc
e8dcdeaf65 Add: Quick retire options fallback to avoid user mistakes 2022-09-10 18:11:07 +08:00
nEEtdo0d
e982795216 Fix: [EN] os monthly ticket asset shifted post maintenance 2022-09-09 10:39:48 -04:00
nEEtdo0d
c58b13a551 Add: [EN] ash meta/dossier assets (#1606) 2022-09-09 10:37:59 -04:00
LmeSzinc
ba984ceddf Merge branch 'master' into dev 2022-09-07 00:10:06 +08:00
LmeSzinc
d48e633f9b
Merge pull request #1574 from zhou525/dev_1375_pr 
Dossier Beacon and OneHitMode
 2022-09-07 00:08:32 +08:00
zhou525
9085ac0b8b Add: [CN]Dossier Beacon Attack Add: [CN]Ash Beacon OneHitMode 2022-09-06 23:58:37 +08:00
LmeSzinc
5c95717474 Upd: AUTO_SEARCH_MENU_CONTINUE and AUTO_SEARCH_MENU_EXIT 2022-09-06 22:46:24 +08:00
nEEtdo0d
b7c9443ee1 Add: [EN] storage assets 
Fix: [EN] storage OCR position differs, exclude ':' on read
 2022-09-01 21:07:41 -04:00
Bookbug
b26b6c97d1
Add: TaskBalancer (#1509) 
* CoinManagement added, but malfunction

* CoinManagement added, but malfunction

* CoinManagement:Translation complete

* CoinManagement:ready for testing

* CoinManagement:ready for testing

* CoinControl: Almost done, needs optimization/fix

* Add: CoinControl, done with full test.

* Add: TaskBalancer(experimental)

* Add: TaskBalancer(experimental)

* Remove legacy codes

* Upt: Reform codes(Experimental)

* Add:Task Balancer(Experimental)

* Add:Task Balancer(Experimental)

* Upt: config.py

* Fix: Default value of CheckInterval

* Upd: Minor translation adjustment

* Upd: Minor translation adjustment

* Upd: Revert the enable button and remove the CheckInterval

* Fix: minor translation

* Fix: additional trigger message caused by legacy code

* Add: User-defined delay interval

* Opt: Translation and default value of CoinLimit; Remove user-defined CheckInterval; Reform task sorting logic
 2022-08-24 23:44:49 +08:00
LmeSzinc
11aea6d4d9 Fix: Cancel researches with unsatisfied requirements 
Avoid to add into queue
- Refactor: Split out ResearchSelector
 2022-08-23 02:47:44 +08:00
LmeSzinc
fa32962de6 Upd: Copy static storage assets to all servers 2022-08-23 01:14:44 +08:00
LmeSzinc
d54d42f0f9 Merge branch 'master' into dev 2022-08-22 12:07:34 +08:00
nEEtdo0d
87430d53e2 Upd: [EN] reward bubble assets; post maintenance change 2022-08-20 21:30:50 -04:00
freesrz93
faf5a74e56 Add: Use tech box & Disassemble equipments 
Opt: check GET_ITEMS_CONTINUE to disassemble faster

Fix: material_enter may enter disassemble
Fix: can't select equipments with info bar

Opt: no need to use OCR

Opt: Use less templates

Refactor: StorageHandler

Fix: threshold too low
 2022-08-21 08:56:49 +08:00
LmeSzinc
ea28a0cb65 Upd: AUTOMATION_CONFIRM 2022-08-20 23:28:15 +08:00
LmeSzinc
f0426236c8 Upd: [EN] REWARD_* assets 2022-08-19 00:09:44 +08:00
LmeSzinc
f3f6d19a1f Add: Event Operation Convergence (event_20220818_cn) 2022-08-18 23:51:30 +08:00
nEEtdo0d
0b235ac3e8 Add: [EN] study new skill assets 2022-08-17 22:52:31 -04:00
nEEtdo0d
d05b5cb625 Fix: [EN] adjust OCR parameters; additional string replace hot fixes (#1479) 
Upd: [EN] map name asset; font/size changes post maintenance
 2022-08-14 12:44:33 -04:00
nEEtdo0d
a042aa8615 Upd: [EN] auto search option assets; placement change post maintenance 
Upd: info output to match func parameters
 2022-08-14 12:40:59 -04:00
Horizon101011
07a14849d9 Upd: More accurate asset for enhancement 2022-08-13 19:43:27 +08:00
LmeSzinc
d936a60c65
Merge pull request #1485 from bookbug666/dev_0804 
Upt: Assets of equipment_change
 2022-08-07 15:25:17 +08:00
freesrz93
b68e8abb6a Fix: Wrong OCR result for build ticket count 
Fix: Wrong OCR result for build ticket count

Fix: Wrong OCR result for build ticket count (1)
 2022-08-06 19:39:57 +08:00
bookbug666
dd8d7f0ec5 Fix: Delete unused ui action; Rename button 2022-08-06 16:40:47 +08:00
bookbug666
5a82aa0db0 Upt: [EN]Assets of Equipment_change 2022-08-05 01:18:40 +08:00
bookbug666
fc8bc2efed Upt: [EN]Assets of Equipment_change 2022-08-05 01:16:24 +08:00