Merge pull request #1124 from LmeSzinc/bug_fix

Bug fix

README.md

@@ -3,7 +3,7 @@
 # AzurLaneAutoScript
 
 #### Discord [![](https://img.shields.io/discord/720789890354249748?logo=discord&logoColor=ffffff&color=4e4c97)](https://discord.gg/AQN6GeJ) QQ群  ![](https://img.shields.io/badge/QQ%20Group-1087735381-4e4c97)
-Alas, an Azur Lane automation tool with GUI (Supports CN, EN, JP, TW, able to support other servers), designed for 24/7 running scenes, can take over almost all Azur Lane gameplay. Azur Lane, as a mobile game, has entered the late stage of its life cycle. During the period from now to the server down, please reduce the time spent on the Azur Lane and leave everything to Alas.
+Azur Lane bot with GUI (Supports CN, EN, JP, TW, able to support other servers), designed for 24/7 running scenes, can take over almost all Azur Lane gameplay. Azur Lane, as a mobile game, has entered the late stage of its life cycle. During the period from now to the server down, please reduce the time spent on the Azur Lane and leave everything to Alas.
 
 Alas is a free open source software, link: https://github.com/LmeSzinc/AzurLaneAutoScript
 

README_en.md

@@ -4,7 +4,7 @@
 
 #### Discord [![](https://img.shields.io/discord/720789890354249748?logo=discord&logoColor=ffffff&color=4e4c97)](https://discord.gg/AQN6GeJ) QQ Group ![](https://img.shields.io/badge/QQ%20Group-1087735381-4e4c97)
 
-Alas, an Azur Lane automation tool with GUI (Supports CN, EN, JP, TW, able to support other servers), designed for 24/7 running scenes, can take over almost all Azur Lane gameplay. Azur Lane, as a mobile game, has entered the late stage of its life cycle. During the period from now to the server down, please reduce the time spent on the Azur Lane and leave everything to Alas.
+Azur Lane bot with GUI (Supports CN, EN, JP, TW, able to support other servers), designed for 24/7 running scenes, can take over almost all Azur Lane gameplay. Azur Lane, as a mobile game, has entered the late stage of its life cycle. During the period from now to the server down, please reduce the time spent on the Azur Lane and leave everything to Alas.
 
 Alas is a free open source software, link: https://github.com/LmeSzinc/AzurLaneAutoScript
 

deploy/AidLux/0.92/requirements.txt

@@ -4,6 +4,7 @@ pillow
 imageio
 lz4
 tqdm
+adbutils==0.11.0
 uiautomator2==2.16.7
 retrying
 mxnet==1.6.0

module/raid/assets.py

