Merge pull request #2508 from LmeSzinc/dev

Bug fix

Author: LmeSzinc

campaign/campaign_sos/campaign_10_5.py

@@ -2,7 +2,7 @@
 from module.map.map_base import CampaignMap
 from module.map.map_grids import RoadGrids, SelectedGrids
 
-from .campaign_base import CampaignBase
+from .campaign_base import CampaignBase, ConfigBase
 
 MAP = CampaignMap('SOS')
 MAP.shape = 'I6'
@@ -42,7 +42,7 @@
     = MAP.flatten()
 
 
-class Config:
+class Config(ConfigBase):
     # ===== Start of generated config =====
     MAP_HAS_MAP_STORY = False
     MAP_HAS_FLEET_STEP = False
@@ -80,4 +80,4 @@ def battle_5(self):
         return self.battle_default()
 
     def battle_6(self):
-        self.fleet_boss.clear_boss()
+        return self.fleet_boss.clear_boss()

campaign/campaign_sos/campaign_3_5.py

@@ -2,7 +2,7 @@
 from module.map.map_base import CampaignMap
 from module.map.map_grids import RoadGrids, SelectedGrids
 
-from .campaign_base import CampaignBase
+from .campaign_base import CampaignBase, ConfigBase
 
 MAP = CampaignMap('SOS')
 MAP.shape = 'H5'
@@ -36,7 +36,7 @@
     = MAP.flatten()
 
 
-class Config:
+class Config(ConfigBase):
     # ===== Start of generated config =====
     MAP_HAS_MAP_STORY = False
     MAP_HAS_FLEET_STEP = False
@@ -81,4 +81,4 @@ def battle_2(self):
         return self.battle_default()
 
     def battle_3(self):
-        self.fleet_boss.clear_boss()
+        return self.fleet_boss.clear_boss()

campaign/campaign_sos/campaign_4_5.py

@@ -2,7 +2,7 @@
 from module.map.map_base import CampaignMap
 from module.map.map_grids import RoadGrids, SelectedGrids
 
-from .campaign_base import CampaignBase
+from .campaign_base import CampaignBase, ConfigBase
 
 MAP = CampaignMap('SOS')
 MAP.shape = 'H7'
@@ -43,7 +43,7 @@
     = MAP.flatten()
 
 
-class Config:
+class Config(ConfigBase):
     # ===== Start of generated config =====
     MAP_HAS_MAP_STORY = False
     MAP_HAS_FLEET_STEP = False
@@ -91,4 +91,4 @@ def battle_3(self):
         return self.battle_default()
 
     def battle_4(self):
-        self.fleet_boss.clear_boss()
+        return self.fleet_boss.clear_boss()

campaign/campaign_sos/campaign_5_5.py

@@ -2,7 +2,7 @@
 from module.map.map_base import CampaignMap
 from module.map.map_grids import RoadGrids, SelectedGrids
 
-from .campaign_base import CampaignBase
+from .campaign_base import CampaignBase, ConfigBase
 
 MAP = CampaignMap('SOS')
 MAP.shape = 'H6'
@@ -40,7 +40,7 @@
     = MAP.flatten()
 
 
-class Config:
+class Config(ConfigBase):
     # ===== Start of generated config =====
     MAP_HAS_MAP_STORY = False
     MAP_HAS_FLEET_STEP = False
@@ -85,4 +85,4 @@ def battle_3(self):
         return self.battle_default()
 
     def battle_4(self):
-        self.fleet_boss.clear_boss()
+        return self.fleet_boss.clear_boss()

campaign/campaign_sos/campaign_6_5.py

@@ -2,7 +2,7 @@
 from module.map.map_base import CampaignMap
 from module.map.map_grids import RoadGrids, SelectedGrids
 
-from .campaign_base import CampaignBase
+from .campaign_base import CampaignBase, ConfigBase
 
 MAP = CampaignMap('SOS')
 MAP.shape = 'H6'
@@ -41,7 +41,7 @@
     = MAP.flatten()
 
 
-class Config:
+class Config(ConfigBase):
     # ===== Start of generated config =====
     MAP_HAS_MAP_STORY = False
     MAP_HAS_FLEET_STEP = False
@@ -73,4 +73,4 @@ def battle_4(self):
         return self.battle_default()
 
     def battle_5(self):
-        self.fleet_boss.clear_boss()
+        return self.fleet_boss.clear_boss()

campaign/campaign_sos/campaign_7_5.py

@@ -2,7 +2,7 @@
 from module.map.map_base import CampaignMap
 from module.map.map_grids import RoadGrids, SelectedGrids
 
-from .campaign_base import CampaignBase
+from .campaign_base import CampaignBase, ConfigBase
 
 MAP = CampaignMap('SOS')
 MAP.shape = 'H6'
@@ -41,7 +41,7 @@
     = MAP.flatten()
 
 
-class Config:
+class Config(ConfigBase):
     # ===== Start of generated config =====
     MAP_HAS_MAP_STORY = False
     MAP_HAS_FLEET_STEP = False
@@ -76,4 +76,4 @@ def battle_4(self):
         return self.battle_default()
 
     def battle_5(self):
-        self.fleet_boss.clear_boss()
+        return self.fleet_boss.clear_boss()

campaign/campaign_sos/campaign_8_5.py

@@ -2,7 +2,7 @@
 from module.map.map_base import CampaignMap
 from module.map.map_grids import RoadGrids, SelectedGrids
 
-from .campaign_base import CampaignBase
+from .campaign_base import CampaignBase, ConfigBase
 
 MAP = CampaignMap('SOS')
 MAP.shape = 'H7'
@@ -43,7 +43,7 @@
     = MAP.flatten()
 
 
-class Config:
+class Config(ConfigBase):
     # ===== Start of generated config =====
     MAP_HAS_MAP_STORY = False
     MAP_HAS_FLEET_STEP = False
@@ -87,4 +87,4 @@ def battle_3(self):
         return self.battle_default()
 
     def battle_4(self):
-        self.fleet_boss.clear_boss()
+        return self.fleet_boss.clear_boss()

campaign/campaign_sos/campaign_9_5.py

@@ -2,7 +2,7 @@
 from module.map.map_base import CampaignMap
 from module.map.map_grids import RoadGrids, SelectedGrids
 
-from .campaign_base import CampaignBase
+from .campaign_base import CampaignBase, ConfigBase
 
 MAP = CampaignMap('SOS')
 MAP.shape = 'I6'
@@ -41,7 +41,7 @@
     = MAP.flatten()
 
 
-class Config:
+class Config(ConfigBase):
     # ===== Start of generated config =====
     MAP_HAS_MAP_STORY = False
     MAP_HAS_FLEET_STEP = False
@@ -72,4 +72,4 @@ def battle_4(self):
         return self.battle_default()
 
     def battle_5(self):
-        self.fleet_boss.clear_boss()
+        return self.fleet_boss.clear_boss()

campaign/campaign_sos/campaign_base.py

@@ -5,6 +5,10 @@
 from module.template.assets import TEMPLATE_STAGE_SOS
 
 
+class ConfigBase:
+    MAP_HAS_CLEAR_PERCENTAGE = False
+
+
 class CampaignBase(CampaignBase_):
     ENEMY_FILTER = '1T > 1L > 1E > 1M > 2T > 2L > 2E > 2M > 3T > 3L > 3E > 3M'
 

deploy/AidLux/0.92/requirements.txt

@@ -26,4 +26,5 @@ pyzmq==22.3.0
 onepush
 pydantic
 psutil==5.9.3
-av==10.0.0
+av==10.0.0
+uiautomator2cache==0.3.0.1