From 0e66208e1d52f7910f92a02e97920429258c109f Mon Sep 17 00:00:00 2001 From: LmeSzinc Date: Sun, 19 Apr 2020 11:53:11 +0800 Subject: [PATCH] =?UTF-8?q?Fix:=20=E4=BF=AE=E5=A4=8D6-3=E5=87=BA=E7=94=9F?= =?UTF-8?q?=E7=82=B9=E8=A2=AB=E5=A0=B5=E4=BD=8F=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- campaign/campaign_main/campaign_6_3.py | 8 +++++++- module/map/map.py | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/campaign/campaign_main/campaign_6_3.py b/campaign/campaign_main/campaign_6_3.py index 59eb2adbd..eac10e3dd 100644 --- a/campaign/campaign_main/campaign_6_3.py +++ b/campaign/campaign_main/campaign_6_3.py @@ -44,6 +44,12 @@ road_boss = RoadGrids([ A1, [B1, A2], B2, [C2, B3], [B3, C3], [B4, C3], [C3, C4], [C4, D3], D4, # A1 - D4 [G3, H4], [G3, G4], G3, [F3, G4], F4, [E4, F5], [E4, E5], [E4, D5] # H3 - D4 ]) +road_in_map = RoadGrids([ + A1, [B1, A2], B2, [C2, B3], [B3, C3], [B4, C3], [C3, C4], [C4, D3], D4, # A1 - D4 + [G3, H4], [G3, G4], G3, [F3, G4], F4, [E4, F5], [E4, E5], [E4, D5], # H3 - D4 + D1, C1, [B1, C2], # D1 - C2 + E1, F1, [G1, F2], [G2, F2], [F3, G2] # E1 - G3 +]) road_mystery = RoadGrids([[F5, G4], [H4, G5], H2]) @@ -51,7 +57,7 @@ class Campaign(CampaignBase): MAP = MAP def battle_0(self): - if self.fleet_2_step_on(step_on, roadblocks=[road_boss]): + if self.fleet_2_step_on(step_on, roadblocks=[road_in_map]): return True if self.clear_roadblocks([road_boss]): diff --git a/module/map/map.py b/module/map/map.py index 6b18d6939..8349895ad 100644 --- a/module/map/map.py +++ b/module/map/map.py @@ -312,7 +312,7 @@ class Map(Fleet): self.fleet_1.switch_to() return False - logger.info('Fleet_2 step on %s got roadblocks.') + logger.info('Fleet_2 step on got roadblocks.') self.fleet_1.clear_roadblocks(roadblocks) self.fleet_1.clear_all_mystery() return True