瀏覽代碼

Merge pull request #1012 from Gan1Ser/patch-2

fix(Duel): Add combat skills functions
huangrunheng 1 年之前
父節點
當前提交
eeb20bcedf

+ 48 - 10
tasks/Duel/assets.py

@@ -10,9 +10,45 @@ from module.atom.list import RuleList
 class DuelAssets: 
 
 
+	# Click Rule Assets
+	# 清明 
+	C_QM_ZHAN = RuleClick(roi_front=(263,435,60,75), roi_back=(263,435,60,75), name="qm_zhan")
+	# 神乐 
+	C_SL_ZHAN = RuleClick(roi_front=(520,434,60,75), roi_back=(520,434,60,75), name="sl_zhan")
+	# 源博雅 
+	C_YBY_ZHAN = RuleClick(roi_front=(775,435,60,75), roi_back=(775,435,60,75), name="yby_zhan")
+	# 八百比丘尼 
+	C_BBBQN_ZHAN = RuleClick(roi_front=(1030,437,60,75), roi_back=(1030,437,60,75), name="bbbqn_zhan")
+
+
+	# Image Rule Assets
+	# 进入阴阳术 
+	I_YINYANGSHU = RuleImage(roi_front=(970,633,100,49), roi_back=(970,633,100,49), threshold=0.8, method="Template matching", file="./tasks/Duel/changeyys/Screenshots_yinyangshu.png")
+	# 进入阴阳术成功 
+	I_YINYANGSHUOK = RuleImage(roi_front=(98,3,100,38), roi_back=(98,3,100,38), threshold=0.8, method="Template matching", file="./tasks/Duel/changeyys/Screenshots_yinyangshuok.png")
+	# 点击阴阳师 
+	I_YINYANGSHI = RuleImage(roi_front=(80,615,58,67), roi_back=(80,615,58,67), threshold=0.8, method="Template matching", file="./tasks/Duel/changeyys/Screenshots_yinyangshi.png")
+	# 点击英杰 
+	I_YINGJIE = RuleImage(roi_front=(80,615,58,67), roi_back=(80,615,58,67), threshold=0.8, method="Template matching", file="./tasks/Duel/changeyys/Screenshots_yingjie.png")
+	# 交替 
+	I_JIAOTI = RuleImage(roi_front=(32,380,52,42), roi_back=(32,380,52,42), threshold=0.8, method="Template matching", file="./tasks/Duel/changeyys/Screenshots_jiaoti.png")
+	# 进入阴阳师交换页面 
+	I_YYSJIOAHUAN = RuleImage(roi_front=(89,13,176,42), roi_back=(89,13,176,42), threshold=0.8, method="Template matching", file="./tasks/Duel/changeyys/Screenshots_yysjioahuan.png")
+	# 清明(出战) 
+	I_QM_ZHAN = RuleImage(roi_front=(263,435,60,75), roi_back=(263,435,60,75), threshold=0.8, method="Template matching", file="./tasks/Duel/changeyys/qm_zhan.png")
+	# 神乐(出战) 
+	I_SL_ZHAN = RuleImage(roi_front=(520,434,60,75), roi_back=(520,434,60,75), threshold=0.8, method="Template matching", file="./tasks/Duel/changeyys/sl_zhan.png")
+	# 源博雅(出战) 
+	I_YBY_ZHAN = RuleImage(roi_front=(775,435,60,75), roi_back=(775,435,60,75), threshold=0.8, method="Template matching", file="./tasks/Duel/changeyys/yby_zhan.png")
+	# 八百比丘尼(出战) 
+	I_BBBQN_ZHAN = RuleImage(roi_front=(1030,437,60,75), roi_back=(1030,437,60,75), threshold=0.8, method="Template matching", file="./tasks/Duel/changeyys/bbbqn_zhan.png")
+
+
 	# Click Rule Assets
 	# 战斗数据 
 	C_D_BATTLE_DATA = RuleClick(roi_front=(584,279,100,100), roi_back=(584,279,100,100), name="d_battle_data")
+	# 点击第五手上式神位置,获得式神名称 
+	C_DUEL_CLICK_5 = RuleClick(roi_front=(105,23,52,47), roi_back=(105,23,52,47), name="duel_click_5")
 
 
 	# Image Rule Assets
@@ -20,24 +56,16 @@ class DuelAssets:
 	I_D_TEAM = RuleImage(roi_front=(813,288,34,74), roi_back=(785,259,115,119), threshold=0.8, method="Template matching", file="./tasks/Duel/duel/duel_d_team.png")
 	# 一键切换所有的御魂 
 	I_D_TEAM_SWTICH = RuleImage(roi_front=(1082,85,38,41), roi_back=(1082,85,38,41), threshold=0.8, method="Template matching", file="./tasks/Duel/duel/duel_d_team_swtich.png")
-	# 观战 
-	I_D_VISIT = RuleImage(roi_front=(1045,613,53,55), roi_back=(1045,613,53,55), threshold=0.8, method="Template matching", file="./tasks/Duel/duel/duel_d_visit.png")
 	# description 
 	I_D_BATTLE = RuleImage(roi_front=(1153,573,100,100), roi_back=(1123,537,154,177), threshold=0.8, method="Template matching", file="./tasks/Duel/duel/duel_d_battle.png")
 	# 战斗带保护的 
 	I_D_BATTLE_PROTECT = RuleImage(roi_front=(1153,578,100,100), roi_back=(1118,553,155,149), threshold=0.8, method="Template matching", file="./tasks/Duel/duel/duel_d_battle_protect.png")
-	# 预选点击确认 
-	I_D_CONFIRM = RuleImage(roi_front=(1097,517,139,156), roi_back=(1097,517,139,156), threshold=0.8, method="Template matching", file="./tasks/Duel/duel/duel_d_confirm.png")
 	# 自动上阵 
 	I_D_AUTO_ENTRY = RuleImage(roi_front=(42,133,66,62), roi_back=(20,119,115,111), threshold=0.8, method="Template matching", file="./tasks/Duel/duel/duel_d_auto_entry.png")
-	# 手动,弃用 
-	I_D_HAND = RuleImage(roi_front=(34,635,55,55), roi_back=(34,635,55,55), threshold=0.8, method="Template matching", file="./tasks/Duel/duel/duel_d_hand.png")
 	# 主界面的感叹号 
 	I_D_HELP = RuleImage(roi_front=(719,434,32,30), roi_back=(708,397,49,78), threshold=0.8, method="Template matching", file="./tasks/Duel/duel/duel_d_help.png")
 	# 准备 
 	I_D_PREPARE = RuleImage(roi_front=(1127,541,100,100), roi_back=(1127,541,100,100), threshold=0.8, method="Template matching", file="./tasks/Duel/duel/duel_d_prepare.png")
-	# 准备完毕 
-	I_D_PREPARE_DONE = RuleImage(roi_front=(495,82,75,55), roi_back=(495,82,75,55), threshold=0.8, method="Template matching", file="./tasks/Duel/duel/duel_d_prepare_done.png")
 	# 战斗数据 
 	I_D_BATTLE_DATA = RuleImage(roi_front=(1068,610,38,60), roi_back=(1068,610,38,60), threshold=0.8, method="Template matching", file="./tasks/Duel/duel/duel_d_battle_data.png")
 	# 胜利 
@@ -52,18 +80,28 @@ class DuelAssets:
 	I_D_CELEB_HONOR = RuleImage(roi_front=(665,531,25,30), roi_back=(652,517,52,53), threshold=0.75, method="Template matching", file="./tasks/Duel/duel/duel_d_celeb_honor.png")
 	# 练 
 	I_BATTLE_WITH_TRAIN = RuleImage(roi_front=(1161,588,78,81), roi_back=(1114,547,163,172), threshold=0.8, method="Template matching", file="./tasks/Duel/duel/duel_battle_with_train.png")
+	# 练2 
+	I_BATTLE_WITH_TRAIN2 = RuleImage(roi_front=(1161,588,78,81), roi_back=(1114,547,163,172), threshold=0.8, method="Template matching", file="./tasks/Duel/duel/duel_battle_with_train2.png")
+	# 斗技模式(普通) 
+	I_BATTLE_TYPE_COMMON = RuleImage(roi_front=(439,278,90,88), roi_back=(439,278,90,88), threshold=0.8, method="Template matching", file="./tasks/Duel/duel/duel_battle_type_common.png")
 	# 活动的战斗按钮 
 	I_D_BATTLE2 = RuleImage(roi_front=(1171,592,69,78), roi_back=(1119,566,154,143), threshold=0.8, method="Template matching", file="./tasks/Duel/duel/duel_d_battle2.png")
-
+	# 禁用 
+	I_BAN = RuleImage(roi_front=(1112,537,100,100), roi_back=(1112,537,100,100), threshold=0.8, method="Template matching", file="./tasks/Duel/duel/duel_ban.png")
+	# 左上角的退出
+	I_DUEL_EXIT = RuleImage(roi_front=(14,12,43,41), roi_back=(14,12,43,41), threshold=0.8, method="Template matching", file="./tasks/Duel/duel/gb_exit.png")
 
 	# Ocr Rule Assets
 	# 荣誉 
 	O_D_HONOR = RuleOcr(roi=(699,562,131,31), area=(699,562,131,31), mode="DigitCounter", method="Default", keyword="", name="d_honor")
 	# 分数 
 	O_D_SCORE = RuleOcr(roi=(701,509,61,33), area=(701,509,61,33), mode="Digit", method="Default", keyword="", name="d_score")
+	# 名士星星数 
+	O_D_CELEB_STAR = RuleOcr(roi=(625,454,77,37), area=(625,454,77,37), mode="Digit", method="Default", keyword="", name="d_celeb_star")
 	# 手动 
 	O_D_HAND = RuleOcr(roi=(31,639,63,45), area=(31,639,63,45), mode="Single", method="Default", keyword="手动", name="d_hand")
 	# 自动 
 	O_D_AUTO = RuleOcr(roi=(30,640,65,44), area=(30,640,65,44), mode="Single", method="Default", keyword="自动", name="d_auto")
-
+	# 被办式神名称 
+	O_D_BAN_NAME = RuleOcr(roi=(92,97,82,25), area=(92,97,82,25), mode="Single", method="Default", keyword="", name="d_ban_name")
 

二進制
tasks/Duel/ban/sp云外镜.png


二進制
tasks/Duel/ban/封阳君.png


二進制
tasks/Duel/ban/星熊童子.png


二進制
tasks/Duel/ban/祸津神.png


二進制
tasks/Duel/ban/荒骷髅.png


二進制
tasks/Duel/changeyys/Screenshots_jiaoti.png


二進制
tasks/Duel/changeyys/Screenshots_yingjie.png


二進制
tasks/Duel/changeyys/Screenshots_yinyangshi.png


二進制
tasks/Duel/changeyys/Screenshots_yinyangshu.png


二進制
tasks/Duel/changeyys/Screenshots_yinyangshuok.png


二進制
tasks/Duel/changeyys/Screenshots_yysjioahuan.png


二進制
tasks/Duel/changeyys/bbbqn_zhan.png


+ 26 - 0
tasks/Duel/changeyys/click.json

@@ -0,0 +1,26 @@
+[
+  {
+    "itemName": "qm_zhan",
+    "roiFront": "263,435,60,75",
+    "roiBack": "263,435,60,75",
+    "description": "清明"
+  },
+  {
+    "itemName": "sl_zhan",
+    "roiFront": "520,434,60,75",
+    "roiBack": "520,434,60,75",
+    "description": "神乐"
+  },
+  {
+    "itemName": "yby_zhan",
+    "roiFront": "775,435,60,75",
+    "roiBack": "775,435,60,75",
+    "description": "源博雅"
+  },
+  {
+    "itemName": "bbbqn_zhan",
+    "roiFront": "1030,437,60,75",
+    "roiBack": "1030,437,60,75",
+    "description": "八百比丘尼"
+  }
+]

+ 92 - 0
tasks/Duel/changeyys/image.json

@@ -0,0 +1,92 @@
+[
+  {
+    "itemName": "yinyangshu",
+    "imageName": "Screenshots_yinyangshu.png",
+    "roiFront": "970,633,100,49",
+    "roiBack": "970,633,100,49",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "进入阴阳术"
+  },
+  {
+    "itemName": "yinyangshuok",
+    "imageName": "Screenshots_yinyangshuok.png",
+    "roiFront": "98,3,100,38",
+    "roiBack": "98,3,100,38",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "进入阴阳术成功"
+  },
+  {
+    "itemName": "yinyangshi",
+    "imageName": "Screenshots_yinyangshi.png",
+    "roiFront": "80,615,58,67",
+    "roiBack": "80,615,58,67",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "点击阴阳师"
+  },
+  {
+    "itemName": "yingjie",
+    "imageName": "Screenshots_yingjie.png",
+    "roiFront": "80,615,58,67",
+    "roiBack": "80,615,58,67",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "点击英杰"
+  },
+  {
+    "itemName": "jiaoti",
+    "imageName": "Screenshots_jiaoti.png",
+    "roiFront": "32,380,52,42",
+    "roiBack": "32,380,52,42",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "交替"
+  },
+  {
+    "itemName": "yysjioahuan",
+    "imageName": "Screenshots_yysjioahuan.png",
+    "roiFront": "89,13,176,42",
+    "roiBack": "89,13,176,42",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "进入阴阳师交换页面"
+  },
+  {
+    "itemName": "qm_zhan",
+    "imageName": "qm_zhan.png",
+    "roiFront": "263,435,60,75",
+    "roiBack": "263,435,60,75",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "清明(出战)"
+  },
+  {
+    "itemName": "sl_zhan",
+    "imageName": "sl_zhan.png",
+    "roiFront": "520,434,60,75",
+    "roiBack": "520,434,60,75",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "神乐(出战)"
+  },
+  {
+    "itemName": "yby_zhan",
+    "imageName": "yby_zhan.png",
+    "roiFront": "775,435,60,75",
+    "roiBack": "775,435,60,75",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "源博雅(出战)"
+  },
+  {
+    "itemName": "bbbqn_zhan",
+    "imageName": "bbbqn_zhan.png",
+    "roiFront": "1030,437,60,75",
+    "roiBack": "1030,437,60,75",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "八百比丘尼(出战)"
+  }
+]

二進制
tasks/Duel/changeyys/qm_zhan.png


二進制
tasks/Duel/changeyys/sl_zhan.png


二進制
tasks/Duel/changeyys/yby_zhan.png


+ 27 - 44
tasks/Duel/config.py

@@ -1,20 +1,29 @@
 # This Python file uses the following encoding: utf-8
 # @author runhey
 # github https://github.com/runhey
-from typing import Any, Dict
-from pydantic import (Field,
-                      model_validator,
-                      ValidationError,
-                      model_serializer,
-                      WithJsonSchema,
-                      SerializerFunctionWrapHandler,
-                      GetJsonSchemaHandler)
+from pydantic import BaseModel, Field
+from datetime import time
 
 from tasks.Component.config_scheduler import Scheduler
 from tasks.Component.config_base import ConfigBase, Time
 from tasks.Component.GeneralBattle.config_general_battle import GreenMarkType
+from enum import Enum
+from tasks.Component.SwitchSoul.switch_soul_config import SwitchSoulConfig
+
+
+class Onmyoji(str, Enum):
+    Ylg = '源赖光'
+    Qm = '晴明'
+    Sl = '神乐'
+    Yby = '源博雅'
+    Bbbqn = '八百比丘尼'
+
 
 class DuelConfig(ConfigBase):
+    # 是否切换阴阳师
+    switch_enabled: bool = Field(default=True, description='是否切换阴阳师')
+    # 切换阴阳师
+    switch_onmyoji: Onmyoji = Field(default=Onmyoji.Ylg, description='切换阴阳师')
     # 一键切换斗技御魂
     switch_all_soul: bool = Field(default=False, description='switch_all_soul_help')
     # 限制时间
@@ -29,42 +38,16 @@ class DuelConfig(ConfigBase):
     green_mark: GreenMarkType = Field(default=GreenMarkType.GREEN_LEFT1, description='green_mark_help')
 
 
+class DuelCelebConfig(ConfigBase):
+    # 是否开启名仕战斗
+    celeb_battle: bool = Field(default=False, description='是否开启名仕战斗')
+    # 填写第五手式神名称,如果阵容式神被办,第五手就会换式神,退出斗技
+    ban_name: str = Field(default='', description='填写第五手式神名称')
+    initial_score: int = Field(default=3800, description='设置初始斗技分值默认为8颗星之后每赢一场加100输一场减100')
+
+
 class Duel(ConfigBase):
     scheduler: Scheduler = Field(default_factory=Scheduler)
     duel_config: DuelConfig = Field(default_factory=DuelConfig)
-    # test_list: list[DuelConfig]
-    #
-    # @model_validator(mode='before')
-    # @classmethod
-    # def check_list(cls, data: dict) -> Any:
-    #     if 'test_list' not in data:
-    #         data['test_list'] = []
-    #     for key, value in data.items():
-    #         if isinstance(value, list):
-    #             continue
-    #         if 'test_list' not in key:
-    #             continue
-    #         try:
-    #             DuelConfig(**value)
-    #             data['test_list'].append(value)
-    #         except ValidationError as e:
-    #             pass
-    #     # 补全list
-    #     while len(data['test_list']) < data['scheduler']['priority']:
-    #         data['test_list'].append(DuelConfig())
-    #     return data
-    #
-    # @model_serializer()
-    # def serializer_model(self, value: Any) -> Dict[str, Any]:
-    #     properties = self.__dict__
-    #     data = {}
-    #     for key,value in properties.items():
-    #         if isinstance(value, list):
-    #             for index, v in enumerate(value):
-    #                 data[f'{key}_{index+1}'] = v.model_dump()
-    #         else:
-    #             data[key] = value.model_dump()
-    #     return data
-
-
-
+    duel_celeb_config: DuelCelebConfig = Field(default_factory=DuelCelebConfig)
+    switch_soul: SwitchSoulConfig = Field(default_factory=SwitchSoulConfig)

+ 6 - 0
tasks/Duel/duel/click.json

@@ -4,5 +4,11 @@
     "roiFront": "584,279,100,100",
     "roiBack": "584,279,100,100",
     "description": "战斗数据"
+  },
+  {
+    "itemName": "duel_click_5",
+    "roiFront": "105,23,52,47",
+    "roiBack": "105,23,52,47",
+    "description": "点击第五手上式神位置,获得式神名称"
   }
 ]

二進制
tasks/Duel/duel/duel_ban.png


二進制
tasks/Duel/duel/duel_ban_flag.png


二進制
tasks/Duel/duel/duel_battle_type_common.png


二進制
tasks/Duel/duel/duel_battle_with_train2.png


二進制
tasks/Duel/duel/gb_exit.png


+ 36 - 36
tasks/Duel/duel/image.json

@@ -17,15 +17,6 @@
     "threshold": 0.8,
     "description": "一键切换所有的御魂"
   },
-  {
-    "itemName": "d_visit",
-    "imageName": "duel_d_visit.png",
-    "roiFront": "1045,613,53,55",
-    "roiBack": "1045,613,53,55",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "观战"
-  },
   {
     "itemName": "d_battle",
     "imageName": "duel_d_battle.png",
@@ -44,15 +35,6 @@
     "threshold": 0.8,
     "description": "战斗带保护的"
   },
-  {
-    "itemName": "d_confirm",
-    "imageName": "duel_d_confirm.png",
-    "roiFront": "1097,517,139,156",
-    "roiBack": "1097,517,139,156",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "预选点击确认"
-  },
   {
     "itemName": "d_auto_entry",
     "imageName": "duel_d_auto_entry.png",
@@ -62,15 +44,6 @@
     "threshold": 0.8,
     "description": "自动上阵"
   },
-  {
-    "itemName": "d_hand",
-    "imageName": "duel_d_hand.png",
-    "roiFront": "34,635,55,55",
-    "roiBack": "34,635,55,55",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "手动,弃用"
-  },
   {
     "itemName": "d_help",
     "imageName": "duel_d_help.png",
@@ -89,15 +62,6 @@
     "threshold": 0.8,
     "description": "准备"
   },
-  {
-    "itemName": "d_prepare_done",
-    "imageName": "duel_d_prepare_done.png",
-    "roiFront": "495,82,75,55",
-    "roiBack": "495,82,75,55",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "准备完毕"
-  },
   {
     "itemName": "d_battle_data",
     "imageName": "duel_d_battle_data.png",
@@ -161,6 +125,24 @@
     "threshold": 0.8,
     "description": "练"
   },
+  {
+    "itemName": "battle_with_train2",
+    "imageName": "duel_battle_with_train2.png",
+    "roiFront": "1161,588,78,81",
+    "roiBack": "1114,547,163,172",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "练2"
+  },
+  {
+    "itemName": "battle_type_common",
+    "imageName": "duel_battle_type_common.png",
+    "roiFront": "439,278,90,88",
+    "roiBack": "439,278,90,88",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "斗技模式(普通)"
+  },
   {
     "itemName": "d_battle2",
     "imageName": "duel_d_battle2.png",
@@ -169,5 +151,23 @@
     "method": "Template matching",
     "threshold": 0.8,
     "description": "活动的战斗按钮"
+  },
+  {
+    "itemName": "ban",
+    "imageName": "duel_ban.png",
+    "roiFront": "1112,537,100,100",
+    "roiBack": "1112,537,100,100",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "禁用"
+  },
+  {
+    "itemName": "duel_exit",
+    "imageName": "gb_exit.png",
+    "roiFront": "14,12,43,41",
+    "roiBack": "14,12,43,41",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "左上角的退出"
   }
 ]

+ 18 - 0
tasks/Duel/duel/ocr.json

@@ -17,6 +17,15 @@
     "keyword": "",
     "description": "分数"
   },
+  {
+    "itemName": "d_celeb_star",
+    "roiFront": "625,454,77,37",
+    "roiBack": "625,454,77,37",
+    "mode": "Digit",
+    "method": "Default",
+    "keyword": "",
+    "description": "名士星星数"
+  },
   {
     "itemName": "d_hand",
     "roiFront": "31,639,63,45",
@@ -34,5 +43,14 @@
     "method": "Default",
     "keyword": "自动",
     "description": "自动"
+  },
+  {
+    "itemName": "d_ban_name",
+    "roiFront": "92,97,82,25",
+    "roiBack": "92,97,82,25",
+    "mode": "Single",
+    "method": "Default",
+    "keyword": "",
+    "description": "被办式神名称"
   }
 ]

+ 305 - 50
tasks/Duel/script_task.py

@@ -4,54 +4,153 @@
 from time import sleep
 from datetime import time, datetime, timedelta
 
+import cv2
+import numpy as np
+from module.atom.ocr import RuleOcr
+
 from module.logger import logger
-from module.exception import TaskEnd, RequestHumanTakeover
+from module.exception import TaskEnd
 from module.base.timer import Timer
 
 from tasks.Component.GeneralBattle.general_battle import GeneralBattle
 from tasks.Component.GeneralBattle.config_general_battle import GreenMarkType
 from tasks.GameUi.game_ui import GameUi
 from tasks.GameUi.page import page_main, page_duel
-from tasks.Duel.config import Duel
+from tasks.Duel.config import Duel, Onmyoji
 from tasks.Duel.assets import DuelAssets
+from tasks.Component.SwitchSoul.switch_soul import SwitchSoul
+from tasks.GameUi.page import page_main, page_team, page_shikigami_records
+import os
+from module.atom.image import RuleImage
+""" 斗技 """
+
 
-class ScriptTask(GameUi, GeneralBattle, DuelAssets):
+class ScriptTask(GameUi, GeneralBattle, SwitchSoul, DuelAssets):
+    battle_count = 0
+    battle_win_count = 0
+    battle_lose_count = 0
+    current_score = 0
+    battle_win_copy=battle_win_count
+    battle_lose_copy=battle_lose_count
     def run(self):
+
+        current_time = datetime.now().time()
+        if not (time(12, 00) <= current_time < time(23, 00)):
+            self.set_next_run(task='Duel', success=True, finish=False)
+            raise TaskEnd('Duel')
+
+        con = self.config.duel
+        # 切换御魂
+        if con.switch_soul.enable:
+            self.ui_get_current_page()
+            self.ui_goto(page_shikigami_records)
+            self.run_switch_soul(con.switch_soul.switch_group_team)
+
+        if con.switch_soul.enable_switch_by_name:
+            self.ui_get_current_page()
+            self.ui_goto(page_shikigami_records)
+            self.run_switch_soul_by_name(con.switch_soul.group_name,con.switch_soul.team_name)
+
         con = self.config.duel.duel_config
+        celeb_con = self.config.duel.duel_celeb_config
+        self.current_score = celeb_con.initial_score
         limit_time = con.limit_time
         self.limit_time: timedelta = timedelta(hours=limit_time.hour, minutes=limit_time.minute,
                                                seconds=limit_time.second)
+
+        self.ui_get_current_page()
+        self.ui_goto(page_main)
+        # 切换阴阳师
+        if con.switch_enabled:
+            # 清明
+            if con.switch_onmyoji == Onmyoji.Qm:
+                self.switch_kagura(con, self.C_QM_ZHAN, self.I_QM_ZHAN)
+            # 神乐
+            elif con.switch_onmyoji == Onmyoji.Sl:
+                self.switch_kagura(con, self.C_SL_ZHAN, self.I_SL_ZHAN)
+            # 源博雅
+            elif con.switch_onmyoji == Onmyoji.Yby:
+                self.switch_kagura(con, self.C_YBY_ZHAN, self.I_YBY_ZHAN)
+            # 八百比丘尼
+            elif con.switch_onmyoji == Onmyoji.Bbbqn:
+                self.switch_kagura(con, self.C_BBBQN_ZHAN, self.I_BBBQN_ZHAN)
+            # 源赖光
+            elif con.switch_onmyoji == Onmyoji.Ylg:
+                self.switch_yorimitsu()
+
         self.ui_get_current_page()
         self.ui_goto(page_duel)