@@ -10,9 +10,9 @@ BRISTOL_OCR_REMAIN_NORMAL = Button(area={'cn': (1089, 414, 1148, 432), 'en': (10
 BRISTOL_RAID_EASY = Button(area={'cn': (1151, 490, 1203, 528), 'en': (1155, 504, 1197, 524), 'jp': (1152, 491, 1203, 528), 'tw': (1151, 490, 1203, 528)}, color={'cn': (141, 164, 177), 'en': (145, 167, 177), 'jp': (126, 151, 166), 'tw': (141, 164, 177)}, button={'cn': (1151, 490, 1203, 528), 'en': (1155, 504, 1197, 524), 'jp': (1152, 491, 1203, 528), 'tw': (1151, 490, 1203, 528)}, file={'cn': './assets/cn/raid/BRISTOL_RAID_EASY.png', 'en': './assets/en/raid/BRISTOL_RAID_EASY.png', 'jp': './assets/jp/raid/BRISTOL_RAID_EASY.png', 'tw': './assets/cn/raid/BRISTOL_RAID_EASY.png'})
 BRISTOL_RAID_HARD = Button(area={'cn': (1167, 246, 1220, 285), 'en': (1156, 259, 1231, 278), 'jp': (1159, 250, 1229, 285), 'tw': (1167, 246, 1220, 285)}, color={'cn': (136, 160, 173), 'en': (133, 156, 168), 'jp': (145, 168, 181), 'tw': (136, 160, 173)}, button={'cn': (1167, 246, 1220, 285), 'en': (1156, 259, 1231, 278), 'jp': (1159, 250, 1229, 285), 'tw': (1167, 246, 1220, 285)}, file={'cn': './assets/cn/raid/BRISTOL_RAID_HARD.png', 'en': './assets/en/raid/BRISTOL_RAID_HARD.png', 'jp': './assets/jp/raid/BRISTOL_RAID_HARD.png', 'tw': './assets/cn/raid/BRISTOL_RAID_HARD.png'})
 BRISTOL_RAID_NORMAL = Button(area={'cn': (1098, 367, 1150, 404), 'en': (1089, 380, 1158, 396), 'jp': (1099, 368, 1149, 404), 'tw': (1098, 367, 1150, 404)}, color={'cn': (129, 152, 165), 'en': (131, 153, 164), 'jp': (119, 146, 163), 'tw': (129, 152, 165)}, button={'cn': (1098, 367, 1150, 404), 'en': (1089, 380, 1158, 396), 'jp': (1099, 368, 1149, 404), 'tw': (1098, 367, 1150, 404)}, file={'cn': './assets/cn/raid/BRISTOL_RAID_NORMAL.png', 'en': './assets/en/raid/BRISTOL_RAID_NORMAL.png', 'jp': './assets/jp/raid/BRISTOL_RAID_NORMAL.png', 'tw': './assets/cn/raid/BRISTOL_RAID_NORMAL.png'})
-ESSEX_OCR_REMAIN_EASY = Button(area={'cn': (1073, 501, 1092, 520), 'en': (1073, 501, 1092, 520), 'jp': (1073, 501, 1092, 520), 'tw': (1073, 501, 1092, 520)}, color={'cn': (99, 133, 255), 'en': (99, 133, 255), 'jp': (99, 133, 255), 'tw': (99, 133, 255)}, button={'cn': (1073, 501, 1092, 520), 'en': (1073, 501, 1092, 520), 'jp': (1073, 501, 1092, 520), 'tw': (1073, 501, 1092, 520)}, file={'cn': './assets/cn/raid/ESSEX_OCR_REMAIN_EASY.png', 'en': './assets/en/raid/ESSEX_OCR_REMAIN_EASY.png', 'jp': './assets/jp/raid/ESSEX_OCR_REMAIN_EASY.png', 'tw': './assets/tw/raid/ESSEX_OCR_REMAIN_EASY.png'})
-ESSEX_OCR_REMAIN_HARD = Button(area={'cn': (1090, 271, 1109, 290), 'en': (1090, 271, 1109, 290), 'jp': (1090, 271, 1109, 290), 'tw': (1090, 271, 1109, 290)}, color={'cn': (100, 132, 255), 'en': (100, 132, 255), 'jp': (100, 132, 255), 'tw': (100, 132, 255)}, button={'cn': (1090, 271, 1109, 290), 'en': (1090, 271, 1109, 290), 'jp': (1090, 271, 1109, 290), 'tw': (1090, 271, 1109, 290)}, file={'cn': './assets/cn/raid/ESSEX_OCR_REMAIN_HARD.png', 'en': './assets/en/raid/ESSEX_OCR_REMAIN_HARD.png', 'jp': './assets/jp/raid/ESSEX_OCR_REMAIN_HARD.png', 'tw': './assets/tw/raid/ESSEX_OCR_REMAIN_HARD.png'})
-ESSEX_OCR_REMAIN_NORMAL = Button(area={'cn': (1051, 385, 1070, 404), 'en': (1051, 385, 1070, 404), 'jp': (1051, 385, 1070, 404), 'tw': (1051, 385, 1070, 404)}, color={'cn': (99, 132, 255), 'en': (99, 132, 255), 'jp': (99, 132, 255), 'tw': (99, 132, 255)}, button={'cn': (1051, 385, 1070, 404), 'en': (1051, 385, 1070, 404), 'jp': (1051, 385, 1070, 404), 'tw': (1051, 385, 1070, 404)}, file={'cn': './assets/cn/raid/ESSEX_OCR_REMAIN_NORMAL.png', 'en': './assets/en/raid/ESSEX_OCR_REMAIN_NORMAL.png', 'jp': './assets/jp/raid/ESSEX_OCR_REMAIN_NORMAL.png', 'tw': './assets/tw/raid/ESSEX_OCR_REMAIN_NORMAL.png'})
+ESSEX_OCR_REMAIN_EASY = Button(area={'cn': (1071, 503, 1121, 518), 'en': (1071, 503, 1121, 518), 'jp': (1071, 503, 1121, 518), 'tw': (1071, 503, 1121, 518)}, color={'cn': (97, 130, 255), 'en': (97, 130, 255), 'jp': (97, 130, 255), 'tw': (97, 130, 255)}, button={'cn': (1071, 503, 1121, 518), 'en': (1071, 503, 1121, 518), 'jp': (1071, 503, 1121, 518), 'tw': (1071, 503, 1121, 518)}, file={'cn': './assets/cn/raid/ESSEX_OCR_REMAIN_EASY.png', 'en': './assets/en/raid/ESSEX_OCR_REMAIN_EASY.png', 'jp': './assets/jp/raid/ESSEX_OCR_REMAIN_EASY.png', 'tw': './assets/tw/raid/ESSEX_OCR_REMAIN_EASY.png'})
+ESSEX_OCR_REMAIN_HARD = Button(area={'cn': (1088, 273, 1138, 287), 'en': (1088, 273, 1138, 287), 'jp': (1088, 273, 1138, 287), 'tw': (1088, 273, 1138, 287)}, color={'cn': (96, 126, 255), 'en': (96, 126, 255), 'jp': (96, 126, 255), 'tw': (96, 126, 255)}, button={'cn': (1088, 273, 1138, 287), 'en': (1088, 273, 1138, 287), 'jp': (1088, 273, 1138, 287), 'tw': (1088, 273, 1138, 287)}, file={'cn': './assets/cn/raid/ESSEX_OCR_REMAIN_HARD.png', 'en': './assets/en/raid/ESSEX_OCR_REMAIN_HARD.png', 'jp': './assets/jp/raid/ESSEX_OCR_REMAIN_HARD.png', 'tw': './assets/tw/raid/ESSEX_OCR_REMAIN_HARD.png'})
+ESSEX_OCR_REMAIN_NORMAL = Button(area={'cn': (1049, 387, 1099, 402), 'en': (1049, 387, 1099, 402), 'jp': (1049, 387, 1099, 402), 'tw': (1049, 387, 1099, 402)}, color={'cn': (97, 129, 255), 'en': (97, 129, 255), 'jp': (97, 129, 255), 'tw': (97, 129, 255)}, button={'cn': (1049, 387, 1099, 402), 'en': (1049, 387, 1099, 402), 'jp': (1049, 387, 1099, 402), 'tw': (1049, 387, 1099, 402)}, file={'cn': './assets/cn/raid/ESSEX_OCR_REMAIN_NORMAL.png', 'en': './assets/en/raid/ESSEX_OCR_REMAIN_NORMAL.png', 'jp': './assets/jp/raid/ESSEX_OCR_REMAIN_NORMAL.png', 'tw': './assets/tw/raid/ESSEX_OCR_REMAIN_NORMAL.png'})
 ESSEX_RAID_EASY = Button(area={'cn': (1136, 501, 1199, 544), 'en': (1152, 503, 1196, 536), 'jp': (1143, 496, 1209, 521), 'tw': (1142, 496, 1198, 543)}, color={'cn': (127, 177, 243), 'en': (130, 182, 240), 'jp': (162, 192, 225), 'tw': (137, 182, 239)}, button={'cn': (1136, 501, 1199, 544), 'en': (1152, 503, 1196, 536), 'jp': (1143, 496, 1209, 521), 'tw': (1142, 496, 1198, 543)}, file={'cn': './assets/cn/raid/ESSEX_RAID_EASY.png', 'en': './assets/en/raid/ESSEX_RAID_EASY.png', 'jp': './assets/jp/raid/ESSEX_RAID_EASY.png', 'tw': './assets/tw/raid/ESSEX_RAID_EASY.png'})
 ESSEX_RAID_HARD = Button(area={'cn': (1155, 271, 1215, 313), 'en': (1155, 264, 1212, 303), 'jp': (1138, 266, 1202, 291), 'tw': (1157, 266, 1215, 313)}, color={'cn': (131, 179, 241), 'en': (132, 179, 238), 'jp': (154, 186, 230), 'tw': (139, 182, 238)}, button={'cn': (1155, 271, 1215, 313), 'en': (1155, 264, 1212, 303), 'jp': (1138, 266, 1202, 291), 'tw': (1157, 266, 1215, 313)}, file={'cn': './assets/cn/raid/ESSEX_RAID_HARD.png', 'en': './assets/en/raid/ESSEX_RAID_HARD.png', 'jp': './assets/jp/raid/ESSEX_RAID_HARD.png', 'tw': './assets/tw/raid/ESSEX_RAID_HARD.png'})
 ESSEX_RAID_NORMAL = Button(area={'cn': (1111, 385, 1176, 428), 'en': (1132, 385, 1185, 421), 'jp': (1118, 381, 1188, 404), 'tw': (1120, 381, 1175, 428)}, color={'cn': (123, 173, 242), 'en': (126, 182, 241), 'jp': (163, 190, 224), 'tw': (130, 178, 239)}, button={'cn': (1111, 385, 1176, 428), 'en': (1132, 385, 1185, 421), 'jp': (1118, 381, 1188, 404), 'tw': (1120, 381, 1175, 428)}, file={'cn': './assets/cn/raid/ESSEX_RAID_NORMAL.png', 'en': './assets/en/raid/ESSEX_RAID_NORMAL.png', 'jp': './assets/jp/raid/ESSEX_RAID_NORMAL.png', 'tw': './assets/tw/raid/ESSEX_RAID_NORMAL.png'})

requirements-in.txt

@@ -5,6 +5,7 @@ opencv-python
 imageio
 lz4
 tqdm
+adbutils==0.11.0
 uiautomator2==2.16.7
 retrying
 mxnet==1.6.0