Skip to content
Merged
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
69 changes: 0 additions & 69 deletions .trae/skills/image-updater/SKILL.md

This file was deleted.

26 changes: 13 additions & 13 deletions tasks/GameUi/assets.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,33 +44,33 @@ class GameUiAssets:
# description
I_MAIN_GOTO_EXPLORATION = RuleImage(roi_front=(493,116,45,75), roi_back=(243,100,933,211), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_main_goto_exploration.png")
# description
I_CHECK_EXPLORATION = RuleImage(roi_front=(1149,119,27,21), roi_back=(1149,119,27,21), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_check_exploration.png")
I_CHECK_EXPLORATION = RuleImage(roi_front=(1146,175,21,22), roi_back=(1146,175,21,22), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_check_exploration.png")
# 探索前往觉醒
I_EXPLORATION_GOTO_AWAKE_ZONE = RuleImage(roi_front=(69,635,46,64), roi_back=(69,635,46,64), threshold=0.65, method="Template matching", file="./tasks/GameUi/page/page_exploration_goto_awake_zone.png")
I_EXPLORATION_GOTO_AWAKE_ZONE = RuleImage(roi_front=(57,628,57,42), roi_back=(33,619,113,79), threshold=0.65, method="Template matching", file="./tasks/GameUi/page/page_exploration_goto_awake_zone.png")
# 探索前往御魂
I_EXPLORATION_GOTO_SOUL_ZONE = RuleImage(roi_front=(170,631,34,62), roi_back=(170,631,34,62), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_exploration_goto_soul_zone.png")
I_EXPLORATION_GOTO_SOUL_ZONE = RuleImage(roi_front=(163,642,44,36), roi_back=(134,623,93,70), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_exploration_goto_soul_zone.png")
# 探索前往结界突破
I_EXPLORATION_GOTO_REALM_RAID = RuleImage(roi_front=(260,634,44,60), roi_back=(260,634,44,60), threshold=0.65, method="Template matching", file="./tasks/GameUi/page/page_exploration_goto_realm_raid.png")
I_EXPLORATION_GOTO_REALM_RAID = RuleImage(roi_front=(248,636,67,48), roi_back=(229,612,203,87), threshold=0.65, method="Template matching", file="./tasks/GameUi/page/page_exploration_goto_realm_raid.png")
# 探索前往御灵
I_EXPLORATION_GOTO_GORYOU_REALM = RuleImage(roi_front=(359,635,38,59), roi_back=(359,635,38,59), threshold=0.7, method="Template matching", file="./tasks/GameUi/page/page_exploration_goto_goryou_realm.png")
I_EXPLORATION_GOTO_GORYOU_REALM = RuleImage(roi_front=(353,639,47,45), roi_back=(346,626,178,67), threshold=0.7, method="Template matching", file="./tasks/GameUi/page/page_exploration_goto_goryou_realm.png")
# 探索前往式神委派
I_EXPLORATION_GOTO_DELEGATION = RuleImage(roi_front=(450,636,49,54), roi_back=(450,636,49,54), threshold=0.65, method="Template matching", file="./tasks/GameUi/page/page_exploration_goto_delegation.png")
I_EXPLORATION_GOTO_DELEGATION = RuleImage(roi_front=(453,639,53,37), roi_back=(409,613,167,75), threshold=0.65, method="Template matching", file="./tasks/GameUi/page/page_exploration_goto_delegation.png")
# 探索前往秘闻
I_EXPLORATION_GOTO_SECRET_ZONES = RuleImage(roi_front=(545,634,49,57), roi_back=(545,634,49,57), threshold=0.7, method="Template matching", file="./tasks/GameUi/page/page_exploration_goto_secret_zones.png")
I_EXPLORATION_GOTO_SECRET_ZONES = RuleImage(roi_front=(549,633,53,40), roi_back=(524,614,200,87), threshold=0.7, method="Template matching", file="./tasks/GameUi/page/page_exploration_goto_secret_zones.png")
# 探索前往地域鬼王
I_EXPLORATION_GOTO_AREA_BOSS = RuleImage(roi_front=(643,634,46,60), roi_back=(643,634,46,60), threshold=0.65, method="Template matching", file="./tasks/GameUi/page/page_exploration_goto_area_boss.png")
I_EXPLORATION_GOTO_AREA_BOSS = RuleImage(roi_front=(640,638,51,45), roi_back=(640,638,180,45), threshold=0.65, method="Template matching", file="./tasks/GameUi/page/page_exploration_goto_area_boss.png")
# 探索前往平安奇谭
I_EXPLORATION_GOTO_HEIAN_KITAN = RuleImage(roi_front=(739,643,52,44), roi_back=(739,643,180,44), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_exploration_goto_heian_kitan.png")
# 探索前往六道之门
I_EXPLORATION_GOTO_SIX_GATES = RuleImage(roi_front=(930,634,47,61), roi_back=(930,634,47,61), threshold=0.65, method="Template matching", file="./tasks/GameUi/page/page_exploration_goto_six_gates.png")
I_EXPLORATION_GOTO_SIX_GATES = RuleImage(roi_front=(938,640,60,49), roi_back=(820,631,296,66), threshold=0.65, method="Template matching", file="./tasks/GameUi/page/page_exploration_goto_six_gates.png")
# 探索前往契灵之境
I_EXPLORATION_GOTO_BONDLING_FAIRYLAND = RuleImage(roi_front=(1024,636,51,54), roi_back=(1024,636,51,54), threshold=0.65, method="Template matching", file="./tasks/GameUi/page/page_exploration_goto_bondling_fairyland.png")
I_EXPLORATION_GOTO_BONDLING_FAIRYLAND = RuleImage(roi_front=(1037,635,56,44), roi_back=(918,623,218,72), threshold=0.65, method="Template matching", file="./tasks/GameUi/page/page_exploration_goto_bondling_fairyland.png")
# description
I_BACK_BLUE = RuleImage(roi_front=(32,37,54,52), roi_back=(3,2,130,114), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_back_blue.png")
# description
I_CHECK_AWAKE = RuleImage(roi_front=(376,565,73,82), roi_back=(376,565,73,82), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_check_awake.png")
# description
I_CHECK_SOUL_ZONES = RuleImage(roi_front=(152,20,68,36), roi_back=(152,20,68,36), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_check_soul_zones.png")
I_CHECK_SOUL_ZONES = RuleImage(roi_front=(49,186,298,237), roi_back=(49,186,298,237), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_check_soul_zones.png")
# description
I_CHECK_REALM_RAID = RuleImage(roi_front=(129,632,52,48), roi_back=(66,526,233,188), threshold=0.7, method="Template matching", file="./tasks/GameUi/page/page_check_realm_raid.png")
# description
Expand Down Expand Up @@ -131,7 +131,7 @@ class GameUiAssets:
# description
I_BACK_YOLLOW = RuleImage(roi_front=(24,16,48,55), roi_back=(0,0,100,100), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_back_yollow.png")
# description
I_DEMON_ENCOUNTER_GOTO_TOWN = RuleImage(roi_front=(22,19,41,37), roi_back=(22,19,41,37), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_demon_encounter_goto_town.png")
I_DEMON_ENCOUNTER_GOTO_TOWN = RuleImage(roi_front=(28,20,56,52), roi_back=(3,4,100,100), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_demon_encounter_goto_town.png")
# description
I_TOWN_GOTO_HYAKKIYAKOU = RuleImage(roi_front=(880,165,53,69), roi_back=(827,149,148,100), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_town_goto_hyakkiyakou.png")
# description
Expand Down Expand Up @@ -216,7 +216,7 @@ class GameUiAssets:
# 英杰试炼左上角标志
I_CHECK_HERO_TEST = RuleImage(roi_front=(148,10,133,48), roi_back=(137,0,157,71), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_check_hero_test.png")
# 探索前往英杰试炼
I_EXPLORATION_GOTO_HERO_TEST = RuleImage(roi_front=(834,639,48,56), roi_back=(834,639,48,56), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_exploration_goto_hero_test.png")
I_EXPLORATION_GOTO_HERO_TEST = RuleImage(roi_front=(837,630,58,56), roi_back=(7,605,1272,113), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_exploration_goto_hero_test.png")


# Image Rule Assets
Expand Down
Binary file modified tasks/GameUi/page/page_check_exploration.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/GameUi/page/page_check_soul_zones.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/GameUi/page/page_demon_encounter_goto_town.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/GameUi/page/page_exploration_goto_area_boss.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/GameUi/page/page_exploration_goto_awake_zone.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/GameUi/page/page_exploration_goto_bondling_fairyland.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/GameUi/page/page_exploration_goto_delegation.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/GameUi/page/page_exploration_goto_goryou_realm.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/GameUi/page/page_exploration_goto_hero_test.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/GameUi/page/page_exploration_goto_main.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/GameUi/page/page_exploration_goto_realm_raid.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/GameUi/page/page_exploration_goto_secret_zones.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/GameUi/page/page_exploration_goto_six_gates.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/GameUi/page/page_exploration_goto_soul_zone.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
44 changes: 22 additions & 22 deletions tasks/GameUi/page/page_img.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,71 +29,71 @@
{
"itemName": "check_exploration",
"imageName": "page_check_exploration.png",
"roiFront": "1149,119,27,21",
"roiBack": "1149,119,27,21",
"roiFront": "1146,175,21,22",
"roiBack": "1146,175,21,22",
"method": "Template matching",
"threshold": 0.8,
"description": "description"
},
{
"itemName": "exploration_goto_awake_zone",
"imageName": "page_exploration_goto_awake_zone.png",
"roiFront": "69,635,46,64",
"roiBack": "69,635,46,64",
"roiFront": "57,628,57,42",
"roiBack": "33,619,113,79",
"method": "Template matching",
"threshold": 0.65,
"description": "探索前往觉醒"
},
{
"itemName": "exploration_goto_soul_zone",
"imageName": "page_exploration_goto_soul_zone.png",
"roiFront": "170,631,34,62",
"roiBack": "170,631,34,62",
"roiFront": "163,642,44,36",
"roiBack": "134,623,93,70",
"method": "Template matching",
"threshold": 0.8,
"description": "探索前往御魂"
},
{
"itemName": "exploration_goto_realm_raid",
"imageName": "page_exploration_goto_realm_raid.png",
"roiFront": "260,634,44,60",
"roiBack": "260,634,44,60",
"roiFront": "248,636,67,48",
"roiBack": "229,612,203,87",
"method": "Template matching",
"threshold": 0.65,
"description": "探索前往结界突破"
},
{
"itemName": "exploration_goto_goryou_realm",
"imageName": "page_exploration_goto_goryou_realm.png",
"roiFront": "359,635,38,59",
"roiBack": "359,635,38,59",
"roiFront": "353,639,47,45",
"roiBack": "346,626,178,67",
"method": "Template matching",
"threshold": 0.7,
"description": "探索前往御灵"
},
{
"itemName": "exploration_goto_delegation",
"imageName": "page_exploration_goto_delegation.png",
"roiFront": "450,636,49,54",
"roiBack": "450,636,49,54",
"roiFront": "453,639,53,37",
"roiBack": "409,613,167,75",
"method": "Template matching",
"threshold": 0.65,
"description": "探索前往式神委派"
},
{
"itemName": "exploration_goto_secret_zones",
"imageName": "page_exploration_goto_secret_zones.png",
"roiFront": "545,634,49,57",
"roiBack": "545,634,49,57",
"roiFront": "549,633,53,40",
"roiBack": "524,614,200,87",
"method": "Template matching",
"threshold": 0.7,
"description": "探索前往秘闻"
},
{
"itemName": "exploration_goto_area_boss",
"imageName": "page_exploration_goto_area_boss.png",
"roiFront": "643,634,46,60",
"roiBack": "643,634,46,60",
"roiFront": "640,638,51,45",
"roiBack": "640,638,180,45",
"method": "Template matching",
"threshold": 0.65,
"description": "探索前往地域鬼王"
Expand All @@ -110,17 +110,17 @@
{
"itemName": "exploration_goto_six_gates",
"imageName": "page_exploration_goto_six_gates.png",
"roiFront": "930,634,47,61",
"roiBack": "930,634,47,61",
"roiFront": "938,640,60,49",
"roiBack": "820,631,296,66",
"method": "Template matching",
"threshold": 0.65,
"description": "探索前往六道之门"
},
{
"itemName": "exploration_goto_bondling_fairyland",
"imageName": "page_exploration_goto_bondling_fairyland.png",
"roiFront": "1024,636,51,54",
"roiBack": "1024,636,51,54",
"roiFront": "1037,635,56,44",
"roiBack": "918,623,218,72",
"method": "Template matching",
"threshold": 0.65,
"description": "探索前往契灵之境"
Expand All @@ -146,8 +146,8 @@
{
"itemName": "check_soul_zones",
"imageName": "page_check_soul_zones.png",
"roiFront": "152,20,68,36",
"roiBack": "152,20,68,36",
"roiFront": "49,186,298,237",
"roiBack": "49,186,298,237",
"method": "Template matching",
"threshold": 0.8,
"description": "description"
Expand Down
4 changes: 2 additions & 2 deletions tasks/GameUi/page/page_img_2.json
Original file line number Diff line number Diff line change
Expand Up @@ -155,8 +155,8 @@
{
"itemName": "demon_encounter_goto_town",
"imageName": "page_demon_encounter_goto_town.png",
"roiFront": "22,19,41,37",
"roiBack": "22,19,41,37",
"roiFront": "28,20,56,52",
"roiBack": "3,4,100,100",
"method": "Template matching",
"threshold": 0.8,
"description": "description"
Expand Down
4 changes: 2 additions & 2 deletions tasks/GameUi/page/page_img_supplement.json
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,8 @@
{
"itemName": "exploration_goto_hero_test",
"imageName": "page_exploration_goto_hero_test.png",
"roiFront": "834,639,48,56",
"roiBack": "834,639,48,56",
"roiFront": "837,630,58,56",
"roiBack": "7,605,1272,113",
"method": "Template matching",
"threshold": 0.8,
"description": "探索前往英杰试炼"
Expand Down
Binary file modified tasks/HeroTest/as/as_hero2_skill6.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 removed tasks/HeroTest/as/as_hero2_skill7.png
Binary file not shown.
63 changes: 0 additions & 63 deletions tasks/HeroTest/as/image.json
Original file line number Diff line number Diff line change
Expand Up @@ -304,68 +304,5 @@
"method": "Template matching",
"threshold": 0.8,
"description": "真钱"
},
{
"itemName": "hero2_skill1",
"imageName": "as_hero2_skill1.png",
"roiFront": "825,358,61,36",
"roiBack": "47,340,1178,65",
"method": "Template matching",
"threshold": 0.8,
"description": "同调祝福"
},
{
"itemName": "hero2_skill2",
"imageName": "as_hero2_skill2.png",
"roiFront": "521,356,63,37",
"roiBack": "46,333,1174,82",
"method": "Template matching",
"threshold": 0.8,
"description": "韵迟祝福"
},
{
"itemName": "hero2_skill3",
"imageName": "as_hero2_skill3.png",
"roiFront": "520,358,62,38",
"roiBack": "41,346,1172,63",
"method": "Template matching",
"threshold": 0.8,
"description": "弥天祝福"
},
{
"itemName": "hero2_skill4",
"imageName": "as_hero2_skill4.png",
"roiFront": "1127,356,65,41",
"roiBack": "48,349,1173,57",
"method": "Template matching",
"threshold": 0.8,
"description": "叠辉祝福"
},
{
"itemName": "hero2_skill5",
"imageName": "as_hero2_skill5.png",
"roiFront": "217,358,65,37",
"roiBack": "46,334,1148,81",
"method": "Template matching",
"threshold": 0.8,
"description": "敛神祝福"
},
{
"itemName": "hero2_skill6",
"imageName": "as_hero2_skill6.png",
"roiFront": "253,128,39,63",
"roiBack": "253,128,39,63",
"method": "Template matching",
"threshold": 0.8,
"description": "默认技能"
},
{
"itemName": "hero2_skill7",
"imageName": "as_hero2_skill7.png",
"roiFront": "427,356,62,38",
"roiBack": "48,342,1175,67",
"method": "Template matching",
"threshold": 0.8,
"description": "速度祝福"
}
]
6 changes: 2 additions & 4 deletions tasks/HeroTest/assets.py
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,8 @@ class HeroTestAssets:
I_HERO2_SKILL5 = RuleImage(roi_front=(217,358,65,37), roi_back=(46,334,1148,81), threshold=0.8, method="Template matching", file="./tasks/HeroTest/as/as_hero2_skill5.png")
# 弥天祝福
I_HERO2_SKILL3 = RuleImage(roi_front=(520,358,62,38), roi_back=(41,346,1172,63), threshold=0.8, method="Template matching", file="./tasks/HeroTest/as/as_hero2_skill3.png")
# 默认技能
I_HERO2_SKILL6 = RuleImage(roi_front=(253,128,39,63), roi_back=(253,128,39,63), threshold=0.8, method="Template matching", file="./tasks/HeroTest/as/as_hero2_skill6.png")
# 速度祝福
I_HERO2_SKILL7 = RuleImage(roi_front=(427,356,62,38), roi_back=(48,342,1175,67), threshold=0.8, method="Template matching", file="./tasks/HeroTest/as/as_hero2_skill7.png")
# 速度祝福
I_HERO2_SKILL6 = RuleImage(roi_front=(427,356,62,38), roi_back=(48,342,1175,67), threshold=0.8, method="Template matching", file="./tasks/HeroTest/as/as_hero2_skill6.png")


# Ocr Rule Assets
Expand Down
10 changes: 3 additions & 7 deletions tasks/HeroTest/script_task.py
Original file line number Diff line number Diff line change
Expand Up @@ -151,14 +151,10 @@ def hero2_skill_wait(self):
self.I_HERO2_SKILL3, # 弥天祝福
self.I_HERO2_SKILL4, # 叠辉祝福
self.I_HERO2_SKILL5, # 敛神祝福
self.I_HERO2_SKILL6, # 默认技能,选第一个祝福
self.I_HERO2_SKILL7, # 速度祝福
]
# pvp技能列表
pvp_skill = [
self.I_HERO2_SKILL6, # 默认技能,选第一个祝福
self.I_HERO2_SKILL7, # 速度祝福
self.I_HERO2_SKILL6, # 速度祝福
]
# TODO: PVP
pvp_skill = []
target_skill_dict: dict[SkillMode, list] = {
SkillMode.PVE: pve_skill,
SkillMode.PVP: pvp_skill,
Expand Down
Loading
Loading