+        # 切换御魂
         if con.switch_all_soul:
             self.switch_all_soul()
 
         # 循环
+        duel_week_over = False
         while 1:
             self.screenshot()
             if self.appear_then_click(self.I_REWARD, interval=0.6):
                 continue
             if not self.duel_main():
                 continue
+            # 检查分数
+            current_score = self.check_score()
+
+            # if current_score == 3000 and self.check_honor():
+            #     # 3000分和满荣誉退出,退出
+            #     logger.info('Duel task is over score')
+            #     duel_week_over = True
+            #     break
 
             if datetime.now() - self.start_time >= self.limit_time:
                 # 任务执行时间超过限制时间,退出
                 logger.info('Duel task is over time')
                 break
-            if con.honor_full_exit and self.check_honor():
-                # 荣誉满了,退出
-                logger.info('Duel task is over honor')
+
+            # 不开启名仕战斗,到达名士直接退出
+            if not celeb_con.celeb_battle:
+                if self.appear(self.I_D_CELEB_STAR) or self.appear(self.I_D_CELEB_HONOR):
+                    logger.info('You are already a celeb(名仕)')
+                    current_score = "名仕"
+                    duel_week_over = True
+                    break
+            # 练习
+            if self.appear(self.I_BATTLE_WITH_TRAIN) or self.appear(self.I_BATTLE_WITH_TRAIN2):
                 break
-            current_score = self.check_score(con.target_score)
-            if not current_score:
-                # 分数够了,退出
+
+            # if con.honor_full_exit and self.check_honor():
+            #     # 荣誉满了,退出
+            #     logger.info('Duel task is over honor')
+            #     break
+
+            # 当前分数跟目标分数比较
+            if current_score >= con.target_score:
+                # 分数够了
                 logger.info('Duel task is over score')
-                break
-            self.duel_one(current_score, con.green_enable, con.green_mark)
+                # 是否刷满荣誉就退出
+                if con.honor_full_exit:
+                    if self.check_honor():
+                        # 荣誉满了,退出
+                        # self.save_image(content=f'分数: {current_score}, 本周斗技结束', push_flag=True)
+                        logger.info('Duel task is over honor')
+                        duel_week_over = True
+                        break
+                else:
+                    break
+
+            # 进行一次斗技
+            self.duel_one(current_score, con.green_enable, con.green_mark, celeb_con.ban_name)
 
+        logger.info('Duel battle end')
         # 记得退回去到町中
         self.ui_click(self.I_UI_BACK_YELLOW, self.I_CHECK_TOWN)
-        self.set_next_run(task='Duel', success=True, finish=False)
+
+        if duel_week_over:
+            self.set_next_run(task='Duel', success=True, finish=True)
+        else:
+            self.set_next_run(task='Duel', success=True, finish=False)
+
+        # 调起花合战
+        self.set_next_run(task='TalismanPass', target=datetime.now())
         raise TaskEnd('Duel')
 
     def duel_main(self, screenshot=False) -> bool:
@@ -84,6 +183,68 @@ class ScriptTask(GameUi, GeneralBattle, DuelAssets):
         logger.info('Souls Switch is complete')
         self.ui_click(self.I_UI_BACK_YELLOW, self.I_D_TEAM)
 
+    def switch_kagura(self,con, target1, target2):
+        click_count = 0  # 计数
+        while 1:
+            self.screenshot()
+            if click_count >= 4:
+                break
+            if self.appear(self.I_YINYANGSHUOK, interval=1):
+                break
+            if self.appear_then_click(self.I_YINYANGSHU, interval=1):
+                click_count += 1
+                continue
+        click_count = 0  # 计数
+        while 1:
+            self.screenshot()
+            if click_count >= 4:
+                break
+            if self.appear(self.I_YYSJIOAHUAN, interval=1):
+                break
+            if self.appear_then_click(self.I_JIAOTI, interval=1):
+                continue
+            if self.appear_then_click(self.I_YINGJIE, interval=1):
+                click_count += 1
+                continue
+        click_count = 0  # 计数
+        while 1:
+            self.screenshot()
+            if click_count >= 4:
+                break
+            if self.appear(target2, interval=1):
+                break
+            if self.appear_then_click(self.I_JIAOTI, interval=1):
+                continue
+            if self.click(target1, interval=1):
+                click_count += 1
+                continue
+        self.ui_get_current_page()
+        self.ui_goto(page_main)
+
+    def switch_yorimitsu(self):
+        click_count = 0  # 计数
+        while 1:
+            self.screenshot()
+            if click_count >= 4:
+                break
+            if self.appear(self.I_YINYANGSHUOK, interval=1):
+                break
+            if self.appear_then_click(self.I_YINYANGSHU, interval=1):
+                click_count += 1
+                continue
+        click_count = 0  # 计数
+        while 1:
+            self.screenshot()
+            if click_count >= 4:
+                break
+            if self.appear(self.I_YINGJIE, interval=1):
+                break
+            if self.appear_then_click(self.I_YINYANGSHI, interval=1):
+                click_count += 1
+                continue
+        self.ui_get_current_page()
+        self.ui_goto(page_main)
+
     def check_honor(self) -> bool:
         """
         检查荣誉是否满了
@@ -94,7 +255,7 @@ class ScriptTask(GameUi, GeneralBattle, DuelAssets):
             return True
         return False
 
-    def check_score(self, target: int) -> int or None:
+    def check_score(self) -> int or None:
         """
         检查是否达到目标分数
         :param target: 目标分数
