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 deleted file mode 100644 index 6066c5b..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.jpg and /dev/null differ diff --git a/assets/WindowsGraphicsCaptureMethod_3840x2160_title_None_Client-Win64-Shipping-exe_3840x2160_1577828_1_False_original_png.rf.3ed83cbce453e93e1027f37184cff0a5.png b/assets/WindowsGraphicsCaptureMethod_3840x2160_title_None_Client-Win64-Shipping-exe_3840x2160_1577828_1_False_original_png.rf.3ed83cbce453e93e1027f37184cff0a5.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.3ed83cbce453e93e1027f37184cff0a5.png differ diff --git a/assets/_annotations.coco.json b/assets/_annotations.coco.json index 3ad1e36..6f5b59d 100644 --- a/assets/_annotations.coco.json +++ b/assets/_annotations.coco.json @@ -1,11 +1,11 @@ { "info": { "year": "2024", - "version": "21", + "version": "24", "description": "Exported from roboflow.com", "contributor": "", "url": "https://public.roboflow.com/object-detection/undefined", - "date_created": "2024-07-18T09:42:58+00:00" + "date_created": "2024-07-20T13:21:40+00:00" }, "licenses": [ { @@ -282,6 +282,11 @@ }, { "id": 53, + "name": "revive_confirm", + "supercategory": "ww" + }, + { + "id": 54, "name": "target_enemy_white", "supercategory": "ww" } @@ -290,106 +295,106 @@ { "id": 0, "license": 1, - "file_name": "WindowsGraphicsCaptureMethod_3840x2160_title_None_Client-Win64-Shipping-exe_3840x2160_10361910_1_False_original_png.rf.244ee2bd0b4de93caac3066adaae0b75.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-18T09:42:58+00:00" + "date_captured": "2024-07-20T13:21:40+00:00" }, { "id": 1, "license": 1, - "file_name": "221458a6-13_25_04_962031_WindowsGraphicsCaptureMethod_3840x2160_title_None_Clie_XYXLS23_png.rf.281b46703c1e3f6bd436750f6aa82cf2.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-18T09:42:58+00:00" + "date_captured": "2024-07-20T13:21:40+00:00" }, { "id": 2, "license": 1, - "file_name": "4_png.rf.180bb3f2bed38134b1d0bba90c3fcdb0.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-18T09:42:58+00:00" + "date_captured": "2024-07-20T13:21:40+00:00" }, { "id": 3, "license": 1, - "file_name": "e521850f-00_37_38_458841_Encore_liberation_0-274_original_png.rf.e7703de2285a6b2c70567e891804c760.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-18T09:42:58+00:00" + "date_captured": "2024-07-20T13:21:40+00:00" }, { "id": 4, "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_1577828_1_False_original_png.rf.3ed83cbce453e93e1027f37184cff0a5.png", "height": 2160, "width": 3840, - "date_captured": "2024-07-18T09:42:58+00:00" + "date_captured": "2024-07-20T13:21:40+00:00" }, { "id": 5, "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": "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-18T09:42:58+00:00" + "date_captured": "2024-07-20T13:21:40+00:00" }, { "id": 6, "license": 1, - "file_name": "0ab28c72-00_54_43_431654_WindowsGraphicsCaptureMethod_3840x2160_title_None_Clie_usg73Cm_png.rf.124dc89f9b3816ecb0ce5a97c95475dc.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-18T09:42:58+00:00" + "date_captured": "2024-07-20T13:21:40+00:00" }, { "id": 7, "license": 1, - "file_name": "5841f84c-17_04_26_738022_WindowsGraphicsCaptureMethod_3840x2160_title_None_Clie_TIDxIl1_png.rf.97a22c8e01f1fd88debc20c4c903b8b9.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-18T09:42:58+00:00" + "date_captured": "2024-07-20T13:21:40+00:00" }, { "id": 8, "license": 1, - "file_name": "154eb284-17_01_16_406889_WindowsGraphicsCaptureMethod_3840x2160_title_None_Clie_6yGu616_png.rf.12ebc1f4e7e5208bcbf2c7f878f691aa.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-18T09:42:58+00:00" + "date_captured": "2024-07-20T13:21:40+00:00" }, { "id": 9, "license": 1, - "file_name": "WindowsGraphicsCaptureMethod_0x0_title_None_Client-Win64-Shipping-exe_3840x2160_1841174_1_False_original-1-_png.rf.e6c4a5734163badfbfa76780248cd2f8.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-18T09:42:58+00:00" + "date_captured": "2024-07-20T13:21:40+00:00" }, { "id": 10, "license": 1, - "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-18T09:42:58+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-20T13:21:40+00:00" }, { "id": 11, "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_12847792_1_False_original_png.rf.abeaa08198ff5a77fb70340952ba23f3.png", "height": 2160, "width": 3840, - "date_captured": "2024-07-18T09:42:58+00:00" + "date_captured": "2024-07-20T13:21:40+00:00" }, { "id": 12, "license": 1, - "file_name": "934f0ca6-17_53_47_840123_WindowsGraphicsCaptureMethod_3840x2160_title_None_Clie_aJQVINN_png.rf.a107256237035eec3be4125f726b8b73.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-18T09:42:58+00:00" + "date_captured": "2024-07-20T13:21:40+00:00" }, { "id": 13, @@ -397,7 +402,7 @@ "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-18T09:42:58+00:00" + "date_captured": "2024-07-20T13:21:40+00:00" }, { "id": 14, @@ -405,85 +410,107 @@ "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-18T09:42:58+00:00" + "date_captured": "2024-07-20T13:21:40+00:00" }, { "id": 15, "license": 1, - "file_name": "64425cad-10_44_19_536997_WindowsGraphicsCaptureMethod_0x0_title_None_Client-Win_BLAxtp1_png.rf.d37538db2b2d15d6aad459dd08bb348d.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-18T09:42:58+00:00" + "date_captured": "2024-07-20T13:21:40+00:00" }, { "id": 16, "license": 1, - "file_name": "WindowsGraphicsCaptureMethod_3840x2160_title_None_Client-Win64-Shipping-exe_3840x2160_12847792_1_False_original_png.rf.abeaa08198ff5a77fb70340952ba23f3.png", + "file_name": "4_png.rf.180bb3f2bed38134b1d0bba90c3fcdb0.png", "height": 2160, "width": 3840, - "date_captured": "2024-07-18T09:42:58+00:00" + "date_captured": "2024-07-20T13:21:40+00:00" }, { "id": 17, "license": 1, - "file_name": "3b991d47-10_18_37_465122_WindowsGraphicsCaptureMethod_3840x2160_title_None_Clie_3Hw8AdB_png.rf.7b75bb60b5b041f3c6f36e735ca3bc19.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-18T09:42:58+00:00" + "date_captured": "2024-07-20T13:21:40+00:00" }, { "id": 18, "license": 1, - "file_name": "WindowsGraphicsCaptureMethod_0x0_title_None_Client-Win64-Shipping-exe_3840x2160_133336_1_False_original_png.rf.a2b55fa3583fef2081d49205ae9c643b.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-18T09:42:58+00:00" + "date_captured": "2024-07-20T13:21:40+00:00" }, { "id": 19, "license": 1, - "file_name": "WindowsGraphicsCaptureMethod_3840x2160_title_None_Client-Win64-Shipping-exe_3840x2160_4720836_1_False_original_png.rf.935bb51188f6bc516efc5a57b52fe8ad.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-18T09:42:58+00:00" + "date_captured": "2024-07-20T13:21:40+00:00" }, { "id": 20, "license": 1, - "file_name": "9dd77a5d-16_57_31_014010_WindowsGraphicsCaptureMethod_3840x2160_title_None_Clie_RVvCfQe_png.rf.e8397fbd133d485459bb8c30fc37353c.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-18T09:42:58+00:00" + "date_captured": "2024-07-20T13:21:40+00:00" }, { "id": 21, "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-18T09:42:58+00:00" + "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-20T13:21:40+00:00" }, { "id": 22, "license": 1, - "file_name": "9f04db98-16_20_58_825243_WindowsGraphicsCaptureMethod_3840x2160_title_None_Clie_VuLpBVc_png.rf.a16ce4854c42840f44a6c0a04d44c83c.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-18T09:42:58+00:00" + "date_captured": "2024-07-20T13:21:40+00:00" }, { "id": 23, "license": 1, - "file_name": "9ed8b373-00_57_50_813872_WindowsGraphicsCaptureMethod_3840x2160_title_None_Clie_3jLoRJh_png.rf.170fe2ae11c1d8058d8d3e4b2361357a.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-20T13:21:40+00:00" + }, + { + "id": 24, + "license": 1, + "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-18T09:42:58+00:00" + "date_captured": "2024-07-20T13:21:40+00:00" } ], "annotations": [ { "id": 0, "image_id": 0, + "category_id": 40, + "bbox": [ + 2937, + 1888, + 86, + 84 + ], + "area": 7224, + "segmentation": [], + "iscrowd": 0 + }, + { + "id": 1, + "image_id": 1, "category_id": 37, "bbox": [ 1909, @@ -496,8 +523,8 @@ "iscrowd": 0 }, { - "id": 1, - "image_id": 1, + "id": 2, + "image_id": 2, "category_id": 28, "bbox": [ 3554, @@ -510,8 +537,8 @@ "iscrowd": 0 }, { - "id": 2, - "image_id": 1, + "id": 3, + "image_id": 2, "category_id": 32, "bbox": [ 3534, @@ -524,8 +551,8 @@ "iscrowd": 0 }, { - "id": 3, - "image_id": 1, + "id": 4, + "image_id": 2, "category_id": 27, "bbox": [ 3541, @@ -537,367 +564,353 @@ "segmentation": [], "iscrowd": 0 }, - { - "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": 45, + "category_id": 20, "bbox": [ - 1747, - 274, - 58, - 54 + 3474, + 427, + 26, + 31 ], - "area": 3132, + "area": 806, "segmentation": [], "iscrowd": 0 }, { "id": 6, - "image_id": 4, - "category_id": 47, + "image_id": 3, + "category_id": 8, "bbox": [ - 272, - 327, - 108, - 108 + 2169, + 1996, + 4, + 12 ], - "area": 11664, + "area": 48, "segmentation": [], "iscrowd": 0 }, { "id": 7, - "image_id": 5, - "category_id": 29, + "image_id": 3, + "category_id": 34, "bbox": [ - 3543, - 733, - 81.36, - 64.55 + 3534, + 745, + 70, + 57 ], - "area": 5251.788, + "area": 3990, "segmentation": [], "iscrowd": 0 }, { "id": 8, - "image_id": 6, - "category_id": 50, + "image_id": 3, + "category_id": 35, "bbox": [ - 2589, - 1897, - 242, - 210 + 3541, + 485, + 68, + 50 ], - "area": 50820, + "area": 3400, "segmentation": [], "iscrowd": 0 }, { "id": 9, - "image_id": 7, - "category_id": 13, + "image_id": 3, + "category_id": 33, "bbox": [ - 2523, - 1221, - 101, - 82 + 3541, + 977, + 74, + 71 ], - "area": 8282, + "area": 5254, "segmentation": [], "iscrowd": 0 }, { "id": 10, - "image_id": 7, - "category_id": 14, + "image_id": 3, + "category_id": 11, "bbox": [ - 2525, - 1384, - 104, - 81 + 3138, + 1895, + 118.14, + 78 ], - "area": 8424, + "area": 9214.92, "segmentation": [], "iscrowd": 0 }, { "id": 11, - "image_id": 7, - "category_id": 12, + "image_id": 4, + "category_id": 53, "bbox": [ - 3381, - 107, - 58, - 46 + 2887, + 1405, + 213.33, + 281.67 ], - "area": 2668, + "area": 60088.661, "segmentation": [], "iscrowd": 0 }, { "id": 12, - "image_id": 7, - "category_id": 16, + "image_id": 5, + "category_id": 52, "bbox": [ - 3565, - 111, - 63, - 38 + 2488, + 1105, + 36.42, + 38.87 ], - "area": 2394, + "area": 1415.645, "segmentation": [], "iscrowd": 0 }, { "id": 13, - "image_id": 8, - "category_id": 9, + "image_id": 5, + "category_id": 26, "bbox": [ - 3356, - 1901, - 111.66, - 67.61 + 3549, + 471, + 69.01, + 51.99 ], - "area": 7549.333, + "area": 3587.83, "segmentation": [], "iscrowd": 0 }, { "id": 14, - "image_id": 8, - "category_id": 7, + "image_id": 5, + "category_id": 30, "bbox": [ - 3496, - 929, - 176, - 182 + 3550, + 732, + 64.28, + 58.61 ], - "area": 32032, + "area": 3767.451, "segmentation": [], "iscrowd": 0 }, { "id": 15, - "image_id": 8, - "category_id": 5, + "image_id": 5, + "category_id": 25, "bbox": [ - 3508, - 407, - 172, - 185 + 3554, + 998, + 57.66, + 51.99 ], - "area": 31820, + "area": 2997.743, "segmentation": [], "iscrowd": 0 }, { "id": 16, - "image_id": 8, - "category_id": 6, + "image_id": 5, + "category_id": 38, "bbox": [ - 3515, - 665, - 169, - 188 + 2598, + 1108, + 32.06, + 25.29 ], - "area": 31772, + "area": 810.797, "segmentation": [], "iscrowd": 0 }, { "id": 17, - "image_id": 8, - "category_id": 31, + "image_id": 6, + "category_id": 15, "bbox": [ - 3536, - 985, - 83, - 77 + 3560, + 65, + 114, + 114 ], - "area": 6391, + "area": 12996, "segmentation": [], "iscrowd": 0 }, { "id": 18, - "image_id": 8, - "category_id": 39, + "image_id": 7, + "category_id": 22, "bbox": [ - 3401, - 1939, - 10, - 10 + 3473, + 690, + 28, + 31 ], - "area": 100, + "area": 868, "segmentation": [], "iscrowd": 0 }, { "id": 19, - "image_id": 8, - "category_id": 10, + "image_id": 7, + "category_id": 24, "bbox": [ - 3566, - 1896, - 116.83, - 71.99 + 3474, + 954, + 27, + 32 ], - "area": 8410.592, + "area": 864, "segmentation": [], "iscrowd": 0 }, { "id": 20, - "image_id": 8, - "category_id": 3, + "image_id": 7, + "category_id": 23, "bbox": [ - 3347, - 740, - 153, - 72 + 3649, + 1005, + 28, + 21 ], - "area": 11016, + "area": 588, "segmentation": [], "iscrowd": 0 }, { "id": 21, "image_id": 8, - "category_id": 36, + "category_id": 45, "bbox": [ - 3544, - 709, - 60, - 35.45 + 1747, + 274, + 58, + 54 ], - "area": 2127, + "area": 3132, "segmentation": [], "iscrowd": 0 }, { "id": 22, - "image_id": 8, - "category_id": 4, + "image_id": 9, + "category_id": 13, "bbox": [ - 3348, - 994, - 153, - 72 + 2523, + 1221, + 101, + 82 ], - "area": 11016, + "area": 8282, "segmentation": [], "iscrowd": 0 }, { "id": 23, - "image_id": 8, - "category_id": 2, + "image_id": 9, + "category_id": 14, "bbox": [ - 3346, - 480, - 153, - 72 + 2525, + 1384, + 104, + 81 ], - "area": 11016, + "area": 8424, "segmentation": [], "iscrowd": 0 }, { "id": 24, "image_id": 9, - "category_id": 53, + "category_id": 12, "bbox": [ - 1688, - 983, - 23.42, - 23.25 + 3381, + 107, + 58, + 46 ], - "area": 544.515, + "area": 2668, "segmentation": [], "iscrowd": 0 }, { "id": 25, - "image_id": 10, - "category_id": 49, + "image_id": 9, + "category_id": 16, "bbox": [ - 3579, - 1875, - 98, - 184 + 3565, + 111, + 63, + 38 ], - "area": 18032, + "area": 2394, "segmentation": [], "iscrowd": 0 }, { "id": 26, - "image_id": 11, - "category_id": 22, + "image_id": 10, + "category_id": 1, "bbox": [ - 3473, - 690, - 28, - 31 + 1820, + 227, + 35, + 90.71 ], - "area": 868, + "area": 3174.85, "segmentation": [], "iscrowd": 0 }, { "id": 27, - "image_id": 11, - "category_id": 24, + "image_id": 10, + "category_id": 43, "bbox": [ - 3474, - 954, - 27, - 32 + 36, + 273, + 78.57, + 78.57 ], - "area": 864, + "area": 6173.245, "segmentation": [], "iscrowd": 0 }, { "id": 28, "image_id": 11, - "category_id": 23, + "category_id": 51, "bbox": [ - 3649, - 1005, - 28, - 21 + 1555, + 1550, + 306.67, + 121.67 ], - "area": 588, + "area": 37312.539, "segmentation": [], "iscrowd": 0 }, { "id": 29, "image_id": 12, - "category_id": 15, + "category_id": 54, "bbox": [ - 3560, - 65, - 114, - 114 + 1688, + 983, + 23.42, + 23.25 ], - "area": 12996, + "area": 544.515, "segmentation": [], "iscrowd": 0 }, @@ -932,48 +945,48 @@ { "id": 32, "image_id": 15, - "category_id": 46, + "category_id": 49, "bbox": [ - 2805, - 1225, - 165, - 267 + 3579, + 1875, + 98, + 184 ], - "area": 44055, + "area": 18032, "segmentation": [], "iscrowd": 0 }, { "id": 33, - "image_id": 15, - "category_id": 17, + "image_id": 16, + "category_id": 41, "bbox": [ - 890, - 1243, - 75, - 211.67 + 3220, + 1930, + 76.67, + 158.33 ], - "area": 15875.25, + "area": 12139.161, "segmentation": [], "iscrowd": 0 }, { "id": 34, - "image_id": 16, - "category_id": 51, + "image_id": 17, + "category_id": 47, "bbox": [ - 1555, - 1550, - 306.67, - 121.67 + 272, + 327, + 108, + 108 ], - "area": 37312.539, + "area": 11664, "segmentation": [], "iscrowd": 0 }, { "id": 35, - "image_id": 17, + "image_id": 18, "category_id": 21, "bbox": [ 3649, @@ -987,7 +1000,7 @@ }, { "id": 36, - "image_id": 17, + "image_id": 18, "category_id": 19, "bbox": [ 3650, @@ -1001,225 +1014,239 @@ }, { "id": 37, - "image_id": 18, - "category_id": 52, + "image_id": 19, + "category_id": 50, "bbox": [ - 2488, - 1105, - 36.42, - 38.87 + 2589, + 1897, + 242, + 210 ], - "area": 1415.645, + "area": 50820, "segmentation": [], "iscrowd": 0 }, { "id": 38, - "image_id": 18, - "category_id": 26, + "image_id": 20, + "category_id": 46, "bbox": [ - 3549, - 471, - 69.01, - 51.99 + 2805, + 1225, + 165, + 267 ], - "area": 3587.83, + "area": 44055, "segmentation": [], "iscrowd": 0 }, { "id": 39, - "image_id": 18, - "category_id": 30, + "image_id": 20, + "category_id": 17, "bbox": [ - 3550, - 732, - 64.28, - 58.61 + 890, + 1243, + 75, + 211.67 ], - "area": 3767.451, + "area": 15875.25, "segmentation": [], "iscrowd": 0 }, { "id": 40, - "image_id": 18, - "category_id": 25, + "image_id": 21, + "category_id": 9, "bbox": [ - 3554, - 998, - 57.66, - 51.99 + 3356, + 1901, + 111.66, + 67.61 ], - "area": 2997.743, + "area": 7549.333, "segmentation": [], "iscrowd": 0 }, { "id": 41, - "image_id": 18, - "category_id": 38, + "image_id": 21, + "category_id": 7, "bbox": [ - 2598, - 1108, - 32.06, - 25.29 + 3496, + 929, + 176, + 182 ], - "area": 810.797, + "area": 32032, "segmentation": [], "iscrowd": 0 }, { "id": 42, - "image_id": 19, - "category_id": 42, + "image_id": 21, + "category_id": 5, "bbox": [ - 77, - 533, - 151.67, - 153.33 + 3508, + 407, + 172, + 185 ], - "area": 23255.561, + "area": 31820, "segmentation": [], "iscrowd": 0 }, { "id": 43, - "image_id": 20, - "category_id": 48, + "image_id": 21, + "category_id": 6, "bbox": [ - 2513, - 1239, - 58, - 100 + 3515, + 665, + 169, + 188 ], - "area": 5800, + "area": 31772, "segmentation": [], "iscrowd": 0 }, { "id": 44, "image_id": 21, - "category_id": 1, + "category_id": 31, "bbox": [ - 1820, - 227, - 35, - 90.71 + 3536, + 985, + 83, + 77 ], - "area": 3174.85, + "area": 6391, "segmentation": [], "iscrowd": 0 }, { "id": 45, "image_id": 21, - "category_id": 43, + "category_id": 39, "bbox": [ - 36, - 273, - 78.57, - 78.57 + 3401, + 1939, + 10, + 10 ], - "area": 6173.245, + "area": 100, "segmentation": [], "iscrowd": 0 }, { "id": 46, - "image_id": 22, - "category_id": 20, + "image_id": 21, + "category_id": 10, "bbox": [ - 3474, - 427, - 26, - 31 + 3566, + 1896, + 116.83, + 71.99 ], - "area": 806, + "area": 8410.592, "segmentation": [], "iscrowd": 0 }, { "id": 47, - "image_id": 22, - "category_id": 8, + "image_id": 21, + "category_id": 3, "bbox": [ - 2169, - 1996, - 4, - 12 + 3347, + 740, + 153, + 72 ], - "area": 48, + "area": 11016, "segmentation": [], "iscrowd": 0 }, { "id": 48, - "image_id": 22, - "category_id": 34, + "image_id": 21, + "category_id": 36, "bbox": [ - 3534, - 745, - 70, - 57 + 3544, + 709, + 60, + 35.45 ], - "area": 3990, + "area": 2127, "segmentation": [], "iscrowd": 0 }, { "id": 49, - "image_id": 22, - "category_id": 35, + "image_id": 21, + "category_id": 4, "bbox": [ - 3541, - 485, - 68, - 50 + 3348, + 994, + 153, + 72 ], - "area": 3400, + "area": 11016, "segmentation": [], "iscrowd": 0 }, { "id": 50, - "image_id": 22, - "category_id": 33, + "image_id": 21, + "category_id": 2, "bbox": [ - 3541, - 977, - 74, - 71 + 3346, + 480, + 153, + 72 ], - "area": 5254, + "area": 11016, "segmentation": [], "iscrowd": 0 }, { "id": 51, "image_id": 22, - "category_id": 11, + "category_id": 29, "bbox": [ - 3138, - 1895, - 118.14, - 78 + 3543, + 733, + 81.36, + 64.55 ], - "area": 9214.92, + "area": 5251.788, "segmentation": [], "iscrowd": 0 }, { "id": 52, "image_id": 23, - "category_id": 40, + "category_id": 48, "bbox": [ - 2937, - 1888, - 86, - 84 + 2513, + 1239, + 58, + 100 ], - "area": 7224, + "area": 5800, + "segmentation": [], + "iscrowd": 0 + }, + { + "id": 53, + "image_id": 24, + "category_id": 42, + "bbox": [ + 77, + 533, + 151.67, + 153.33 + ], + "area": 23255.561, "segmentation": [], "iscrowd": 0 } diff --git a/config.py b/config.py index a6e38cf..10c0014 100644 --- a/config.py +++ b/config.py @@ -41,11 +41,11 @@ def calculate_pc_exe_path(running_path): 'min_size': (1600, 900) }, 'analytics': { - 'report_url': 'https://okreport.ok-script.com/report' + 'report_url': 'http://okreportcn.ok-script.com/report' }, 'update': { 'releases_url': 'https://api.github.com/repos/ok-oldking/ok-wuthering-waves/releases?per_page=15', - 'proxy_url': 'https://gh.ok-script.com/', + 'proxy_url': 'http://okreportcn.ok-script.com/', 'exe_name': 'ok-ww.exe', 'use_proxy': True }, diff --git a/src/task/BaseCombatTask.py b/src/task/BaseCombatTask.py index ae6a303..9cc4313 100644 --- a/src/task/BaseCombatTask.py +++ b/src/task/BaseCombatTask.py @@ -22,6 +22,10 @@ class NotInCombatException(Exception): pass +class CharDeadException(NotInCombatException): + pass + + key_config_option = ConfigOption('Game Hotkey Config', { 'Echo Key': 'q', 'Liberation Key': 'r', @@ -42,10 +46,12 @@ def __init__(self): self.char_texts = ['char_1_text', 'char_2_text', 'char_3_text'] - def raise_not_in_combat(self, message): + def raise_not_in_combat(self, message, exception_type=None): logger.error(message) self.reset_to_false(reason=message) - raise NotInCombatException(message) + if exception_type is None: + exception_type = NotInCombatException + raise exception_type(message) def combat_once(self, wait_combat_time=180, wait_before=2): self.wait_until(lambda: self.in_combat(), time_out=wait_combat_time, raise_if_not_found=True) @@ -57,6 +63,8 @@ def combat_once(self, wait_combat_time=180, wait_before=2): try: logger.debug(f'combat_once loop {self.chars}') self.get_current_char().perform() + except CharDeadException as e: + raise e except NotInCombatException as e: logger.info(f'combat_once out of combat break {e}') if self.debug: @@ -79,27 +87,6 @@ def run_in_circle_to_find_echo(self, circle_count=3): return True total_index += 1 - # @property - # def frame(self): - # frame = super().frame - # if frame is not None: - # start = time.time() - # # if cv2.countNonZero(cv2.split(frame)) == 0: - # means, stddevs = cv2.meanStdDev(frame) - # - # # Check if all channel means are very close to zero (black) - # all_black_means = np.all(np.isclose(means, 0.0, atol=1e-3)) - # - # # Check if all channel standard deviations are low (uniform) - # low_stddevs = np.all(stddevs[0] < 1e-3) - # - # # Return True if all channels are black and uniform - # if all_black_means and low_stddevs: - # logger.error('got a pure black frame!') - # return self.next_frame() - # logger.debug(f'black check:{time.time() - start}') - # return frame - def switch_next_char(self, current_char, post_action=None, free_intro=False, target_low_con=False): max_priority = Priority.MIN switch_to = None @@ -141,11 +128,19 @@ def switch_next_char(self, current_char, post_action=None, free_intro=False, tar self.send_key(switch_to.index + 1) last_click = now in_team, current_index, size = self.in_team() - if not in_team or now - start > 10: + 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) + if confirm: + self.log_info(f'char dead') + self.raise_not_in_combat(f'char dead', exception_type=CharDeadException) + else: + self.raise_not_in_combat( + f'not in team while switching chars_{current_char}_to_{switch_to}') + if now - start > 10: self.raise_not_in_combat( - f'not in team while switching chars_{current_char}_to_{switch_to}, {now - start}') + f'switch too long failed chars_{current_char}_to_{switch_to}, {now - start}') if current_index != switch_to.index: has_intro = free_intro if free_intro else current_char.is_con_full() switch_to.has_intro = has_intro diff --git a/src/task/FarmEchoTask.py b/src/task/FarmEchoTask.py index fa0bd7a..e6c66e8 100644 --- a/src/task/FarmEchoTask.py +++ b/src/task/FarmEchoTask.py @@ -79,18 +79,13 @@ def choose_level(self, start): y = 0.17 x = 0.15 distance = 0.08 - # for i in range(4): - # if i < start: - # continue + logger.info(f'choose level {start}') self.click_relative(x, y + (start - 1) * distance) self.sleep(0.5) - # self.click_relative(x, y + (start - 1) * distance) + self.wait_click_feature('gray_button_challenge', raise_if_not_found=True, use_gray_scale=True, click_after_delay=0.5) - # self.sleep(1) - # confirm_button = self.find_one('gray_confirm_exit_button', use_gray_scale=True, threshold=0.7) - self.wait_click_feature('gray_confirm_exit_button', relative_x=-1, raise_if_not_found=False, use_gray_scale=True, time_out=3, click_after_delay=0.5, threshold=0.8) self.wait_click_feature('gray_start_battle', relative_x=-1, raise_if_not_found=True, diff --git a/src/task/FarmWorldBossTask.py b/src/task/FarmWorldBossTask.py index f1f2cea..cae02ec 100644 --- a/src/task/FarmWorldBossTask.py +++ b/src/task/FarmWorldBossTask.py @@ -2,7 +2,7 @@ from ok.feature.Feature import Feature from ok.logging.Logger import get_logger -from src.task.BaseCombatTask import BaseCombatTask +from src.task.BaseCombatTask import BaseCombatTask, CharDeadException logger = get_logger(__name__) @@ -88,6 +88,9 @@ def teleport(self, boss_name): 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) + self.click_fast_travel() + + def click_fast_travel(self): travel = self.wait_feature('fast_travel_custom', raise_if_not_found=True, threshold=0.75) self.click_box(travel, relative_x=1.5) @@ -119,12 +122,9 @@ def scroll_down_a_page(self): self.click_relative(0.5, 0.5) self.sleep(0.1) - # count = 0 while True: if time.time() - start > 20: raise Exception("scroll to long") - # if count % 10 == 0: - # count += 1 self.scroll_relative(0.5, 0.5, -1) self.sleep(0.1) targets = self.find_feature('target_box', box=target_box, template=source_template) @@ -132,6 +132,21 @@ def scroll_down_a_page(self): self.log_info(f'scroll to targets {targets} successfully') break + def teleport_to_heal(self): + self.info['Death Times'] = self.info.get('Death Times', 0) + 1 + self.send_key('esc') + self.sleep(1) + self.log_info('click m to open the map') + self.send_key('m') + self.sleep(2) + self.click_relative(0.68, 0.05) + self.sleep(1) + self.click_relative(0.37, 0.42) + travel = self.wait_feature('gray_teleport', raise_if_not_found=True, use_gray_scale=True, time_out=3) + self.click_box(travel, relative_x=1.5) + self.wait_in_team_and_world(time_out=20) + self.sleep(2) + def run(self): if not self.check_main(): self.log_error('must be in game world and in teams', notify=True) @@ -150,7 +165,12 @@ def run(self): self.sleep(2) logger.info('Crownless walk to f') self.walk_until_f(raise_if_not_found=True, time_out=4, backward_time=1) - self.combat_once() + try: + self.combat_once() + except CharDeadException: + logger.info(f'char dead try teleport to heal') + self.teleport_to_heal() + continue logger.info(f'farm echo combat end') if boss_name == 'Bell-Borne Geochelone': logger.info(f'sleep for the Boss model to disappear')