sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-26 12:47:53 +08:00
Code Activity

Merge branch 'master' into dev

Browse Source
This commit is contained in:
LmeSzinc
2022-01-10 21:45:42 +08:00
parent 50b5b49365 fb96203bba
commit f24390cc8a
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
module/os/globe_camera.py
View File

@@ -179,7 +179,7 @@ class GlobeCamera(GlobeOperation, ZoneManager):
center = np.array([[cv2.mean(center), ], ]).astype(np.uint8) center = np.array([[cv2.mean(center), ], ]).astype(np.uint8)
h, s, v = rgb2hsv(center)[0][0] h, s, v = rgb2hsv(center)[0][0]
# hsv usually to be (338, 74.9, 100) # hsv usually to be (338, 74.9, 100)
if 290 < h <= 360 and s > 45 and v > 45: if 285 < h <= 360 and s > 45 and v > 45:
return True return True
else: else:
return False return False
@@ -233,8 +233,16 @@ class GlobeCamera(GlobeOperation, ZoneManager):
""" """
logger.hr(f'Find siren stronghold', level=1) logger.hr(f'Find siren stronghold', level=1)
region = self.camera_to_zone(self.globe_camera).region region = self.camera_to_zone(self.globe_camera).region
order = [1, 2, 4, 3] * 2 order = [1, 2, 4, 3]
if region not in order:
# Camera may focus on region 5, select the nearest non-region-5 zone
zones = self.zones.delete(self.zones.select(region=5)) \
.delete(self.zones.select(is_port=True)) \
.sort_by_camera_distance(self.globe_camera)
region = zones[0].region
index = order.index(region) index = order.index(region)
order = order * 2
order = order[index:index + 4] order = order[index:index + 4]
for region in order: for region in order:
logger.hr(f'Find siren stronghold in region {region}', level=2) logger.hr(f'Find siren stronghold in region {region}', level=2)

2
webapp/packages/main/src/index.ts
View File

@@ -165,7 +165,7 @@ alas.on('stderr', function (message: string) {
* Or backend has started already * Or backend has started already
* `[Errno 10048] error while attempting to bind on address ('0.0.0.0', 22267): ` * `[Errno 10048] error while attempting to bind on address ('0.0.0.0', 22267): `
*/ */
if (message.includes('running on') || message.includes('bind on address')) { if (message.includes('Application startup complete') || message.includes('bind on address')) {
alas.removeAllListeners('stderr'); alas.removeAllListeners('stderr');
loadURL() loadURL()
} }