@@ -103,25 +264,25 @@ class ScriptTask(GameUi, GeneralBattle, DuelAssets):
         while 1:
             self.screenshot()
             if self.appear(self.I_D_CELEB_STAR) or self.appear(self.I_D_CELEB_HONOR):
-                logger.info('You are already a celeb')
-                return None
-            current_score = self.O_D_SCORE.ocr(self.device.image)
-            if current_score < 1200:
-                # 分太低了
-                logger.warning('Score is too low')
-                logger.error('Please enhance your score')
-                raise RequestHumanTakeover
-            elif current_score > 10000:
-                # 识别错误分数超过一万, 去掉最高位
-                logger.warning('Recognition error, score is too high')
-                logger.warning('Remove the highest digit')
-                current_score = int(str(current_score)[1:])
-            elif current_score > 3000:
-                continue
-            return current_score if current_score <= target else None
-
-    def duel_one(self, current_score: int, enable: bool=False,
-                 mark_mode: GreenMarkType=GreenMarkType.GREEN_MAIN) -> bool:
+                if self.battle_win_count - self.battle_win_copy == 1:
+                    self.battle_win_copy = self.battle_win_count
+                    self.current_score += 100
+                elif self.battle_lose_count - self.battle_lose_copy == 1:
+                    self.battle_lose_copy = self.battle_lose_count
+                    self.current_score -= 100
+                else:
+                    self.current_score = self.current_score
+            else:
+                self.current_score = self.O_D_SCORE.ocr(self.device.image)
+                if self.current_score > 10000:
+                    # 识别错误分数超过一万, 去掉最高位
+                    logger.warning('Recognition error, score is too high')
+                    self.current_score = int(str(self.current_score)[1:])
+            logger.info(f'battle score: {self.current_score}')
+            return self.current_score
+
+    def duel_one(self, current_score: int, enable: bool = False,
+                 mark_mode: GreenMarkType = GreenMarkType.GREEN_MAIN, ban_name: str = '') -> bool:
         """
         进行一次斗技, 返回输赢结果
         :param mark_mode:
@@ -129,37 +290,105 @@ class ScriptTask(GameUi, GeneralBattle, DuelAssets):
         :param current_score: 当前分数, 不同的分数有不同的战斗界面
         :return:
         """
+        logger.hr('Duel battle', 2)
+        self.battle_count += 1
+        # 是否名士
+        celeb_status = False
         while 1:
             self.screenshot()
-            if not self.appear(self.I_D_HELP):
+            # 如果对方直接秒退,那自己就是赢的
+            if self.appear(self.I_D_VICTORY):
+                self.ui_click_until_disappear(self.I_D_VICTORY)
+                self.battle_win_copy = self.battle_win_count
+                self.battle_win_count += 1
+                return
+            if self.appear(self.I_D_AUTO_ENTRY) or self.appear(self.I_D_PREPARE):
                 break
-            if self.appear_then_click(self.I_D_BATTLE, interval=1):
-                continue
-            if self.appear_then_click(self.I_D_BATTLE2, interval=1):
+            # 名士以上禁用
+            if self.appear_then_click(self.I_BAN, interval=1):
+                celeb_status = True
                 continue
-            if self.appear_then_click(self.I_BATTLE_WITH_TRAIN, interval=1):
+            # 战斗按钮
+            if self.appear_then_click(self.I_D_BATTLE, interval=1) or self.appear_then_click(self.I_D_BATTLE2, interval=1):
                 continue
+            # 战斗带保护的按钮
             if self.appear_then_click(self.I_D_BATTLE_PROTECT, interval=1.6):
                 continue
+            # 斗技模式(普通)
+            # if self.appear_then_click(self.I_BATTLE_TYPE_COMMON, interval=1):
+            #     continue
+            # 练习
+            # if self.appear_then_click(self.I_BATTLE_WITH_TRAIN, interval=1) or self.appear_then_click(self.I_BATTLE_WITH_TRAIN2, interval=1):
+            #     continue
+
         # 点击斗技 开始匹配对手
         logger.hr('Duel start match')
         while 1:
             self.screenshot()
+            # 出现自动上阵
             if self.appear(self.I_D_AUTO_ENTRY):
