Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions tasks/EternitySea/assets.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ class EternitySeaAssets:

# Image Rule Assets
# 选择永生之海
I_ETERNITY_SEA = RuleImage(roi_front=(1139,93,127,416), roi_back=(1139,93,127,416), threshold=0.8, method="Template matching", file="./tasks/EternitySea/res/res_eternity_sea.png")
I_ETERNITY_SEA = RuleImage(roi_front=(1158,88,70,70), roi_back=(1002,78,233,353), threshold=0.8, method="Template matching", file="./tasks/EternitySea/res/res_eternity_sea.png")
# 组队
I_FORM_TEAM = RuleImage(roi_front=(939,594,96,90), roi_back=(939,594,96,90), threshold=0.8, method="Template matching", file="./tasks/EternitySea/res/res_form_team.png")
I_FORM_TEAM = RuleImage(roi_front=(962,579,96,90), roi_back=(962,579,96,90), threshold=0.8, method="Template matching", file="./tasks/EternitySea/res/res_form_team.png")
# 挑战
I_ETERNITY_SEA_FIRE = RuleImage(roi_front=(1108,592,96,93), roi_back=(1108,592,96,93), threshold=0.8, method="Template matching", file="./tasks/EternitySea/res/res_eternity_sea_fire.png")
I_ETERNITY_SEA_FIRE = RuleImage(roi_front=(1146,595,92,49), roi_back=(1142,580,96,93), threshold=0.8, method="Template matching", file="./tasks/EternitySea/res/res_eternity_sea_fire.png")
# 开锁
I_ETERNITYSEA_UNLOCK = RuleImage(roi_front=(556,560,35,34), roi_back=(556,560,35,34), threshold=0.8, method="Template matching", file="./tasks/EternitySea/res/res_eternitysea_unlock.png")
I_ETERNITYSEA_UNLOCK = RuleImage(roi_front=(700,654,35,34), roi_back=(669,644,167,64), threshold=0.8, method="Template matching", file="./tasks/EternitySea/res/res_eternitysea_unlock.png")
# 关锁
I_NEWETERNITYSEA_LOCK = RuleImage(roi_front=(556,560,31,37), roi_back=(556,560,31,37), threshold=0.8, method="Template matching", file="./tasks/EternitySea/res/res_neweternitysea_lock.png")
I_NEWETERNITYSEA_LOCK = RuleImage(roi_front=(699,652,31,37), roi_back=(667,652,164,53), threshold=0.8, method="Template matching", file="./tasks/EternitySea/res/res_neweternitysea_lock.png")
# 小小宠物,发现宝藏
I_PET_PRESENT = RuleImage(roi_front=(873,184,62,147), roi_back=(873,184,62,147), threshold=0.8, method="Template matching", file="./tasks/EternitySea/res/res_pet_present.png")
# description
Expand All @@ -29,7 +29,7 @@ class EternitySeaAssets:

# List Rule Assets
# 永生之海层数列表
L_LAYER_LIST = RuleList(folder="./tasks/EternitySea/res", direction="vertical", mode="ocr", roi_back=(138,127,353,435), size=(56, 68),
L_LAYER_LIST = RuleList(folder="./tasks/EternitySea/res", direction="vertical", mode="ocr", roi_back=(124,101,74,593), size=(71, 84),
array=["壹", "贰", "叁", "肆"])


20 changes: 10 additions & 10 deletions tasks/EternitySea/res/image.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,44 +2,44 @@
{
"itemName": "eternity_sea",
"imageName": "res_eternity_sea.png",
"roiFront": "1139,93,127,416",
"roiBack": "1139,93,127,416",
"roiFront": "1158,88,70,70",
"roiBack": "1002,78,233,353",
"method": "Template matching",
"threshold": 0.8,
"description": "选择永生之海"
},
{
"itemName": "form_team",
"imageName": "res_form_team.png",
"roiFront": "939,594,96,90",
"roiBack": "939,594,96,90",
"roiFront": "962,579,96,90",
"roiBack": "962,579,96,90",
"method": "Template matching",
"threshold": 0.8,
"description": "组队"
},
{
"itemName": "eternity_sea_fire",
"imageName": "res_eternity_sea_fire.png",
"roiFront": "1108,592,96,93",
"roiBack": "1108,592,96,93",
"roiFront": "1146,595,92,49",
"roiBack": "1142,580,96,93",
"method": "Template matching",
"threshold": 0.8,
"description": "挑战"
},
{
"itemName": "eternitysea_unlock",
"imageName": "res_eternitysea_unlock.png",
"roiFront": "556,560,35,34",
"roiBack": "556,560,35,34",
"roiFront": "700,654,35,34",
"roiBack": "669,644,167,64",
"method": "Template matching",
"threshold": 0.8,
"description": "开锁"
},
{
"itemName": "neweternitysea_lock",
"imageName": "res_neweternitysea_lock.png",
"roiFront": "556,560,31,37",
"roiBack": "556,560,31,37",
"roiFront": "699,652,31,37",
"roiBack": "667,652,164,53",
"method": "Template matching",
"threshold": 0.8,
"description": "关锁"
Expand Down
10 changes: 5 additions & 5 deletions tasks/EternitySea/res/list.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,24 @@
"name": "layer_list",
"direction": "vertical",
"type": "ocr",
"roiBack": "138,127,353,435",
"roiBack": "124,101,74,593",
"description": "永生之海层数列表",
"list": [
{
"itemName": "壹",
"roiFront": "266,148,60,64"
"roiFront": "126,104,69,83"
},
{
"itemName": "贰",
"roiFront": "270,253,54,74"
"roiFront": "125,203,72,81"
},
{
"itemName": "叁",
"roiFront": "276,367,50,67"
"roiFront": "125,295,72,87"
},
{
"itemName": "肆",
"roiFront": "271,479,60,70"
"roiFront": "124,396,74,85"
}
]
}
Binary file modified tasks/EternitySea/res/res_eternity_sea.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tasks/EternitySea/res/res_eternity_sea_fire.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tasks/EternitySea/res/res_eternitysea_unlock.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tasks/EternitySea/res/res_form_team.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tasks/EternitySea/res/res_neweternitysea_lock.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 11 additions & 11 deletions tasks/EvoZone/assets.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,35 +12,35 @@ class EvoZoneAssets:

# Image Rule Assets
# 火麒麟进入
I_FIRE_KIRIN = RuleImage(roi_front=(84,126,217,406), roi_back=(84,126,217,406), threshold=0.8, method="Template matching", file="./tasks/EvoZone/o/o_fire_kirin.png")
I_FIRE_KIRIN = RuleImage(roi_front=(104,120,217,406), roi_back=(104,120,217,406), threshold=0.8, method="Template matching", file="./tasks/EvoZone/o/o_fire_kirin.png")
# 组队
I_FORM_TEAM = RuleImage(roi_front=(934,585,100,100), roi_back=(916,572,156,130), threshold=0.8, method="Template matching", file="./tasks/EvoZone/o/o_form_team.png")
I_FORM_TEAM = RuleImage(roi_front=(959,580,100,100), roi_back=(916,572,156,130), threshold=0.8, method="Template matching", file="./tasks/EvoZone/o/o_form_team.png")
# description
I_EVOZONE_LOCK = RuleImage(roi_front=(558,565,31,32), roi_back=(548,554,53,54), threshold=0.8, method="Template matching", file="./tasks/EvoZone/o/o_evozone_lock.png")
I_EVOZONE_LOCK = RuleImage(roi_front=(700,655,31,32), roi_back=(690,648,53,54), threshold=0.8, method="Template matching", file="./tasks/EvoZone/o/o_evozone_lock.png")
# description
I_EVOZONE_UNLOCK = RuleImage(roi_front=(560,565,26,29), roi_back=(551,557,43,45), threshold=0.8, method="Template matching", file="./tasks/EvoZone/o/o_evozone_unlock.png")
I_EVOZONE_UNLOCK = RuleImage(roi_front=(701,657,26,29), roi_back=(695,650,43,45), threshold=0.8, method="Template matching", file="./tasks/EvoZone/o/o_evozone_unlock.png")
# 点击挑战
I_EVOZONE_FIRE = RuleImage(roi_front=(1095,577,131,124), roi_back=(1095,577,131,124), threshold=0.6, method="Template matching", file="./tasks/EvoZone/o/o_evozone_fire.png")
I_EVOZONE_FIRE = RuleImage(roi_front=(1127,568,131,124), roi_back=(1127,568,131,124), threshold=0.6, method="Template matching", file="./tasks/EvoZone/o/o_evozone_fire.png")
# 式神录
I_SHI_RECORDS = RuleImage(roi_front=(821,638,48,45), roi_back=(821,638,48,45), threshold=0.8, method="Template matching", file="./tasks/EvoZone/o/o_shi_records.png")
I_SHI_RECORDS = RuleImage(roi_front=(843,570,48,45), roi_back=(843,570,48,45), threshold=0.8, method="Template matching", file="./tasks/EvoZone/o/o_shi_records.png")
# 小小宠物,发现宝藏
I_PET_PRESENT = RuleImage(roi_front=(873,184,62,147), roi_back=(873,184,62,147), threshold=0.8, method="Template matching", file="./tasks/EvoZone/o/o_pet_present.png")
# 风麒麟进入
I_WIND_KIRIN = RuleImage(roi_front=(377,126,232,420), roi_back=(377,126,232,420), threshold=0.8, method="Template matching", file="./tasks/EvoZone/o/o_wind_kirin.png")
I_WIND_KIRIN = RuleImage(roi_front=(410,116,225,320), roi_back=(410,116,225,320), threshold=0.8, method="Template matching", file="./tasks/EvoZone/o/o_wind_kirin.png")
# 水麒麟进入
I_WATER_KIRIN = RuleImage(roi_front=(671,122,236,420), roi_back=(671,122,236,420), threshold=0.8, method="Template matching", file="./tasks/EvoZone/o/o_water_kirin.png")
I_WATER_KIRIN = RuleImage(roi_front=(705,115,224,378), roi_back=(705,115,224,378), threshold=0.8, method="Template matching", file="./tasks/EvoZone/o/o_water_kirin.png")
# 雷麒麟进入
I_LIGHTNING_KIRIN = RuleImage(roi_front=(967,121,239,419), roi_back=(967,121,239,419), threshold=0.8, method="Template matching", file="./tasks/EvoZone/o/o_lightning_kirin.png")
I_LIGHTNING_KIRIN = RuleImage(roi_front=(1005,99,229,326), roi_back=(1005,99,229,326), threshold=0.8, method="Template matching", file="./tasks/EvoZone/o/o_lightning_kirin.png")


# List Rule Assets
# 这个是觉醒界面选择不同层数的
L_LAYER_LIST = RuleList(folder="./tasks/EvoZone/res", direction="vertical", mode="ocr", roi_back=(138,130,359,500), size=(44, 88),
L_LAYER_LIST = RuleList(folder="./tasks/EvoZone/res", direction="vertical", mode="ocr", roi_back=(124,84,77,632), size=(75, 83),
array=["壹", "贰", "叁", "肆", "伍", "陆", "柒", "捌", "玖", "拾"])


# Ocr Rule Assets
# Ocr-description
O_O_TEST_OCR = RuleOcr(roi=(126,136,360,491), area=(126,136,360,491), mode="Full", method="Default", keyword="", name="o_test_ocr")
O_O_TEST_OCR = RuleOcr(roi=(128,114,349,564), area=(128,114,349,564), mode="Full", method="Default", keyword="", name="o_test_ocr")


34 changes: 17 additions & 17 deletions tasks/EvoZone/o/image.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
{
"itemName": "fire_kirin",
"imageName": "o_fire_kirin.png",
"roiFront": "84,126,217,406",
"roiBack": "84,126,217,406",
"roiFront": "104,120,217,406",
"roiBack": "104,120,217,406",
"method": "Template matching",
"threshold": 0.8,
"description": "火麒麟进入"
},
{
"itemName": "form_team",
"imageName": "o_form_team.png",
"roiFront": "934,585,100,100",
"roiFront": "959,580,100,100",
"roiBack": "916,572,156,130",
"method": "Template matching",
"threshold": 0.8,
Expand All @@ -20,35 +20,35 @@
{
"itemName": "evozone_lock",
"imageName": "o_evozone_lock.png",
"roiFront": "558,565,31,32",
"roiBack": "548,554,53,54",
"roiFront": "700,655,31,32",
"roiBack": "690,648,53,54",
"method": "Template matching",
"threshold": 0.8,
"description": "description"
},
{
"itemName": "evozone_unlock",
"imageName": "o_evozone_unlock.png",
"roiFront": "560,565,26,29",
"roiBack": "551,557,43,45",
"roiFront": "701,657,26,29",
"roiBack": "695,650,43,45",
"method": "Template matching",
"threshold": 0.8,
"description": "description"
},
{
"itemName": "evozone_fire",
"imageName": "o_evozone_fire.png",
"roiFront": "1095,577,131,124",
"roiBack": "1095,577,131,124",
"roiFront": "1127,568,131,124",
"roiBack": "1127,568,131,124",
"method": "Template matching",
"threshold": 0.6,
"description": "点击挑战"
},
{
"itemName": "shi_records",
"imageName": "o_shi_records.png",
"roiFront": "821,638,48,45",
"roiBack": "821,638,48,45",
"roiFront": "843,570,48,45",
"roiBack": "843,570,48,45",
"method": "Template matching",
"threshold": 0.8,
"description": "式神录"
Expand All @@ -65,26 +65,26 @@
{
"itemName": "wind_kirin",
"imageName": "o_wind_kirin.png",
"roiFront": "377,126,232,420",
"roiBack": "377,126,232,420",
"roiFront": "410,116,225,320",
"roiBack": "410,116,225,320",
"method": "Template matching",
"threshold": 0.8,
"description": "风麒麟进入"
},
{
"itemName": "water_kirin",
"imageName": "o_water_kirin.png",
"roiFront": "671,122,236,420",
"roiBack": "671,122,236,420",
"roiFront": "705,115,224,378",
"roiBack": "705,115,224,378",
"method": "Template matching",
"threshold": 0.8,
"description": "水麒麟进入"
},
{
"itemName": "lightning_kirin",
"imageName": "o_lightning_kirin.png",
"roiFront": "967,121,239,419",
"roiBack": "967,121,239,419",
"roiFront": "1005,99,229,326",
"roiBack": "1005,99,229,326",
"method": "Template matching",
"threshold": 0.8,
"description": "雷麒麟进入"
Expand Down
Binary file modified tasks/EvoZone/o/o_evozone_fire.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tasks/EvoZone/o/o_evozone_lock.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tasks/EvoZone/o/o_evozone_unlock.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tasks/EvoZone/o/o_fire_kirin.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tasks/EvoZone/o/o_form_team.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tasks/EvoZone/o/o_lightning_kirin.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tasks/EvoZone/o/o_shi_records.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tasks/EvoZone/o/o_water_kirin.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tasks/EvoZone/o/o_wind_kirin.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 11 additions & 11 deletions tasks/EvoZone/res/list.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,48 +2,48 @@
"name": "layer_list",
"direction": "vertical",
"type": "ocr",
"roiBack": "138,130,359,500",
"roiBack": "124,84,77,632",
"description": "这个是觉醒界面选择不同层数的",
"list": [
{
"itemName": "壹",
"roiFront": "281,135,39,102"
"roiFront": "124,92,76,70"
},
{
"itemName": "贰",
"roiFront": "280,253,39,85"
"roiFront": "124,194,75,75"
},
{
"itemName": "叁",
"roiFront": "283,422,43,93"
"roiFront": "124,289,77,90"
},
{
"itemName": "肆",
"roiFront": "280,312,44,90"
"roiFront": "124,392,77,92"
},
{
"itemName": "伍",
"roiFront": "282,425,43,82"
"roiFront": "124,502,77,82"
},
{
"itemName": "陆",
"roiFront": "275,316,47,89"
"roiFront": "124,605,75,82"
},
{
"itemName": "柒",
"roiFront": "279,312,48,93"
"roiFront": "125,293,75,97"
},
{
"itemName": "捌",
"roiFront": "275,203,51,89"
"roiFront": "125,406,76,85"
},
{
"itemName": "玖",
"roiFront": "278,206,48,81"
"roiFront": "124,507,77,84"
},
{
"itemName": "拾",
"roiFront": "282,315,45,84"
"roiFront": "125,613,74,77"
}
]
}
4 changes: 2 additions & 2 deletions tasks/EvoZone/res/ocr.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[
{
"itemName": "o_test_ocr",
"roiFront": "126,136,360,491",
"roiBack": "126,136,360,491",
"roiFront": "128,114,349,564",
"roiBack": "128,114,349,564",
"mode": "Full",
"method": "Default",
"keyword": "",
Expand Down
14 changes: 7 additions & 7 deletions tasks/FallenSun/assets.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,27 +12,27 @@ class FallenSunAssets:

# Image Rule Assets
# 选择日轮
I_FALLEN_SUN = RuleImage(roi_front=(784,113,290,396), roi_back=(784,113,290,396), threshold=0.8, method="Template matching", file="./tasks/FallenSun/f/f_fallen_sun.png")
I_FALLEN_SUN = RuleImage(roi_front=(881,100,58,65), roi_back=(720,83,231,394), threshold=0.8, method="Template matching", file="./tasks/FallenSun/f/f_fallen_sun.png")
# 组队
I_FORM_TEAM = RuleImage(roi_front=(939,594,96,90), roi_back=(939,594,96,90), threshold=0.8, method="Template matching", file="./tasks/FallenSun/f/f_form_team.png")
I_FORM_TEAM = RuleImage(roi_front=(963,584,96,90), roi_back=(963,584,96,90), threshold=0.8, method="Template matching", file="./tasks/FallenSun/f/f_form_team.png")
# description
I_FALLEN_SUN_FIRE = RuleImage(roi_front=(1108,592,96,93), roi_back=(1108,592,96,93), threshold=0.8, method="Template matching", file="./tasks/FallenSun/f/f_fallen_sun_fire.png")
I_FALLEN_SUN_FIRE = RuleImage(roi_front=(1142,593,94,51), roi_back=(1141,582,104,98), threshold=0.8, method="Template matching", file="./tasks/FallenSun/f/f_fallen_sun_fire.png")
# description
I_FALLEN_SUN_UNLOCK = RuleImage(roi_front=(557,560,31,38), roi_back=(557,560,31,38), threshold=0.8, method="Template matching", file="./tasks/FallenSun/f/f_fallen_sun_unlock.png")
I_FALLEN_SUN_UNLOCK = RuleImage(roi_front=(699,650,31,38), roi_back=(699,650,31,38), threshold=0.8, method="Template matching", file="./tasks/FallenSun/f/f_fallen_sun_unlock.png")
# description
I_FALLEN_SUN_LOCK = RuleImage(roi_front=(557,561,31,37), roi_back=(557,561,31,37), threshold=0.8, method="Template matching", file="./tasks/FallenSun/f/f_fallen_sun_lock.png")
I_FALLEN_SUN_LOCK = RuleImage(roi_front=(700,652,31,37), roi_back=(700,652,31,37), threshold=0.8, method="Template matching", file="./tasks/FallenSun/f/f_fallen_sun_lock.png")
# 小小宠物,发现宝藏
I_PET_PRESENT = RuleImage(roi_front=(873,184,62,147), roi_back=(873,184,62,147), threshold=0.8, method="Template matching", file="./tasks/FallenSun/f/f_pet_present.png")


# List Rule Assets
# 这个是御魂界面选择不同层数的
L_LAYER_LIST = RuleList(folder="./tasks/FallenSun/res", direction="vertical", mode="ocr", roi_back=(138,130,359,500), size=(43, 87),
L_LAYER_LIST = RuleList(folder="./tasks/FallenSun/res", direction="vertical", mode="ocr", roi_back=(128,106,65,579), size=(65, 86),
array=["壹", "贰", "叁", "日"])


# Ocr Rule Assets
# Ocr-description
O_O_TEST_OCR = RuleOcr(roi=(126,136,360,491), area=(126,136,360,491), mode="Full", method="Default", keyword="", name="o_test_ocr")
O_O_TEST_OCR = RuleOcr(roi=(85,96,361,491), area=(85,96,360,491), mode="Full", method="Default", keyword="", name="o_test_ocr")


Binary file modified tasks/FallenSun/f/f_fallen_sun.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tasks/FallenSun/f/f_fallen_sun_fire.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tasks/FallenSun/f/f_fallen_sun_lock.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tasks/FallenSun/f/f_fallen_sun_unlock.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tasks/FallenSun/f/f_form_team.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading