xtaodada/StarRailCopilot
1
0
Fork 0
mirror of https://github.com/LmeSzinc/StarRailCopilot.git synced 2024-11-26 18:20:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: 修复血量平衡拖拽无效的问题

Browse Source 
- 修复12-2不打小型的问题
This commit is contained in:
LmeSzinc 2020-05-08 23:10:55 +08:00
parent 6d942764fd
commit 75254b6599
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
campaign/campaign_main/campaign_12_2_leveling.py
View File

@ -47,7 +47,9 @@ class Campaign(CampaignBase):
elif self.battle_count >= 5:
self.withdraw()
current = self.map.select(is_enemy=True, enemy_scale=2).count
current = self.map.select(is_enemy=True, enemy_scale=2)\
.add(self.map.select(is_enemy=True, enemy_scale=1))\
.count
logger.attr('S2_enemy', current)
if self.s3_enemy_count >= self.config.C122_S3_TOLERANCE and current == 0:
@ -57,6 +59,8 @@ class Campaign(CampaignBase):
self.check_s3_enemy()
if self.clear_enemy(scale=(2,)):
return True
if self.clear_enemy(scale=(1,)):
return True
if self.clear_enemy(scale=(3,)):
self.s3_enemy_count += 1
return True

2
module/combat/hp_balancer.py
View File

@ -75,7 +75,7 @@ class HPBalancer(ModuleBase):
p2 (int): Target position [0, 2].
"""
logger.info('scout_position_change (%s, %s)' % (p1, p2))
self.device.drag(p1=SCOUT_POSITION[p1], p2=SCOUT_POSITION[p2])
self.device.drag(p1=SCOUT_POSITION[p1], p2=SCOUT_POSITION[p2], segments=3)
def _expected_scout_order(self, hp):
descending = np.sort(hp)[::-1]

4
module/config/argparser.py
View File

@ -179,10 +179,10 @@ def main(ini_name=''):
e3.add_argument('--全员已婚3', default=default('--全员已婚3'), choices=['是', '否'])
# 血量平衡
balance = setting_parser.add_argument_group('血量平衡', '')
balance = setting_parser.add_argument_group('血量平衡', '需关闭舰队锁定才能生效')
balance.add_argument('--启用血量平衡', default=default('--启用血量平衡'), choices=['是', '否'])
balance.add_argument('--启用低血量撤退', default=default('--启用低血量撤退'), choices=['是', '否'])
balance.add_argument('--先锋血量平衡阈值', default=default('--先锋血量平衡阈值'), help='血量差值大于阈值时, 换位. 启用阵容锁定后停用')
balance.add_argument('--先锋血量平衡阈值', default=default('--先锋血量平衡阈值'), help='血量差值大于阈值时, 换位')
balance.add_argument('--低血量撤退阈值', default=default('--低血量撤退阈值'), help='任意一人血量低于阈值时, 撤退')
# 退役选项