-                # 出现自动上阵
+                ban_check_success = True
+                if celeb_status:
+                    # 检查禁选式神
+                    name_timer = Timer(5)
+                    name_timer.start()
+                    ban_check_success = False
+                    while 1:
+                        if name_timer.reached():
+                            break
+                        self.click(self.C_DUEL_CLICK_5)
+                        sleep(0.5)
+                        self.screenshot()
+                        # 如果对方直接秒退,那自己就是赢的
+                        if self.appear(self.I_D_VICTORY):
+                            self.ui_click_until_disappear(self.I_D_VICTORY)
+                            self.battle_win_copy = self.battle_win_count
+                            self.battle_win_count += 1
+                            return
+                        ocr_ban_name = self.O_D_BAN_NAME.ocr(self.device.image)
+                        if ocr_ban_name == '':
+                            continue
+                        if any(char in ocr_ban_name for char in ban_name):
+                            ban_check_success = True
+                            break
+                        else:
+                            break
+
+                # 处理检查结果
+                if not ban_check_success:
+                    self.duel_exit_battle()
+                    if self.appear(self.I_D_FAIL):
+                        # 输了
+                        self.ui_click_until_disappear(self.I_D_FAIL)
+                        self.battle_lose_copy = self.battle_lose_count
+                        self.battle_lose_count += 1
+                    return
+
+                # 等待自动上阵消失
                 self.ui_click_until_disappear(self.I_D_AUTO_ENTRY)
-                logger.info('Duel auto entry')
                 self.device.stuck_record_clear()
                 self.device.stuck_record_add('BATTLE_STATUS_S')
                 self.wait_until_disappear(self.I_D_WORD_BATTLE)
                 break
-            if current_score <= 1800 and self.appear(self.I_D_PREPARE):
+            if self.appear(self.I_D_PREPARE):
                 # 低段位有的准备
                 self.ui_click_until_disappear(self.I_D_PREPARE)
+                self.wait_until_disappear(self.I_D_PREPARE_DONE)
                 logger.info('Duel prepare')
                 break
-        # 正式进入战斗
-        logger.info('Duel start battle')
+            # 如果对方直接秒退,那自己就是赢的
+            if self.appear(self.I_D_VICTORY):
+                self.ui_click_until_disappear(self.I_D_VICTORY)
+                self.battle_win_copy = self.battle_win_count
+                self.battle_win_count += 1
+                return
+        timer = Timer(10)
+        timer.start()
+        while 1:
+            if timer.reached():
+                break
+            if self.is_in_battle():
+                break
         while 1:
             self.screenshot()
             if self.ocr_appear(self.O_D_AUTO, interval=0.4):
@@ -168,9 +397,16 @@ class ScriptTask(GameUi, GeneralBattle, DuelAssets):
                 continue
             # 如果对方直接秒退,那自己就是赢的
             if self.appear(self.I_D_VICTORY):
-                logger.info('Duel battle win')
                 self.ui_click_until_disappear(self.I_D_VICTORY)
-                return True
+                self.battle_win_copy = self.battle_win_count
+                self.battle_win_count += 1
+                return
+            if self.appear(self.I_D_FAIL):
+                # 输了
+                self.ui_click_until_disappear(self.I_D_FAIL)
+                self.battle_lose_copy = self.battle_lose_count
+                self.battle_lose_count += 1
+                return
         # 绿标
         self.green_mark(enable, mark_mode)
         # 等待结果
@@ -187,25 +423,21 @@ class ScriptTask(GameUi, GeneralBattle, DuelAssets):
                 continue
             if self.appear(self.I_FALSE):
                 # 打输了
-                logger.info('Duel battle lose')
                 self.ui_click_until_disappear(self.I_FALSE)
                 battle_win = False
                 break
             if self.appear(self.I_D_FAIL):
                 # 输了
-                logger.info('Duel battle lose')
                 self.ui_click_until_disappear(self.I_D_FAIL)
                 battle_win = False
                 break
             if self.appear(self.I_WIN):
                 # 打赢了
-                logger.info('Duel battle win')
                 self.ui_click_until_disappear(self.I_WIN)
                 battle_win = True
                 break
             if self.appear(self.I_D_VICTORY):
                 # 打赢了
-                logger.info('Duel battle win')
                 self.ui_click_until_disappear(self.I_D_VICTORY)
                 battle_win = True
                 break
@@ -221,15 +453,38 @@ class ScriptTask(GameUi, GeneralBattle, DuelAssets):
                 logger.warning('Duel battle stuck, swipe')
                 self.device.stuck_record_clear()
                 self.device.stuck_record_add('BATTLE_STATUS_S')
-        return battle_win
 
+        if battle_win:
+            self.battle_win_copy = self.battle_win_count
+            self.battle_win_count += 1
+        else:
+            self.battle_lose_copy = self.battle_lose_count
+            self.battle_lose_count += 1
 
+        task_run_time = datetime.now() - self.start_time
+        # 格式化时间,只保留整数部分的秒
+        task_run_time_seconds = timedelta(seconds=int(task_run_time.total_seconds()))
 
+        logger.info(f'battle result: {battle_win}')
+        logger.info(f'battle count: {self.battle_count} | win: {self.battle_win_count} failure: {self.battle_lose_count}')
+        logger.info(f'battle time: {task_run_time_seconds} / {self.limit_time}')
+        return battle_win
+
+    def duel_exit_battle(self):
+        while 1:
+            self.screenshot()
+            if self.appear(self.I_D_FAIL) or self.appear(self.I_FALSE):
+                return
+            if self.appear_then_click(self.I_EXIT_ENSURE):
+                continue
+            if self.appear_then_click(self.I_DUEL_EXIT, interval=1):
+                continue
 
 if __name__ == '__main__':
     from module.config.config import Config
     from module.device.device import Device
-    c = Config('oas1')
+
+    c = Config('mi')
     d = Device(c)
     t = ScriptTask(c, d)