Fix: 调整了回出击界面时的判定, 修改了一些地图格子权重

This commit is contained in:
LmeSzinc 2020-04-30 17:11:47 +08:00
parent 2244ca3d8d
commit 2c10f77e4d
4 changed files with 20 additions and 32 deletions

View File

@ -15,9 +15,9 @@ MAP.map_data = '''
'''
MAP.weight_data = '''
40 30 30 30 30 30 30 30
20 20 20 20 20 20 20 20
20 20 20 10 20 20 20 20
10 10 10 10 10 10 10 10
20 20 20 20 20 20 20 20
20 20 20 10 20 20 20 20
30 30 30 30 30 30 30 30
'''
MAP.camera_data = ['D3']

View File

@ -2,34 +2,8 @@ from module.campaign.campaign_base import CampaignBase
from module.map.map_base import CampaignMap
from module.map.map_grids import SelectedGrids, RoadGrids
from module.logger import logger
from campaign.campaign_main.campaign_7_2 import Config
from campaign.campaign_main.campaign_7_2 import Config, MAP
MAP = CampaignMap('7-2')
MAP.shape = 'H5'
MAP.map_data = '''
ME ++ ME -- ME ME -- SP
MM ++ ++ MM -- -- ME --
ME -- ME MB ME -- ME MM
-- ME -- MM -- ME ++ ++
SP -- ME ME -- ME ++ ++
'''
MAP.weight_data = '''
40 30 30 30 30 30 30 30
20 20 20 20 20 20 20 20
10 10 10 10 10 10 10 10
20 20 20 20 20 20 20 20
30 30 30 30 30 30 30 30
'''
MAP.camera_data = ['D3']
MAP.spawn_data = [
{'battle': 0, 'enemy': 3},
{'battle': 1, 'enemy': 2, 'mystery': 1},
{'battle': 2, 'enemy': 2, 'mystery': 1},
{'battle': 3, 'enemy': 1, 'mystery': 2},
{'battle': 4, 'enemy': 1},
{'battle': 5, 'boss': 1},
]
# MAP.in_map_swipe_preset_data = (-1, 0)
A1, B1, C1, D1, E1, F1, G1, H1, \

View File

@ -14,6 +14,15 @@ MAP.map_data = '''
ME -- ME ME ME -- -- ++ --
-- ME ++ ++ ++ MS ME -- --
'''
MAP.weight_data = '''
10 10 10 10 10 10 10 10 10
10 10 10 10 10 10 10 10 10
10 10 10 10 10 10 10 10 10
10 10 10 10 10 10 10 10 10
10 10 10 10 10 10 10 10 10
20 20 10 10 10 10 10 10 10
20 20 10 10 10 10 10 10 10
'''
MAP.camera_data = ['D3', 'D5', 'F3', 'F5']
MAP.spawn_data = [
{'battle': 0, 'enemy': 2, 'siren': 2},

View File

@ -9,8 +9,8 @@ from module.logger import logger
class EnemySearchingHandler(InfoBarHandler, StoryHandler):
MAP_ENEMY_SEARCHING_OVERLAY_TRANSPARENCY_THRESHOLD = 0.5 # Usually (0.70, 0.80).
MAP_ENEMY_SEARCHING_TIMEOUT_SECOND = 4.5
in_stage_timer = Timer(1, count=3)
MAP_ENEMY_SEARCHING_TIMEOUT_SECOND = 5
in_stage_timer = Timer(1, count=2)
def enemy_searching_color_initial(self):
MAP_ENEMY_SEARCHING.load_color(self.device.image)
@ -48,10 +48,15 @@ class EnemySearchingHandler(InfoBarHandler, StoryHandler):
timeout = Timer(self.MAP_ENEMY_SEARCHING_TIMEOUT_SECOND)
appeared = False
while 1:
timeout.start()
if self.is_in_map():
timeout.start()
else:
timeout.reset()
if self.handle_in_stage():
return True
if self.handle_story_skip():
timeout.limit = 10
timeout.reset()
if self.enemy_searching_appear():
appeared = True