diff --git a/assets/1433eace-21_13_50_556378_WindowsGraphicsCaptureMethod_3840x2160_title_None_Clie_z8GnYut_png.rf.0cdbc8a85686f46c7a404d24d4b425ec.png b/assets/1433eace-21_13_50_556378_WindowsGraphicsCaptureMethod_3840x2160_title_None_Clie_z8GnYut_png.rf.0cdbc8a85686f46c7a404d24d4b425ec.png deleted file mode 100644 index fa991d0..0000000 Binary files a/assets/1433eace-21_13_50_556378_WindowsGraphicsCaptureMethod_3840x2160_title_None_Clie_z8GnYut_png.rf.0cdbc8a85686f46c7a404d24d4b425ec.png and /dev/null differ diff --git a/assets/154eb284-17_01_16_406889_WindowsGraphicsCaptureMethod_3840x2160_title_None_Clie_6yGu616_png.rf.6b58ba35dfdb01cfe5a8f2b5dc578c12.png b/assets/154eb284-17_01_16_406889_WindowsGraphicsCaptureMethod_3840x2160_title_None_Clie_6yGu616_png.rf.6b58ba35dfdb01cfe5a8f2b5dc578c12.png deleted file mode 100644 index c470308..0000000 Binary files a/assets/154eb284-17_01_16_406889_WindowsGraphicsCaptureMethod_3840x2160_title_None_Clie_6yGu616_png.rf.6b58ba35dfdb01cfe5a8f2b5dc578c12.png and /dev/null differ diff --git a/assets/154eb284-17_01_16_406889_WindowsGraphicsCaptureMethod_3840x2160_title_None_Clie_6yGu616_png.rf.b7e209054f83709bed21a07dd8bfde12.png b/assets/154eb284-17_01_16_406889_WindowsGraphicsCaptureMethod_3840x2160_title_None_Clie_6yGu616_png.rf.b7e209054f83709bed21a07dd8bfde12.png deleted file mode 100644 index 163159b..0000000 Binary files a/assets/154eb284-17_01_16_406889_WindowsGraphicsCaptureMethod_3840x2160_title_None_Clie_6yGu616_png.rf.b7e209054f83709bed21a07dd8bfde12.png and /dev/null differ diff --git a/assets/154eb284-17_01_16_406889_WindowsGraphicsCaptureMethod_3840x2160_title_None_Clie_6yGu616_png.rf.da9ca0640a0c122989090b5cf9589e3b.png b/assets/154eb284-17_01_16_406889_WindowsGraphicsCaptureMethod_3840x2160_title_None_Clie_6yGu616_png.rf.da9ca0640a0c122989090b5cf9589e3b.png deleted file mode 100644 index 163159b..0000000 Binary files a/assets/154eb284-17_01_16_406889_WindowsGraphicsCaptureMethod_3840x2160_title_None_Clie_6yGu616_png.rf.da9ca0640a0c122989090b5cf9589e3b.png and /dev/null differ diff --git a/assets/17_11_07_938917_WindowsGraphicsCaptureMethod_0x0_title_None_Client-Win64-Shipping-exe_3840x2160_396094_1_False_original_png.rf.b71534b615badeea04ffa8a299b9a473.jpg b/assets/17_11_07_938917_WindowsGraphicsCaptureMethod_0x0_title_None_Client-Win64-Shipping-exe_3840x2160_396094_1_False_original_png.rf.b71534b615badeea04ffa8a299b9a473.jpg new file mode 100644 index 0000000..6066c5b Binary files /dev/null and b/assets/17_11_07_938917_WindowsGraphicsCaptureMethod_0x0_title_None_Client-Win64-Shipping-exe_3840x2160_396094_1_False_original_png.rf.b71534b615badeea04ffa8a299b9a473.jpg differ diff --git a/assets/17_11_07_938917_WindowsGraphicsCaptureMethod_0x0_title_None_Client-Win64-Shipping-exe_3840x2160_396094_1_False_original_png.rf.b71534b615badeea04ffa8a299b9a473.png b/assets/17_11_07_938917_WindowsGraphicsCaptureMethod_0x0_title_None_Client-Win64-Shipping-exe_3840x2160_396094_1_False_original_png.rf.b71534b615badeea04ffa8a299b9a473.png deleted file mode 100644 index 624e80f..0000000 Binary files a/assets/17_11_07_938917_WindowsGraphicsCaptureMethod_0x0_title_None_Client-Win64-Shipping-exe_3840x2160_396094_1_False_original_png.rf.b71534b615badeea04ffa8a299b9a473.png and /dev/null differ diff --git a/assets/17_11_07_938917_WindowsGraphicsCaptureMethod_0x0_title_None_Client-Win64-Shipping-exe_3840x2160_396094_1_False_original_png.rf.f921e6fb49de02d7ef17e7f5f6a976c4.png b/assets/17_11_07_938917_WindowsGraphicsCaptureMethod_0x0_title_None_Client-Win64-Shipping-exe_3840x2160_396094_1_False_original_png.rf.f921e6fb49de02d7ef17e7f5f6a976c4.png new file mode 100644 index 0000000..95bcb70 Binary files /dev/null and b/assets/17_11_07_938917_WindowsGraphicsCaptureMethod_0x0_title_None_Client-Win64-Shipping-exe_3840x2160_396094_1_False_original_png.rf.f921e6fb49de02d7ef17e7f5f6a976c4.png differ diff --git a/assets/4533b3e8-00_53_36_188376_WindowsGraphicsCaptureMethod_3840x2160_title_None_Clie_4ls54Fe_png.rf.4d173023c1d2dba20d42efc2610a5694.png b/assets/4533b3e8-00_53_36_188376_WindowsGraphicsCaptureMethod_3840x2160_title_None_Clie_4ls54Fe_png.rf.4d173023c1d2dba20d42efc2610a5694.png deleted file mode 100644 index ffc83b5..0000000 Binary files a/assets/4533b3e8-00_53_36_188376_WindowsGraphicsCaptureMethod_3840x2160_title_None_Clie_4ls54Fe_png.rf.4d173023c1d2dba20d42efc2610a5694.png and /dev/null differ diff --git a/assets/4533b3e8-00_53_36_188376_WindowsGraphicsCaptureMethod_3840x2160_title_None_Clie_4ls54Fe_png.rf.a3daefc4a50b5cb646406e36f1c769ee.png b/assets/4533b3e8-00_53_36_188376_WindowsGraphicsCaptureMethod_3840x2160_title_None_Clie_4ls54Fe_png.rf.a3daefc4a50b5cb646406e36f1c769ee.png deleted file mode 100644 index 37db060..0000000 Binary files a/assets/4533b3e8-00_53_36_188376_WindowsGraphicsCaptureMethod_3840x2160_title_None_Clie_4ls54Fe_png.rf.a3daefc4a50b5cb646406e36f1c769ee.png and /dev/null differ diff --git a/assets/64425cad-10_44_19_536997_WindowsGraphicsCaptureMethod_0x0_title_None_Client-Win_BLAxtp1_png.rf.24dbe80092b3236adeed97f046507120.png b/assets/64425cad-10_44_19_536997_WindowsGraphicsCaptureMethod_0x0_title_None_Client-Win_BLAxtp1_png.rf.24dbe80092b3236adeed97f046507120.png deleted file mode 100644 index f67b63a..0000000 Binary files a/assets/64425cad-10_44_19_536997_WindowsGraphicsCaptureMethod_0x0_title_None_Client-Win_BLAxtp1_png.rf.24dbe80092b3236adeed97f046507120.png and /dev/null differ diff --git a/assets/9f04db98-16_20_58_825243_WindowsGraphicsCaptureMethod_3840x2160_title_None_Clie_VuLpBVc_png.rf.d5a9546240f15ceec20770b94a7606a2.png b/assets/9f04db98-16_20_58_825243_WindowsGraphicsCaptureMethod_3840x2160_title_None_Clie_VuLpBVc_png.rf.d5a9546240f15ceec20770b94a7606a2.png deleted file mode 100644 index f131511..0000000 Binary files a/assets/9f04db98-16_20_58_825243_WindowsGraphicsCaptureMethod_3840x2160_title_None_Clie_VuLpBVc_png.rf.d5a9546240f15ceec20770b94a7606a2.png and /dev/null differ diff --git a/assets/WindowsGraphicsCaptureMethod_0x0_title_None_Client-Win64-Shipping-exe_3840x2160_133336_1_False_original_png.rf.a2b55fa3583fef2081d49205ae9c643b.png b/assets/WindowsGraphicsCaptureMethod_0x0_title_None_Client-Win64-Shipping-exe_3840x2160_133336_1_False_original_png.rf.a2b55fa3583fef2081d49205ae9c643b.png new file mode 100644 index 0000000..0c52ab0 Binary files /dev/null and b/assets/WindowsGraphicsCaptureMethod_0x0_title_None_Client-Win64-Shipping-exe_3840x2160_133336_1_False_original_png.rf.a2b55fa3583fef2081d49205ae9c643b.png differ diff --git a/assets/WindowsGraphicsCaptureMethod_1920x1080_title_None_Client-Win64-Shipping-exe_1920x1080_329010_1_False_original_png.rf.04af9811881aa3edd9a7b36d96c5e5b9.png b/assets/WindowsGraphicsCaptureMethod_1920x1080_title_None_Client-Win64-Shipping-exe_1920x1080_329010_1_False_original_png.rf.04af9811881aa3edd9a7b36d96c5e5b9.png deleted file mode 100644 index 14de254..0000000 Binary files a/assets/WindowsGraphicsCaptureMethod_1920x1080_title_None_Client-Win64-Shipping-exe_1920x1080_329010_1_False_original_png.rf.04af9811881aa3edd9a7b36d96c5e5b9.png and /dev/null differ diff --git a/assets/WindowsGraphicsCaptureMethod_1920x1080_title_None_Client-Win64-Shipping-exe_1920x1080_329010_1_False_original_png.rf.05df8d2ee8391150d4b9c33b0c932aa6.png b/assets/WindowsGraphicsCaptureMethod_1920x1080_title_None_Client-Win64-Shipping-exe_1920x1080_329010_1_False_original_png.rf.05df8d2ee8391150d4b9c33b0c932aa6.png deleted file mode 100644 index ffb2055..0000000 Binary files a/assets/WindowsGraphicsCaptureMethod_1920x1080_title_None_Client-Win64-Shipping-exe_1920x1080_329010_1_False_original_png.rf.05df8d2ee8391150d4b9c33b0c932aa6.png and /dev/null differ diff --git a/assets/WindowsGraphicsCaptureMethod_1920x1080_title_None_Client-Win64-Shipping-exe_1920x1080_329010_1_False_original_png.rf.af972a2439733f3885ec4e7fe7d47d82.png b/assets/WindowsGraphicsCaptureMethod_1920x1080_title_None_Client-Win64-Shipping-exe_1920x1080_329010_1_False_original_png.rf.af972a2439733f3885ec4e7fe7d47d82.png deleted file mode 100644 index ffb2055..0000000 Binary files a/assets/WindowsGraphicsCaptureMethod_1920x1080_title_None_Client-Win64-Shipping-exe_1920x1080_329010_1_False_original_png.rf.af972a2439733f3885ec4e7fe7d47d82.png and /dev/null differ diff --git a/assets/WindowsGraphicsCaptureMethod_3840x2160_title_None_Client-Win64-Shipping-exe_3840x2160_12847792_1_False_original_png.rf.abeaa08198ff5a77fb70340952ba23f3.png b/assets/WindowsGraphicsCaptureMethod_3840x2160_title_None_Client-Win64-Shipping-exe_3840x2160_12847792_1_False_original_png.rf.abeaa08198ff5a77fb70340952ba23f3.png new file mode 100644 index 0000000..08e52f9 Binary files /dev/null and b/assets/WindowsGraphicsCaptureMethod_3840x2160_title_None_Client-Win64-Shipping-exe_3840x2160_12847792_1_False_original_png.rf.abeaa08198ff5a77fb70340952ba23f3.png differ diff --git a/assets/_annotations.coco.json b/assets/_annotations.coco.json index a59c1fb..3ad1e36 100644 --- a/assets/_annotations.coco.json +++ b/assets/_annotations.coco.json @@ -1,11 +1,11 @@ { "info": { "year": "2024", - "version": "18", + "version": "21", "description": "Exported from roboflow.com", "contributor": "", "url": "https://public.roboflow.com/object-detection/undefined", - "date_created": "2024-07-12T17:27:43+00:00" + "date_created": "2024-07-18T09:42:58+00:00" }, "licenses": [ { @@ -167,111 +167,121 @@ }, { "id": 30, - "name": "char_rover", + "name": "char_mortefi", "supercategory": "ww" }, { "id": 31, - "name": "char_sanhua", + "name": "char_rover", "supercategory": "ww" }, { "id": 32, - "name": "char_taoqi", + "name": "char_sanhua", "supercategory": "ww" }, { "id": 33, - "name": "char_verina", + "name": "char_taoqi", "supercategory": "ww" }, { "id": 34, - "name": "char_yinlin", + "name": "char_verina", "supercategory": "ww" }, { "id": 35, - "name": "char_yuanwu", + "name": "char_yinlin", "supercategory": "ww" }, { "id": 36, - "name": "custom_teleport", + "name": "char_yuanwu", "supercategory": "ww" }, { "id": 37, - "name": "edge_echo_cd_dot", + "name": "custom_teleport", "supercategory": "ww" }, { "id": 38, - "name": "edge_levitator", + "name": "dialog_3_dots", "supercategory": "ww" }, { "id": 39, - "name": "fast_travel_custom", + "name": "edge_echo_cd_dot", "supercategory": "ww" }, { "id": 40, - "name": "gray_book_boss", + "name": "edge_levitator", "supercategory": "ww" }, { "id": 41, - "name": "gray_book_boss_highlight", + "name": "fast_travel_custom", "supercategory": "ww" }, { "id": 42, - "name": "gray_book_button", + "name": "gray_book_boss", "supercategory": "ww" }, { "id": 43, - "name": "gray_button_challenge", + "name": "gray_book_boss_highlight", "supercategory": "ww" }, { "id": 44, - "name": "gray_combat_count_down", + "name": "gray_button_challenge", "supercategory": "ww" }, { "id": 45, - "name": "gray_confirm_exit_button", + "name": "gray_combat_count_down", "supercategory": "ww" }, { "id": 46, - "name": "gray_crownless_battle", + "name": "gray_confirm_exit_button", "supercategory": "ww" }, { "id": 47, - "name": "gray_custom_way_point", + "name": "gray_crownless_battle", "supercategory": "ww" }, { "id": 48, - "name": "gray_start_battle", + "name": "gray_custom_way_point", "supercategory": "ww" }, { "id": 49, - "name": "gray_teleport", + "name": "gray_start_battle", "supercategory": "ww" }, { "id": 50, - "name": "pick_up_f", + "name": "gray_teleport", "supercategory": "ww" }, { "id": 51, + "name": "monthly_card", + "supercategory": "ww" + }, + { + "id": 52, + "name": "pick_up_f", + "supercategory": "ww" + }, + { + "id": 53, "name": "target_enemy_white", "supercategory": "ww" } @@ -280,262 +290,214 @@ { "id": 0, "license": 1, - "file_name": "cef1b3dd-00_55_22_640294_WindowsGraphicsCaptureMethod_3840x2160_title_None_Clie_NtclVno_png.rf.0eb178e9974bb9135567f91780337d55.png", + "file_name": "WindowsGraphicsCaptureMethod_3840x2160_title_None_Client-Win64-Shipping-exe_3840x2160_10361910_1_False_original_png.rf.244ee2bd0b4de93caac3066adaae0b75.png", "height": 2160, "width": 3840, - "date_captured": "2024-07-12T17:27:43+00:00" + "date_captured": "2024-07-18T09:42:58+00:00" }, { "id": 1, "license": 1, - "file_name": "5841f84c-17_04_26_738022_WindowsGraphicsCaptureMethod_3840x2160_title_None_Clie_TIDxIl1_png.rf.97a22c8e01f1fd88debc20c4c903b8b9.png", + "file_name": "221458a6-13_25_04_962031_WindowsGraphicsCaptureMethod_3840x2160_title_None_Clie_XYXLS23_png.rf.281b46703c1e3f6bd436750f6aa82cf2.png", "height": 2160, "width": 3840, - "date_captured": "2024-07-12T17:27:43+00:00" + "date_captured": "2024-07-18T09:42:58+00:00" }, { "id": 2, "license": 1, - "file_name": "221458a6-13_25_04_962031_WindowsGraphicsCaptureMethod_3840x2160_title_None_Clie_XYXLS23_png.rf.281b46703c1e3f6bd436750f6aa82cf2.png", + "file_name": "4_png.rf.180bb3f2bed38134b1d0bba90c3fcdb0.png", "height": 2160, "width": 3840, - "date_captured": "2024-07-12T17:27:43+00:00" + "date_captured": "2024-07-18T09:42:58+00:00" }, { "id": 3, "license": 1, - "file_name": "WindowsGraphicsCaptureMethod_3840x2160_title_None_Client-Win64-Shipping-exe_3840x2160_4720836_1_False_original_png.rf.935bb51188f6bc516efc5a57b52fe8ad.png", + "file_name": "e521850f-00_37_38_458841_Encore_liberation_0-274_original_png.rf.e7703de2285a6b2c70567e891804c760.png", "height": 2160, "width": 3840, - "date_captured": "2024-07-12T17:27:43+00:00" + "date_captured": "2024-07-18T09:42:58+00:00" }, { "id": 4, "license": 1, - "file_name": "934f0ca6-17_53_47_840123_WindowsGraphicsCaptureMethod_3840x2160_title_None_Clie_aJQVINN_png.rf.a107256237035eec3be4125f726b8b73.png", + "file_name": "cef1b3dd-00_55_22_640294_WindowsGraphicsCaptureMethod_3840x2160_title_None_Clie_NtclVno_png.rf.0eb178e9974bb9135567f91780337d55.png", "height": 2160, "width": 3840, - "date_captured": "2024-07-12T17:27:43+00:00" + "date_captured": "2024-07-18T09:42:58+00:00" }, { "id": 5, "license": 1, - "file_name": "55617870-00_55_49_536245_WindowsGraphicsCaptureMethod_3840x2160_title_None_Clie_NSeTZ2S_png.rf.5947b06a7caca9b89c2e06ec7ceab8fa.png", + "file_name": "17_11_07_938917_WindowsGraphicsCaptureMethod_0x0_title_None_Client-Win64-Shipping-exe_3840x2160_396094_1_False_original_png.rf.f921e6fb49de02d7ef17e7f5f6a976c4.png", "height": 2160, "width": 3840, - "date_captured": "2024-07-12T17:27:43+00:00" + "date_captured": "2024-07-18T09:42:58+00:00" }, { "id": 6, "license": 1, - "file_name": "9dd77a5d-16_57_31_014010_WindowsGraphicsCaptureMethod_3840x2160_title_None_Clie_RVvCfQe_png.rf.e8397fbd133d485459bb8c30fc37353c.png", + "file_name": "0ab28c72-00_54_43_431654_WindowsGraphicsCaptureMethod_3840x2160_title_None_Clie_usg73Cm_png.rf.124dc89f9b3816ecb0ce5a97c95475dc.png", "height": 2160, "width": 3840, - "date_captured": "2024-07-12T17:27:43+00:00" + "date_captured": "2024-07-18T09:42:58+00:00" }, { "id": 7, "license": 1, - "file_name": "9beed513-16_15_23_246388_WindowsGraphicsCaptureMethod_3840x2160_title_None_Clie_a4tQhDg_png.rf.4e79b52b95ad46f47bc470f069a65b29.png", + "file_name": "5841f84c-17_04_26_738022_WindowsGraphicsCaptureMethod_3840x2160_title_None_Clie_TIDxIl1_png.rf.97a22c8e01f1fd88debc20c4c903b8b9.png", "height": 2160, "width": 3840, - "date_captured": "2024-07-12T17:27:43+00:00" + "date_captured": "2024-07-18T09:42:58+00:00" }, { "id": 8, "license": 1, - "file_name": "WindowsGraphicsCaptureMethod_0x0_title_None_Client-Win64-Shipping-exe_3840x2160_1841174_1_False_original-1-_png.rf.e6c4a5734163badfbfa76780248cd2f8.png", + "file_name": "154eb284-17_01_16_406889_WindowsGraphicsCaptureMethod_3840x2160_title_None_Clie_6yGu616_png.rf.12ebc1f4e7e5208bcbf2c7f878f691aa.png", "height": 2160, "width": 3840, - "date_captured": "2024-07-12T17:27:43+00:00" + "date_captured": "2024-07-18T09:42:58+00:00" }, { "id": 9, "license": 1, - "file_name": "17_11_07_938917_WindowsGraphicsCaptureMethod_0x0_title_None_Client-Win64-Shipping-exe_3840x2160_396094_1_False_original_png.rf.b71534b615badeea04ffa8a299b9a473.png", + "file_name": "WindowsGraphicsCaptureMethod_0x0_title_None_Client-Win64-Shipping-exe_3840x2160_1841174_1_False_original-1-_png.rf.e6c4a5734163badfbfa76780248cd2f8.png", "height": 2160, "width": 3840, - "date_captured": "2024-07-12T17:27:43+00:00" + "date_captured": "2024-07-18T09:42:58+00:00" }, { "id": 10, "license": 1, - "file_name": "9f04db98-16_20_58_825243_WindowsGraphicsCaptureMethod_3840x2160_title_None_Clie_VuLpBVc_png.rf.a16ce4854c42840f44a6c0a04d44c83c.png", + "file_name": "01304a45-10_34_04_580378_WindowsGraphicsCaptureMethod_0x0_title_None_Client-Win_WnYCyUT_png.rf.7b5dfc4585195e1d846574b715468897.png", "height": 2160, "width": 3840, - "date_captured": "2024-07-12T17:27:43+00:00" + "date_captured": "2024-07-18T09:42:58+00:00" }, { "id": 11, "license": 1, - "file_name": "1433eace-21_13_50_556378_WindowsGraphicsCaptureMethod_3840x2160_title_None_Clie_z8GnYut_png.rf.0cdbc8a85686f46c7a404d24d4b425ec.png", + "file_name": "9beed513-16_15_23_246388_WindowsGraphicsCaptureMethod_3840x2160_title_None_Clie_a4tQhDg_png.rf.4e79b52b95ad46f47bc470f069a65b29.png", "height": 2160, "width": 3840, - "date_captured": "2024-07-12T17:27:43+00:00" + "date_captured": "2024-07-18T09:42:58+00:00" }, { "id": 12, "license": 1, - "file_name": "e521850f-00_37_38_458841_Encore_liberation_0-274_original_png.rf.e7703de2285a6b2c70567e891804c760.png", + "file_name": "934f0ca6-17_53_47_840123_WindowsGraphicsCaptureMethod_3840x2160_title_None_Clie_aJQVINN_png.rf.a107256237035eec3be4125f726b8b73.png", "height": 2160, "width": 3840, - "date_captured": "2024-07-12T17:27:43+00:00" + "date_captured": "2024-07-18T09:42:58+00:00" }, { "id": 13, "license": 1, - "file_name": "0ab28c72-00_54_43_431654_WindowsGraphicsCaptureMethod_3840x2160_title_None_Clie_usg73Cm_png.rf.124dc89f9b3816ecb0ce5a97c95475dc.png", + "file_name": "55617870-00_55_49_536245_WindowsGraphicsCaptureMethod_3840x2160_title_None_Clie_NSeTZ2S_png.rf.5947b06a7caca9b89c2e06ec7ceab8fa.png", "height": 2160, "width": 3840, - "date_captured": "2024-07-12T17:27:43+00:00" + "date_captured": "2024-07-18T09:42:58+00:00" }, { "id": 14, "license": 1, - "file_name": "9ed8b373-00_57_50_813872_WindowsGraphicsCaptureMethod_3840x2160_title_None_Clie_3jLoRJh_png.rf.170fe2ae11c1d8058d8d3e4b2361357a.png", + "file_name": "WindowsGraphicsCaptureMethod_2560x1440_title_None_Client-Win64-Shipping-exe_3840x2160_465786_1_False_original_png.rf.015495d17edfa6c8bf29047cfcc19d6d.png", "height": 2160, "width": 3840, - "date_captured": "2024-07-12T17:27:43+00:00" + "date_captured": "2024-07-18T09:42:58+00:00" }, { "id": 15, "license": 1, - "file_name": "4_png.rf.180bb3f2bed38134b1d0bba90c3fcdb0.png", + "file_name": "64425cad-10_44_19_536997_WindowsGraphicsCaptureMethod_0x0_title_None_Client-Win_BLAxtp1_png.rf.d37538db2b2d15d6aad459dd08bb348d.png", "height": 2160, "width": 3840, - "date_captured": "2024-07-12T17:27:43+00:00" + "date_captured": "2024-07-18T09:42:58+00:00" }, { "id": 16, "license": 1, - "file_name": "3b991d47-10_18_37_465122_WindowsGraphicsCaptureMethod_3840x2160_title_None_Clie_3Hw8AdB_png.rf.7b75bb60b5b041f3c6f36e735ca3bc19.png", + "file_name": "WindowsGraphicsCaptureMethod_3840x2160_title_None_Client-Win64-Shipping-exe_3840x2160_12847792_1_False_original_png.rf.abeaa08198ff5a77fb70340952ba23f3.png", "height": 2160, "width": 3840, - "date_captured": "2024-07-12T17:27:43+00:00" + "date_captured": "2024-07-18T09:42:58+00:00" }, { "id": 17, "license": 1, - "file_name": "WindowsGraphicsCaptureMethod_2560x1440_title_None_Client-Win64-Shipping-exe_3840x2160_465786_1_False_original_png.rf.015495d17edfa6c8bf29047cfcc19d6d.png", + "file_name": "3b991d47-10_18_37_465122_WindowsGraphicsCaptureMethod_3840x2160_title_None_Clie_3Hw8AdB_png.rf.7b75bb60b5b041f3c6f36e735ca3bc19.png", "height": 2160, "width": 3840, - "date_captured": "2024-07-12T17:27:43+00:00" + "date_captured": "2024-07-18T09:42:58+00:00" }, { "id": 18, "license": 1, - "file_name": "154eb284-17_01_16_406889_WindowsGraphicsCaptureMethod_3840x2160_title_None_Clie_6yGu616_png.rf.12ebc1f4e7e5208bcbf2c7f878f691aa.png", + "file_name": "WindowsGraphicsCaptureMethod_0x0_title_None_Client-Win64-Shipping-exe_3840x2160_133336_1_False_original_png.rf.a2b55fa3583fef2081d49205ae9c643b.png", "height": 2160, "width": 3840, - "date_captured": "2024-07-12T17:27:43+00:00" + "date_captured": "2024-07-18T09:42:58+00:00" }, { "id": 19, "license": 1, - "file_name": "01304a45-10_34_04_580378_WindowsGraphicsCaptureMethod_0x0_title_None_Client-Win_WnYCyUT_png.rf.7b5dfc4585195e1d846574b715468897.png", + "file_name": "WindowsGraphicsCaptureMethod_3840x2160_title_None_Client-Win64-Shipping-exe_3840x2160_4720836_1_False_original_png.rf.935bb51188f6bc516efc5a57b52fe8ad.png", "height": 2160, "width": 3840, - "date_captured": "2024-07-12T17:27:43+00:00" + "date_captured": "2024-07-18T09:42:58+00:00" }, { "id": 20, "license": 1, - "file_name": "WindowsGraphicsCaptureMethod_1920x1080_title_None_Client-Win64-Shipping-exe_1920x1080_329010_1_False_original_png.rf.b6f619b8fe6f0e1e8a0993a5e61e2801.png", - "height": 1080, - "width": 1920, - "date_captured": "2024-07-12T17:27:43+00:00" + "file_name": "9dd77a5d-16_57_31_014010_WindowsGraphicsCaptureMethod_3840x2160_title_None_Clie_RVvCfQe_png.rf.e8397fbd133d485459bb8c30fc37353c.png", + "height": 2160, + "width": 3840, + "date_captured": "2024-07-18T09:42:58+00:00" }, { "id": 21, "license": 1, - "file_name": "64425cad-10_44_19_536997_WindowsGraphicsCaptureMethod_0x0_title_None_Client-Win_BLAxtp1_png.rf.d37538db2b2d15d6aad459dd08bb348d.png", - "height": 2160, - "width": 3840, - "date_captured": "2024-07-12T17:27:43+00:00" + "file_name": "WindowsGraphicsCaptureMethod_1920x1080_title_None_Client-Win64-Shipping-exe_1920x1080_329010_1_False_original_png.rf.b6f619b8fe6f0e1e8a0993a5e61e2801.png", + "height": 1080, + "width": 1920, + "date_captured": "2024-07-18T09:42:58+00:00" }, { "id": 22, "license": 1, - "file_name": "WindowsGraphicsCaptureMethod_3840x2160_title_None_Client-Win64-Shipping-exe_3840x2160_10361910_1_False_original_png.rf.244ee2bd0b4de93caac3066adaae0b75.png", + "file_name": "9f04db98-16_20_58_825243_WindowsGraphicsCaptureMethod_3840x2160_title_None_Clie_VuLpBVc_png.rf.a16ce4854c42840f44a6c0a04d44c83c.png", "height": 2160, "width": 3840, - "date_captured": "2024-07-12T17:27:43+00:00" + "date_captured": "2024-07-18T09:42:58+00:00" + }, + { + "id": 23, + "license": 1, + "file_name": "9ed8b373-00_57_50_813872_WindowsGraphicsCaptureMethod_3840x2160_title_None_Clie_3jLoRJh_png.rf.170fe2ae11c1d8058d8d3e4b2361357a.png", + "height": 2160, + "width": 3840, + "date_captured": "2024-07-18T09:42:58+00:00" } ], "annotations": [ { "id": 0, "image_id": 0, - "category_id": 46, + "category_id": 37, "bbox": [ - 272, - 327, - 108, - 108 + 1909, + 1038, + 34.81, + 68.65 ], - "area": 11664, + "area": 2389.707, "segmentation": [], "iscrowd": 0 }, { "id": 1, "image_id": 1, - "category_id": 13, - "bbox": [ - 2523, - 1221, - 101, - 82 - ], - "area": 8282, - "segmentation": [], - "iscrowd": 0 - }, - { - "id": 2, - "image_id": 1, - "category_id": 14, - "bbox": [ - 2525, - 1384, - 104, - 81 - ], - "area": 8424, - "segmentation": [], - "iscrowd": 0 - }, - { - "id": 3, - "image_id": 1, - "category_id": 12, - "bbox": [ - 3381, - 107, - 58, - 46 - ], - "area": 2668, - "segmentation": [], - "iscrowd": 0 - }, - { - "id": 4, - "image_id": 1, - "category_id": 16, - "bbox": [ - 3565, - 111, - 63, - 38 - ], - "area": 2394, - "segmentation": [], - "iscrowd": 0 - }, - { - "id": 5, - "image_id": 2, "category_id": 28, "bbox": [ 3554, @@ -548,9 +510,9 @@ "iscrowd": 0 }, { - "id": 6, - "image_id": 2, - "category_id": 31, + "id": 2, + "image_id": 1, + "category_id": 32, "bbox": [ 3534, 1004, @@ -562,8 +524,8 @@ "iscrowd": 0 }, { - "id": 7, - "image_id": 2, + "id": 3, + "image_id": 1, "category_id": 27, "bbox": [ 3541, @@ -576,120 +538,50 @@ "iscrowd": 0 }, { - "id": 8, + "id": 4, + "image_id": 2, + "category_id": 41, + "bbox": [ + 3220, + 1930, + 76.67, + 158.33 + ], + "area": 12139.161, + "segmentation": [], + "iscrowd": 0 + }, + { + "id": 5, "image_id": 3, - "category_id": 40, + "category_id": 45, "bbox": [ - 77, - 533, - 151.67, - 153.33 + 1747, + 274, + 58, + 54 ], - "area": 23255.561, + "area": 3132, "segmentation": [], "iscrowd": 0 }, { - "id": 9, + "id": 6, "image_id": 4, - "category_id": 15, - "bbox": [ - 3560, - 65, - 114, - 114 - ], - "area": 12996, - "segmentation": [], - "iscrowd": 0 - }, - { - "id": 10, - "image_id": 5, - "category_id": 43, - "bbox": [ - 2413, - 1859, - 210, - 197 - ], - "area": 41370, - "segmentation": [], - "iscrowd": 0 - }, - { - "id": 11, - "image_id": 6, "category_id": 47, "bbox": [ - 2513, - 1239, - 58, - 100 + 272, + 327, + 108, + 108 ], - "area": 5800, + "area": 11664, "segmentation": [], "iscrowd": 0 }, { - "id": 12, - "image_id": 7, - "category_id": 22, - "bbox": [ - 3473, - 690, - 28, - 31 - ], - "area": 868, - "segmentation": [], - "iscrowd": 0 - }, - { - "id": 13, - "image_id": 7, - "category_id": 24, - "bbox": [ - 3474, - 954, - 27, - 32 - ], - "area": 864, - "segmentation": [], - "iscrowd": 0 - }, - { - "id": 14, - "image_id": 7, - "category_id": 23, - "bbox": [ - 3649, - 1005, - 28, - 21 - ], - "area": 588, - "segmentation": [], - "iscrowd": 0 - }, - { - "id": 15, - "image_id": 8, - "category_id": 51, - "bbox": [ - 1688, - 983, - 23.42, - 23.25 - ], - "area": 544.515, - "segmentation": [], - "iscrowd": 0 - }, - { - "id": 16, - "image_id": 9, + "id": 7, + "image_id": 5, "category_id": 29, "bbox": [ 3543, @@ -702,163 +594,9 @@ "iscrowd": 0 }, { - "id": 17, - "image_id": 9, - "category_id": 25, - "bbox": [ - 3545, - 1008, - 73.64, - 51.82 - ], - "area": 3816.025, - "segmentation": [], - "iscrowd": 0 - }, - { - "id": 18, - "image_id": 9, - "category_id": 26, - "bbox": [ - 3545, - 481, - 73.64, - 43.18 - ], - "area": 3179.775, - "segmentation": [], - "iscrowd": 0 - }, - { - "id": 19, - "image_id": 10, - "category_id": 20, - "bbox": [ - 3474, - 427, - 26, - 31 - ], - "area": 806, - "segmentation": [], - "iscrowd": 0 - }, - { - "id": 20, - "image_id": 10, - "category_id": 8, - "bbox": [ - 2169, - 1996, - 4, - 12 - ], - "area": 48, - "segmentation": [], - "iscrowd": 0 - }, - { - "id": 21, - "image_id": 10, - "category_id": 33, - "bbox": [ - 3534, - 745, - 70, - 57 - ], - "area": 3990, - "segmentation": [], - "iscrowd": 0 - }, - { - "id": 22, - "image_id": 10, - "category_id": 34, - "bbox": [ - 3541, - 485, - 68, - 50 - ], - "area": 3400, - "segmentation": [], - "iscrowd": 0 - }, - { - "id": 23, - "image_id": 10, - "category_id": 32, - "bbox": [ - 3541, - 977, - 74, - 71 - ], - "area": 5254, - "segmentation": [], - "iscrowd": 0 - }, - { - "id": 24, - "image_id": 10, - "category_id": 11, - "bbox": [ - 3138, - 1895, - 118.14, - 78 - ], - "area": 9214.92, - "segmentation": [], - "iscrowd": 0 - }, - { - "id": 25, - "image_id": 11, + "id": 8, + "image_id": 6, "category_id": 50, - "bbox": [ - 2502, - 1207, - 27, - 27 - ], - "area": 729, - "segmentation": [], - "iscrowd": 0 - }, - { - "id": 26, - "image_id": 11, - "category_id": 42, - "bbox": [ - 2937, - 101, - 74, - 45 - ], - "area": 3330, - "segmentation": [], - "iscrowd": 0 - }, - { - "id": 27, - "image_id": 12, - "category_id": 44, - "bbox": [ - 1747, - 274, - 58, - 54 - ], - "area": 3132, - "segmentation": [], - "iscrowd": 0 - }, - { - "id": 28, - "image_id": 13, - "category_id": 49, "bbox": [ 2589, 1897, @@ -870,78 +608,64 @@ "iscrowd": 0 }, { - "id": 29, - "image_id": 14, - "category_id": 38, + "id": 9, + "image_id": 7, + "category_id": 13, "bbox": [ - 2937, - 1888, - 86, - 84 + 2523, + 1221, + 101, + 82 ], - "area": 7224, + "area": 8282, "segmentation": [], "iscrowd": 0 }, { - "id": 30, - "image_id": 15, - "category_id": 39, + "id": 10, + "image_id": 7, + "category_id": 14, "bbox": [ - 3220, - 1930, - 76.67, - 158.33 + 2525, + 1384, + 104, + 81 ], - "area": 12139.161, + "area": 8424, "segmentation": [], "iscrowd": 0 }, { - "id": 31, - "image_id": 16, - "category_id": 21, + "id": 11, + "image_id": 7, + "category_id": 12, "bbox": [ - 3649, - 739, - 28, - 23 + 3381, + 107, + 58, + 46 ], - "area": 644, + "area": 2668, "segmentation": [], "iscrowd": 0 }, { - "id": 32, - "image_id": 16, - "category_id": 19, + "id": 12, + "image_id": 7, + "category_id": 16, "bbox": [ - 3650, - 474, - 27, - 25 + 3565, + 111, + 63, + 38 ], - "area": 675, + "area": 2394, "segmentation": [], "iscrowd": 0 }, { - "id": 33, - "image_id": 17, - "category_id": 18, - "bbox": [ - 3537, - 723, - 68.85, - 65 - ], - "area": 4475.25, - "segmentation": [], - "iscrowd": 0 - }, - { - "id": 34, - "image_id": 18, + "id": 13, + "image_id": 8, "category_id": 9, "bbox": [ 3356, @@ -954,8 +678,8 @@ "iscrowd": 0 }, { - "id": 35, - "image_id": 18, + "id": 14, + "image_id": 8, "category_id": 7, "bbox": [ 3496, @@ -968,8 +692,8 @@ "iscrowd": 0 }, { - "id": 36, - "image_id": 18, + "id": 15, + "image_id": 8, "category_id": 5, "bbox": [ 3508, @@ -982,8 +706,8 @@ "iscrowd": 0 }, { - "id": 37, - "image_id": 18, + "id": 16, + "image_id": 8, "category_id": 6, "bbox": [ 3515, @@ -996,9 +720,9 @@ "iscrowd": 0 }, { - "id": 38, - "image_id": 18, - "category_id": 30, + "id": 17, + "image_id": 8, + "category_id": 31, "bbox": [ 3536, 985, @@ -1010,9 +734,9 @@ "iscrowd": 0 }, { - "id": 39, - "image_id": 18, - "category_id": 37, + "id": 18, + "image_id": 8, + "category_id": 39, "bbox": [ 3401, 1939, @@ -1024,8 +748,8 @@ "iscrowd": 0 }, { - "id": 40, - "image_id": 18, + "id": 19, + "image_id": 8, "category_id": 10, "bbox": [ 3566, @@ -1038,8 +762,8 @@ "iscrowd": 0 }, { - "id": 41, - "image_id": 18, + "id": 20, + "image_id": 8, "category_id": 3, "bbox": [ 3347, @@ -1052,9 +776,9 @@ "iscrowd": 0 }, { - "id": 42, - "image_id": 18, - "category_id": 35, + "id": 21, + "image_id": 8, + "category_id": 36, "bbox": [ 3544, 709, @@ -1066,8 +790,8 @@ "iscrowd": 0 }, { - "id": 43, - "image_id": 18, + "id": 22, + "image_id": 8, "category_id": 4, "bbox": [ 3348, @@ -1080,8 +804,8 @@ "iscrowd": 0 }, { - "id": 44, - "image_id": 18, + "id": 23, + "image_id": 8, "category_id": 2, "bbox": [ 3346, @@ -1094,9 +818,23 @@ "iscrowd": 0 }, { - "id": 45, - "image_id": 19, - "category_id": 48, + "id": 24, + "image_id": 9, + "category_id": 53, + "bbox": [ + 1688, + 983, + 23.42, + 23.25 + ], + "area": 544.515, + "segmentation": [], + "iscrowd": 0 + }, + { + "id": 25, + "image_id": 10, + "category_id": 49, "bbox": [ 3579, 1875, @@ -1108,37 +846,93 @@ "iscrowd": 0 }, { - "id": 46, - "image_id": 20, - "category_id": 1, + "id": 26, + "image_id": 11, + "category_id": 22, "bbox": [ - 1820, - 227, - 35, - 90.71 + 3473, + 690, + 28, + 31 ], - "area": 3174.85, + "area": 868, "segmentation": [], "iscrowd": 0 }, { - "id": 47, - "image_id": 20, - "category_id": 41, + "id": 27, + "image_id": 11, + "category_id": 24, "bbox": [ - 36, - 273, - 78.57, - 78.57 + 3474, + 954, + 27, + 32 ], - "area": 6173.245, + "area": 864, "segmentation": [], "iscrowd": 0 }, { - "id": 48, - "image_id": 21, - "category_id": 45, + "id": 28, + "image_id": 11, + "category_id": 23, + "bbox": [ + 3649, + 1005, + 28, + 21 + ], + "area": 588, + "segmentation": [], + "iscrowd": 0 + }, + { + "id": 29, + "image_id": 12, + "category_id": 15, + "bbox": [ + 3560, + 65, + 114, + 114 + ], + "area": 12996, + "segmentation": [], + "iscrowd": 0 + }, + { + "id": 30, + "image_id": 13, + "category_id": 44, + "bbox": [ + 2413, + 1859, + 210, + 197 + ], + "area": 41370, + "segmentation": [], + "iscrowd": 0 + }, + { + "id": 31, + "image_id": 14, + "category_id": 18, + "bbox": [ + 3537, + 723, + 68.85, + 65 + ], + "area": 4475.25, + "segmentation": [], + "iscrowd": 0 + }, + { + "id": 32, + "image_id": 15, + "category_id": 46, "bbox": [ 2805, 1225, @@ -1150,8 +944,8 @@ "iscrowd": 0 }, { - "id": 49, - "image_id": 21, + "id": 33, + "image_id": 15, "category_id": 17, "bbox": [ 890, @@ -1163,17 +957,269 @@ "segmentation": [], "iscrowd": 0 }, + { + "id": 34, + "image_id": 16, + "category_id": 51, + "bbox": [ + 1555, + 1550, + 306.67, + 121.67 + ], + "area": 37312.539, + "segmentation": [], + "iscrowd": 0 + }, + { + "id": 35, + "image_id": 17, + "category_id": 21, + "bbox": [ + 3649, + 739, + 28, + 23 + ], + "area": 644, + "segmentation": [], + "iscrowd": 0 + }, + { + "id": 36, + "image_id": 17, + "category_id": 19, + "bbox": [ + 3650, + 474, + 27, + 25 + ], + "area": 675, + "segmentation": [], + "iscrowd": 0 + }, + { + "id": 37, + "image_id": 18, + "category_id": 52, + "bbox": [ + 2488, + 1105, + 36.42, + 38.87 + ], + "area": 1415.645, + "segmentation": [], + "iscrowd": 0 + }, + { + "id": 38, + "image_id": 18, + "category_id": 26, + "bbox": [ + 3549, + 471, + 69.01, + 51.99 + ], + "area": 3587.83, + "segmentation": [], + "iscrowd": 0 + }, + { + "id": 39, + "image_id": 18, + "category_id": 30, + "bbox": [ + 3550, + 732, + 64.28, + 58.61 + ], + "area": 3767.451, + "segmentation": [], + "iscrowd": 0 + }, + { + "id": 40, + "image_id": 18, + "category_id": 25, + "bbox": [ + 3554, + 998, + 57.66, + 51.99 + ], + "area": 2997.743, + "segmentation": [], + "iscrowd": 0 + }, + { + "id": 41, + "image_id": 18, + "category_id": 38, + "bbox": [ + 2598, + 1108, + 32.06, + 25.29 + ], + "area": 810.797, + "segmentation": [], + "iscrowd": 0 + }, + { + "id": 42, + "image_id": 19, + "category_id": 42, + "bbox": [ + 77, + 533, + 151.67, + 153.33 + ], + "area": 23255.561, + "segmentation": [], + "iscrowd": 0 + }, + { + "id": 43, + "image_id": 20, + "category_id": 48, + "bbox": [ + 2513, + 1239, + 58, + 100 + ], + "area": 5800, + "segmentation": [], + "iscrowd": 0 + }, + { + "id": 44, + "image_id": 21, + "category_id": 1, + "bbox": [ + 1820, + 227, + 35, + 90.71 + ], + "area": 3174.85, + "segmentation": [], + "iscrowd": 0 + }, + { + "id": 45, + "image_id": 21, + "category_id": 43, + "bbox": [ + 36, + 273, + 78.57, + 78.57 + ], + "area": 6173.245, + "segmentation": [], + "iscrowd": 0 + }, + { + "id": 46, + "image_id": 22, + "category_id": 20, + "bbox": [ + 3474, + 427, + 26, + 31 + ], + "area": 806, + "segmentation": [], + "iscrowd": 0 + }, + { + "id": 47, + "image_id": 22, + "category_id": 8, + "bbox": [ + 2169, + 1996, + 4, + 12 + ], + "area": 48, + "segmentation": [], + "iscrowd": 0 + }, + { + "id": 48, + "image_id": 22, + "category_id": 34, + "bbox": [ + 3534, + 745, + 70, + 57 + ], + "area": 3990, + "segmentation": [], + "iscrowd": 0 + }, + { + "id": 49, + "image_id": 22, + "category_id": 35, + "bbox": [ + 3541, + 485, + 68, + 50 + ], + "area": 3400, + "segmentation": [], + "iscrowd": 0 + }, { "id": 50, "image_id": 22, - "category_id": 36, + "category_id": 33, "bbox": [ - 1909, - 1038, - 34.81, - 68.65 + 3541, + 977, + 74, + 71 ], - "area": 2389.707, + "area": 5254, + "segmentation": [], + "iscrowd": 0 + }, + { + "id": 51, + "image_id": 22, + "category_id": 11, + "bbox": [ + 3138, + 1895, + 118.14, + 78 + ], + "area": 9214.92, + "segmentation": [], + "iscrowd": 0 + }, + { + "id": 52, + "image_id": 23, + "category_id": 40, + "bbox": [ + 2937, + 1888, + 86, + 84 + ], + "area": 7224, "segmentation": [], "iscrowd": 0 } diff --git a/src/combat/CombatCheck.py b/src/combat/CombatCheck.py index 7c15d50..5fe1cd5 100644 --- a/src/combat/CombatCheck.py +++ b/src/combat/CombatCheck.py @@ -25,6 +25,7 @@ class CombatCheck: self.boss_health_box = None self.boss_health = None self.out_of_combat_reason = "" + self.combat_check_interval = 0.8 def reset_to_false(self, recheck=False, reason=""): if is_pure_black(self.frame): @@ -133,7 +134,7 @@ class CombatCheck: return True if self._in_combat: now = time.time() - if now - self.last_combat_check > 1: + if now - self.last_combat_check > self.combat_check_interval: self.last_combat_check = now if not self.in_team()[0]: return self.reset_to_false(recheck=False, reason="not in team") diff --git a/src/task/BaseCombatTask.py b/src/task/BaseCombatTask.py index 5900ec9..806446e 100644 --- a/src/task/BaseCombatTask.py +++ b/src/task/BaseCombatTask.py @@ -244,8 +244,7 @@ class BaseCombatTask(BaseTask, FindFeature, OCR, CombatCheck): return True def walk_until_f(self, direction='w', time_out=0, raise_if_not_found=True, backward_time=0): - if not self.find_one('pick_up_f', horizontal_variance=0.1, vertical_variance=0.1, threshold=0.8, - use_gray_scale=True): + if not self.find_one('pick_up_f', horizontal_variance=0.01, vertical_variance=0.01, threshold=0.8): if backward_time > 0: if self.send_key_and_wait_f('s', raise_if_not_found, backward_time): return True diff --git a/src/task/FarmEchoTask.py b/src/task/FarmEchoTask.py index 0f6eb83..fa0bd7a 100644 --- a/src/task/FarmEchoTask.py +++ b/src/task/FarmEchoTask.py @@ -51,7 +51,7 @@ class FarmEchoTask(BaseCombatTask): self.combat_once() logger.info(f'farm echo combat end') self.wait_in_team_and_world(time_out=20) - logger.info(f'farm echo move forward walk_until_f to find echo') + logger.info(f'farm echo move {self.config.get("Entrance Direction")} walk_until_f to find echo') if self.config.get('Entrance Direction') == 'Forward': dropped = self.walk_until_f(time_out=3, raise_if_not_found=False) # find and pick echo diff --git a/src/task/FarmWorldBossTask.py b/src/task/FarmWorldBossTask.py index 26260c4..f1f2cea 100644 --- a/src/task/FarmWorldBossTask.py +++ b/src/task/FarmWorldBossTask.py @@ -61,17 +61,15 @@ class FarmWorldBossTask(BaseCombatTask): else: logger.info('click normal boss') self.click_relative(0.21, 0.36) - # self.wait_click_feature('gray_book_forgery', raise_if_not_found=True, use_gray_scale=True, threshold=0.7) - # self.wait_click_feature('gray_book_boss', raise_if_not_found=True, use_gray_scale=True, threshold=0.7) + self.sleep(1) - # while index > 4: # first page + if index > 4: self.log_info(f'click scroll bar') self.click_relative(3760 / 3840, 1852 / 2160) self.sleep(0.5) - # self.scroll_down_a_page() index -= 4 - # y = y + (index - 1) * distance + self.log_info(f'index after scrolling down {index}') proceeds = self.find_feature('boss_proceed', vertical_variance=1, use_gray_scale=True, threshold=0.8) if self.debug: @@ -79,8 +77,6 @@ class FarmWorldBossTask(BaseCombatTask): if not proceeds: raise Exception("can't find the boss proceeds") - # self.click_relative(self.crownless_pos[0], self.crownless_pos[1]) - # self.wait_click_feature('gray_teleport', raise_if_not_found=True, use_gray_scale=True) self.wait_feature('gray_teleport', raise_if_not_found=True, use_gray_scale=True, time_out=120, pre_action=lambda: self.click_box(proceeds[index], relative_x=-1), wait_until_before_delay=5) self.sleep(1) @@ -92,7 +88,7 @@ class FarmWorldBossTask(BaseCombatTask): self.wait_click_feature('gray_custom_way_point', box=self.box_of_screen(0.62, 0.48, 0.70, 0.66), raise_if_not_found=True, use_gray_scale=True, threshold=0.75, time_out=2) - travel = self.wait_feature('fast_travel_custom', raise_if_not_found=True, use_gray_scale=True, threshold=0.75) + travel = self.wait_feature('fast_travel_custom', raise_if_not_found=True, threshold=0.75) self.click_box(travel, relative_x=1.5) def wait_book(self):