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 new file mode 100644 index 00000000..163159ba Binary files /dev/null and b/assets/154eb284-17_01_16_406889_WindowsGraphicsCaptureMethod_3840x2160_title_None_Clie_6yGu616_png.rf.b7e209054f83709bed21a07dd8bfde12.png differ diff --git a/assets/64425cad-10_44_19_536997_WindowsGraphicsCaptureMethod_0x0_title_None_Client-Win_BLAxtp1_png.rf.d37538db2b2d15d6aad459dd08bb348d.png b/assets/64425cad-10_44_19_536997_WindowsGraphicsCaptureMethod_0x0_title_None_Client-Win_BLAxtp1_png.rf.d37538db2b2d15d6aad459dd08bb348d.png new file mode 100644 index 00000000..b158e7b7 Binary files /dev/null and b/assets/64425cad-10_44_19_536997_WindowsGraphicsCaptureMethod_0x0_title_None_Client-Win_BLAxtp1_png.rf.d37538db2b2d15d6aad459dd08bb348d.png differ diff --git a/assets/_annotations.coco.json b/assets/_annotations.coco.json index 6ea9da12..08342d6c 100644 --- a/assets/_annotations.coco.json +++ b/assets/_annotations.coco.json @@ -1,11 +1,11 @@ { "info": { "year": "2024", - "version": "4", + "version": "6", "description": "Exported from roboflow.com", "contributor": "", "url": "https://public.roboflow.com/object-detection/undefined", - "date_created": "2024-06-30T02:58:17+00:00" + "date_created": "2024-07-01T17:34:12+00:00" }, "licenses": [ { @@ -22,211 +22,231 @@ }, { "id": 1, - "name": "box_char_1", + "name": "box_char1_switch_wave", "supercategory": "ww" }, { "id": 2, - "name": "box_char_2", + "name": "box_char2_switch_wave", "supercategory": "ww" }, { "id": 3, - "name": "box_char_3", + "name": "box_char3_switch_wave", "supercategory": "ww" }, { "id": 4, - "name": "box_concerto_last_dot", + "name": "box_char_1", "supercategory": "ww" }, { "id": 5, - "name": "box_echo", + "name": "box_char_2", "supercategory": "ww" }, { "id": 6, - "name": "box_liberation", + "name": "box_char_3", "supercategory": "ww" }, { "id": 7, - "name": "box_resonance", + "name": "box_concerto_last_dot", "supercategory": "ww" }, { "id": 8, - "name": "btn_auto_play_dialog", + "name": "box_echo", "supercategory": "ww" }, { "id": 9, - "name": "btn_dialog_3dots", + "name": "box_liberation", "supercategory": "ww" }, { "id": 10, - "name": "btn_dialog_arrow", + "name": "box_resonance", "supercategory": "ww" }, { "id": 11, - "name": "btn_dialog_close", + "name": "btn_auto_play_dialog", "supercategory": "ww" }, { "id": 12, - "name": "btn_dialog_eye", + "name": "btn_dialog_3dots", "supercategory": "ww" }, { "id": 13, - "name": "char_1_lib_check_mark", + "name": "btn_dialog_arrow", "supercategory": "ww" }, { "id": 14, - "name": "char_1_text", + "name": "btn_dialog_close", "supercategory": "ww" }, { "id": 15, - "name": "char_2_lib_check_mark", + "name": "btn_dialog_eye", "supercategory": "ww" }, { "id": 16, - "name": "char_2_text", + "name": "cancel_button", "supercategory": "ww" }, { "id": 17, - "name": "char_3_lib_check_mark", + "name": "char_1_lib_check_mark", "supercategory": "ww" }, { "id": 18, - "name": "char_3_text", + "name": "char_1_text", "supercategory": "ww" }, { "id": 19, - "name": "char_chixia", + "name": "char_2_lib_check_mark", "supercategory": "ww" }, { "id": 20, - "name": "char_danjin", + "name": "char_2_text", "supercategory": "ww" }, { "id": 21, - "name": "char_encore", + "name": "char_3_lib_check_mark", "supercategory": "ww" }, { "id": 22, - "name": "char_jianxin", + "name": "char_3_text", "supercategory": "ww" }, { "id": 23, - "name": "char_jinhsi", + "name": "char_chixia", "supercategory": "ww" }, { "id": 24, - "name": "char_rover", + "name": "char_danjin", "supercategory": "ww" }, { "id": 25, - "name": "char_sanhua", + "name": "char_encore", "supercategory": "ww" }, { "id": 26, - "name": "char_taoqi", + "name": "char_jianxin", "supercategory": "ww" }, { "id": 27, - "name": "char_verina", + "name": "char_jinhsi", "supercategory": "ww" }, { "id": 28, - "name": "char_yinlin", + "name": "char_rover", "supercategory": "ww" }, { "id": 29, - "name": "char_yuanwu", + "name": "char_sanhua", "supercategory": "ww" }, { "id": 30, - "name": "edge_echo_cd_dot", + "name": "char_taoqi", "supercategory": "ww" }, { "id": 31, - "name": "edge_levitator", + "name": "char_verina", "supercategory": "ww" }, { "id": 32, - "name": "gray_book_button", + "name": "char_yinlin", "supercategory": "ww" }, { "id": 33, - "name": "gray_book_forgery", + "name": "char_yuanwu", "supercategory": "ww" }, { "id": 34, - "name": "gray_book_weekly_boss", + "name": "edge_echo_cd_dot", "supercategory": "ww" }, { "id": 35, - "name": "gray_button_challenge", + "name": "edge_levitator", "supercategory": "ww" }, { "id": 36, - "name": "gray_combat_count_down", + "name": "gray_book_button", "supercategory": "ww" }, { "id": 37, - "name": "gray_confirm_exit_button", + "name": "gray_book_forgery", "supercategory": "ww" }, { "id": 38, - "name": "gray_crownless_battle", + "name": "gray_book_weekly_boss", "supercategory": "ww" }, { "id": 39, - "name": "gray_custom_way_point", + "name": "gray_button_challenge", "supercategory": "ww" }, { "id": 40, - "name": "gray_start_battle", + "name": "gray_combat_count_down", "supercategory": "ww" }, { "id": 41, - "name": "gray_teleport", + "name": "gray_confirm_exit_button", "supercategory": "ww" }, { "id": 42, + "name": "gray_crownless_battle", + "supercategory": "ww" + }, + { + "id": 43, + "name": "gray_custom_way_point", + "supercategory": "ww" + }, + { + "id": 44, + "name": "gray_start_battle", + "supercategory": "ww" + }, + { + "id": 45, + "name": "gray_teleport", + "supercategory": "ww" + }, + { + "id": 46, "name": "pick_up_f", "supercategory": "ww" } @@ -235,188 +255,188 @@ { "id": 0, "license": 1, - "file_name": "1433eace-21_13_50_556378_WindowsGraphicsCaptureMethod_3840x2160_title_None_Clie_z8GnYut_png.rf.0cdbc8a85686f46c7a404d24d4b425ec.png", + "file_name": "9ed8b373-00_57_50_813872_WindowsGraphicsCaptureMethod_3840x2160_title_None_Clie_3jLoRJh_png.rf.170fe2ae11c1d8058d8d3e4b2361357a.png", "height": 2160, "width": 3840, - "date_captured": "2024-06-30T02:58:17+00:00" + "date_captured": "2024-07-01T17:34:12+00:00" }, { "id": 1, "license": 1, - "file_name": "934f0ca6-17_53_47_840123_WindowsGraphicsCaptureMethod_3840x2160_title_None_Clie_aJQVINN_png.rf.a107256237035eec3be4125f726b8b73.png", + "file_name": "4533b3e8-00_53_36_188376_WindowsGraphicsCaptureMethod_3840x2160_title_None_Clie_4ls54Fe_png.rf.4d173023c1d2dba20d42efc2610a5694.png", "height": 2160, "width": 3840, - "date_captured": "2024-06-30T02:58:17+00:00" + "date_captured": "2024-07-01T17:34:12+00:00" }, { "id": 2, "license": 1, - "file_name": "9dd77a5d-16_57_31_014010_WindowsGraphicsCaptureMethod_3840x2160_title_None_Clie_RVvCfQe_png.rf.e8397fbd133d485459bb8c30fc37353c.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-06-30T02:58:17+00:00" + "date_captured": "2024-07-01T17:34:12+00:00" }, { "id": 3, "license": 1, - "file_name": "4533b3e8-00_53_36_188376_WindowsGraphicsCaptureMethod_3840x2160_title_None_Clie_4ls54Fe_png.rf.4d173023c1d2dba20d42efc2610a5694.png", + "file_name": "9f04db98-16_20_58_825243_WindowsGraphicsCaptureMethod_3840x2160_title_None_Clie_VuLpBVc_png.rf.d5a9546240f15ceec20770b94a7606a2.png", "height": 2160, "width": 3840, - "date_captured": "2024-06-30T02:58:17+00:00" + "date_captured": "2024-07-01T17:34:12+00:00" }, { "id": 4, "license": 1, - "file_name": "9ed8b373-00_57_50_813872_WindowsGraphicsCaptureMethod_3840x2160_title_None_Clie_3jLoRJh_png.rf.170fe2ae11c1d8058d8d3e4b2361357a.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-06-30T02:58:17+00:00" + "date_captured": "2024-07-01T17:34:12+00:00" }, { "id": 5, "license": 1, - "file_name": "5841f84c-17_04_26_738022_WindowsGraphicsCaptureMethod_3840x2160_title_None_Clie_TIDxIl1_png.rf.97a22c8e01f1fd88debc20c4c903b8b9.png", + "file_name": "17_11_07_938917_WindowsGraphicsCaptureMethod_0x0_title_None_Client-Win64-Shipping-exe_3840x2160_396094_1_False_original_png.rf.b71534b615badeea04ffa8a299b9a473.png", "height": 2160, "width": 3840, - "date_captured": "2024-06-30T02:58:17+00:00" + "date_captured": "2024-07-01T17:34:12+00:00" }, { "id": 6, "license": 1, - "file_name": "01304a45-10_34_04_580378_WindowsGraphicsCaptureMethod_0x0_title_None_Client-Win_WnYCyUT_png.rf.7b5dfc4585195e1d846574b715468897.png", + "file_name": "9dd77a5d-16_57_31_014010_WindowsGraphicsCaptureMethod_3840x2160_title_None_Clie_RVvCfQe_png.rf.e8397fbd133d485459bb8c30fc37353c.png", "height": 2160, "width": 3840, - "date_captured": "2024-06-30T02:58:17+00:00" + "date_captured": "2024-07-01T17:34:12+00:00" }, { "id": 7, "license": 1, - "file_name": "e521850f-00_37_38_458841_Encore_liberation_0-274_original_png.rf.e7703de2285a6b2c70567e891804c760.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-06-30T02:58:17+00:00" + "date_captured": "2024-07-01T17:34:12+00:00" }, { "id": 8, "license": 1, - "file_name": "64425cad-10_44_19_536997_WindowsGraphicsCaptureMethod_0x0_title_None_Client-Win_BLAxtp1_png.rf.24dbe80092b3236adeed97f046507120.png", + "file_name": "1433eace-21_13_50_556378_WindowsGraphicsCaptureMethod_3840x2160_title_None_Clie_z8GnYut_png.rf.0cdbc8a85686f46c7a404d24d4b425ec.png", "height": 2160, "width": 3840, - "date_captured": "2024-06-30T02:58:17+00:00" + "date_captured": "2024-07-01T17:34:12+00:00" }, { "id": 9, "license": 1, - "file_name": "3b991d47-10_18_37_465122_WindowsGraphicsCaptureMethod_3840x2160_title_None_Clie_3Hw8AdB_png.rf.7b75bb60b5b041f3c6f36e735ca3bc19.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-06-30T02:58:17+00:00" + "date_captured": "2024-07-01T17:34:12+00:00" }, { "id": 10, "license": 1, - "file_name": "0ab28c72-00_54_43_431654_WindowsGraphicsCaptureMethod_3840x2160_title_None_Clie_usg73Cm_png.rf.124dc89f9b3816ecb0ce5a97c95475dc.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-06-30T02:58:17+00:00" + "date_captured": "2024-07-01T17:34:12+00:00" }, { "id": 11, "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": "e521850f-00_37_38_458841_Encore_liberation_0-274_original_png.rf.e7703de2285a6b2c70567e891804c760.png", "height": 2160, "width": 3840, - "date_captured": "2024-06-30T02:58:17+00:00" + "date_captured": "2024-07-01T17:34:12+00:00" }, { "id": 12, "license": 1, - "file_name": "221458a6-13_25_04_962031_WindowsGraphicsCaptureMethod_3840x2160_title_None_Clie_XYXLS23_png.rf.281b46703c1e3f6bd436750f6aa82cf2.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-06-30T02:58:17+00:00" + "date_captured": "2024-07-01T17:34:12+00:00" }, { "id": 13, "license": 1, - "file_name": "55617870-00_55_49_536245_WindowsGraphicsCaptureMethod_3840x2160_title_None_Clie_NSeTZ2S_png.rf.5947b06a7caca9b89c2e06ec7ceab8fa.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-06-30T02:58:17+00:00" + "date_captured": "2024-07-01T17:34:12+00:00" }, { "id": 14, "license": 1, - "file_name": "cef1b3dd-00_55_22_640294_WindowsGraphicsCaptureMethod_3840x2160_title_None_Clie_NtclVno_png.rf.0eb178e9974bb9135567f91780337d55.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-06-30T02:58:17+00:00" + "date_captured": "2024-07-01T17:34:12+00:00" }, { "id": 15, "license": 1, - "file_name": "9beed513-16_15_23_246388_WindowsGraphicsCaptureMethod_3840x2160_title_None_Clie_a4tQhDg_png.rf.4e79b52b95ad46f47bc470f069a65b29.png", + "file_name": "154eb284-17_01_16_406889_WindowsGraphicsCaptureMethod_3840x2160_title_None_Clie_6yGu616_png.rf.b7e209054f83709bed21a07dd8bfde12.png", "height": 2160, "width": 3840, - "date_captured": "2024-06-30T02:58:17+00:00" + "date_captured": "2024-07-01T17:34:12+00:00" }, { "id": 16, "license": 1, - "file_name": "9f04db98-16_20_58_825243_WindowsGraphicsCaptureMethod_3840x2160_title_None_Clie_VuLpBVc_png.rf.d5a9546240f15ceec20770b94a7606a2.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-06-30T02:58:17+00:00" + "date_captured": "2024-07-01T17:34:12+00:00" }, { "id": 17, "license": 1, - "file_name": "154eb284-17_01_16_406889_WindowsGraphicsCaptureMethod_3840x2160_title_None_Clie_6yGu616_png.rf.da9ca0640a0c122989090b5cf9589e3b.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-06-30T02:58:17+00:00" + "date_captured": "2024-07-01T17:34:12+00:00" } ], "annotations": [ { "id": 0, "image_id": 0, - "category_id": 42, + "category_id": 35, "bbox": [ - 2502, - 1207, - 27, - 27 + 2937, + 1888, + 86, + 84 ], - "area": 729, + "area": 7224, "segmentation": [], "iscrowd": 0 }, { "id": 1, - "image_id": 0, - "category_id": 32, + "image_id": 1, + "category_id": 38, "bbox": [ - 2937, - 101, - 74, - 45 + 413, + 1177, + 130, + 114 ], - "area": 3330, + "area": 14820, "segmentation": [], "iscrowd": 0 }, { "id": 2, "image_id": 1, - "category_id": 11, + "category_id": 37, "bbox": [ - 3560, - 65, - 114, - 114 + 75, + 540, + 143, + 146 ], - "area": 12996, + "area": 20878, "segmentation": [], "iscrowd": 0 }, @@ -425,187 +445,173 @@ "image_id": 2, "category_id": 39, "bbox": [ - 2513, - 1239, - 58, - 100 + 2413, + 1859, + 210, + 197 ], - "area": 5800, + "area": 41370, "segmentation": [], "iscrowd": 0 }, { "id": 4, "image_id": 3, - "category_id": 34, + "category_id": 18, "bbox": [ - 413, - 1177, - 130, - 114 + 3474, + 427, + 26, + 31 ], - "area": 14820, + "area": 806, "segmentation": [], "iscrowd": 0 }, { "id": 5, "image_id": 3, - "category_id": 33, + "category_id": 7, "bbox": [ - 75, - 540, - 143, - 146 + 2169, + 1996, + 4, + 12 ], - "area": 20878, + "area": 48, "segmentation": [], "iscrowd": 0 }, { "id": 6, - "image_id": 4, + "image_id": 3, "category_id": 31, "bbox": [ - 2937, - 1888, - 86, - 84 + 3534, + 745, + 70, + 57 ], - "area": 7224, + "area": 3990, "segmentation": [], "iscrowd": 0 }, { "id": 7, - "image_id": 5, - "category_id": 9, + "image_id": 3, + "category_id": 32, "bbox": [ - 2523, - 1221, - 101, - 82 + 3541, + 485, + 68, + 50 ], - "area": 8282, + "area": 3400, "segmentation": [], "iscrowd": 0 }, { "id": 8, - "image_id": 5, - "category_id": 10, + "image_id": 3, + "category_id": 30, "bbox": [ - 2525, - 1384, - 104, - 81 + 3541, + 977, + 74, + 71 ], - "area": 8424, + "area": 5254, "segmentation": [], "iscrowd": 0 }, { "id": 9, - "image_id": 5, - "category_id": 8, + "image_id": 3, + "category_id": 10, "bbox": [ - 3381, - 107, - 58, - 46 + 3138, + 1895, + 114.25, + 70.22 ], - "area": 2668, + "area": 8022.635, "segmentation": [], "iscrowd": 0 }, { "id": 10, - "image_id": 5, - "category_id": 12, + "image_id": 4, + "category_id": 42, "bbox": [ - 3565, - 111, - 63, - 38 + 272, + 327, + 108, + 108 ], - "area": 2394, + "area": 11664, "segmentation": [], "iscrowd": 0 }, { "id": 11, - "image_id": 6, - "category_id": 40, + "image_id": 5, + "category_id": 27, "bbox": [ - 3579, - 1875, - 98, - 184 + 3543, + 733, + 81.36, + 64.55 ], - "area": 18032, + "area": 5251.788, "segmentation": [], "iscrowd": 0 }, { "id": 12, - "image_id": 7, - "category_id": 36, + "image_id": 5, + "category_id": 23, "bbox": [ - 1747, - 274, - 58, - 54 + 3545, + 1008, + 73.64, + 51.82 ], - "area": 3132, + "area": 3816.025, "segmentation": [], "iscrowd": 0 }, { "id": 13, - "image_id": 8, - "category_id": 37, + "image_id": 5, + "category_id": 24, "bbox": [ - 2805, - 1225, - 165, - 267 + 3545, + 481, + 73.64, + 43.18 ], - "area": 44055, + "area": 3179.775, "segmentation": [], "iscrowd": 0 }, { "id": 14, - "image_id": 9, - "category_id": 15, + "image_id": 6, + "category_id": 43, "bbox": [ - 3649, - 739, - 28, - 23 + 2513, + 1239, + 58, + 100 ], - "area": 644, + "area": 5800, "segmentation": [], "iscrowd": 0 }, { "id": 15, - "image_id": 9, - "category_id": 13, - "bbox": [ - 3650, - 474, - 27, - 25 - ], - "area": 675, - "segmentation": [], - "iscrowd": 0 - }, - { - "id": 16, - "image_id": 10, - "category_id": 41, + "image_id": 7, + "category_id": 45, "bbox": [ 2589, 1897, @@ -617,51 +623,51 @@ "iscrowd": 0 }, { - "id": 17, - "image_id": 11, - "category_id": 23, + "id": 16, + "image_id": 8, + "category_id": 46, "bbox": [ - 3543, - 733, - 81.36, - 64.55 + 2502, + 1207, + 27, + 27 ], - "area": 5251.788, + "area": 729, "segmentation": [], "iscrowd": 0 }, { - "id": 18, - "image_id": 11, - "category_id": 19, + "id": 17, + "image_id": 8, + "category_id": 36, "bbox": [ - 3545, - 1008, - 73.64, - 51.82 + 2937, + 101, + 74, + 45 ], - "area": 3816.025, + "area": 3330, "segmentation": [], "iscrowd": 0 }, { - "id": 19, - "image_id": 11, - "category_id": 20, + "id": 18, + "image_id": 9, + "category_id": 44, "bbox": [ - 3545, - 481, - 73.64, - 43.18 + 3579, + 1875, + 98, + 184 ], - "area": 3179.775, + "area": 18032, "segmentation": [], "iscrowd": 0 }, { - "id": 20, - "image_id": 12, - "category_id": 22, + "id": 19, + "image_id": 10, + "category_id": 26, "bbox": [ 3554, 734, @@ -673,9 +679,9 @@ "iscrowd": 0 }, { - "id": 21, - "image_id": 12, - "category_id": 25, + "id": 20, + "image_id": 10, + "category_id": 29, "bbox": [ 3534, 1004, @@ -687,9 +693,9 @@ "iscrowd": 0 }, { - "id": 22, - "image_id": 12, - "category_id": 21, + "id": 21, + "image_id": 10, + "category_id": 25, "bbox": [ 3541, 477, @@ -701,37 +707,23 @@ "iscrowd": 0 }, { - "id": 23, - "image_id": 13, - "category_id": 35, - "bbox": [ - 2413, - 1859, - 210, - 197 - ], - "area": 41370, - "segmentation": [], - "iscrowd": 0 - }, - { - "id": 24, - "image_id": 14, - "category_id": 38, + "id": 22, + "image_id": 11, + "category_id": 40, "bbox": [ - 272, - 327, - 108, - 108 + 1747, + 274, + 58, + 54 ], - "area": 11664, + "area": 3132, "segmentation": [], "iscrowd": 0 }, { - "id": 25, - "image_id": 15, - "category_id": 16, + "id": 23, + "image_id": 12, + "category_id": 20, "bbox": [ 3473, 690, @@ -743,9 +735,9 @@ "iscrowd": 0 }, { - "id": 26, - "image_id": 15, - "category_id": 18, + "id": 24, + "image_id": 12, + "category_id": 22, "bbox": [ 3474, 954, @@ -757,9 +749,9 @@ "iscrowd": 0 }, { - "id": 27, - "image_id": 15, - "category_id": 17, + "id": 25, + "image_id": 12, + "category_id": 21, "bbox": [ 3649, 1005, @@ -771,93 +763,51 @@ "iscrowd": 0 }, { - "id": 28, - "image_id": 16, - "category_id": 14, - "bbox": [ - 3474, - 427, - 26, - 31 - ], - "area": 806, - "segmentation": [], - "iscrowd": 0 - }, - { - "id": 29, - "image_id": 16, - "category_id": 4, - "bbox": [ - 2169, - 1996, - 4, - 12 - ], - "area": 48, - "segmentation": [], - "iscrowd": 0 - }, - { - "id": 30, - "image_id": 16, - "category_id": 27, - "bbox": [ - 3534, - 745, - 70, - 57 - ], - "area": 3990, - "segmentation": [], - "iscrowd": 0 - }, - { - "id": 31, - "image_id": 16, - "category_id": 28, + "id": 26, + "image_id": 13, + "category_id": 41, "bbox": [ - 3541, - 485, - 68, - 50 + 2805, + 1225, + 165, + 267 ], - "area": 3400, + "area": 44055, "segmentation": [], "iscrowd": 0 }, { - "id": 32, - "image_id": 16, - "category_id": 26, + "id": 27, + "image_id": 13, + "category_id": 16, "bbox": [ - 3541, - 977, - 74, - 71 + 890, + 1243, + 75, + 211.67 ], - "area": 5254, + "area": 15875.25, "segmentation": [], "iscrowd": 0 }, { - "id": 33, - "image_id": 16, - "category_id": 7, + "id": 28, + "image_id": 14, + "category_id": 14, "bbox": [ - 3138, - 1895, - 114.25, - 70.22 + 3560, + 65, + 114, + 114 ], - "area": 8022.635, + "area": 12996, "segmentation": [], "iscrowd": 0 }, { - "id": 34, - "image_id": 17, - "category_id": 5, + "id": 29, + "image_id": 15, + "category_id": 8, "bbox": [ 3356, 1901, @@ -869,9 +819,9 @@ "iscrowd": 0 }, { - "id": 35, - "image_id": 17, - "category_id": 3, + "id": 30, + "image_id": 15, + "category_id": 6, "bbox": [ 3496, 929, @@ -883,9 +833,9 @@ "iscrowd": 0 }, { - "id": 36, - "image_id": 17, - "category_id": 1, + "id": 31, + "image_id": 15, + "category_id": 4, "bbox": [ 3508, 407, @@ -897,9 +847,9 @@ "iscrowd": 0 }, { - "id": 37, - "image_id": 17, - "category_id": 2, + "id": 32, + "image_id": 15, + "category_id": 5, "bbox": [ 3515, 665, @@ -911,9 +861,9 @@ "iscrowd": 0 }, { - "id": 38, - "image_id": 17, - "category_id": 24, + "id": 33, + "image_id": 15, + "category_id": 28, "bbox": [ 3536, 985, @@ -925,9 +875,9 @@ "iscrowd": 0 }, { - "id": 39, - "image_id": 17, - "category_id": 30, + "id": 34, + "image_id": 15, + "category_id": 34, "bbox": [ 3401, 1939, @@ -939,9 +889,9 @@ "iscrowd": 0 }, { - "id": 40, - "image_id": 17, - "category_id": 6, + "id": 35, + "image_id": 15, + "category_id": 9, "bbox": [ 3566, 1896, @@ -953,9 +903,23 @@ "iscrowd": 0 }, { - "id": 41, - "image_id": 17, - "category_id": 29, + "id": 36, + "image_id": 15, + "category_id": 2, + "bbox": [ + 3347, + 740, + 153, + 72 + ], + "area": 11016, + "segmentation": [], + "iscrowd": 0 + }, + { + "id": 37, + "image_id": 15, + "category_id": 33, "bbox": [ 3544, 709, @@ -965,6 +929,118 @@ "area": 2127, "segmentation": [], "iscrowd": 0 + }, + { + "id": 38, + "image_id": 15, + "category_id": 3, + "bbox": [ + 3348, + 994, + 153, + 72 + ], + "area": 11016, + "segmentation": [], + "iscrowd": 0 + }, + { + "id": 39, + "image_id": 15, + "category_id": 1, + "bbox": [ + 3346, + 480, + 153, + 72 + ], + "area": 11016, + "segmentation": [], + "iscrowd": 0 + }, + { + "id": 40, + "image_id": 16, + "category_id": 19, + "bbox": [ + 3649, + 739, + 28, + 23 + ], + "area": 644, + "segmentation": [], + "iscrowd": 0 + }, + { + "id": 41, + "image_id": 16, + "category_id": 17, + "bbox": [ + 3650, + 474, + 27, + 25 + ], + "area": 675, + "segmentation": [], + "iscrowd": 0 + }, + { + "id": 42, + "image_id": 17, + "category_id": 12, + "bbox": [ + 2523, + 1221, + 101, + 82 + ], + "area": 8282, + "segmentation": [], + "iscrowd": 0 + }, + { + "id": 43, + "image_id": 17, + "category_id": 13, + "bbox": [ + 2525, + 1384, + 104, + 81 + ], + "area": 8424, + "segmentation": [], + "iscrowd": 0 + }, + { + "id": 44, + "image_id": 17, + "category_id": 11, + "bbox": [ + 3381, + 107, + 58, + 46 + ], + "area": 2668, + "segmentation": [], + "iscrowd": 0 + }, + { + "id": 45, + "image_id": 17, + "category_id": 15, + "bbox": [ + 3565, + 111, + 63, + 38 + ], + "area": 2394, + "segmentation": [], + "iscrowd": 0 } ] } \ No newline at end of file diff --git a/config.py b/config.py index 90c526c7..79c3840c 100644 --- a/config.py +++ b/config.py @@ -1,5 +1,6 @@ import os +from ok.interaction.PostMessageInteraction import PostMessageInteraction from ok.util.path import get_path_in_package from src.task.AutoCombatTask import AutoCombatTask from src.task.FarmEchoTask import FarmEchoTask @@ -31,8 +32,13 @@ def calculate_pc_exe_path(running_path): 'windows': { # required when supporting windows game 'exe': 'Client-Win64-Shipping.exe', 'calculate_pc_exe_path': calculate_pc_exe_path, + 'interaction': PostMessageInteraction, 'can_bit_blt': False # default false, opengl games does not support bit_blt }, + 'supported_resolution': { + 'ratio': '16:9', + 'min_size': (1280, 720) + }, 'analytics': { 'report_url': 'https://okreport.ok-script.com/report' }, diff --git a/src/char/BaseChar.py b/src/char/BaseChar.py index c892b663..e608dca0 100644 --- a/src/char/BaseChar.py +++ b/src/char/BaseChar.py @@ -83,8 +83,7 @@ def wait_down(self): f'{self}_down_finish_{(time.time() - start):.2f}_f:{self.is_forte_full()}_e:{self.resonance_available()}_r:{self.echo_available()}_q:{self.liberation_available()}_i{self.has_intro}') def do_perform(self): - if self.click_liberation(con_less_than=1): - return self.switch_next_char() + self.click_liberation(con_less_than=1) if self.click_resonance()[0]: return self.switch_next_char() if self.click_echo(): @@ -107,7 +106,7 @@ def has_cd(self, box_name): big_area_count += 1 if left > 0 and top > 0 and left + width < box.width and top + height < box.height: self.logger.debug(f"{box_name} Area of connected component {i}: {area} pixels {width}x{height}") - if 20 / 3840 / 2160 <= area / self.task.frame.shape[0] / self.task.frame.shape[ + if 16 / 3840 / 2160 <= area / self.task.frame.shape[0] / self.task.frame.shape[ 1] <= 60 / 3840 / 2160 and abs(width - height) / (width + height) < 0.3: has_dot = True elif 25 / 2160 <= height / self.task.screen_height <= 45 / 2160 and 5 / 2160 <= width / self.task.screen_height <= 35 / 2160: @@ -181,6 +180,11 @@ def click_resonance(self, post_sleep=0, has_animation=False, send_click=True): last_op = 'resonance' self.send_resonance_key() last_click = now + if time.time() - resonance_click_time > 10: + self.logger.error(f'click_resonance too long, breaking') + self.task.screenshot(self.task.get_box_by_name('box_resonance').crop(self.task.frame), + 'click_resonance too long, breaking') + break self.task.next_frame() if clicked: self.sleep(post_sleep) diff --git a/src/char/Jinhsi.py b/src/char/Jinhsi.py index a93c93d5..787bf34b 100644 --- a/src/char/Jinhsi.py +++ b/src/char/Jinhsi.py @@ -79,6 +79,7 @@ def handle_intro(self): self.logger.info(f'handle_intro start') last = None start = time.time() + self.send_resonance_key() while not self.has_cd('resonance'): if last != 'resonance' or time.time() - start < 1: if self.send_resonance_key(interval=0.1): diff --git a/src/task/BaseCombatTask.py b/src/task/BaseCombatTask.py index 7a1fdb84..ee888a3f 100644 --- a/src/task/BaseCombatTask.py +++ b/src/task/BaseCombatTask.py @@ -1,3 +1,4 @@ +import random import time from ok.feature.FindFeature import FindFeature @@ -106,6 +107,12 @@ def switch_next_char(self, current_char, post_action=None, free_intro=False, tar logger.info(f'switch_next_char end {(switch_time - start):.3f}s') return switch_time + def click(self, x=-1, y=-1, move_back=False, name=None, interval=-1): + if x == -1 and y == -1: + x = self.width_of_screen(random.uniform(0.4, 0.6)) + y = self.height_of_screen(random.uniform(0.4, 0.6)) + return super().click(x, y, move_back, name, interval) + def wait_in_team(self, time_out=10): self.wait_until(lambda: self.in_team()[0], time_out=time_out) @@ -129,10 +136,11 @@ def check_combat(self): self.raise_not_in_combat('combat check not in combat') def walk_until_f(self, time_out=0, raise_if_not_found=True): - if not self.find_one('pick_up_f', horizontal_variance=0.02, vertical_variance=0.02, use_gray_scale=True): + if not self.find_one('pick_up_f', horizontal_variance=0.02, vertical_variance=0.2, threshold=0.8, + use_gray_scale=True): self.send_key_down('w') f_found = self.wait_feature('pick_up_f', horizontal_variance=0.02, vertical_variance=0.02, - use_gray_scale=True, + use_gray_scale=True, threshold=0.8, wait_until_before_delay=0, time_out=time_out, raise_if_not_found=False) self.send_key_up('w') if not f_found: @@ -198,7 +206,7 @@ def get_resonance_percentage(self): return self.calculate_color_percentage(white_color, self.get_box_by_name('box_resonance')) def in_team(self): - start = time.time() + # start = time.time() c1 = self.find_one('char_1_text', use_gray_scale=True) c2 = self.find_one('char_2_text', use_gray_scale=True) c3 = self.find_one('char_3_text', use_gray_scale=True) diff --git a/src/task/FarmEchoTask.py b/src/task/FarmEchoTask.py index e7eb34f4..43916825 100644 --- a/src/task/FarmEchoTask.py +++ b/src/task/FarmEchoTask.py @@ -1,3 +1,5 @@ +import re + from ok.logging.Logger import get_logger from src.task.BaseCombatTask import BaseCombatTask, NotInCombatException @@ -34,14 +36,23 @@ def run(self): # loop here count = 0 + i = -1 while count < self.config.get("Repeat Farm Count", 0): count += 1 self.wait_until(lambda: self.in_team()[0], time_out=40) self.walk_until_f() - self.wait_click_feature('gray_crownless_battle', raise_if_not_found=True, use_gray_scale=True) - self.wait_click_feature('gray_button_challenge', raise_if_not_found=True, use_gray_scale=True) - self.wait_click_feature('gray_start_battle', relative_x=-1, raise_if_not_found=True, use_gray_scale=True) - self.wait_until(lambda: self.in_combat(), time_out=40) + self.wait_ocr(0.75, 0.02, 0.85, 0.09, match=re.compile('240'), raise_if_not_found=True) + i = self.choose_level(0) + if i == -1: + self.log_error('Can not find a level to enter', notify=True) + return + # self.wait_click_feature('gray_crownless_battle', raise_if_not_found=True, use_gray_scale=True, + # box=self.box_of_screen(0.05, 0.12, 0.11, 0.22), threshold=0.7) + # self.click_relative(0.15, 0.17) + # self.sleep(1) + # + + self.wait_until(lambda: self.in_combat(), time_out=40, raise_if_not_found=True) self.load_chars() while True: try: @@ -57,3 +68,25 @@ def run(self): self.wait_click_feature('gray_confirm_exit_button', relative_x=-1, raise_if_not_found=True, use_gray_scale=True) self.wait_in_team(time_out=40) + + def choose_level(self, start): + y = 0.17 + x = 0.15 + distance = 0.08 + for i in range(4): + if i < start: + continue + self.click_relative(x, y + i * distance) + self.sleep(1) + self.wait_click_feature('gray_button_challenge', raise_if_not_found=True, use_gray_scale=True) + self.sleep(1) + cancel_button = self.find_one('cancel_button', use_gray_scale=True, threshold=0.7) + self.screenshot(f'cancel_{cancel_button}') + if not cancel_button: + self.wait_click_feature('gray_start_battle', relative_x=-1, raise_if_not_found=True, + use_gray_scale=True) + return i + else: + self.click(cancel_button) + self.sleep(1) + return -1