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

Fix: Swipe vector generate in random_rectangle_vector_opted()

Browse Source
This commit is contained in:
LmeSzinc
2022-04-29 01:32:00 +08:00
parent 9c5f080b15
commit 058f8658e4
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
module/base/utils.py
View File

@@ -84,8 +84,8 @@ def random_rectangle_vector_opted(
vector = np.array(vector) + random_rectangle_point(random_range) vector = np.array(vector) + random_rectangle_point(random_range)
vector = np.round(vector).astype(np.int) vector = np.round(vector).astype(np.int)
half_vector = np.round(vector / 2).astype(np.int) half_vector = np.round(vector / 2).astype(np.int)
box = np.array(box) + np.append(np.abs(half_vector) + padding, -np.abs(half_vector) - padding) box_pad = np.array(box) + np.append(np.abs(half_vector) + padding, -np.abs(half_vector) - padding)
box = area_offset(box, half_vector) box_pad = area_offset(box_pad, half_vector)
segment = int(np.linalg.norm(vector) // 70) + 1 segment = int(np.linalg.norm(vector) // 70) + 1
def in_blacklist(end): def in_blacklist(end):
@@ -100,21 +100,21 @@ def random_rectangle_vector_opted(
if whitelist_area: if whitelist_area:
for area in whitelist_area: for area in whitelist_area:
area = area_limit(area, box) area = area_limit(area, box_pad)
if all([x > 0 for x in area_size(area)]): if all([x > 0 for x in area_size(area)]):
end_point = random_rectangle_point(area) end_point = random_rectangle_point(area)
for _ in range(10): for _ in range(10):
if in_blacklist(end_point): if in_blacklist(end_point):
continue continue
return tuple(end_point - vector), tuple(end_point) return point_limit(end_point - vector, box), point_limit(end_point, box)
for _ in range(100): for _ in range(100):
end_point = random_rectangle_point(box) end_point = random_rectangle_point(box_pad)
if in_blacklist(end_point): if in_blacklist(end_point):
continue continue
return tuple(end_point - vector), tuple(end_point) return point_limit(end_point - vector, box), point_limit(end_point, box)
end_point = random_rectangle_point(box) end_point = random_rectangle_point(box_pad)
return point_limit(end_point - vector, box), point_limit(end_point, box) return point_limit(end_point - vector, box), point_limit(end_point, box)