diff --git a/assets/en/handler/MAP_ENEMY_SEARCHING.png b/assets/en/handler/MAP_ENEMY_SEARCHING.png index 028728e24..0a9f3f9e0 100644 Binary files a/assets/en/handler/MAP_ENEMY_SEARCHING.png and b/assets/en/handler/MAP_ENEMY_SEARCHING.png differ diff --git a/campaign/campaign_main/campaign_7_2_mystery_farming.py b/campaign/campaign_main/campaign_7_2_mystery_farming.py index 20f5c6167..2266984e9 100644 --- a/campaign/campaign_main/campaign_7_2_mystery_farming.py +++ b/campaign/campaign_main/campaign_7_2_mystery_farming.py @@ -15,7 +15,7 @@ A5, B5, C5, D5, E5, F5, G5, H5 = MAP.flatten() ROAD_MAIN = RoadGrids([A3, [C3, B4, C5], [F1, G2, G3]]) GRIDS_FOR_FASTER = SelectedGrids([A3, C3, E3, G3]) FLEET_2_STEP_ON = SelectedGrids([A3, G3, C3, E3]) -MAP.camera_data_spawn_point = ['A1'] +# MAP.camera_data_spawn_point = ['A1'] class Campaign(CampaignBase): diff --git a/module/handler/assets.py b/module/handler/assets.py index c752e46bb..7019d8095 100644 --- a/module/handler/assets.py +++ b/module/handler/assets.py @@ -30,7 +30,7 @@ MAP_AMBUSH = Button(area={'cn': (261, 433, 1280, 449), 'en': (261, 433, 1280, 44 MAP_AMBUSH_EVADE = Button(area={'cn': (325, 393, 1280, 395), 'en': (325, 393, 1280, 395), 'jp': (325, 393, 1280, 395)}, color={'cn': (255, 255, 255), 'en': (255, 255, 255), 'jp': (255, 255, 255)}, button={'cn': (979, 444, 1152, 502), 'en': (978, 443, 1153, 503), 'jp': (979, 444, 1152, 502)}, file={'cn': './assets/cn/handler/MAP_AMBUSH_EVADE.png', 'en': './assets/en/handler/MAP_AMBUSH_EVADE.png', 'jp': './assets/jp/handler/MAP_AMBUSH_EVADE.png'}) MAP_BUFF = Button(area={'cn': (145, 115, 437, 159), 'en': (145, 115, 437, 159), 'jp': (145, 115, 437, 159)}, color={'cn': (103, 118, 118), 'en': (103, 118, 118), 'jp': (103, 118, 118)}, button={'cn': (145, 115, 437, 159), 'en': (145, 115, 437, 159), 'jp': (145, 115, 437, 159)}, file={'cn': './assets/cn/handler/MAP_BUFF.png', 'en': './assets/en/handler/MAP_BUFF.png', 'jp': './assets/jp/handler/MAP_BUFF.png'}) MAP_CLEAR_PERCENTAGE = Button(area={'cn': (626, 185, 970, 190), 'en': (626, 185, 970, 190), 'jp': (626, 185, 970, 190)}, color={'cn': (245, 213, 88), 'en': (245, 213, 88), 'jp': (245, 213, 88)}, button={'cn': (626, 185, 970, 190), 'en': (626, 185, 970, 190), 'jp': (626, 185, 970, 190)}, file={'cn': './assets/cn/handler/MAP_CLEAR_PERCENTAGE.png', 'en': './assets/en/handler/MAP_CLEAR_PERCENTAGE.png', 'jp': './assets/jp/handler/MAP_CLEAR_PERCENTAGE.png'}) -MAP_ENEMY_SEARCHING = Button(area={'cn': (531, 320, 864, 382), 'en': (531, 320, 864, 382), 'jp': (608, 325, 785, 368)}, color={'cn': (200, 99, 91), 'en': (200, 99, 91), 'jp': (242, 136, 130)}, button={'cn': (531, 320, 864, 382), 'en': (531, 320, 864, 382), 'jp': (608, 325, 785, 368)}, file={'cn': './assets/cn/handler/MAP_ENEMY_SEARCHING.png', 'en': './assets/en/handler/MAP_ENEMY_SEARCHING.png', 'jp': './assets/jp/handler/MAP_ENEMY_SEARCHING.png'}) +MAP_ENEMY_SEARCHING = Button(area={'cn': (531, 320, 864, 382), 'en': (531, 320, 864, 382), 'jp': (608, 325, 785, 368)}, color={'cn': (200, 99, 91), 'en': (174, 122, 83), 'jp': (242, 136, 130)}, button={'cn': (531, 320, 864, 382), 'en': (531, 320, 864, 382), 'jp': (608, 325, 785, 368)}, file={'cn': './assets/cn/handler/MAP_ENEMY_SEARCHING.png', 'en': './assets/en/handler/MAP_ENEMY_SEARCHING.png', 'jp': './assets/jp/handler/MAP_ENEMY_SEARCHING.png'}) MAP_GREEN = Button(area={'cn': (195, 260, 349, 292), 'en': (201, 259, 341, 290), 'jp': (242, 265, 323, 287)}, color={'cn': (125, 190, 84), 'en': (104, 207, 104), 'jp': (143, 196, 109)}, button={'cn': (195, 260, 349, 292), 'en': (201, 259, 341, 290), 'jp': (242, 265, 323, 287)}, file={'cn': './assets/cn/handler/MAP_GREEN.png', 'en': './assets/en/handler/MAP_GREEN.png', 'jp': './assets/jp/handler/MAP_GREEN.png'}) MAP_STAR_1 = Button(area={'cn': (245, 377, 254, 384), 'en': (232, 381, 240, 389), 'jp': (239, 377, 244, 387)}, color={'cn': (251, 233, 143), 'en': (252, 234, 146), 'jp': (230, 203, 119)}, button={'cn': (245, 377, 254, 384), 'en': (232, 381, 240, 389), 'jp': (239, 377, 244, 387)}, file={'cn': './assets/cn/handler/MAP_STAR_1.png', 'en': './assets/en/handler/MAP_STAR_1.png', 'jp': './assets/jp/handler/MAP_STAR_1.png'}) MAP_STAR_2 = Button(area={'cn': (532, 377, 540, 384), 'en': (518, 382, 526, 389), 'jp': (526, 377, 531, 387)}, color={'cn': (251, 233, 144), 'en': (252, 234, 144), 'jp': (229, 204, 120)}, button={'cn': (532, 377, 540, 384), 'en': (518, 382, 526, 389), 'jp': (526, 377, 531, 387)}, file={'cn': './assets/cn/handler/MAP_STAR_2.png', 'en': './assets/en/handler/MAP_STAR_2.png', 'jp': './assets/jp/handler/MAP_STAR_2.png'}) diff --git a/module/handler/enemy_searching.py b/module/handler/enemy_searching.py index b217c8ac7..84abe3fe1 100644 --- a/module/handler/enemy_searching.py +++ b/module/handler/enemy_searching.py @@ -66,7 +66,7 @@ class EnemySearchingHandler(InfoHandler): if appeared: self.handle_enemy_flashing() self.device.sleep(0.3) - logger.info('In map.') + logger.info('Enemy searching appeared.') break self.enemy_searching_color_initial() if timeout.reached(): diff --git a/version.txt b/version.txt deleted file mode 100644 index 05ba528d3..000000000 --- a/version.txt +++ /dev/null @@ -1,2 +0,0 @@ -0.9.0 -20200615.01 \ No newline at end of file