sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-19 01:23:34 +08:00
Code Activity

Merge pull request #248 from noname94/patch

Browse Source 
Opt: grid.merge() optimization
This commit is contained in:
LmeSzinc
2020-11-23 21:13:32 +08:00
committed by GitHub
parent 858f3ecb4a 9fc230a1d2
commit f37387da0f
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
module/map_detection/grid_info.py
View File

@@ -206,7 +206,7 @@ class GridInfo:
self.is_enemy = True self.is_enemy = True
if info.enemy_scale: if info.enemy_scale:
self.enemy_scale = info.enemy_scale self.enemy_scale = info.enemy_scale
if info.enemy_genre: if info.enemy_genre and not (info.enemy_genre == 'Enemy' and self.enemy_genre):
self.enemy_genre = info.enemy_genre self.enemy_genre = info.enemy_genre
return True return True
elif mode == 'carrier' and not self.is_land and self.may_carrier: elif mode == 'carrier' and not self.is_land and self.may_carrier:
@@ -214,7 +214,7 @@ class GridInfo:
self.is_carrier = True self.is_carrier = True
if info.enemy_scale: if info.enemy_scale:
self.enemy_scale = info.enemy_scale self.enemy_scale = info.enemy_scale
if info.enemy_genre: if info.enemy_genre and not (info.enemy_genre == 'Enemy' and self.enemy_genre):
self.enemy_genre = info.enemy_genre self.enemy_genre = info.enemy_genre
return True return True
else: else: