diff --git a/assets/64425cad-10_44_19_536997_WindowsGraphicsCaptureMethod_0x0_title_None_Client-Win_BLAxtp1_png.rf.312c7038c189f7e1f19aad748fcca173.png b/assets/64425cad-10_44_19_536997_WindowsGraphicsCaptureMethod_0x0_title_None_Client-Win_BLAxtp1_png.rf.312c7038c189f7e1f19aad748fcca173.png new file mode 100644 index 0000000..b158e7b Binary files /dev/null and b/assets/64425cad-10_44_19_536997_WindowsGraphicsCaptureMethod_0x0_title_None_Client-Win_BLAxtp1_png.rf.312c7038c189f7e1f19aad748fcca173.png differ diff --git a/assets/WindowsGraphicsCaptureMethod_0x0_title_None_Client-Win64-Shipping-exe_3840x2160_133336_1_False_original_png.rf.feddfc26474eafcb154a459f8232def5.png b/assets/WindowsGraphicsCaptureMethod_0x0_title_None_Client-Win64-Shipping-exe_3840x2160_133336_1_False_original_png.rf.feddfc26474eafcb154a459f8232def5.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.feddfc26474eafcb154a459f8232def5.png differ diff --git a/assets/WindowsGraphicsCaptureMethod_3840x2160_title_None_Client-Win64-Shipping-exe_3840x2160_10227166_1_False_original_png.rf.c49da0f879fe70ce6a7edb76c6c482ac.png b/assets/WindowsGraphicsCaptureMethod_3840x2160_title_None_Client-Win64-Shipping-exe_3840x2160_10227166_1_False_original_png.rf.c49da0f879fe70ce6a7edb76c6c482ac.png new file mode 100644 index 0000000..70564a8 Binary files /dev/null and b/assets/WindowsGraphicsCaptureMethod_3840x2160_title_None_Client-Win64-Shipping-exe_3840x2160_10227166_1_False_original_png.rf.c49da0f879fe70ce6a7edb76c6c482ac.png differ diff --git a/assets/WindowsGraphicsCaptureMethod_3840x2160_title_None_Client-Win64-Shipping-exe_3840x2160_10361910_1_False_original_png.rf.a84ee152c66940adbd63d8d404d54e6e.png b/assets/WindowsGraphicsCaptureMethod_3840x2160_title_None_Client-Win64-Shipping-exe_3840x2160_10361910_1_False_original_png.rf.a84ee152c66940adbd63d8d404d54e6e.png new file mode 100644 index 0000000..39ecc64 Binary files /dev/null and b/assets/WindowsGraphicsCaptureMethod_3840x2160_title_None_Client-Win64-Shipping-exe_3840x2160_10361910_1_False_original_png.rf.a84ee152c66940adbd63d8d404d54e6e.png differ diff --git a/assets/WindowsGraphicsCaptureMethod_3840x2160_title_None_Client-Win64-Shipping-exe_3840x2160_1577828_1_False_original_png.rf.2564331d523d3ea98ceb64d8c54bdd98.png b/assets/WindowsGraphicsCaptureMethod_3840x2160_title_None_Client-Win64-Shipping-exe_3840x2160_1577828_1_False_original_png.rf.2564331d523d3ea98ceb64d8c54bdd98.png new file mode 100644 index 0000000..0fab982 Binary files /dev/null and b/assets/WindowsGraphicsCaptureMethod_3840x2160_title_None_Client-Win64-Shipping-exe_3840x2160_1577828_1_False_original_png.rf.2564331d523d3ea98ceb64d8c54bdd98.png differ diff --git a/assets/_annotations.coco.json b/assets/_annotations.coco.json index 1429233..59390cb 100644 --- a/assets/_annotations.coco.json +++ b/assets/_annotations.coco.json @@ -1,11 +1,11 @@ { "info": { "year": "2024", - "version": "30", + "version": "33", "description": "Exported from roboflow.com", "contributor": "", "url": "https://public.roboflow.com/object-detection/undefined", - "date_created": "2024-07-31T14:20:59+00:00" + "date_created": "2024-08-01T16:17:35+00:00" }, "licenses": [ { @@ -112,7 +112,7 @@ }, { "id": 19, - "name": "cancel_button", + "name": "cancel_button_hcenter_vcenter", "supercategory": "ww" }, { @@ -227,12 +227,12 @@ }, { "id": 42, - "name": "claim_cancel_button", + "name": "claim_cancel_button_hcenter_vcenter", "supercategory": "ww" }, { "id": 43, - "name": "custom_teleport", + "name": "custom_teleport_hcenter_vcenter", "supercategory": "ww" }, { @@ -302,12 +302,12 @@ }, { "id": 57, - "name": "pick_up_f", + "name": "pick_up_f_hcenter_vcenter", "supercategory": "ww" }, { "id": 58, - "name": "revive_confirm", + "name": "revive_confirm_hcenter_vcenter", "supercategory": "ww" }, { @@ -320,10 +320,10 @@ { "id": 0, "license": 1, - "file_name": "9ed8b373-00_57_50_813872_WindowsGraphicsCaptureMethod_3840x2160_title_None_Clie_3jLoRJh_png.rf.170fe2ae11c1d8058d8d3e4b2361357a.png", + "file_name": "WindowsGraphicsCaptureMethod_3840x2160_title_None_Client-Win64-Shipping-exe_3840x2160_1379888_1_False_original_png.rf.446e422a7ffba26d0b8e8e159c7e56c0.png", "height": 2160, "width": 3840, - "date_captured": "2024-07-31T14:20:59+00:00" + "date_captured": "2024-08-01T16:17:35+00:00" }, { "id": 1, @@ -331,55 +331,55 @@ "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-31T14:20:59+00:00" + "date_captured": "2024-08-01T16:17:35+00:00" }, { "id": 2, "license": 1, - "file_name": "154eb284-17_01_16_406889_WindowsGraphicsCaptureMethod_3840x2160_title_None_Clie_6yGu616_png.rf.55e6947e2f1a3ecadae3c094dcd30d08.png", - "height": 2160, - "width": 3840, - "date_captured": "2024-07-31T14:20:59+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-08-01T16:17:35+00:00" }, { "id": 3, "license": 1, - "file_name": "01304a45-10_34_04_580378_WindowsGraphicsCaptureMethod_0x0_title_None_Client-Win_WnYCyUT_png.rf.7b5dfc4585195e1d846574b715468897.png", + "file_name": "4_png.rf.180bb3f2bed38134b1d0bba90c3fcdb0.png", "height": 2160, "width": 3840, - "date_captured": "2024-07-31T14:20:59+00:00" + "date_captured": "2024-08-01T16:17:35+00:00" }, { "id": 4, "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_10361910_1_False_original_png.rf.a84ee152c66940adbd63d8d404d54e6e.png", "height": 2160, "width": 3840, - "date_captured": "2024-07-31T14:20:59+00:00" + "date_captured": "2024-08-01T16:17:35+00:00" }, { "id": 5, "license": 1, - "file_name": "WindowsGraphicsCaptureMethod_3840x2160_title_None_Client-Win64-Shipping-exe_3840x2160_10227166_1_False_original_png.rf.550aad28c0aff7d97d160b25a341ec7c.png", + "file_name": "154eb284-17_01_16_406889_WindowsGraphicsCaptureMethod_3840x2160_title_None_Clie_6yGu616_png.rf.55e6947e2f1a3ecadae3c094dcd30d08.png", "height": 2160, "width": 3840, - "date_captured": "2024-07-31T14:20:59+00:00" + "date_captured": "2024-08-01T16:17:35+00:00" }, { "id": 6, "license": 1, - "file_name": "221458a6-13_25_04_962031_WindowsGraphicsCaptureMethod_3840x2160_title_None_Clie_XYXLS23_png.rf.281b46703c1e3f6bd436750f6aa82cf2.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-31T14:20:59+00:00" + "date_captured": "2024-08-01T16:17:35+00:00" }, { "id": 7, "license": 1, - "file_name": "WindowsGraphicsCaptureMethod_3840x2160_title_None_Client-Win64-Shipping-exe_3840x2160_4720836_1_False_original_png.rf.935bb51188f6bc516efc5a57b52fe8ad.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-07-31T14:20:59+00:00" + "date_captured": "2024-08-01T16:17:35+00:00" }, { "id": 8, @@ -387,181 +387,181 @@ "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-31T14:20:59+00:00" + "date_captured": "2024-08-01T16:17:35+00:00" }, { "id": 9, "license": 1, - "file_name": "0ab28c72-00_54_43_431654_WindowsGraphicsCaptureMethod_3840x2160_title_None_Clie_usg73Cm_png.rf.124dc89f9b3816ecb0ce5a97c95475dc.png", + "file_name": "64425cad-10_44_19_536997_WindowsGraphicsCaptureMethod_0x0_title_None_Client-Win_BLAxtp1_png.rf.312c7038c189f7e1f19aad748fcca173.png", "height": 2160, "width": 3840, - "date_captured": "2024-07-31T14:20:59+00:00" + "date_captured": "2024-08-01T16:17:35+00:00" }, { "id": 10, "license": 1, - "file_name": "WindowsGraphicsCaptureMethod_3840x2160_title_None_Client-Win64-Shipping-exe_3840x2160_264720_1_False_original_png.rf.a131c132d915d7471e1f0475fc72b7f6.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-31T14:20:59+00:00" + "date_captured": "2024-08-01T16:17:35+00:00" }, { "id": 11, "license": 1, - "file_name": "WindowsGraphicsCaptureMethod_3840x2160_title_None_Client-Win64-Shipping-exe_3840x2160_1577828_1_False_original_png.rf.3ed83cbce453e93e1027f37184cff0a5.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-31T14:20:59+00:00" + "date_captured": "2024-08-01T16:17:35+00:00" }, { "id": 12, "license": 1, - "file_name": "WindowsGraphicsCaptureMethod_3840x2160_title_None_Client-Win64-Shipping-exe_3840x2160_10361910_1_False_original_png.rf.244ee2bd0b4de93caac3066adaae0b75.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-31T14:20:59+00:00" + "date_captured": "2024-08-01T16:17:35+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": "9beed513-16_15_23_246388_WindowsGraphicsCaptureMethod_3840x2160_title_None_Clie_a4tQhDg_png.rf.4e79b52b95ad46f47bc470f069a65b29.png", "height": 2160, "width": 3840, - "date_captured": "2024-07-31T14:20:59+00:00" + "date_captured": "2024-08-01T16:17:35+00:00" }, { "id": 14, "license": 1, - "file_name": "4_png.rf.180bb3f2bed38134b1d0bba90c3fcdb0.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-31T14:20:59+00:00" + "date_captured": "2024-08-01T16:17:35+00:00" }, { "id": 15, "license": 1, - "file_name": "WindowsGraphicsCaptureMethod_3840x2160_title_None_Client-Win64-Shipping-exe_3840x2160_7476412_1_False_original_png.rf.a21fbbbefc2fa48f56917d19a6a443b2.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-31T14:20:59+00:00" + "date_captured": "2024-08-01T16:17:35+00:00" }, { "id": 16, "license": 1, - "file_name": "5841f84c-17_04_26_738022_WindowsGraphicsCaptureMethod_3840x2160_title_None_Clie_TIDxIl1_png.rf.97a22c8e01f1fd88debc20c4c903b8b9.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-31T14:20:59+00:00" + "date_captured": "2024-08-01T16:17:35+00:00" }, { "id": 17, "license": 1, - "file_name": "64425cad-10_44_19_536997_WindowsGraphicsCaptureMethod_0x0_title_None_Client-Win_BLAxtp1_png.rf.d37538db2b2d15d6aad459dd08bb348d.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-31T14:20:59+00:00" + "date_captured": "2024-08-01T16:17:35+00:00" }, { "id": 18, "license": 1, - "file_name": "9beed513-16_15_23_246388_WindowsGraphicsCaptureMethod_3840x2160_title_None_Clie_a4tQhDg_png.rf.4e79b52b95ad46f47bc470f069a65b29.png", + "file_name": "WindowsGraphicsCaptureMethod_3840x2160_title_None_Client-Win64-Shipping-exe_3840x2160_1577828_1_False_original_png.rf.2564331d523d3ea98ceb64d8c54bdd98.png", "height": 2160, "width": 3840, - "date_captured": "2024-07-31T14:20:59+00:00" + "date_captured": "2024-08-01T16:17:35+00:00" }, { "id": 19, "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-31T14:20:59+00:00" + "file_name": "5841f84c-17_04_26_738022_WindowsGraphicsCaptureMethod_3840x2160_title_None_Clie_TIDxIl1_png.rf.97a22c8e01f1fd88debc20c4c903b8b9.png", + "height": 2160, + "width": 3840, + "date_captured": "2024-08-01T16:17:35+00:00" }, { "id": 20, "license": 1, - "file_name": "9f04db98-16_20_58_825243_WindowsGraphicsCaptureMethod_3840x2160_title_None_Clie_VuLpBVc_png.rf.a16ce4854c42840f44a6c0a04d44c83c.png", + "file_name": "WindowsGraphicsCaptureMethod_3840x2160_title_None_Client-Win64-Shipping-exe_3840x2160_7476412_1_False_original_png.rf.a21fbbbefc2fa48f56917d19a6a443b2.png", "height": 2160, "width": 3840, - "date_captured": "2024-07-31T14:20:59+00:00" + "date_captured": "2024-08-01T16:17:35+00:00" }, { "id": 21, "license": 1, - "file_name": "WindowsGraphicsCaptureMethod_3840x2160_title_None_Client-Win64-Shipping-exe_3840x2160_1379888_1_False_original_png.rf.446e422a7ffba26d0b8e8e159c7e56c0.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-31T14:20:59+00:00" + "date_captured": "2024-08-01T16:17:35+00:00" }, { "id": 22, "license": 1, - "file_name": "WindowsGraphicsCaptureMethod_0x0_title_None_Client-Win64-Shipping-exe_3840x2160_133336_1_False_original_png.rf.a2b55fa3583fef2081d49205ae9c643b.png", + "file_name": "WindowsGraphicsCaptureMethod_3840x2160_title_None_Client-Win64-Shipping-exe_3840x2160_10227166_1_False_original_png.rf.c49da0f879fe70ce6a7edb76c6c482ac.png", "height": 2160, "width": 3840, - "date_captured": "2024-07-31T14:20:59+00:00" + "date_captured": "2024-08-01T16:17:35+00:00" }, { "id": 23, "license": 1, - "file_name": "934f0ca6-17_53_47_840123_WindowsGraphicsCaptureMethod_3840x2160_title_None_Clie_aJQVINN_png.rf.a107256237035eec3be4125f726b8b73.png", + "file_name": "WindowsGraphicsCaptureMethod_3840x2160_title_None_Client-Win64-Shipping-exe_3840x2160_264720_1_False_original_png.rf.a131c132d915d7471e1f0475fc72b7f6.png", "height": 2160, "width": 3840, - "date_captured": "2024-07-31T14:20:59+00:00" + "date_captured": "2024-08-01T16:17:35+00:00" }, { "id": 24, "license": 1, - "file_name": "WindowsGraphicsCaptureMethod_3840x2160_title_None_Client-Win64-Shipping-exe_3840x2160_12847792_1_False_original_png.rf.abeaa08198ff5a77fb70340952ba23f3.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-31T14:20:59+00:00" + "date_captured": "2024-08-01T16:17:35+00:00" }, { "id": 25, "license": 1, - "file_name": "17_11_07_938917_WindowsGraphicsCaptureMethod_0x0_title_None_Client-Win64-Shipping-exe_3840x2160_396094_1_False_original_png.rf.f921e6fb49de02d7ef17e7f5f6a976c4.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-31T14:20:59+00:00" + "date_captured": "2024-08-01T16:17:35+00:00" }, { "id": 26, "license": 1, - "file_name": "WindowsGraphicsCaptureMethod_0x0_title_None_Client-Win64-Shipping-exe_3840x2160_1841174_1_False_original-1-_png.rf.e6c4a5734163badfbfa76780248cd2f8.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-31T14:20:59+00:00" + "date_captured": "2024-08-01T16:17:35+00:00" }, { "id": 27, "license": 1, - "file_name": "e521850f-00_37_38_458841_Encore_liberation_0-274_original_png.rf.e7703de2285a6b2c70567e891804c760.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-07-31T14:20:59+00:00" + "date_captured": "2024-08-01T16:17:35+00:00" }, { "id": 28, "license": 1, - "file_name": "9dd77a5d-16_57_31_014010_WindowsGraphicsCaptureMethod_3840x2160_title_None_Clie_RVvCfQe_png.rf.e8397fbd133d485459bb8c30fc37353c.png", + "file_name": "WindowsGraphicsCaptureMethod_0x0_title_None_Client-Win64-Shipping-exe_3840x2160_133336_1_False_original_png.rf.feddfc26474eafcb154a459f8232def5.png", "height": 2160, "width": 3840, - "date_captured": "2024-07-31T14:20:59+00:00" + "date_captured": "2024-08-01T16:17:35+00:00" } ], "annotations": [ { "id": 0, "image_id": 0, - "category_id": 45, + "category_id": 2, "bbox": [ - 2937, - 1888, - 86, - 84 + 2681, + 1080, + 103.75, + 60 ], - "area": 7224, + "area": 6225, "segmentation": [], "iscrowd": 0 }, @@ -582,6 +582,62 @@ { "id": 2, "image_id": 2, + "category_id": 3, + "bbox": [ + 1820, + 227, + 35, + 90.71 + ], + "area": 3174.85, + "segmentation": [], + "iscrowd": 0 + }, + { + "id": 3, + "image_id": 2, + "category_id": 48, + "bbox": [ + 36, + 273, + 78.57, + 78.57 + ], + "area": 6173.245, + "segmentation": [], + "iscrowd": 0 + }, + { + "id": 4, + "image_id": 3, + "category_id": 46, + "bbox": [ + 3220, + 1930, + 76.67, + 158.33 + ], + "area": 12139.161, + "segmentation": [], + "iscrowd": 0 + }, + { + "id": 5, + "image_id": 4, + "category_id": 43, + "bbox": [ + 1909, + 1038, + 34.81, + 68.65 + ], + "area": 2389.707, + "segmentation": [], + "iscrowd": 0 + }, + { + "id": 6, + "image_id": 5, "category_id": 11, "bbox": [ 3345, @@ -594,8 +650,8 @@ "iscrowd": 0 }, { - "id": 3, - "image_id": 2, + "id": 7, + "image_id": 5, "category_id": 9, "bbox": [ 3512, @@ -608,8 +664,8 @@ "iscrowd": 0 }, { - "id": 4, - "image_id": 2, + "id": 8, + "image_id": 5, "category_id": 7, "bbox": [ 3511, @@ -622,8 +678,8 @@ "iscrowd": 0 }, { - "id": 5, - "image_id": 2, + "id": 9, + "image_id": 5, "category_id": 8, "bbox": [ 3511, @@ -636,8 +692,8 @@ "iscrowd": 0 }, { - "id": 6, - "image_id": 2, + "id": 10, + "image_id": 5, "category_id": 36, "bbox": [ 3541, @@ -650,8 +706,8 @@ "iscrowd": 0 }, { - "id": 7, - "image_id": 2, + "id": 11, + "image_id": 5, "category_id": 12, "bbox": [ 3566, @@ -664,8 +720,8 @@ "iscrowd": 0 }, { - "id": 8, - "image_id": 2, + "id": 12, + "image_id": 5, "category_id": 5, "bbox": [ 3347, @@ -678,8 +734,8 @@ "iscrowd": 0 }, { - "id": 9, - "image_id": 2, + "id": 13, + "image_id": 5, "category_id": 41, "bbox": [ 3544, @@ -692,8 +748,8 @@ "iscrowd": 0 }, { - "id": 10, - "image_id": 2, + "id": 14, + "image_id": 5, "category_id": 6, "bbox": [ 3348, @@ -706,8 +762,8 @@ "iscrowd": 0 }, { - "id": 11, - "image_id": 2, + "id": 15, + "image_id": 5, "category_id": 4, "bbox": [ 3346, @@ -720,660 +776,604 @@ "iscrowd": 0 }, { - "id": 12, - "image_id": 3, - "category_id": 54, + "id": 16, + "image_id": 6, + "category_id": 49, "bbox": [ - 3579, - 1875, - 98, - 184 + 2413, + 1859, + 210, + 197 ], - "area": 18032, + "area": 41370, "segmentation": [], "iscrowd": 0 }, { - "id": 13, - "image_id": 4, - "category_id": 23, + "id": 17, + "image_id": 7, + "category_id": 45, "bbox": [ - 3649, - 739, - 28, - 23 + 2937, + 1888, + 86, + 84 ], - "area": 644, + "area": 7224, "segmentation": [], "iscrowd": 0 }, { - "id": 14, - "image_id": 4, - "category_id": 21, + "id": 18, + "image_id": 8, + "category_id": 20, "bbox": [ - 3650, - 474, - 27, - 25 + 3537, + 723, + 68.85, + 65 ], - "area": 675, + "area": 4475.25, "segmentation": [], "iscrowd": 0 }, { - "id": 15, - "image_id": 5, - "category_id": 42, + "id": 19, + "image_id": 9, + "category_id": 51, "bbox": [ - 867, - 1200, - 135, - 280 + 2805, + 1225, + 165, + 267 ], - "area": 37800, + "area": 44055, "segmentation": [], "iscrowd": 0 }, { - "id": 16, - "image_id": 6, - "category_id": 32, + "id": 20, + "image_id": 9, + "category_id": 19, "bbox": [ - 3554, - 734, - 76, - 60 + 890, + 1243, + 75, + 211.67 ], - "area": 4560, + "area": 15875.25, "segmentation": [], "iscrowd": 0 }, { - "id": 17, - "image_id": 6, - "category_id": 37, + "id": 21, + "image_id": 10, + "category_id": 47, "bbox": [ - 3534, - 1004, - 75, - 42 + 77, + 533, + 151.67, + 153.33 ], - "area": 3150, - "segmentation": [], - "iscrowd": 0 - }, - { - "id": 18, - "image_id": 6, - "category_id": 31, - "bbox": [ - 3541, - 477, - 72, - 48 - ], - "area": 3456, - "segmentation": [], - "iscrowd": 0 - }, - { - "id": 19, - "image_id": 7, - "category_id": 47, - "bbox": [ - 77, - 533, - 151.67, - 153.33 - ], - "area": 23255.561, - "segmentation": [], - "iscrowd": 0 - }, - { - "id": 20, - "image_id": 8, - "category_id": 20, - "bbox": [ - 3537, - 723, - 68.85, - 65 - ], - "area": 4475.25, - "segmentation": [], - "iscrowd": 0 - }, - { - "id": 21, - "image_id": 9, - "category_id": 55, - "bbox": [ - 2589, - 1897, - 242, - 210 - ], - "area": 50820, + "area": 23255.561, "segmentation": [], "iscrowd": 0 }, { "id": 22, - "image_id": 10, - "category_id": 1, + "image_id": 11, + "category_id": 56, "bbox": [ - 2680, - 1081, - 173.57, - 60.71 + 1555, + 1550, + 306.67, + 121.67 ], - "area": 10537.435, + "area": 37312.539, "segmentation": [], "iscrowd": 0 }, { "id": 23, - "image_id": 11, - "category_id": 58, + "image_id": 12, + "category_id": 32, "bbox": [ - 2887, - 1405, - 213.33, - 281.67 + 3554, + 734, + 76, + 60 ], - "area": 60088.661, + "area": 4560, "segmentation": [], "iscrowd": 0 }, { "id": 24, "image_id": 12, - "category_id": 43, + "category_id": 37, "bbox": [ - 1909, - 1038, - 34.81, - 68.65 + 3534, + 1004, + 75, + 42 ], - "area": 2389.707, + "area": 3150, "segmentation": [], "iscrowd": 0 }, { "id": 25, - "image_id": 13, - "category_id": 49, + "image_id": 12, + "category_id": 31, "bbox": [ - 2413, - 1859, - 210, - 197 + 3541, + 477, + 72, + 48 ], - "area": 41370, + "area": 3456, "segmentation": [], "iscrowd": 0 }, { "id": 26, - "image_id": 14, - "category_id": 46, + "image_id": 13, + "category_id": 24, "bbox": [ - 3220, - 1930, - 76.67, - 158.33 + 3473, + 690, + 28, + 31 ], - "area": 12139.161, + "area": 868, "segmentation": [], "iscrowd": 0 }, { "id": 27, - "image_id": 15, - "category_id": 27, + "image_id": 13, + "category_id": 26, "bbox": [ - 3557, - 991, - 63.33, - 58.33 + 3474, + 954, + 27, + 32 ], - "area": 3694.039, + "area": 864, "segmentation": [], "iscrowd": 0 }, { "id": 28, - "image_id": 15, - "category_id": 28, + "image_id": 13, + "category_id": 25, "bbox": [ - 3550, - 733, - 78.33, - 52.67 + 3649, + 1005, + 28, + 21 ], - "area": 4125.641, + "area": 588, "segmentation": [], "iscrowd": 0 }, { "id": 29, - "image_id": 15, - "category_id": 34, + "image_id": 14, + "category_id": 23, "bbox": [ - 3538, - 456, - 54, - 61.33 + 3649, + 739, + 28, + 23 ], - "area": 3311.82, + "area": 644, "segmentation": [], "iscrowd": 0 }, { "id": 30, - "image_id": 16, - "category_id": 15, + "image_id": 14, + "category_id": 21, "bbox": [ - 2523, - 1221, - 101, - 82 + 3650, + 474, + 27, + 25 ], - "area": 8282, + "area": 675, "segmentation": [], "iscrowd": 0 }, { "id": 31, - "image_id": 16, - "category_id": 16, + "image_id": 15, + "category_id": 22, "bbox": [ - 2525, - 1384, - 104, - 81 + 3474, + 427, + 26, + 31 ], - "area": 8424, + "area": 806, "segmentation": [], "iscrowd": 0 }, { "id": 32, - "image_id": 16, - "category_id": 14, + "image_id": 15, + "category_id": 10, "bbox": [ - 3381, - 107, - 58, - 46 + 2169, + 1996, + 4, + 12 ], - "area": 2668, + "area": 48, "segmentation": [], "iscrowd": 0 }, { "id": 33, - "image_id": 16, - "category_id": 18, + "image_id": 15, + "category_id": 39, "bbox": [ - 3565, - 111, - 63, - 38 + 3534, + 745, + 70, + 57 ], - "area": 2394, + "area": 3990, "segmentation": [], "iscrowd": 0 }, { "id": 34, - "image_id": 17, - "category_id": 51, + "image_id": 15, + "category_id": 40, "bbox": [ - 2805, - 1225, - 165, - 267 + 3541, + 485, + 68, + 50 ], - "area": 44055, + "area": 3400, "segmentation": [], "iscrowd": 0 }, { "id": 35, - "image_id": 17, - "category_id": 19, + "image_id": 15, + "category_id": 38, "bbox": [ - 890, - 1243, - 75, - 211.67 + 3541, + 977, + 74, + 71 ], - "area": 15875.25, + "area": 5254, "segmentation": [], "iscrowd": 0 }, { "id": 36, - "image_id": 18, - "category_id": 24, + "image_id": 15, + "category_id": 13, "bbox": [ - 3473, - 690, - 28, - 31 + 3138, + 1895, + 118.14, + 78 ], - "area": 868, + "area": 9214.92, "segmentation": [], "iscrowd": 0 }, { "id": 37, - "image_id": 18, - "category_id": 26, + "image_id": 16, + "category_id": 55, "bbox": [ - 3474, - 954, - 27, - 32 + 2589, + 1897, + 242, + 210 ], - "area": 864, + "area": 50820, "segmentation": [], "iscrowd": 0 }, { "id": 38, - "image_id": 18, - "category_id": 25, + "image_id": 17, + "category_id": 17, "bbox": [ - 3649, - 1005, - 28, - 21 + 3560, + 65, + 114, + 114 ], - "area": 588, + "area": 12996, "segmentation": [], "iscrowd": 0 }, { "id": 39, - "image_id": 19, - "category_id": 3, + "image_id": 18, + "category_id": 58, "bbox": [ - 1820, - 227, - 35, - 90.71 + 2887, + 1405, + 213.33, + 281.67 ], - "area": 3174.85, + "area": 60088.661, "segmentation": [], "iscrowd": 0 }, { "id": 40, "image_id": 19, - "category_id": 48, + "category_id": 15, "bbox": [ - 36, - 273, - 78.57, - 78.57 + 2523, + 1221, + 101, + 82 ], - "area": 6173.245, + "area": 8282, "segmentation": [], "iscrowd": 0 }, { "id": 41, - "image_id": 20, - "category_id": 22, + "image_id": 19, + "category_id": 16, "bbox": [ - 3474, - 427, - 26, - 31 + 2525, + 1384, + 104, + 81 ], - "area": 806, + "area": 8424, "segmentation": [], "iscrowd": 0 }, { "id": 42, - "image_id": 20, - "category_id": 10, + "image_id": 19, + "category_id": 14, "bbox": [ - 2169, - 1996, - 4, - 12 + 3381, + 107, + 58, + 46 ], - "area": 48, + "area": 2668, "segmentation": [], "iscrowd": 0 }, { "id": 43, - "image_id": 20, - "category_id": 39, + "image_id": 19, + "category_id": 18, "bbox": [ - 3534, - 745, - 70, - 57 + 3565, + 111, + 63, + 38 ], - "area": 3990, + "area": 2394, "segmentation": [], "iscrowd": 0 }, { "id": 44, "image_id": 20, - "category_id": 40, + "category_id": 27, "bbox": [ - 3541, - 485, - 68, - 50 + 3557, + 991, + 63.33, + 58.33 ], - "area": 3400, + "area": 3694.039, "segmentation": [], "iscrowd": 0 }, { "id": 45, "image_id": 20, - "category_id": 38, + "category_id": 28, "bbox": [ - 3541, - 977, - 74, - 71 + 3550, + 733, + 78.33, + 52.67 ], - "area": 5254, + "area": 4125.641, "segmentation": [], "iscrowd": 0 }, { "id": 46, "image_id": 20, - "category_id": 13, + "category_id": 34, "bbox": [ - 3138, - 1895, - 118.14, - 78 + 3538, + 456, + 54, + 61.33 ], - "area": 9214.92, + "area": 3311.82, "segmentation": [], "iscrowd": 0 }, { "id": 47, "image_id": 21, - "category_id": 2, + "category_id": 59, "bbox": [ - 2681, - 1080, - 103.75, - 60 + 1688, + 983, + 23.42, + 23.25 ], - "area": 6225, + "area": 544.515, "segmentation": [], "iscrowd": 0 }, { "id": 48, "image_id": 22, - "category_id": 57, + "category_id": 42, "bbox": [ - 2488, - 1105, - 36.42, - 38.87 + 867, + 1200, + 135, + 280 ], - "area": 1415.645, + "area": 37800, "segmentation": [], "iscrowd": 0 }, { "id": 49, - "image_id": 22, - "category_id": 30, + "image_id": 23, + "category_id": 1, "bbox": [ - 3549, - 471, - 69.01, - 51.99 + 2680, + 1081, + 173.57, + 60.71 ], - "area": 3587.83, + "area": 10537.435, "segmentation": [], "iscrowd": 0 }, { "id": 50, - "image_id": 22, - "category_id": 35, + "image_id": 24, + "category_id": 54, "bbox": [ - 3550, - 732, - 64.28, - 58.61 + 3579, + 1875, + 98, + 184 ], - "area": 3767.451, + "area": 18032, "segmentation": [], "iscrowd": 0 }, { "id": 51, - "image_id": 22, - "category_id": 29, + "image_id": 25, + "category_id": 50, "bbox": [ - 3554, - 998, - 57.66, - 51.99 + 1747, + 274, + 58, + 54 ], - "area": 2997.743, + "area": 3132, "segmentation": [], "iscrowd": 0 }, { "id": 52, - "image_id": 22, - "category_id": 44, + "image_id": 26, + "category_id": 33, "bbox": [ - 2598, - 1108, - 32.06, - 25.29 + 3543, + 733, + 81.36, + 64.55 ], - "area": 810.797, + "area": 5251.788, "segmentation": [], "iscrowd": 0 }, { "id": 53, - "image_id": 23, - "category_id": 17, + "image_id": 27, + "category_id": 53, "bbox": [ - 3560, - 65, - 114, - 114 + 2513, + 1239, + 58, + 100 ], - "area": 12996, + "area": 5800, "segmentation": [], "iscrowd": 0 }, { "id": 54, - "image_id": 24, - "category_id": 56, + "image_id": 28, + "category_id": 57, "bbox": [ - 1555, - 1550, - 306.67, - 121.67 + 2488, + 1105, + 36.42, + 38.87 ], - "area": 37312.539, + "area": 1415.645, "segmentation": [], "iscrowd": 0 }, { "id": 55, - "image_id": 25, - "category_id": 33, + "image_id": 28, + "category_id": 30, "bbox": [ - 3543, - 733, - 81.36, - 64.55 + 3549, + 471, + 69.01, + 51.99 ], - "area": 5251.788, + "area": 3587.83, "segmentation": [], "iscrowd": 0 }, { "id": 56, - "image_id": 26, - "category_id": 59, + "image_id": 28, + "category_id": 35, "bbox": [ - 1688, - 983, - 23.42, - 23.25 + 3550, + 732, + 64.28, + 58.61 ], - "area": 544.515, + "area": 3767.451, "segmentation": [], "iscrowd": 0 }, { "id": 57, - "image_id": 27, - "category_id": 50, + "image_id": 28, + "category_id": 29, "bbox": [ - 1747, - 274, - 58, - 54 + 3554, + 998, + 57.66, + 51.99 ], - "area": 3132, + "area": 2997.743, "segmentation": [], "iscrowd": 0 }, { "id": 58, "image_id": 28, - "category_id": 53, + "category_id": 44, "bbox": [ - 2513, - 1239, - 58, - 100 + 2598, + 1108, + 32.06, + 25.29 ], - "area": 5800, + "area": 810.797, "segmentation": [], "iscrowd": 0 } diff --git a/config.py b/config.py index c3626b9..dbf4a19 100644 --- a/config.py +++ b/config.py @@ -69,7 +69,6 @@ def calculate_pc_exe_path(running_path): 使用本软件可能会导致账号被封。 请在了解风险后再使用。

""", - 'supported_screen_ratio': '16:9', 'screenshots_folder': "screenshots", 'gui_title': 'OK-WW', # Optional # 'coco_feature_folder': get_path(__file__, 'assets/coco_feature'), # required if using feature detection diff --git a/src/char/BaseChar.py b/src/char/BaseChar.py index 79897e5..36ad641 100644 --- a/src/char/BaseChar.py +++ b/src/char/BaseChar.py @@ -392,7 +392,8 @@ def is_con_full(self): return self.get_current_con() == 1 def get_current_con(self): - box = self.task.box_of_screen(1422 / 3840, 1939 / 2160, 1566 / 3840, 2076 / 2160, name='con_full') + box = self.task.box_of_screen_scaled(3840, 2160, 1422, 1939, to_x=1566, to_y=2076, name='con_full', + hcenter=True) box.confidence = 0 max_area = 0 @@ -447,7 +448,7 @@ def get_current_con(self): return percent def is_forte_full(self): - box = self.task.box_of_screen(2251 / 3840, 1993 / 2160, 2311 / 3840, 2016 / 2160, name='forte_full') + box = self.task.box_of_screen_scaled(3840, 2160, 2251, 1993, 2311, 2016, name='forte_full', hcenter=True) white_percent = self.task.calculate_color_percentage(forte_white_color, box) # num_labels, stats = get_connected_area_by_color(box.crop_frame(self.task.frame), forte_white_color, # connectivity=8) diff --git a/src/combat/CombatCheck.py b/src/combat/CombatCheck.py index cdda8a5..9daccd9 100644 --- a/src/combat/CombatCheck.py +++ b/src/combat/CombatCheck.py @@ -58,8 +58,8 @@ def recent_liberation(self): return time.time() - self.last_liberation < 0.3 def check_count_down(self): - count_down_area = self.box_of_screen(1820 / 3840, 266 / 2160, 2100 / 3840, - 340 / 2160, name="check_count_down") + count_down_area = self.box_of_screen_scaled(3840, 2160, 1820, 266, 2100, + 340, name="check_count_down", hcenter=True) count_down = self.calculate_color_percentage(text_white_color, count_down_area) @@ -212,7 +212,7 @@ def check_health_bar(self): return self.find_boss_lv_text() def find_boss_lv_text(self): - texts = self.ocr(box=self.box_of_screen(1269 / 3840, 10 / 2160, 2533 / 3840, 140 / 2160), + texts = self.ocr(box=self.box_of_screen(1269 / 3840, 10 / 2160, 2533 / 3840, 140 / 2160, hcenter=True), target_height=540, name='boss_lv_text') boss_lv_texts = find_boxes_by_name(texts, [re.compile(r'(?i)^L[V].*')]) diff --git a/src/task/AutoPickTask.py b/src/task/AutoPickTask.py index a57ace3..28f46f1 100644 --- a/src/task/AutoPickTask.py +++ b/src/task/AutoPickTask.py @@ -22,7 +22,7 @@ def run(self): self.sleep(0.2) def trigger(self): - if f := self.find_one('pick_up_f', box=self.f_search_box, + if f := self.find_one('pick_up_f_hcenter_vcenter', box=self.f_search_box, threshold=0.8): dialog_search = f.copy(x_offset=f.width * 2, width_offset=f.width * 2, height_offset=f.height * 2, y_offset=-f.height, diff --git a/src/task/BaseCombatTask.py b/src/task/BaseCombatTask.py index 3d41869..ac078a5 100644 --- a/src/task/BaseCombatTask.py +++ b/src/task/BaseCombatTask.py @@ -140,7 +140,7 @@ def switch_next_char(self, current_char, post_action=None, free_intro=False, tar if not in_team: if self.debug: self.screenshot(f'not in team while switching chars_{current_char}_to_{switch_to} {now - start}') - confirm = self.wait_feature('revive_confirm', threshold=0.8, time_out=3) + confirm = self.wait_feature('revive_confirm_hcenter_vcenter', threshold=0.8, time_out=3) if confirm: self.log_info(f'char dead') self.raise_not_in_combat(f'char dead', exception_type=CharDeadException) @@ -233,7 +233,7 @@ def send_key_and_wait_f(self, direction, raise_if_not_found, time_out, running=F return f_found def handle_claim_button(self): - if self.wait_feature('claim_cancel_button', raise_if_not_found=False, horizontal_variance=0.05, + if self.wait_feature('claim_cancel_button_hcenter_vcenter', raise_if_not_found=False, horizontal_variance=0.05, vertical_variance=0.1, time_out=1.5, threshold=0.8): self.sleep(0.5) self.send_key('esc') diff --git a/src/task/BaseWWTask.py b/src/task/BaseWWTask.py index db89e22..3c53b6f 100644 --- a/src/task/BaseWWTask.py +++ b/src/task/BaseWWTask.py @@ -74,7 +74,7 @@ def set_check_monthly_card(self, next_day=False): @property def f_search_box(self): - f_search_box = self.get_box_by_name('pick_up_f') + f_search_box = self.get_box_by_name('pick_up_f_hcenter_vcenter') f_search_box = f_search_box.copy(x_offset=-f_search_box.width / 2, width_offset=f_search_box.width, height_offset=f_search_box.height * 9, @@ -83,7 +83,7 @@ def f_search_box(self): return f_search_box def find_f_with_text(self, target_text=None): - f = self.find_one('pick_up_f', box=self.f_search_box, threshold=0.8) + f = self.find_one('pick_up_f_hcenter_vcenter', box=self.f_search_box, threshold=0.8) if f and target_text: search_text_box = f.copy(x_offset=f.width * 5, width_offset=f.width * 7, height_offset=1.5 * f.height, y_offset=-0.8 * f.height, name='search_text_box') diff --git a/src/task/FarmWorldBossTask.py b/src/task/FarmWorldBossTask.py index d6106cf..2e8723e 100644 --- a/src/task/FarmWorldBossTask.py +++ b/src/task/FarmWorldBossTask.py @@ -80,10 +80,11 @@ def teleport_to_boss(self, boss_name): self.wait_feature('gray_teleport', raise_if_not_found=True, time_out=200, pre_action=lambda: self.click_box(proceeds[index], relative_x=-1), wait_until_before_delay=5) self.sleep(1) - teleport = self.wait_click_feature('custom_teleport', box=self.box_of_screen(0.48, 0.45, 0.54, 0.58), + teleport = self.wait_click_feature('custom_teleport_hcenter_vcenter', + box=self.box_of_screen(0.48, 0.45, 0.54, 0.58), raise_if_not_found=False, threshold=0.8, time_out=2) if not teleport: - self.click_relative(0.5, 0.5) + self.click_relative(0.5, 0.5, hcenter=True) self.sleep(0.5) self.wait_click_feature('gray_custom_way_point', box=self.box_of_screen(0.62, 0.48, 0.70, 0.86), raise_if_not_found=True, threshold=0.75, time_out=2) @@ -96,7 +97,7 @@ def click_fast_travel(self): def wait_book(self): gray_book_boss = self.wait_until( - lambda: self.find_one('gray_book_boss', vertical_variance=1, horizontal_variance=0.05, + lambda: self.find_one('gray_book_boss', vertical_variance=0.8, horizontal_variance=0.05, threshold=0.7, canny_lower=50, canny_higher=150) or self.find_one( 'gray_book_boss_highlight',