1
0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-04-07 05:30:54 +08:00

124 Commits

Author SHA1 Message Date
GH Action - Upstream Sync
23723f14c7 Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2026-04-03 14:53:49 +00:00
LmeSzinc
a3c871f963 Bug fix (#5596)
* Merge pull request #5595 from Heipen/ui_update

Upd: Battle UI ElvenVine

* Upd: [TW] Event The Vagabond’s Recruitment Plan (event_20260326_cn)

---------

Co-authored-by: heipen <126669219+Heipen@users.noreply.github.com>
2026-04-03 22:50:39 +08:00
LmeSzinc
e9a09a368e Upd: [TW] Event The Vagabond’s Recruitment Plan (event_20260326_cn) 2026-04-03 22:49:31 +08:00
heipen
5cf249c8e7 Merge pull request #5595 from Heipen/ui_update
Upd: Battle UI ElvenVine
2026-04-03 22:44:37 +08:00
GH Action - Upstream Sync
9ca2f99143 Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2026-04-01 15:19:58 +00:00
LmeSzinc
594a652819 Bug fix (#5591) 2026-04-01 22:57:52 +08:00
iceynano
37bf25c4b0 Fix Event Reaction (#5589)
* Add: Event Reaction

* Update widgets.py

* Update widgets.py

* Update widgets.py

* Update widgets.py

* Update widgets.py

* Fix event_trigger

* Resolve patch #5226

Removed unnecessary whitespace in set_aside and set_aside_status methods.
2026-04-01 22:52:12 +08:00
GH Action - Upstream Sync
4e1673fe99 Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2026-03-31 19:13:46 +00:00
LmeSzinc
01c69f645e Fix: Conflicted interval of DOCK_CHECK after selecting ship 2026-04-01 02:02:23 +08:00
LmeSzinc
1e67ed613a Merge pull request #5587 from LmeSzinc/dev
Bug fix
2026-04-01 01:18:17 +08:00
LmeSzinc
032b2c1931 Fix: Limit match area of SHOP_REFRESH
to handle spamming bulin character at bottom-right of shop page, at April 1st
2026-04-01 01:17:12 +08:00
LmeSzinc
278edcdf12 Opt: Add favourite student default to false 2026-04-01 01:12:20 +08:00
LmeSzinc
aad22c753a Opt: Mood control default to prevent_green_face 2026-04-01 01:12:13 +08:00
27f9a23ad5 Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2026-03-31 13:54:36 +08:00
LmeSzinc
433059bc8e Merge pull request #5586 from LmeSzinc/dev
Bug fix
2026-03-31 12:52:26 +08:00
LmeSzinc
9ca4b263ad Fix: Reset no searching timeout if not in map 2026-03-31 12:47:37 +08:00
LmeSzinc
8c9a39b703 Fix: Add expected=boss if only one boss spawn point 2026-03-31 12:41:07 +08:00
positnuec
bf03867f0b Feat: Restart emulator on its network disconnection 2026-03-30 21:38:28 +08:00
positnuec
8a7c9f3115 Opt: Relaxed conditions for ship changes 2026-03-30 21:33:54 +08:00
LmeSzinc
e8f5ad9830 Merge pull request #5585 from LmeSzinc/dev
W16
2026-03-30 15:54:28 +08:00
LmeSzinc
b993a5e8b4 Fix: W16 map data 2026-03-30 02:39:51 +08:00
LmeSzinc
33e812adb8 Merge pull request #5455 from guoh064/campaign_16_main
Add: W16 preparations
2026-03-29 19:26:04 +08:00
GH Action - Upstream Sync
4f917c8169 Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2026-03-28 14:39:56 +00:00
LmeSzinc
dce5261670 Bug fix (#5576)
* Fix: _reward_mission_claim_click stucked at MISSION_UNFINISH (#5573)

* Add: Add Students with Level >= X Only

* Fix: [ALAS] Skip permission errors when replacing adb

* Fix: Uninstall registry not closed

* Add: [ALAS] Support LDPlayer14

* Fix: [ALAS] search by emulator type first, which is more trustworthy

* Fix: [ALAS] Limit Android SDK version when benchmarking Droidcast

---------

Co-authored-by: guoh064 <50830808+guoh064@users.noreply.github.com>
2026-03-28 21:55:19 +08:00
LmeSzinc
c60c343c68 Fix: [ALAS] Limit Android SDK version when benchmarking Droidcast 2026-03-28 19:09:14 +08:00
LmeSzinc
5c9b955d24 Fix: [ALAS] search by emulator type first, which is more trustworthy 2026-03-28 19:07:47 +08:00
LmeSzinc
960db91be9 Add: [ALAS] Support LDPlayer14 2026-03-28 19:00:12 +08:00
LmeSzinc
b703cb10ea Fix: Uninstall registry not closed 2026-03-28 18:32:55 +08:00
LmeSzinc
0c4f46180e Fix: [ALAS] Skip permission errors when replacing adb 2026-03-28 18:17:42 +08:00
LmeSzinc
e45fd05341 Add: Add Students with Level >= X Only 2026-03-28 18:12:31 +08:00
guoh064
0c31b2c4ec Fix: _reward_mission_claim_click stucked at MISSION_UNFINISH (#5573) 2026-03-28 17:49:29 +08:00
52adbc54f2 Upd: island characters 2026-03-27 22:55:06 +08:00
275b36d041 Merge branch 'master' of https://github.com/sui-feng-cb/AzurLaneAutoScript1 2026-03-27 22:44:54 +08:00
guoh064
483f6cc338 Opt: campaign_16_main MAP_SWIPE_MULTIPLY 2026-03-27 22:13:47 +08:00
guoh064
0ca7a52bcd Opt: campaign_16_main clear mode battle function using mob move 2026-03-27 22:13:40 +08:00
guoh064
9ebf8d7d06 Upd: campaign_16_main clear mode 2026-03-27 22:13:32 +08:00
GH Action - Upstream Sync
428b8f3b00 Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2026-03-26 17:13:54 +00:00
LmeSzinc
65c303317a Add: Event The Vagabond’s Recruitment Plan (event_20260326_cn) (#5571)
* Upd: ocr model azur_lane_jp (#5553)

* Upd: Event entrance of The Vagabond’s Recruitment Plan

* Add: Chapter T HT

* Add: Chapter SP

---------

Co-authored-by: guoh064 <50830808+guoh064@users.noreply.github.com>
2026-03-27 00:41:37 +08:00
LmeSzinc
17a385274b Add: Chapter SP 2026-03-26 23:09:38 +08:00
LmeSzinc
d99af8fb07 Add: Chapter T HT 2026-03-26 23:04:52 +08:00
LmeSzinc
b64d3e13e2 Upd: Event entrance of The Vagabond’s Recruitment Plan 2026-03-26 21:37:14 +08:00
guoh064
c422a4d58f Upd: ocr model azur_lane_jp (#5553) 2026-03-26 20:38:38 +08:00
guoh064
e4a6a5728e Opt: campaign_16_main MAP_SWIPE_MULTIPLY 2026-03-24 01:58:48 +08:00
GH Action - Upstream Sync
37ef364631 Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2026-03-23 11:01:32 +00:00
LmeSzinc
3bd8a21d3b Bug fix (#5567) 2026-03-23 18:25:28 +08:00
LmeSzinc
7cddbaf7a1 Fix: Prefer TACTICAL_CLASS_START than TACTICAL_CLASS_CANCEL
because TACTICAL_CLASS_CANCEL might be "Cancel" or "Return" in EN
2026-03-23 18:24:10 +08:00
guoh064
d7d69e95ef Opt: campaign_16_main clear mode battle function using mob move 2026-03-23 11:32:46 +08:00
下面我簡單喵兩句
561aa27942 Upd:[TW]event 20260319 update (#5564) 2026-03-20 18:52:03 +08:00
guoh064
da0e2458b7 Upd: campaign_16_main clear mode 2026-03-19 20:54:51 +08:00
74e6fd021a Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2026-03-14 20:17:42 +08:00
b0b77e7097 Upd: use Filter in skinbox_allowed_positions 2026-03-14 20:14:49 +08:00
positnuec
58d9a9f653 Opt: SkinBox position filter 2026-03-14 20:14:34 +08:00
LmeSzinc
adfe9783b9 Bug fix (#5557) 2026-03-13 22:29:25 +08:00
guoh064
a11876976c Del: [JP] temporary MetaDigitCounter color (#5556) 2026-03-13 22:28:41 +08:00
LmeSzinc
a4fd8c126d Fix: Handle popup after enter minigame 2026-03-13 18:49:34 +08:00
LmeSzinc
a6f1695de5 Merge pull request #5555 from LmeSzinc/dev
Add: event entrance for event_20240229_cn rerun
2026-03-12 19:34:30 +08:00
guoh064
9a9454df26 Add: event entrance for event_20240229_cn rerun (#5552) 2026-03-12 18:47:15 +08:00
guoh064
3f9e7edf4e Add: hide_in_upper_left option for combat manual 2026-03-12 18:46:50 +08:00
guoh064
5611dce94b Upd: asset COMBAT_AUTO 2026-03-12 18:46:50 +08:00
d7af303d04 Fix: missing argument in skinbox_position_check 2026-03-12 16:14:10 +08:00
69cdd06e60 Upd: event_20240229_cn rerun 2026-03-12 02:11:51 +08:00
positnuec
71f8051b82 Add: Purchase SkinBox by position 2026-03-12 02:07:07 +08:00
positnuec
a07dffbeda Add: Auto recommend submarine fleet in hard mode 2026-03-09 13:42:55 +08:00
positnuec
b5fe8e425b Fix: Misjudgement caused by click light effect interference 2026-03-09 13:42:45 +08:00
positnuec
da7ca5d706 Add: Control CL1 Record independently 2026-03-09 12:50:27 +08:00
positnuec
ecf2a841cf Fix: OS infinite click on CLICK_SAFE_AREA 2026-03-09 12:45:47 +08:00
GH Action - Upstream Sync
3ceade600f Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2026-03-05 18:14:27 +00:00
LmeSzinc
b687048405 Merge pull request #5545 from LmeSzinc/dev
Bug fix
2026-03-06 01:13:28 +08:00
LmeSzinc
c9e95702dc Fix: Skip event story in event_20260226_cn 2026-03-06 01:12:54 +08:00
LmeSzinc
b24d09f1a0 Upd: [TW] Event event_20260226_cn (fixed #5544) 2026-03-06 01:11:10 +08:00
GH Action - Upstream Sync
4e2e4572c3 Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2026-03-05 14:56:10 +00:00
LmeSzinc
8618ea2352 Upd: Battle UI SpringInn (#5541) (#5543)
Co-authored-by: heipen <126669219+Heipen@users.noreply.github.com>
2026-03-05 22:42:45 +08:00
heipen
dbc5fe42e8 Upd: Battle UI SpringInn (#5541) 2026-03-04 12:32:12 +08:00
2eec1333ad Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2026-02-28 05:33:05 +08:00
LmeSzinc
2a2901d218 Merge pull request #5533 from LmeSzinc/dev
Add: Event Springtide Inn Online (event_20260226_cn)
2026-02-28 04:43:01 +08:00
LmeSzinc
66fa598e75 Fix: Abyssal combat with handle_map_event (#5328) 2026-02-28 04:37:52 +08:00
LmeSzinc
bfe67e2922 Opt: swipe multiply in event_20260226_cn 2026-02-28 04:17:37 +08:00
LmeSzinc
bd108dc35f Fix: Clicking BACK_ARROW at combat loading 2026-02-28 04:09:49 +08:00
LmeSzinc
07bf9d9947 Fix: Handle wrong OCR error like "I4-4" (#5532) 2026-02-28 03:42:27 +08:00
guoh064
c8e8d0b2fe Add: Event Springtide Inn Online (event_20260226_cn) 2026-02-28 02:50:22 +08:00
37a1d8bb8e Add: Event Springtide Inn Online (event_20260226_cn) 2026-02-27 17:12:21 +08:00
3b8271fbca Revert "Upd: [tmp] event entrance of event_20260226_cn"
This reverts commit 8f933b5468.
2026-02-27 17:10:42 +08:00
guoh064
4b05184cbd Add: Event Springtide Inn Online (event_20260226_cn) 2026-02-27 00:19:36 +08:00
a97af04d85 Fix: set the management page to top before island run 2026-02-26 20:31:17 +08:00
8f933b5468 Upd: [tmp] event entrance of event_20260226_cn 2026-02-26 16:44:25 +08:00
LmeSzinc
5c7f57f3b2 Fix: patch_mimetype 2026-02-19 10:19:42 +08:00
45b7c2cdba Merge branch 'master' of https://github.com/sui-feng-cb/AzurLaneAutoScript1 2026-02-19 05:16:45 +08:00
GH Action - Upstream Sync
ce23ea94a5 Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2026-02-18 20:51:23 +00:00
LmeSzinc
ad623f6332 Merge pull request #5525 from LmeSzinc/dev
Bug fix
2026-02-19 03:18:06 +08:00
LmeSzinc
c014140c6e Fix: [CN] Remove more dash-like characters (fixed #5522) 2026-02-19 03:14:09 +08:00
gepotumu
a538739910 Fix: infinite loop in _handle_use_box_amount when box count insufficient (#5516)
When requesting more boxes than available (e.g. requesting 8 but only 3
in stack), the amount-setting loop would never exit because the UI caps
at the available count while the script keeps clicking AMOUNT_PLUS.

Added click_count tracking: if multi_click() has been called 2 times
without the amount reaching the target, treat it as the UI cap and break.
Also changed the return value from bool to the actual amount set, so
_storage_use_one_box tracks the correct number of boxes used.
2026-02-19 02:19:08 +08:00
LmeSzinc
0a4f2a89fc Fix: handle raid remain like "915/", "1515" 2026-02-19 02:15:25 +08:00
LmeSzinc
986d825a81 Fix: [EN] UI switch to page_game_room 2026-02-19 01:58:20 +08:00
LmeSzinc
74bbaf8395 Fix: first ui switch must be ui_ensure 2026-02-18 09:10:55 +08:00
LmeSzinc
d99b759a08 Fix: no poor sleep in fleet_preparation_sidebar_ensure 2026-02-18 09:10:55 +08:00
ArecaSapling
102b7eeaf7 Upd: blueprint purchase for DR5 & PR6 (#5518) 2026-02-18 09:10:41 +08:00
76eeba667f Add: Island Pearl Daemon 2026-02-17 20:58:33 +08:00
1e5a7d444b Merge branch 'master' of https://github.com/sui-feng-cb/AzurLaneAutoScript1 2026-02-15 15:58:29 +08:00
7b48e1ac58 Upd: blueprint purchase for DR5 & PR6 2026-02-15 15:57:18 +08:00
a136cbe1ff Upd: config update 2026-02-15 15:54:45 +08:00
positnuec
39ee794e41 Add: Purchase PR6 and DR5 blueprints in shipyard 2026-02-15 15:11:45 +08:00
e0b231bc58 Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2026-02-14 12:26:34 +08:00
44eb4dbcf2 Revert "Add: [CN] Spring Auction Adventure (raid_20260212)"
This reverts commit c4961c80eb.
2026-02-14 12:25:42 +08:00
95c1128c73 Revert "Fix: use cnocr for CHANGWU_OCR_REMAIN_*"
This reverts commit 5fceeddcb1.
2026-02-14 12:25:33 +08:00
LmeSzinc
cc089b6223 Merge pull request #5515 from LmeSzinc/dev
Add: Spring Auction Adventure (raid_20260212)
2026-02-14 03:44:51 +08:00
LmeSzinc
7eb80ca6f4 Upd: [CN] game server 裁决协议 2026-02-14 03:32:47 +08:00
LmeSzinc
9bb8e191ac Upd: [EN][JP][TW] Raid CHANGWU assets 2026-02-14 03:30:49 +08:00
LmeSzinc
efeb222764 Upd: [TW] Event entrance of raid_20260212 2026-02-14 03:06:07 +08:00
LmeSzinc
11405cf0c3 Fix: [EN] check other buttons for page_academy 2026-02-14 03:00:01 +08:00
LmeSzinc
3623d4c70a Merge pull request #5508 from sui-feng-cb/event_update
Add: [CN] Spring Auction Adventure (raid_20260212)
2026-02-14 02:32:28 +08:00
5ab18b27fd Fix: use cnocr for CHANGWU_OCR_REMAIN_* 2026-02-12 20:28:24 +08:00
5fceeddcb1 Fix: use cnocr for CHANGWU_OCR_REMAIN_* 2026-02-12 20:27:18 +08:00
c4961c80eb Add: [CN] Spring Auction Adventure (raid_20260212) 2026-02-12 16:45:03 +08:00
7e6b87bee8 Add: [CN] Spring Auction Adventure (raid_20260212) 2026-02-12 16:44:24 +08:00
GH Action - Upstream Sync
fc0e4ce016 Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript 2026-02-09 19:27:24 +00:00
LmeSzinc
eb73b3cfd8 Bug fix (#5505)
* Merge pull request #5500 from sui-feng-cb/event_update

Fix: raid_20240328 ex

* Upd: Battle UI Ancient

* Upd: [EN] TEMPLATE_REVELATIONS_OF_DUST

---------

Co-authored-by: ArecaSapling <115386623+sui-feng-cb@users.noreply.github.com>
2026-02-09 23:42:27 +08:00
LmeSzinc
7118c30fea Upd: [EN] TEMPLATE_REVELATIONS_OF_DUST 2026-02-09 23:40:21 +08:00
LmeSzinc
7d9e77e4fd Upd: Battle UI Ancient 2026-02-09 23:31:47 +08:00
ArecaSapling
5a32d9444c Merge pull request #5500 from sui-feng-cb/event_update
Fix: raid_20240328 ex
2026-02-09 23:23:20 +08:00
530efc628e Upd: island ui_additional 2026-02-08 23:10:43 +08:00
f981ec614d Fix: wait until ui appear in project_receive 2026-02-08 22:10:07 +08:00
054da57f5b Fix: GameTooManyClickError in product_select 2026-02-08 21:01:37 +08:00
3767be643a Upd: island character 2026-02-07 14:38:32 +08:00
guoh064
d8bba0331f Upd: [CN] asset AIR_STRIKE_* 2026-01-23 16:12:50 +08:00
179 changed files with 8465 additions and 3596 deletions

26
alas.py
View File

@@ -87,6 +87,20 @@ class AzurLaneAutoScript:
self.config.task_call('Restart') self.config.task_call('Restart')
self.device.sleep(10) self.device.sleep(10)
return False return False
except EmulatorNetworkError as e:
logger.error(e)
self.save_error_log()
if self.device.is_emulator:
logger.info('Game update stuck 3 times. Checking network status on both ends.')
self.checker.check_now()
if self.checker.is_available() and not self.device.is_network_available():
logger.critical('Emulator network is disconnected despite host being online.')
logger.warning('Restarting emulator to fix internal network.')
self.device.emulator_start()
deep_set(self.failure_record, keys='Restart', value=1)
self.config.task_call('Restart')
self.device.sleep(10)
return False
except GameBugError as e: except GameBugError as e:
logger.warning(e) logger.warning(e)
self.save_error_log() self.save_error_log()
@@ -434,6 +448,10 @@ class AzurLaneAutoScript:
from module.storage.box_disassemble import StorageBox from module.storage.box_disassemble import StorageBox
StorageBox(config=self.config, device=self.device, task="BoxDisassemble").run() StorageBox(config=self.config, device=self.device, task="BoxDisassemble").run()
def island_pearl(self):
from module.island.pearl_daemon import IslandPearl
IslandPearl(config=self.config, device=self.device, task="IslandPearl").run()
def azur_lane_uncensored(self): def azur_lane_uncensored(self):
from module.daemon.uncensored import AzurLaneUncensored from module.daemon.uncensored import AzurLaneUncensored
AzurLaneUncensored(config=self.config, device=self.device, task="AzurLaneUncensored").run() AzurLaneUncensored(config=self.config, device=self.device, task="AzurLaneUncensored").run()
@@ -556,12 +574,8 @@ class AzurLaneAutoScript:
_ = self.device _ = self.device
self.device.config = self.config self.device.config = self.config
# Skip first restart # Skip first restart
if task == 'Restart': if task == 'Restart' and self.is_first_task:
if self.is_first_task: logger.info('Skip task `Restart` at scheduler start')
logger.info('Skip task `Restart` at scheduler start')
else:
from module.handler.login import LoginHandler
LoginHandler(self.config, self.device).app_restart()
self.config.task_delay(server_update=True) self.config.task_delay(server_update=True)
del_cached_property(self, 'config') del_cached_property(self, 'config')
continue continue

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.1 KiB

After

Width:  |  Height:  |  Size: 7.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.8 KiB

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.8 KiB

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.1 KiB

After

Width:  |  Height:  |  Size: 7.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.1 KiB

After

Width:  |  Height:  |  Size: 7.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.1 KiB

After

Width:  |  Height:  |  Size: 7.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.6 KiB

View File

@@ -1901,5 +1901,5 @@
183 183
], ],
"heads": [[146, 0, 0], [150, 0, 0]], "heads": [[146, 0, 0], [150, 0, 0]],
"attrs": {"mxnet_version": ["int", 10600]} "attrs": {"mxnet_version": ["int", 10901]}
} }

View File

@@ -281,3 +281,9 @@ To add a new event, add a new row in here, and run `python -m module.config.conf
| 20260122 | event 20220526 cn | Pledge of the Radiant Court | - | - | - | 泠誓光庭 | | 20260122 | event 20220526 cn | Pledge of the Radiant Court | - | - | - | 泠誓光庭 |
| 20260129 | coalition 20260122 | Light & Shadow Fashion Shoot! | - | - | - | 光影風尚-拍攝進行時 | | 20260129 | coalition 20260122 | Light & Shadow Fashion Shoot! | - | - | - | 光影風尚-拍攝進行時 |
| 20260205 | raid 20240328 | From Zero to Hero | 复刻从零开始的魔王讨伐之旅 | From Zero to Hero Rerun | ゼロから頑張る魔王討伐(復刻) | - | | 20260205 | raid 20240328 | From Zero to Hero | 复刻从零开始的魔王讨伐之旅 | From Zero to Hero Rerun | ゼロから頑張る魔王討伐(復刻) | - |
| 20260212 | raid 20260212 | Spring Auction Adventure | 春宴怀玉香满庭 | Spring Auction Adventure | 新春玉逸品会 | 春宴懷玉香滿庭 |
| 20260226 | event 20260226 cn | Springtide Inn Online | 春满客栈Online | Springtide Inn Online | 春色旅籠Online | 春滿客棧Online |
| 20260312 | event 20240229 cn | Snowrealm Peregrination Rerun | 复刻雪境迷踪 | Snowrealm Peregrination Rerun | 銀界遊廻(復刻) | - |
| 20260319 | event 20220728 cn | Aquilifer's Ballade | - | - | - | 復刻雄鷹的敘事歌 |
| 20260326 | event 20260326 cn | The Vagabonds Recruitment Plan | 漫游者招募计划 | The Vagabonds Recruitment Plan | ワンダラー募集計画 | - |
| 20260402 | event 20260326 cn | The Vagabonds Recruitment Plan | - | - | - | 漫遊者招募計劃 |

View File

@@ -205,3 +205,4 @@ class CampaignBase(CampaignBase_):
self._mob_move_info_change(location, target) self._mob_move_info_change(location, target)
self.find_path_initial() self.find_path_initial()
self.map.show() self.map.show()
return True

View File

@@ -7,8 +7,8 @@ from .campaign_16_base_submarine import Config as ConfigBase
MAP = CampaignMap('16-1') MAP = CampaignMap('16-1')
MAP.shape = 'I9' MAP.shape = 'I9'
MAP.camera_data = ['C2', 'C6', 'F2', 'F6'] MAP.camera_data = ['C2', 'C6', 'F2', 'F5']
MAP.camera_data_spawn_point = ['F6'] MAP.camera_data_spawn_point = ['F7']
MAP.camera_sight = (-2, -1, 3, 2) MAP.camera_sight = (-2, -1, 3, 2)
MAP.map_data = """ MAP.map_data = """
++ ME -- -- ME -- -- ME -- ++ ME -- -- ME -- -- ME --
@@ -57,6 +57,11 @@ class Config(ConfigBase):
MAP_HAS_FLEET_STEP = False MAP_HAS_FLEET_STEP = False
MAP_HAS_AMBUSH = True MAP_HAS_AMBUSH = True
MAP_ENSURE_EDGE_INSIGHT_CORNER = 'bottom-right'
MAP_SWIPE_MULTIPLY = (1.050, 1.069)
MAP_SWIPE_MULTIPLY_MINITOUCH = (1.015, 1.034)
MAP_SWIPE_MULTIPLY_MAATOUCH = (0.985, 1.003)
class Campaign(CampaignBase): class Campaign(CampaignBase):
MAP = MAP MAP = MAP

View File

@@ -54,6 +54,11 @@ class Config(ConfigBase):
MAP_HAS_FLEET_STEP = False MAP_HAS_FLEET_STEP = False
MAP_HAS_AMBUSH = True MAP_HAS_AMBUSH = True
MAP_ENSURE_EDGE_INSIGHT_CORNER = 'bottom-left'
MAP_SWIPE_MULTIPLY = (1.093, 1.113)
MAP_SWIPE_MULTIPLY_MINITOUCH = (1.057, 1.077)
MAP_SWIPE_MULTIPLY_MAATOUCH = (1.026, 1.045)
class Campaign(CampaignBase): class Campaign(CampaignBase):
MAP = MAP MAP = MAP

View File

@@ -7,7 +7,7 @@ from .campaign_16_base_aircraft import Config as ConfigBase
MAP = CampaignMap('16-3') MAP = CampaignMap('16-3')
MAP.shape = 'K6' MAP.shape = 'K6'
MAP.camera_data = ['C2', 'C5', 'F2', 'F5', 'H2', 'H5'] MAP.camera_data = ['D3', 'E4', 'G2', 'H2']
MAP.camera_data_spawn_point = ['C5'] MAP.camera_data_spawn_point = ['C5']
MAP.camera_sight = (-2, -1, 3, 2) MAP.camera_sight = (-2, -1, 3, 2)
MAP.map_data = """ MAP.map_data = """
@@ -21,8 +21,8 @@ MAP.map_data = """
MAP.weight_data = """ MAP.weight_data = """
50 50 50 50 50 50 50 50 50 50 50 50 50 50 50 50 50 50 50 50 50 50
50 50 50 50 50 50 50 50 50 50 50 50 50 50 50 50 50 50 50 50 50 50
50 50 40 40 40 40 50 50 50 50 50 50 50 50 50 50 50 50 50 50 50 50
50 50 50 50 50 40 40 40 50 50 50 50 50 50 50 50 50 50 50 50 50 50
50 50 50 50 50 50 50 50 50 50 50 50 50 50 50 50 50 50 50 50 50 50
50 50 50 50 50 50 50 50 50 50 50 50 50 50 50 50 50 50 50 50 50 50
""" """
@@ -30,7 +30,19 @@ MAP.spawn_data = [
{'battle': 0, 'enemy': 3}, {'battle': 0, 'enemy': 3},
{'battle': 1, 'enemy': 6}, {'battle': 1, 'enemy': 6},
{'battle': 2, 'enemy': 3}, {'battle': 2, 'enemy': 3},
{'battle': 3, 'boss': 1}, {'battle': 3},
{'battle': 4},
{'battle': 5},
{'battle': 6},
{'battle': 7, 'boss': 1},
]
MAP.spawn_data_loop = [
{'battle': 0, 'enemy': 3},
{'battle': 1, 'enemy': 6},
{'battle': 2, 'enemy': 3},
{'battle': 3},
{'battle': 4},
{'battle': 5, 'boss': 1},
] ]
A1, B1, C1, D1, E1, F1, G1, H1, I1, J1, K1, \ A1, B1, C1, D1, E1, F1, G1, H1, I1, J1, K1, \
A2, B2, C2, D2, E2, F2, G2, H2, I2, J2, K2, \ A2, B2, C2, D2, E2, F2, G2, H2, I2, J2, K2, \
@@ -40,7 +52,7 @@ A5, B5, C5, D5, E5, F5, G5, H5, I5, J5, K5, \
A6, B6, C6, D6, E6, F6, G6, H6, I6, J6, K6, \ A6, B6, C6, D6, E6, F6, G6, H6, I6, J6, K6, \
= MAP.flatten() = MAP.flatten()
road_main = RoadGrids([C3, D3, F3, G4, H4]) road_main = RoadGrids([G4, H4])
class Config(ConfigBase): class Config(ConfigBase):
@@ -48,43 +60,57 @@ class Config(ConfigBase):
MAP_HAS_FLEET_STEP = False MAP_HAS_FLEET_STEP = False
MAP_HAS_AMBUSH = True MAP_HAS_AMBUSH = True
MAP_ENSURE_EDGE_INSIGHT_CORNER = 'bottom-left'
MAP_SWIPE_MULTIPLY = (1.180, 1.202)
MAP_SWIPE_MULTIPLY_MINITOUCH = (1.141, 1.162)
MAP_SWIPE_MULTIPLY_MAATOUCH = (1.108, 1.128)
class Campaign(CampaignBase): class Campaign(CampaignBase):
MAP = MAP MAP = MAP
use_single_fleet = False
def map_init(self, map_):
super().map_init(map_)
self.map_has_mob_move = self.use_support_fleet and self.map_is_clear_mode
self.use_single_fleet = 'standby' in self.config.Fleet_FleetOrder
def battle_0(self): def battle_0(self):
self.clear_chosen_enemy(C3) if self.map_has_mob_move:
return True if self.mob_move(C3, C2):
return self.clear_chosen_enemy(D6)
self.map_has_mob_move = False
return self.clear_chosen_enemy(C3)
def battle_1(self): def battle_1(self):
if self.use_support_fleet: if self.map_has_mob_move:
self.mob_move(E6, E5)
if not self.use_single_fleet:
self.fleet_boss.goto(F4)
self.fleet_ensure(index=3 - self.fleet_boss_index)
return self.clear_chosen_enemy(G4)
if self.use_support_fleet and not self.map_is_clear_mode:
self.goto(C3)
self.air_strike(E3) self.air_strike(E3)
self.clear_chosen_enemy(D3) return self.clear_chosen_enemy(D3)
return True
def battle_2(self): def battle_2(self):
if self.clear_roadblocks([road_main]): return self.clear_chosen_enemy(F3)
return True
if self.clear_potential_roadblocks([road_main]):
return True
if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0):
return True
return self.battle_default()
def battle_3(self): def battle_3(self):
boss = self.map.select(is_boss=True) boss = self.map.select(is_boss=True)
if boss: if boss:
if not self.check_accessibility(boss[0], fleet='boss'): if not self.check_accessibility(boss[0], fleet='boss'):
return self.clear_roadblocks([road_main]) return self.clear_roadblocks([road_main])
if self.use_support_fleet: if self.use_support_fleet and not self.map_is_clear_mode:
# at this stage the most right zone should be accessible # at this stage the most right zone should be accessible
self.goto(K5) self.goto(K5)
self.air_strike(J6) self.air_strike(J6)
return self.fleet_boss.clear_boss() return self.fleet_boss.clear_boss()
if self.clear_roadblocks([road_main]): if self.clear_roadblocks([road_main]):
return True return True
if self.clear_potential_roadblocks([road_main]): if self.clear_any_enemy(genre=("Light",), strongest=True):
return True
if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0):
return True return True
return self.battle_default() return self.battle_default()

View File

@@ -7,7 +7,7 @@ from .campaign_16_base_aircraft import Config as ConfigBase
MAP = CampaignMap('16-4') MAP = CampaignMap('16-4')
MAP.shape = 'K8' MAP.shape = 'K8'
MAP.camera_data = ['C2', 'C6', 'F2', 'F6', 'H2', 'H6'] MAP.camera_data = ['C2', 'F5', 'F2', 'H2', 'H5']
MAP.camera_data_spawn_point = ['C6'] MAP.camera_data_spawn_point = ['C6']
MAP.camera_sight = (-2, -1, 3, 2) MAP.camera_sight = (-2, -1, 3, 2)
MAP.map_data = """ MAP.map_data = """
@@ -15,24 +15,35 @@ MAP.map_data = """
ME ++ ++ ++ -- -- ME ++ -- -- -- ME ++ ++ ++ -- -- ME ++ -- -- --
-- -- ME -- -- ++ ++ ME -- -- -- -- -- ME -- -- ++ ++ ME -- -- --
-- -- -- ME ++ -- ME -- ++ ++ -- -- -- -- ME ++ -- ME -- ++ ++ --
-- -- ME -- -- ME ++ -- ME ++ -- -- -- -- ME -- ME ++ -- ME ++ --
-- __ -- ++ ++ -- ++ ME ME -- -- -- __ -- ++ ++ -- ++ ME ME -- --
SP -- -- ME -- -- ME ++ -- ++ ++ SP -- -- ME -- -- -- ++ -- ++ ++
SP -- -- -- ++ -- ++ ++ -- -- ++ SP -- -- -- ++ -- ++ ++ -- -- ++
""" """
MAP.weight_data = """ MAP.weight_data = """
50 50 50 50 50 50 50 50 50 50 50 50 50 50 50 50 50 50 50 50 50 50
50 50 50 50 50 50 50 50 50 50 50 50 50 50 50 50 50 50 50 50 50 50
50 50 50 50 50 50 50 40 50 50 50 50 50 50 50 50 50 50 50 50 50 50
50 50 50 40 50 40 40 40 50 50 50 50 50 50 50 50 50 50 50 50 50 50
50 50 50 40 40 40 50 50 50 50 50 50 50 50 50 50 50 50 50 50 50 50
50 50 50 50 50 50 50 50 50 50 50 50 50 50 50 50 50 50 50 50 50 50
50 50 50 50 50 50 50 50 50 50 50 50 50 50 50 50 50 50 50 50 50 50
50 50 50 50 50 50 50 50 50 50 50 50 50 50 50 50 50 50 50 50 50 50
""" """
MAP.spawn_data = [ MAP.spawn_data = [
{'battle': 0, 'enemy': 5}, {'battle': 0, 'enemy': 5},
{'battle': 1, 'enemy': 4}, {'battle': 1, 'enemy': 3},
{'battle': 2, 'enemy': 5},
{'battle': 3},
{'battle': 4},
{'battle': 5},
{'battle': 6},
{'battle': 7},
{'battle': 8, 'boss': 1},
]
MAP.spawn_data_loop = [
{'battle': 0, 'enemy': 5},
{'battle': 1, 'enemy': 3},
{'battle': 2, 'enemy': 5}, {'battle': 2, 'enemy': 5},
{'battle': 3}, {'battle': 3},
{'battle': 4, 'boss': 1}, {'battle': 4, 'boss': 1},
@@ -47,51 +58,108 @@ A7, B7, C7, D7, E7, F7, G7, H7, I7, J7, K7, \
A8, B8, C8, D8, E8, F8, G8, H8, I8, J8, K8, \ A8, B8, C8, D8, E8, F8, G8, H8, I8, J8, K8, \
= MAP.flatten() = MAP.flatten()
road_main = RoadGrids([D4, F5, G4, H3]) road_main = RoadGrids([D5, F5, G4, H3])
class Config(ConfigBase): class Config(ConfigBase):
MAP_HAS_MAP_STORY = False MAP_HAS_MAP_STORY = False
MAP_HAS_FLEET_STEP = False MAP_HAS_FLEET_STEP = False
MAP_HAS_AMBUSH = True MAP_HAS_AMBUSH = True
MAP_ENSURE_EDGE_INSIGHT_CORNER = 'bottom-left'
MAP_SWIPE_MULTIPLY = (1.003, 1.022)
MAP_SWIPE_MULTIPLY_MINITOUCH = (0.970, 0.988)
MAP_SWIPE_MULTIPLY_MAATOUCH = (0.942, 0.959)
class Campaign(CampaignBase): class Campaign(CampaignBase):
MAP = MAP MAP = MAP
F5_is_moved = False
use_single_fleet = False
def map_init(self, map_):
super().map_init(map_)
self.F5_is_moved = False
self.map_has_mob_move = self.use_support_fleet and self.map_is_clear_mode
self.use_single_fleet = 'standby' in self.config.Fleet_FleetOrder
def battle_0(self): def battle_0(self):
self.clear_chosen_enemy(D4) if self.map_has_mob_move and not self.use_single_fleet:
return True if self.mob_move(D7, D8):
self.fleet_boss.goto(J1)
self.fleet_ensure(index=3 - self.fleet_boss_index)
if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0):
return True
return self.battle_default()
self.map_has_mob_move = False
return self.clear_chosen_enemy(D5)
def battle_1(self): def battle_1(self):
if self.use_support_fleet: if not self.map_has_mob_move:
self.goto(D1) return self.clear_chosen_enemy(F5)
self.air_strike(B1)
self.clear_chosen_enemy(F5) if not self.use_single_fleet:
return True if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0):
return True
return self.battle_default()
grids = SelectedGrids([H6, I5])
grid = grids.delete(grids.select(enemy_genre='Main')).first_or_none()
if grid is not None and self.mob_move(F5, F6):
self.F5_is_moved = True
return self.clear_chosen_enemy(grid)
self.F5_is_moved = False
return self.clear_chosen_enemy(F5)
def battle_2(self): def battle_2(self):
if self.clear_roadblocks([road_main]): if not self.map_has_mob_move or self.use_single_fleet:
return True return self.clear_chosen_enemy(G4)
if self.clear_potential_roadblocks([road_main]):
return True
if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0): if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0):
return True return True
return self.battle_default() return self.battle_default()
def battle_3(self):
if not self.map_has_mob_move:
return self.clear_chosen_enemy(H3)
if not self.use_single_fleet:
if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0):
return True
return self.battle_default()
if self.F5_is_moved:
if I6.enemy_genre == "Main" and self.mob_move(I6, I7):
return self.clear_any_enemy(genre=("Light",), strongest=True)
return self.clear_chosen_enemy(I6)
self.mob_move(H3, I3)
self.mob_move(I3, I2)
return self.clear_any_enemy(genre=("Light",), strongest=True)
def battle_4(self): def battle_4(self):
if self.map_is_clear_mode:
return self.fleet_boss.clear_boss()
boss = self.map.select(is_boss=True) boss = self.map.select(is_boss=True)
if boss: if boss:
if not self.check_accessibility(boss[0], fleet='boss'): if not self.check_accessibility(boss[0], fleet='boss'):
return self.clear_roadblocks([road_main]) return self.clear_roadblocks([road_main])
if self.use_support_fleet: if self.use_support_fleet:
# at this stage the most right zone should be accessible # at this stage the most right zone should be accessible
self.goto(J6) self.goto(J6)
self.air_strike(I8) self.air_strike(I8)
return self.fleet_boss.clear_boss() return self.fleet_boss.clear_boss()
if self.clear_roadblocks([road_main]): if self.clear_roadblocks([road_main]):
return True return True
if self.clear_potential_roadblocks([road_main]): if self.clear_potential_roadblocks([road_main]):
return True return True
if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0): if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0):
return True return True
return self.battle_default() return self.battle_default()

View File

@@ -6,7 +6,7 @@ from module.handler.strategy import AIR_STRIKE_OFFSET
from module.logger import logger from module.logger import logger
from module.map.utils import location_ensure from module.map.utils import location_ensure
from .campaign_support_fleet import CampaignBase as CampaignBase_ from .campaign_15_base import CampaignBase as CampaignBase_
class Config: class Config:
@@ -17,7 +17,9 @@ class Config:
'prominence': 10, 'prominence': 10,
'distance': 35, 'distance': 35,
} }
HOMO_CANNY_THRESHOLD = (50, 100) # Handle fog on map, static homography parameters and lower canny threshold
HOMO_STORAGE = ((8, 6), [(137.405, 104.804), (1046.044, 104.804), (-12.171, 652.093), (1166.717, 652.093)])
HOMO_CANNY_THRESHOLD = (50, 80)
class CampaignBase(CampaignBase_): class CampaignBase(CampaignBase_):

View File

@@ -14,9 +14,11 @@ class CampaignBase(CampaignBase_):
ENEMY_FILTER = '1T > 1L > 1E > 1M > 2T > 2L > 2E > 2M > 3T > 3L > 3E > 3M' ENEMY_FILTER = '1T > 1L > 1E > 1M > 2T > 2L > 2E > 2M > 3T > 3L > 3E > 3M'
def map_init(self, map_): def map_init(self, map_):
# submarine battle after entering map
# all emenies spawned already, so no need to wait enemy searching
if self.use_support_fleet: if self.use_support_fleet:
logger.hr(f'{self.FUNCTION_NAME_BASE}SUBMARINE', level=2) logger.hr(f'{self.FUNCTION_NAME_BASE}SUBMARINE', level=2)
self.combat(balance_hp=False, emotion_reduce=False, save_get_items=False) self.combat(balance_hp=False, emotion_reduce=False, save_get_items=False, expected_end='no_searching')
super().map_init(map_) super().map_init(map_)
def handle_submarine_support_popup(self): def handle_submarine_support_popup(self):

View File

@@ -1,3 +1,4 @@
from module.base.timer import Timer
from module.campaign.campaign_base import CampaignBase as CampaignBase_ from module.campaign.campaign_base import CampaignBase as CampaignBase_
from module.exception import RequestHumanTakeover from module.exception import RequestHumanTakeover
from module.logger import logger from module.logger import logger
@@ -58,6 +59,7 @@ class CampaignBase(CampaignBase_):
Fixed number of scrolls until give up, may need to Fixed number of scrolls until give up, may need to
increase as more war archives campaigns are added increase as more war archives campaigns are added
""" """
confirm_timer = Timer(1.5, count=4)
for _ in range(20): for _ in range(20):
if skip_first_screenshot: if skip_first_screenshot:
skip_first_screenshot = False skip_first_screenshot = False
@@ -80,13 +82,19 @@ class CampaignBase(CampaignBase_):
return entrance return entrance
if WAR_ARCHIVES_SCROLL.appear(main=self): if WAR_ARCHIVES_SCROLL.appear(main=self):
confirm_timer.clear()
if WAR_ARCHIVES_SCROLL.at_bottom(main=self): if WAR_ARCHIVES_SCROLL.at_bottom(main=self):
WAR_ARCHIVES_SCROLL.set_top(main=self) WAR_ARCHIVES_SCROLL.set_top(main=self)
else: else:
WAR_ARCHIVES_SCROLL.next_page(main=self, page=0.66) WAR_ARCHIVES_SCROLL.next_page(main=self, page=0.66)
continue continue
else: else:
break confirm_timer.start()
if confirm_timer.reached():
logger.warning('WAR_ARCHIVES_SCROLL disappeared')
break
else:
continue
logger.warning('Failed to find archives entrance') logger.warning('Failed to find archives entrance')
return None return None

View File

@@ -0,0 +1,84 @@
from module.campaign.campaign_base import CampaignBase
from module.map.map_base import CampaignMap
from module.map.map_grids import SelectedGrids, RoadGrids
from module.logger import logger
MAP = CampaignMap('A1')
MAP.shape = 'I8'
MAP.camera_data = ['E2', 'E6']
MAP.camera_data_spawn_point = ['E2']
MAP.map_data = """
-- -- ME -- ME -- -- -- --
-- ++ -- -- -- ME ++ ++ --
-- ++ -- SP -- -- Me ++ --
-- ME -- -- SP -- -- ME --
++ -- Me -- -- -- Me -- --
-- ME ++ MS -- MS ++ ++ ++
-- -- ME -- __ -- ME ++ --
-- -- -- -- MB -- -- -- --
"""
MAP.weight_data = """
50 50 50 50 50 50 50 50 50
50 50 50 50 50 50 50 50 50
50 50 50 50 50 50 50 50 50
50 50 50 50 50 50 50 50 50
50 50 50 50 50 50 50 50 50
50 50 50 50 50 50 50 50 50
50 50 50 50 50 50 50 50 50
50 50 50 50 50 50 50 50 50
"""
MAP.spawn_data = [
{'battle': 0, 'enemy': 2, 'siren': 1},
{'battle': 1, 'enemy': 1},
{'battle': 2, 'enemy': 1},
{'battle': 3, 'enemy': 1, 'boss': 1},
{'battle': 4, 'enemy': 1},
]
A1, B1, C1, D1, E1, F1, G1, H1, I1, \
A2, B2, C2, D2, E2, F2, G2, H2, I2, \
A3, B3, C3, D3, E3, F3, G3, H3, I3, \
A4, B4, C4, D4, E4, F4, G4, H4, I4, \
A5, B5, C5, D5, E5, F5, G5, H5, I5, \
A6, B6, C6, D6, E6, F6, G6, H6, I6, \
A7, B7, C7, D7, E7, F7, G7, H7, I7, \
A8, B8, C8, D8, E8, F8, G8, H8, I8, \
= MAP.flatten()
class Config:
# ===== Start of generated config =====
MAP_SIREN_TEMPLATE = []
MOVABLE_ENEMY_TURN = (2,)
MAP_HAS_SIREN = True
MAP_HAS_MOVABLE_ENEMY = True
MAP_HAS_MAP_STORY = False
MAP_HAS_FLEET_STEP = True
MAP_HAS_AMBUSH = False
MAP_HAS_MYSTERY = False
# ===== End of generated config =====
MAP_CHAPTER_SWITCH_20241219 = True
STAGE_ENTRANCE = ['half', '20240725']
MAP_HAS_MODE_SWITCH = True
STAGE_INCREASE_AB = True
MAP_WALK_USE_CURRENT_FLEET = True
MAP_SIREN_HAS_BOSS_ICON_SMALL = True
MAP_SWIPE_MULTIPLY = (1.179, 1.201)
MAP_SWIPE_MULTIPLY_MINITOUCH = (1.140, 1.161)
MAP_SWIPE_MULTIPLY_MAATOUCH = (1.107, 1.127)
class Campaign(CampaignBase):
MAP = MAP
ENEMY_FILTER = '1L > 1M > 1E > 1C > 2L > 2M > 2E > 2C > 3L > 3M > 3E > 3C'
def battle_0(self):
if self.clear_siren():
return True
if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0):
return True
return self.battle_default()
def battle_3(self):
return self.clear_boss()

View File

@@ -0,0 +1,74 @@
from module.campaign.campaign_base import CampaignBase
from module.map.map_base import CampaignMap
from module.map.map_grids import SelectedGrids, RoadGrids
from module.logger import logger
from .a1 import Config as ConfigBase
MAP = CampaignMap('A2')
MAP.shape = 'J7'
MAP.camera_data = ['D2', 'D5', 'E4']
MAP.camera_data_spawn_point = ['D5']
MAP.map_data = """
-- ME -- -- ME ++ ++ -- -- --
MB -- ME -- -- -- ++ ME ME ++
++ -- ++ ++ Me -- Me -- -- ++
-- -- ++ ++ -- __ -- -- ME --
-- MS -- -- MS -- -- ME ++ --
ME -- -- -- -- -- ME -- -- --
++ -- SP SP -- ++ ++ ++ -- --
"""
MAP.weight_data = """
50 50 50 50 50 50 50 50 50 50
50 50 50 50 50 50 50 50 50 50
50 50 50 50 50 50 50 50 50 50
50 50 50 50 50 50 50 50 50 50
50 50 50 50 50 50 50 50 50 50
50 50 50 50 50 50 50 50 50 50
50 50 50 50 50 50 50 50 50 50
"""
MAP.spawn_data = [
{'battle': 0, 'enemy': 2, 'siren': 1},
{'battle': 1, 'enemy': 1},
{'battle': 2, 'enemy': 1},
{'battle': 3, 'enemy': 1},
{'battle': 4, 'enemy': 1, 'boss': 1},
]
A1, B1, C1, D1, E1, F1, G1, H1, I1, J1, \
A2, B2, C2, D2, E2, F2, G2, H2, I2, J2, \
A3, B3, C3, D3, E3, F3, G3, H3, I3, J3, \
A4, B4, C4, D4, E4, F4, G4, H4, I4, J4, \
A5, B5, C5, D5, E5, F5, G5, H5, I5, J5, \
A6, B6, C6, D6, E6, F6, G6, H6, I6, J6, \
A7, B7, C7, D7, E7, F7, G7, H7, I7, J7, \
= MAP.flatten()
class Config(ConfigBase):
# ===== Start of generated config =====
MAP_SIREN_TEMPLATE = []
MOVABLE_ENEMY_TURN = (2,)
MAP_HAS_SIREN = True
MAP_HAS_MOVABLE_ENEMY = True
MAP_HAS_MAP_STORY = False
MAP_HAS_FLEET_STEP = True
MAP_HAS_AMBUSH = False
MAP_HAS_MYSTERY = False
# ===== End of generated config =====
MAP_ENSURE_EDGE_INSIGHT_CORNER = 'bottom-left'
class Campaign(CampaignBase):
MAP = MAP
ENEMY_FILTER = '1L > 1M > 1E > 1C > 2L > 2M > 2E > 2C > 3L > 3M > 3E > 3C'
def battle_0(self):
if self.clear_siren():
return True
if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0):
return True
return self.battle_default()
def battle_4(self):
return self.clear_boss()

View File

@@ -0,0 +1,75 @@
from module.campaign.campaign_base import CampaignBase
from module.map.map_base import CampaignMap
from module.map.map_grids import SelectedGrids, RoadGrids
from module.logger import logger
from .a1 import Config as ConfigBase
MAP = CampaignMap('A3')
MAP.shape = 'H8'
MAP.camera_data = ['D4', 'D6', 'E3']
MAP.camera_data_spawn_point = ['D4']
MAP.map_data = """
++ ++ -- -- ME -- -- ME
++ ++ MS -- -- -- ME --
SP -- -- MS -- ++ -- --
SP -- -- MS -- ++ ME --
++ Me __ -- -- -- -- --
++ ME -- Me ++ ++ ++ --
-- -- -- -- Me -- ME --
MB ++ Me ME -- ME -- --
"""
MAP.weight_data = """
50 50 50 50 50 50 50 50
50 50 50 50 50 50 50 50
50 50 50 50 50 50 50 50
50 50 50 50 50 50 50 50
50 50 50 50 50 50 50 50
50 50 50 50 50 50 50 50
50 50 50 50 50 50 50 50
50 50 50 50 50 50 50 50
"""
MAP.spawn_data = [
{'battle': 0, 'enemy': 2, 'siren': 1},
{'battle': 1, 'enemy': 1},
{'battle': 2, 'enemy': 1},
{'battle': 3, 'enemy': 1},
{'battle': 4, 'enemy': 1, 'boss': 1},
]
A1, B1, C1, D1, E1, F1, G1, H1, \
A2, B2, C2, D2, E2, F2, G2, H2, \
A3, B3, C3, D3, E3, F3, G3, H3, \
A4, B4, C4, D4, E4, F4, G4, H4, \
A5, B5, C5, D5, E5, F5, G5, H5, \
A6, B6, C6, D6, E6, F6, G6, H6, \
A7, B7, C7, D7, E7, F7, G7, H7, \
A8, B8, C8, D8, E8, F8, G8, H8, \
= MAP.flatten()
class Config(ConfigBase):
# ===== Start of generated config =====
MAP_SIREN_TEMPLATE = []
MOVABLE_ENEMY_TURN = (2,)
MAP_HAS_SIREN = True
MAP_HAS_MOVABLE_ENEMY = True
MAP_HAS_MAP_STORY = False
MAP_HAS_FLEET_STEP = True
MAP_HAS_AMBUSH = False
MAP_HAS_MYSTERY = False
# ===== End of generated config =====
class Campaign(CampaignBase):
MAP = MAP
ENEMY_FILTER = '1L > 1M > 1E > 1C > 2L > 2M > 2E > 2C > 3L > 3M > 3E > 3C'
def battle_0(self):
if self.clear_siren():
return True
if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0):
return True
return self.battle_default()
def battle_4(self):
return self.clear_boss()

View File

@@ -0,0 +1,85 @@
from module.campaign.campaign_base import CampaignBase
from module.map.map_base import CampaignMap
from module.map.map_grids import SelectedGrids, RoadGrids
from module.logger import logger
MAP = CampaignMap('B1')
MAP.shape = 'I8'
MAP.camera_data = ['D3', 'D6', 'F3', 'F6']
MAP.camera_data_spawn_point = ['D6']
MAP.map_data = """
++ -- -- -- -- -- -- -- --
ME -- ME ++ ++ ++ -- -- ++
-- ME -- MS -- MS -- ME ++
-- ++ MS -- -- -- Me -- ME
-- Me -- -- SP -- -- __ Me
-- -- -- SP -- -- Me -- --
++ ++ Me -- -- ++ -- MB --
++ ++ -- ME ME ++ ME -- ME
"""
MAP.weight_data = """
50 50 50 50 50 50 50 50 50
50 50 50 50 50 50 50 50 50
50 50 50 50 50 50 50 50 50
50 50 50 50 50 50 50 50 50
50 50 50 50 50 50 50 50 50
50 50 50 50 50 50 50 50 50
50 50 50 50 50 50 50 50 50
50 50 50 50 50 50 50 50 50
"""
MAP.spawn_data = [
{'battle': 0, 'enemy': 2, 'siren': 1},
{'battle': 1, 'enemy': 1},
{'battle': 2, 'enemy': 2},
{'battle': 3, 'enemy': 1},
{'battle': 4, 'enemy': 2, 'boss': 1},
{'battle': 5, 'enemy': 1},
]
A1, B1, C1, D1, E1, F1, G1, H1, I1, \
A2, B2, C2, D2, E2, F2, G2, H2, I2, \
A3, B3, C3, D3, E3, F3, G3, H3, I3, \
A4, B4, C4, D4, E4, F4, G4, H4, I4, \
A5, B5, C5, D5, E5, F5, G5, H5, I5, \
A6, B6, C6, D6, E6, F6, G6, H6, I6, \
A7, B7, C7, D7, E7, F7, G7, H7, I7, \
A8, B8, C8, D8, E8, F8, G8, H8, I8, \
= MAP.flatten()
class Config:
# ===== Start of generated config =====
MAP_SIREN_TEMPLATE = []
MOVABLE_ENEMY_TURN = (2,)
MAP_HAS_SIREN = True
MAP_HAS_MOVABLE_ENEMY = True
MAP_HAS_MAP_STORY = False
MAP_HAS_FLEET_STEP = True
MAP_HAS_AMBUSH = False
MAP_HAS_MYSTERY = False
# ===== End of generated config =====
MAP_CHAPTER_SWITCH_20241219 = True
STAGE_ENTRANCE = ['half', '20240725']
MAP_HAS_MODE_SWITCH = True
STAGE_INCREASE_AB = True
MAP_WALK_USE_CURRENT_FLEET = True
MAP_SIREN_HAS_BOSS_ICON_SMALL = True
MAP_SWIPE_MULTIPLY = (1.138, 1.160)
MAP_SWIPE_MULTIPLY_MINITOUCH = (1.101, 1.121)
MAP_SWIPE_MULTIPLY_MAATOUCH = (1.069, 1.088)
class Campaign(CampaignBase):
MAP = MAP
ENEMY_FILTER = '1L > 1M > 1E > 1C > 2L > 2M > 2E > 2C > 3L > 3M > 3E > 3C'
def battle_0(self):
if self.clear_siren():
return True
if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0):
return True
return self.battle_default()
def battle_4(self):
return self.clear_boss()

View File

@@ -0,0 +1,76 @@
from module.campaign.campaign_base import CampaignBase
from module.map.map_base import CampaignMap
from module.map.map_grids import SelectedGrids, RoadGrids
from module.logger import logger
from .b1 import Config as ConfigBase
MAP = CampaignMap('B2')
MAP.shape = 'J8'
MAP.camera_data = ['D2', 'D6', 'G2', 'G6']
MAP.camera_data_spawn_point = ['G2']
MAP.map_data = """
MB ++ ME ME ++ ++ ++ -- -- --
-- -- -- -- ++ ME MS -- -- SP
-- ME ++ -- Me -- -- MS -- --
-- -- Me -- -- __ MS -- -- SP
-- ME -- ++ -- -- -- -- -- --
-- ++ ME -- Me -- Me ++ ++ ME
-- ME -- ME ++ -- -- ME ++ --
-- -- -- -- ++ ME -- -- -- --
"""
MAP.weight_data = """
50 50 50 50 50 50 50 50 50 50
50 50 50 50 50 50 50 50 50 50
50 50 50 50 50 50 50 50 50 50
50 50 50 50 50 50 50 50 50 50
50 50 50 50 50 50 50 50 50 50
50 50 50 50 50 50 50 50 50 50
50 50 50 50 50 50 50 50 50 50
50 50 50 50 50 50 50 50 50 50
"""
MAP.spawn_data = [
{'battle': 0, 'enemy': 2, 'siren': 1},
{'battle': 1, 'enemy': 1},
{'battle': 2, 'enemy': 2},
{'battle': 3, 'enemy': 1},
{'battle': 4, 'enemy': 2},
{'battle': 5, 'enemy': 1, 'boss': 1},
]
A1, B1, C1, D1, E1, F1, G1, H1, I1, J1, \
A2, B2, C2, D2, E2, F2, G2, H2, I2, J2, \
A3, B3, C3, D3, E3, F3, G3, H3, I3, J3, \
A4, B4, C4, D4, E4, F4, G4, H4, I4, J4, \
A5, B5, C5, D5, E5, F5, G5, H5, I5, J5, \
A6, B6, C6, D6, E6, F6, G6, H6, I6, J6, \
A7, B7, C7, D7, E7, F7, G7, H7, I7, J7, \
A8, B8, C8, D8, E8, F8, G8, H8, I8, J8, \
= MAP.flatten()
class Config(ConfigBase):
# ===== Start of generated config =====
MAP_SIREN_TEMPLATE = []
MOVABLE_ENEMY_TURN = (2,)
MAP_HAS_SIREN = True
MAP_HAS_MOVABLE_ENEMY = True
MAP_HAS_MAP_STORY = False
MAP_HAS_FLEET_STEP = True
MAP_HAS_AMBUSH = False
MAP_HAS_MYSTERY = False
# ===== End of generated config =====
class Campaign(CampaignBase):
MAP = MAP
ENEMY_FILTER = '1L > 1M > 1E > 1C > 2L > 2M > 2E > 2C > 3L > 3M > 3E > 3C'
def battle_0(self):
if self.clear_siren():
return True
if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0):
return True
return self.battle_default()
def battle_5(self):
return self.fleet_boss.clear_boss()

View File

@@ -0,0 +1,82 @@
from module.campaign.campaign_base import CampaignBase
from module.map.map_base import CampaignMap
from module.map.map_grids import SelectedGrids, RoadGrids
from module.logger import logger
from .b1 import Config as ConfigBase
MAP = CampaignMap('B3')
MAP.shape = 'I10'
MAP.camera_data = ['D4', 'D6', 'D8', 'F4', 'F6', 'F8']
MAP.camera_data_spawn_point = ['D2']
MAP.map_data = """
++ ++ ++ SP -- SP ++ ++ ++
-- -- -- -- -- -- -- -- --
-- Me ++ -- MS -- ++ Me --
-- Me ++ MS -- MS ++ Me --
-- -- Me -- __ -- Me -- --
ME -- -- -- ++ -- -- -- ME
-- ME -- ++ ++ ++ -- ME --
ME -- -- ME -- ME -- -- ME
++ ++ -- -- MB -- -- ++ ++
++ ++ -- ME -- ME -- ++ ++
"""
MAP.weight_data = """
50 50 50 50 50 50 50 50 50
50 50 50 50 50 50 50 50 50
50 50 50 50 50 50 50 50 50
50 50 50 50 50 50 50 50 50
50 50 50 50 50 50 50 50 50
50 50 50 50 50 50 50 50 50
50 50 50 50 50 50 50 50 50
50 50 50 50 50 50 50 50 50
50 50 50 50 50 50 50 50 50
50 50 50 50 50 50 50 50 50
"""
MAP.spawn_data = [
{'battle': 0, 'enemy': 2, 'siren': 2},
{'battle': 1, 'enemy': 1},
{'battle': 2, 'enemy': 2},
{'battle': 3, 'enemy': 1},
{'battle': 4, 'enemy': 2},
{'battle': 5, 'enemy': 1, 'boss': 1},
]
A1, B1, C1, D1, E1, F1, G1, H1, I1, \
A2, B2, C2, D2, E2, F2, G2, H2, I2, \
A3, B3, C3, D3, E3, F3, G3, H3, I3, \
A4, B4, C4, D4, E4, F4, G4, H4, I4, \
A5, B5, C5, D5, E5, F5, G5, H5, I5, \
A6, B6, C6, D6, E6, F6, G6, H6, I6, \
A7, B7, C7, D7, E7, F7, G7, H7, I7, \
A8, B8, C8, D8, E8, F8, G8, H8, I8, \
A9, B9, C9, D9, E9, F9, G9, H9, I9, \
A10, B10, C10, D10, E10, F10, G10, H10, I10, \
= MAP.flatten()
class Config(ConfigBase):
# ===== Start of generated config =====
MAP_SIREN_TEMPLATE = []
MOVABLE_ENEMY_TURN = (2,)
MAP_HAS_SIREN = True
MAP_HAS_MOVABLE_ENEMY = True
MAP_HAS_MAP_STORY = False
MAP_HAS_FLEET_STEP = True
MAP_HAS_AMBUSH = False
MAP_HAS_MYSTERY = False
# ===== End of generated config =====
class Campaign(CampaignBase):
MAP = MAP
ENEMY_FILTER = '1L > 1M > 1E > 1C > 2L > 2M > 2E > 2C > 3L > 3M > 3E > 3C'
def battle_0(self):
if self.clear_siren():
return True
if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0):
return True
return self.battle_default()
def battle_5(self):
return self.fleet_boss.clear_boss()

View File

@@ -0,0 +1,84 @@
from module.campaign.campaign_base import CampaignBase
from module.map.map_base import CampaignMap
from module.map.map_grids import SelectedGrids, RoadGrids
from module.logger import logger
MAP = CampaignMap('C1')
MAP.shape = 'I8'
MAP.camera_data = ['E2', 'E6']
MAP.camera_data_spawn_point = ['E2']
MAP.map_data = """
-- -- ME -- ME -- -- -- --
-- ++ -- -- -- ME ++ ++ --
-- ++ -- SP -- -- Me ++ --
-- ME -- -- SP -- -- ME --
++ -- Me -- -- -- Me -- --
-- ME ++ MS -- MS ++ ++ ++
-- -- ME -- __ -- ME ++ --
-- -- -- -- MB -- -- -- --
"""
MAP.weight_data = """
50 50 50 50 50 50 50 50 50
50 50 50 50 50 50 50 50 50
50 50 50 50 50 50 50 50 50
50 50 50 50 50 50 50 50 50
50 50 50 50 50 50 50 50 50
50 50 50 50 50 50 50 50 50
50 50 50 50 50 50 50 50 50
50 50 50 50 50 50 50 50 50
"""
MAP.spawn_data = [
{'battle': 0, 'enemy': 2, 'siren': 2},
{'battle': 1, 'enemy': 1},
{'battle': 2, 'enemy': 2},
{'battle': 3, 'enemy': 1},
{'battle': 4, 'enemy': 1, 'boss': 1},
]
A1, B1, C1, D1, E1, F1, G1, H1, I1, \
A2, B2, C2, D2, E2, F2, G2, H2, I2, \
A3, B3, C3, D3, E3, F3, G3, H3, I3, \
A4, B4, C4, D4, E4, F4, G4, H4, I4, \
A5, B5, C5, D5, E5, F5, G5, H5, I5, \
A6, B6, C6, D6, E6, F6, G6, H6, I6, \
A7, B7, C7, D7, E7, F7, G7, H7, I7, \
A8, B8, C8, D8, E8, F8, G8, H8, I8, \
= MAP.flatten()
class Config:
# ===== Start of generated config =====
MAP_SIREN_TEMPLATE = []
MOVABLE_ENEMY_TURN = (2,)
MAP_HAS_SIREN = True
MAP_HAS_MOVABLE_ENEMY = True
MAP_HAS_MAP_STORY = False
MAP_HAS_FLEET_STEP = True
MAP_HAS_AMBUSH = False
MAP_HAS_MYSTERY = False
# ===== End of generated config =====
MAP_CHAPTER_SWITCH_20241219 = True
STAGE_ENTRANCE = ['half', '20240725']
MAP_HAS_MODE_SWITCH = True
STAGE_INCREASE_AB = True
MAP_WALK_USE_CURRENT_FLEET = True
MAP_SIREN_HAS_BOSS_ICON_SMALL = True
MAP_SWIPE_MULTIPLY = (1.179, 1.201)
MAP_SWIPE_MULTIPLY_MINITOUCH = (1.140, 1.161)
MAP_SWIPE_MULTIPLY_MAATOUCH = (1.107, 1.127)
class Campaign(CampaignBase):
MAP = MAP
ENEMY_FILTER = '1L > 1M > 1E > 1C > 2L > 2M > 2E > 2C > 3L > 3M > 3E > 3C'
def battle_0(self):
if self.clear_siren():
return True
if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0):
return True
return self.battle_default()
def battle_4(self):
return self.clear_boss()

Some files were not shown because too many files have changed in this diff Show More