sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-25 13:38:13 +08:00
Code Activity

Fix: storage hp bar button grid and red color

Browse Source
This commit is contained in:
sui-feng-cb
2025-09-07 15:15:26 +08:00
parent e9957200e5
commit e43296ee0e
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
module/combat/hp_balancer.py
View File

@@ -4,9 +4,6 @@ from module.base.decorator import Config
from module.config.utils import to_list from module.config.utils import to_list
from module.logger import logger from module.logger import logger
# Color that shows on HP bar.
COLOR_HP_GREEN = (156, 235, 57)
COLOR_HP_RED = (99, 44, 24)
SCOUT_POSITION = [ SCOUT_POSITION = [
(403, 421), (403, 421),
(625, 369), (625, 369),
@@ -19,6 +16,9 @@ class HPBalancer(ModuleBase):
fleet_show_index = 1 fleet_show_index = 1
_hp = {} _hp = {}
_hp_has_ship = {} _hp_has_ship = {}
# Color that shows on HP bar.
COLOR_HP_GREEN = (156, 235, 57)
COLOR_HP_RED = (99, 44, 24)
@property @property
def hp(self): def hp(self):
@@ -62,8 +62,8 @@ class HPBalancer(ModuleBase):
float: HP. float: HP.
""" """
data = max( data = max(
color_bar_percentage(self.device.image, area=area, prev_color=COLOR_HP_RED), color_bar_percentage(self.device.image, area=area, prev_color=self.COLOR_HP_RED),
color_bar_percentage(self.device.image, area=area, prev_color=COLOR_HP_GREEN) color_bar_percentage(self.device.image, area=area, prev_color=self.COLOR_HP_GREEN)
) )
return data return data

8
module/os/fleet.py
View File

@@ -170,7 +170,7 @@ class OSFleet(OSCamera, Combat, Fleet, OSAsh):
return hp_grid return hp_grid
def _storage_hp_grid(self): def _storage_hp_grid(self):
return ButtonGrid(origin=(185, 553), delta=(167, 0), button_shape=(99, 4), grid_shape=(6, 1)) return ButtonGrid(origin=(185, 553), delta=(166, 0), button_shape=(99, 4), grid_shape=(6, 1))
def hp_retreat_triggered(self): def hp_retreat_triggered(self):
return False return False
@@ -220,12 +220,14 @@ class OSFleet(OSCamera, Combat, Fleet, OSAsh):
""" """
Calculate current HP in page STORAGE_CHECK, also detects the wrench (Ship died, need to repair) Calculate current HP in page STORAGE_CHECK, also detects the wrench (Ship died, need to repair)
""" """
origin = self._hp_grid origin = (self._hp_grid, self.COLOR_HP_RED)
self._hp_grid = self._storage_hp_grid self._hp_grid = self._storage_hp_grid
self.COLOR_HP_RED = (236, 0, 0)
try: try:
self._storage_hp_get() self._storage_hp_get()
finally: finally:
self._hp_grid = origin self._hp_grid = origin[0]
self.COLOR_HP_RED = origin[1]
return self.hp return self.hp
def lv_get(self, after_battle=False): def lv_get(self, after_battle=False):