LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-14 17:39:25 +08:00
Code Activity

Merge branch 'refs/heads/LmeSzinc/master' into dev

Browse Source 
# Conflicts:
#	module/campaign/campaign_status.py
#	module/exercise/combat.py
#	module/retire/dock.py
#	module/retire/enhancement.py
This commit is contained in:
LA_DI_DA
2024-10-25 12:00:50 +08:00
parent e8525ffaf0 25b5349fd3
commit a2e6986dcd
217 changed files with 538 additions and 642 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
module/combat/combat.py
View File

@@ -79,21 +79,21 @@ class Combat(Level, HPBalancer, Retirement, SubmarineCall, CombatAuto, CombatMan
def is_combat_executing(self):
"""
Returns:
bool:
Button: PAUSE button that appears
"""
self.device.stuck_record_add(PAUSE)
if self.config.SERVER in ['cn', 'en']:
if PAUSE.match_luma(self.device.image, offset=(20, 20)):
return True
return PAUSE
else:
color = get_color(self.device.image, PAUSE.area)
if color_similar(color, PAUSE.color) or color_similar(color, (238, 244, 248)):
if np.max(self.image_crop(PAUSE_DOUBLE_CHECK, copy=False)) < 153:
return True
return PAUSE
if PAUSE_New.match_luma(self.device.image, offset=(20, 20)):
return True
return PAUSE_New
if PAUSE_Iridescent_Fantasy.match_luma(self.device.image, offset=(20, 20)):
return True
return PAUSE_Iridescent_Fantasy
return False
def handle_combat_quit(self, offset=(20, 20), interval=3):

23
module/combat/level.py
View File

@@ -1,3 +1,5 @@
import module.config.server as server
from module.base.base import ModuleBase
from module.base.button import *
from module.base.decorator import Config
@@ -41,7 +43,7 @@ class Level(ModuleBase):
@Config.when(SERVER='jp')
def _lv_grid(self):
return ButtonGrid(origin=(58, 128), delta=(0, 100), button_shape=(46, 19), grid_shape=(1, 6))
return ButtonGrid(origin=(34, 128), delta=(0, 100), button_shape=(68, 19), grid_shape=(1, 6))
@Config.when(SERVER=None)
def _lv_grid(self):
@@ -125,11 +127,20 @@ class LevelOcr(Digit):
image = cv2.subtract(255, cv2.multiply(image, 255 / (255 - luma_bg)))
# Find 'L' to strip 'LV.'.
# Return an empty image if 'L' is not found.
letter_l = np.nonzero(image[9:15, :].max(axis=0) < 127)[0]
if len(letter_l):
first_digit = letter_l[0] + 17
if first_digit + 3 < 46: # LV_GRID_MAIN.button_shape[0] = 46
return image[:, first_digit:]
if server.server != 'jp':
letter_l = np.nonzero(image[9:15, :].max(axis=0) < 127)[0]
if len(letter_l):
first_digit = letter_l[0] + 17
if first_digit + 3 < 46: # LV_GRID_MAIN.button_shape[0] = 46
return image[:, first_digit:]
else:
letter_l = np.nonzero(image[5:11, :].max(axis=0) < 63)[0]
if len(letter_l):
first_digit = letter_l[0] + 23 # maximal size in dock and minimal size in sea grid
if first_digit + 3 < 70: # LV_GRID_MAIN.button_shape[0] = 46
image = image[:, first_digit:]
image = cv2.copyMakeBorder(image, 2, 2, 2, 2, cv2.BORDER_CONSTANT, value=(255, 255, 255))
return image
return np.array([[255]], dtype=np.uint8)
def after_process(self, result):