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

Fix: HP grid check normal vs os, straight forward, no @Config

Browse Source
This commit is contained in:
nEEtdo0d
2021-05-24 16:21:44 -04:00
parent c6fe8acc41
commit 5b5412ccc0
2 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
module/combat/hp_balancer.py
View File

@@ -65,20 +65,14 @@ class HPBalancer(ModuleBase):
) )
return data return data
@Config.when(SERVER='en')
def _hp_grid(self): def _hp_grid(self):
# Location of six HP bar. # Location of six HP bar, according to respective server for campaign
return ButtonGrid(origin=(35, 190), delta=(0, 100), button_shape=(66, 4), grid_shape=(1, 6)) if self.config.SERVER == 'en':
return ButtonGrid(origin=(35, 190), delta=(0, 100), button_shape=(66, 4), grid_shape=(1, 6))
@Config.when(SERVER='jp') elif self.config.SERVER == 'jp':
def _hp_grid(self): return ButtonGrid(origin=(35, 205), delta=(0, 100), button_shape=(66, 4), grid_shape=(1, 6))
# Location of six HP bar. else:
return ButtonGrid(origin=(35, 205), delta=(0, 100), button_shape=(66, 4), grid_shape=(1, 6)) return ButtonGrid(origin=(35, 206), delta=(0, 100), button_shape=(66, 4), grid_shape=(1, 6))
@Config.when(SERVER=None)
def _hp_grid(self):
# Location of six HP bar.
return ButtonGrid(origin=(35, 206), delta=(0, 100), button_shape=(66, 4), grid_shape=(1, 6))
def hp_get(self): def hp_get(self):
"""Get current HP from screenshot. """Get current HP from screenshot.

14
module/os/fleet.py
View File

@@ -114,10 +114,18 @@ class OSFleet(OSCamera, Combat, Fleet, OSAsh):
else: else:
return '' return ''
@Config.when(SERVER='en')
def _hp_grid(self): def _hp_grid(self):
# Location of six HP bar. hp_grid = super()._hp_grid()
return ButtonGrid(origin=(35, 205), delta=(0, 100), button_shape=(66, 3), grid_shape=(1, 6))
# Location of six HP bar, according to respective server for os
if self.config.SERVER == 'en':
hp_grid = ButtonGrid(origin=(35, 205), delta=(0, 100), button_shape=(66, 3), grid_shape=(1, 6))
elif self.config.SERVER == 'jp':
pass
else:
pass
return hp_grid
def hp_withdraw_triggered(self): def hp_withdraw_triggered(self):
return False return False