diff --git a/assets/cn/map/FLEET_2_IN_USE.png b/assets/cn/map/FLEET_2_IN_USE.png index 585075226..a7759093c 100644 Binary files a/assets/cn/map/FLEET_2_IN_USE.png and b/assets/cn/map/FLEET_2_IN_USE.png differ diff --git a/assets/en/map/FLEET_2_IN_USE.png b/assets/en/map/FLEET_2_IN_USE.png index 585075226..a7759093c 100644 Binary files a/assets/en/map/FLEET_2_IN_USE.png and b/assets/en/map/FLEET_2_IN_USE.png differ diff --git a/assets/jp/map/FLEET_2_IN_USE.png b/assets/jp/map/FLEET_2_IN_USE.png index 585075226..a7759093c 100644 Binary files a/assets/jp/map/FLEET_2_IN_USE.png and b/assets/jp/map/FLEET_2_IN_USE.png differ diff --git a/assets/tw/map/FLEET_2_IN_USE.png b/assets/tw/map/FLEET_2_IN_USE.png index f4f842610..a7759093c 100644 Binary files a/assets/tw/map/FLEET_2_IN_USE.png and b/assets/tw/map/FLEET_2_IN_USE.png differ diff --git a/module/map/assets.py b/module/map/assets.py index f30969fa7..d083eb6b1 100644 --- a/module/map/assets.py +++ b/module/map/assets.py @@ -11,7 +11,7 @@ FLEET_1_IN_USE = Button(area={'cn': (375, 164, 453, 242), 'en': (375, 164, 453, FLEET_2_BAR = Button(area={'cn': (998, 380, 1169, 625), 'en': (998, 380, 1169, 625), 'jp': (998, 380, 1169, 625), 'tw': (1015, 377, 1186, 623)}, color={'cn': (178, 169, 154), 'en': (179, 170, 154), 'jp': (174, 166, 152), 'tw': (180, 171, 155)}, button={'cn': (998, 380, 1169, 625), 'en': (998, 380, 1169, 625), 'jp': (998, 380, 1169, 625), 'tw': (1015, 377, 1186, 623)}, file={'cn': './assets/cn/map/FLEET_2_BAR.png', 'en': './assets/en/map/FLEET_2_BAR.png', 'jp': './assets/jp/map/FLEET_2_BAR.png', 'tw': './assets/tw/map/FLEET_2_BAR.png'}) FLEET_2_CHOOSE = Button(area={'cn': (1009, 303, 1071, 360), 'en': (1008, 303, 1071, 360), 'jp': (1008, 302, 1072, 360), 'tw': (1026, 299, 1089, 357)}, color={'cn': (210, 167, 106), 'en': (197, 148, 83), 'jp': (196, 156, 100), 'tw': (208, 165, 105)}, button={'cn': (1009, 303, 1071, 360), 'en': (1008, 303, 1071, 360), 'jp': (1008, 302, 1072, 360), 'tw': (1026, 299, 1089, 357)}, file={'cn': './assets/cn/map/FLEET_2_CHOOSE.png', 'en': './assets/en/map/FLEET_2_CHOOSE.png', 'jp': './assets/jp/map/FLEET_2_CHOOSE.png', 'tw': './assets/tw/map/FLEET_2_CHOOSE.png'}) FLEET_2_CLEAR = Button(area={'cn': (1091, 303, 1153, 360), 'en': (1090, 303, 1153, 360), 'jp': (1092, 302, 1151, 360), 'tw': (1108, 299, 1172, 357)}, color={'cn': (155, 155, 157), 'en': (138, 139, 142), 'jp': (149, 149, 151), 'tw': (153, 154, 156)}, button={'cn': (1091, 303, 1153, 360), 'en': (1090, 303, 1153, 360), 'jp': (1092, 302, 1151, 360), 'tw': (1108, 299, 1172, 357)}, file={'cn': './assets/cn/map/FLEET_2_CLEAR.png', 'en': './assets/en/map/FLEET_2_CLEAR.png', 'jp': './assets/jp/map/FLEET_2_CLEAR.png', 'tw': './assets/tw/map/FLEET_2_CLEAR.png'}) -FLEET_2_IN_USE = Button(area={'cn': (374, 297, 453, 375), 'en': (374, 297, 453, 375), 'jp': (374, 297, 453, 375), 'tw': (390, 291, 473, 374)}, color={'cn': (198, 190, 194), 'en': (198, 190, 194), 'jp': (198, 190, 194), 'tw': (74, 66, 66)}, button={'cn': (374, 297, 453, 375), 'en': (374, 297, 453, 375), 'jp': (374, 297, 453, 375), 'tw': (390, 291, 473, 374)}, file={'cn': './assets/cn/map/FLEET_2_IN_USE.png', 'en': './assets/en/map/FLEET_2_IN_USE.png', 'jp': './assets/jp/map/FLEET_2_IN_USE.png', 'tw': './assets/tw/map/FLEET_2_IN_USE.png'}) +FLEET_2_IN_USE = Button(area={'cn': (374, 354, 453, 375), 'en': (374, 354, 453, 375), 'jp': (374, 354, 453, 375), 'tw': (374, 354, 453, 375)}, color={'cn': (208, 199, 199), 'en': (208, 199, 199), 'jp': (208, 199, 199), 'tw': (208, 199, 199)}, button={'cn': (374, 354, 453, 375), 'en': (374, 354, 453, 375), 'jp': (374, 354, 453, 375), 'tw': (374, 354, 453, 375)}, file={'cn': './assets/cn/map/FLEET_2_IN_USE.png', 'en': './assets/en/map/FLEET_2_IN_USE.png', 'jp': './assets/jp/map/FLEET_2_IN_USE.png', 'tw': './assets/tw/map/FLEET_2_IN_USE.png'}) FLEET_NUM = Button(area={'cn': (208, 72, 230, 104), 'en': (205, 71, 229, 104), 'jp': (208, 72, 230, 104), 'tw': (208, 72, 230, 104)}, color={'cn': (42, 93, 125), 'en': (45, 78, 115), 'jp': (42, 93, 125), 'tw': (42, 93, 125)}, button={'cn': (208, 72, 230, 104), 'en': (205, 71, 229, 104), 'jp': (208, 72, 230, 104), 'tw': (208, 72, 230, 104)}, file={'cn': './assets/cn/map/FLEET_NUM.png', 'en': './assets/en/map/FLEET_NUM.png', 'jp': './assets/jp/map/FLEET_NUM.png', 'tw': './assets/tw/map/FLEET_NUM.png'}) FLEET_NUM_1 = Button(area={'cn': (213, 76, 224, 101), 'en': (213, 76, 224, 101), 'jp': (213, 76, 224, 101), 'tw': (213, 76, 224, 101)}, color={'cn': (51, 143, 186), 'en': (51, 143, 186), 'jp': (51, 143, 186), 'tw': (51, 143, 186)}, button={'cn': (213, 76, 224, 101), 'en': (213, 76, 224, 101), 'jp': (213, 76, 224, 101), 'tw': (213, 76, 224, 101)}, file={'cn': './assets/cn/map/FLEET_NUM_1.png', 'en': './assets/en/map/FLEET_NUM_1.png', 'jp': './assets/jp/map/FLEET_NUM_1.png', 'tw': './assets/tw/map/FLEET_NUM_1.png'}) FLEET_NUM_2 = Button(area={'cn': (212, 75, 226, 101), 'en': (212, 75, 226, 101), 'jp': (212, 75, 226, 101), 'tw': (212, 75, 226, 101)}, color={'cn': (52, 150, 194), 'en': (52, 150, 194), 'jp': (52, 150, 194), 'tw': (52, 150, 194)}, button={'cn': (212, 75, 226, 101), 'en': (212, 75, 226, 101), 'jp': (212, 75, 226, 101), 'tw': (212, 75, 226, 101)}, file={'cn': './assets/cn/map/FLEET_NUM_2.png', 'en': './assets/en/map/FLEET_NUM_2.png', 'jp': './assets/jp/map/FLEET_NUM_2.png', 'tw': './assets/tw/map/FLEET_NUM_2.png'}) diff --git a/module/map/map_fleet_preparation.py b/module/map/map_fleet_preparation.py index 5aba04de0..6a74f84e5 100644 --- a/module/map/map_fleet_preparation.py +++ b/module/map/map_fleet_preparation.py @@ -77,6 +77,8 @@ class FleetOperator: # goes wrong even if the clear button is clicked multiple times. # If we sleep, the info bar of auto search will pop up, then we may # have to waste a few seconds for it to disappear in in_use(). + + # Cropping FLEET_*_IN_USE to avoid detecting info_bar, also do the trick. self.main.device.screenshot() def open(self):