Просмотр исходного кода

perf: translation and user experience

runhey 3 лет назад
Родитель
Сommit
9a4ded8f9f

+ 53 - 13
config/template.json

@@ -41,7 +41,9 @@
     "scheduler": {
       "enable": false,
       "next_run": "2023-01-01 00:00:00",
-      "priority": 3
+      "interval_days": 1,
+      "interval_hours": 0,
+      "interval_minutes": 0
     },
     "general_battle": {
       "lock_team_enable": false,
@@ -67,63 +69,101 @@
     "scheduler": {
       "enable": false,
       "next_run": "2023-01-01 00:00:00",
-      "priority": 3
+      "interval_days": 1,
+      "interval_hours": 0,
+      "interval_minutes": 0
     }
   },
   "gold_youkai": {
     "scheduler": {
       "enable": false,
       "next_run": "2023-01-01 00:00:00",
-      "priority": 3
+      "interval_days": 1,
+      "interval_hours": 0,
+      "interval_minutes": 0
     }
   },
   "nian": {
     "scheduler": {
       "enable": false,
       "next_run": "2023-01-01 00:00:00",
-      "priority": 3
+      "interval_days": 1,
+      "interval_hours": 0,
+      "interval_minutes": 0
     }
   },
-  "orochi": {
+  "realm_raid": {
     "scheduler": {
       "enable": false,
       "next_run": "2023-01-01 00:00:00",
-      "priority": 3
+      "interval_days": 1,
+      "interval_hours": 0,
+      "interval_minutes": 0
+    },
+    "raid_config": {
+      "raid_mode": "retreat_four_attack_nine",
+      "attack_number": "all"
+    },
+    "general_battle_config": {
+      "lock_team_enable": false,
+      "preset_enable": false,
+      "preset_group": 1,
+      "preset_team": 1,
+      "buff_enable": false,
+      "buff_awake_click": false,
+      "buff_soul_click": false,
+      "buff_gold_50_click": false,
+      "buff_gold_100_click": false,
+      "buff_exp_50_click": false,
+      "buff_exp_100_click": false,
+      "green_enable": false,
+      "green_mark": "green_left1",
+      "random_click_swipt_enable": false
     }
   },
-  "orochi_moans": {
+  "orochi": {
     "scheduler": {
       "enable": false,
       "next_run": "2023-01-01 00:00:00",
-      "priority": 3
+      "interval_days": 1,
+      "interval_hours": 0,
+      "interval_minutes": 0
     }
   },
-  "orochi_judgement": {
+  "orochi_moans": {
     "scheduler": {
       "enable": false,
       "next_run": "2023-01-01 00:00:00",
-      "priority": 3
+      "interval_days": 1,
+      "interval_hours": 0,
+      "interval_minutes": 0
     }
   },
   "sougenbi": {
     "scheduler": {
       "enable": false,
       "next_run": "2023-01-01 00:00:00",
-      "priority": 3
+      "interval_days": 1,
+      "interval_hours": 0,
+      "interval_minutes": 0
     }
   },
   "fallen_sun": {
     "scheduler": {
       "enable": false,
       "next_run": "2023-01-01 00:00:00",
-      "priority": 3
+      "interval_days": 1,
+      "interval_hours": 0,
+      "interval_minutes": 0
     }
   },
   "eternity_sea": {
     "scheduler": {
       "enable": false,
       "next_run": "2023-01-01 00:00:00",
-      "priority": 3
+      "interval_days": 1,
+      "interval_hours": 0,
+      "interval_minutes": 0
     }
   }
 }

+ 0 - 2
module/config/config_model.py

@@ -19,7 +19,6 @@ from tasks.GoldYoukai.config import GoldYoukai
 from tasks.Nian.config import Nian
 from tasks.Orochi.config import Orochi
 from tasks.OrochiMoans.config import OrochiMoans
-from tasks.OrochiJudgement.config import OrochiJudgement
 from tasks.Sougenbi.config import Sougenbi
 from tasks.FallenSun.config import FallenSun
 from tasks.EternitySea.config import EternitySea
@@ -45,7 +44,6 @@ class ConfigModel(BaseModel):
     # 这些是刷御魂的
     orochi: Orochi = Field(default_factory=Orochi)
     orochi_moans: OrochiMoans = Field(default_factory=OrochiMoans)
-    orochi_judgement: OrochiJudgement = Field(default_factory=OrochiJudgement)
     sougenbi: Sougenbi = Field(default_factory=Sougenbi)
     fallen_sun: FallenSun = Field(default_factory=FallenSun)
     eternity_sea: EternitySea = Field(default_factory=EternitySea)

BIN
module/config/i18n/zh_CN.qm


+ 170 - 28
module/config/i18n/zh_CN.ts

@@ -73,27 +73,27 @@
         <source>Locale</source>
         <translation>语言环境</translation>
     </message>
-	<message>
+    <message>
         <source>Dpi Strategy</source>
         <translation>分辨率DPI缩放策略</translation>
     </message>
-	<message>
+    <message>
         <source>default</source>
         <translation>默认不缩放</translation>
     </message>
-	<message>
+    <message>
         <source>floor</source>
         <translation>始终不缩放</translation>
     </message>
-	<message>
+    <message>
         <source>ceil</source>
         <translation>始终缩放</translation>
     </message>
-	<message>
+    <message>
         <source>round</source>
         <translation>设备像素比0.5及以上的,进行缩放</translation>
     </message>
-	<message>
+    <message>
         <source>round_prefer_floor</source>
         <translation>设备像素比0.75及以上的,进行缩放</translation>
     </message>
@@ -126,93 +126,235 @@
         <source>Update</source>
         <translation>更新</translation>
     </message>
-	<message>
+    <message>
         <source>Overview</source>
         <translation>总览</translation>
     </message>
-	<message>
+    <message>
         <source>Script</source>
         <translation>脚本</translation>
     </message>
-	<message>
+    <message>
         <source>General</source>
         <translation>通用</translation>
     </message>
-	<message>
+    <message>
         <source>Restart</source>
         <translation>重启</translation>
     </message>
-	<message>
+    <message>
         <source>Tools</source>
         <translation>工具</translation>
     </message>
-	<message>
+    <message>
         <source>Image Rule</source>
         <translation>截图规范</translation>
     </message>
-	<message>
+    <message>
         <source>Ocr Rule</source>
         <translation>OCR规范</translation>
     </message>
-	<message>
+    <message>
         <source>Click Rule</source>
         <translation>点击规范</translation>
     </message>
-	<message>
+    <message>
         <source>Long Click Rule</source>
         <translation>长按规范</translation>
     </message>
-	<message>
+    <message>
         <source>Swipe Rule</source>
         <translation>滑动规范</translation>
     </message>
-	<message>
+    <message>
         <source>Daily Task</source>
         <translation>日常任务</translation>
     </message>
-	<message>
+    <message>
         <source>AreaBoss</source>
         <translation>地狱鬼王</translation>
     </message>
-	<message>
+    <message>
         <source>GoldYoukai</source>
         <translation>金币妖怪</translation>
     </message>
-	<message>
+    <message>
         <source>ExperienceYoukai</source>
         <translation>经验妖怪</translation>
     </message>
-	<message>
+    <message>
         <source>Nian</source>
         <translation>年兽</translation>
     </message>
-	<message>
+    <message>
         <source>Soul Zones</source>
         <translation>御魂副本</translation>
     </message>
-	<message>
+    <message>
         <source>Orochi</source>
         <translation>八岐大蛇</translation>
     </message>
-	<message>
+    <message>
         <source>OrochiMoans</source>
         <translation>御魂悲鸣</translation>
     </message>
-	<message>
+    <message>
         <source>OrochiJudgement</source>
         <translation>御魂神罚</translation>
     </message>
-	<message>
+    <message>
         <source>Sougenbi</source>
         <translation>业原火</translation>
     </message>
-	<message>
+    <message>
         <source>FallenSun</source>
         <translation>日轮之城</translation>
     </message>
-	<message>
+    <message>
         <source>EternitySea</source>
         <translation>永生之海</translation>
     </message>
+	<message>
+        <source>GlobalGame</source>
+        <translation>全局游戏设置</translation>
+    </message>
+	<message>
+        <source>RealmRaid</source>
+        <translation>个人突破</translation>
+    </message>
+	<message>
+        <source>List Rule</source>
+        <translation>列表规则</translation>
+    </message>
+</context>
+<context>
+    <name>Args</name>
+	<message>
+        <source>Setting</source>
+        <translation>设置</translation>
+    </message>
+    <message>
+        <source>Device</source>
+        <translation>模拟器</translation>
+    </message>
+    <message>
+        <source>Serial</source>
+        <translation>模拟器 Serial</translation>
+    </message>
+    <message>
+        <source>Handle</source>
+        <translation>句柄 Handle</translation>
+    </message>
+    <message>
+        <source>package_name_help</source>
+        <translation>模拟器上装有多个游戏客户端时,需要手动选择服务器</translation>
+    </message>
+	<message><source>PackageName</source><translation>游戏客户端</translation></message>
+	<message><source>ScreenshotMethod</source><translation>模拟器截屏方案</translation></message>
+	<message><source>ControlMethod</source><translation>模拟器控制方案</translation></message>
+	<message>
+		<source>serial_help</source>
+		<translation>常见的模拟器 Serial 可以查询下方列表
+填 "auto" 自动检测模拟器,多个模拟器正在运行或使用不支持自动检测的模拟器时无法使用 "auto",必须手动填写
+
+模拟器默认 Serial:
+[MuMu模拟器12]: 127.0.0.1:16384 
+[MuMu模拟器]: 127.0.0.1:7555 
+[雷电模拟器](全系列通用): emulator-5554 或 127.0.0.1:5555
+
+如果没有提及的那可能是还没有测试或者不推荐使用,可以自行尝试
+如果你使用了模拟器的多开功能,它们的 Serial 将不是默认的,可以在 console.bat 中执行 `adb devices` 查询,或根据模拟器官方的教程填写'</translation>
+	</message>
+	<message>
+        <source>handle_help</source>
+        <translation>填 "auto" 自动检测模拟器,多个模拟器正在运行或使用不支持自动检测的模拟器时无法使用 "auto",必须手动填写
+输入为句柄标题或者是句柄号,每次启动模拟器时句柄号会变化
+
+句柄标题 Handle:
+[MuMu模拟器12]: "MuMu模拟器12"
+[MuMu模拟器]: "MuMu模拟器" "\n"
+[雷电模拟器](全系列通用): "雷电模拟器"
+
+句柄号 Handle:
+!!!占位符</translation>
+    </message>
+	<message>
+        <source>screenshot_method_help</source>
+        <translation>目前只支持window_background, 其他还未完整的测试</translation>
+    </message>
+	<message>
+        <source>control_method_help</source>
+        <translation>目前只支持window_message, 其他还未完整的测试</translation>
+    </message>
+	<message>
+        <source>Adb Restart</source>
+        <translation>在检测不到设备的时候尝试重启adb</translation>
+    </message>
+	<message><source>Error</source><translation>出错</translation></message>
+	<message><source>Handle Error</source><translation>启用异常处理</translation></message>
+	<message><source>handle_error_help</source><translation>处理部分异常,运行出错时撤退</translation></message>
+	<message><source>Save Error</source><translation>出错时,保存 Log 和截图</translation></message>
+	<message><source>Screenshot Length</source><translation>出错时,保留最后 X 张截图</translation></message>
+	<message><source>Optimization</source><translation>优化</translation></message>
+	<message><source>Screenshot Interval</source><translation>放慢截图速度至 X 秒一张</translation></message>
+	<message><source>Combat Screenshot Interval</source><translation>战斗中放慢截图速度至 X 秒一张</translation></message>
+	<message><source>Task Hoarding Duration</source><translation>囤积任务 X 分钟</translation></message>
+	<message><source>WhenTaskQueueEmpty</source><translation>当任务队列清空后</translation></message>
+	<message><source>screenshot_interval_help</source><translation>执行两次截图之间的最小间隔,限制在 0.1 ~ 0.3,对于高配置电脑能降低 CPU 占用</translation></message>
+	<message><source>combat_screenshot_interval_help</source><translation>执行两次截图之间的最小间隔,限制在 0.1 ~ 1.0,能降低战斗时的 CPU 占用</translation></message>
+	<message><source>task_hoarding_duration_help</source><translation>能在收菜期间降低操作游戏的频率,任务触发后,等待 X 分钟,再一次性执行囤积的任务</translation></message>
+	<message><source>when_task_queue_empty_help</source><translation>无任务时关闭游戏,能在收菜期间降低 CPU 占用</translation></message>
+</context>
+<context>
+    <name>Args</name>
+	<message><source>Scheduler</source><translation>任务调度</translation></message>
+	<message><source>Enable</source><translation>启用该功能</translation></message>
+	<message><source>Next Run</source><translation>下一次运行时间</translation></message>
+	<message><source>Priority</source><translation>任务优先级</translation></message>
+	<message><source>Interval Days</source><translation>下次执行的间隔天数</translation></message>
+	<message><source>Interval Hours</source><translation>下次执行的间隔小时</translation></message>
+	<message><source>Interval Minutes</source><translation>下次执行的间隔分钟</translation></message>
+	<message><source>enable_help</source><translation>将这个任务加入调度器</translation></message>
+	<message><source>next_run_help</source><translation>会根据下面的间隔时间自动计算时间,清空后回车即可设置为当前</translation></message>
+	<message><source>priority_help</source><translation>如果设置调度规则为基于优先级,则该选项有效
+默认为5,数字越低优先级越高,可取[1~15],如果同优先级,则按照先来后到规则进行调度</translation></message>
+	<message><source>interval_days_help</source><translation>可取[0~7]</translation></message>
+	<message><source>interval_hours_help</source><translation>可取[0~24]</translation></message>
+	<message><source>interval_minutes_help</source><translation>可取[0~60]</translation></message>
+</context>
+<context>
+    <name>Args</name>
+	<message><source>GeneralBattleConfig</source><translation>通用战斗</translation></message>
+	<message><source>Lock Team Enable</source><translation>锁定阵容</translation></message>
+	<message><source>Preset Enable</source><translation>启用切换预设队伍</translation></message>
+	<message><source>Preset Group</source><translation>第 X 个预设组</translation></message>
+	<message><source>Preset Team</source><translation>第 X 个预设队伍</translation></message>
+	<message><source>Buff Enable</source><translation>启用加成</translation></message>
+	<message><source>Buff Awake Click</source><translation>开启觉醒加成</translation></message>
+	<message><source>Buff Soul Click</source><translation>开启御魂加成</translation></message>
+	<message><source>Buff Gold 50 Click</source><translation>开启金币加成50%</translation></message>
+	<message><source>Buff Gold 100 Click</source><translation>开启金币加成100%</translation></message>
+	<message><source>Buff Exp 50 Click</source><translation>开启经验加成50%</translation></message>
+	<message><source>Buff Exp 100 Click</source><translation>开启金币加成100%</translation></message>
+	<message><source>Green Enable</source><translation>启用我方绿标</translation></message>
+	<message><source>GreenMarkType</source><translation>设置第 X 个式神为绿标</translation></message>
+	<message><source>Random Click Swipt Enable</source><translation>战斗时随机点击或者随机滑动</translation></message>
+	
+	<message><source>lock_team_enable_help</source><translation>如果锁定阵容将无法启用预设队伍、加成功能</translation></message>
+	<message><source>preset_enable_help</source><translation> </translation></message>
+	<message><source>preset_group_help</source><translation>可选[1~7]</translation></message>
+	<message><source>preset_team_help</source><translation>可选[1~5]</translation></message>
+	<message><source>buff_enable_help</source><translation>在准备阶段开启加成不太符合直觉,暂时还未实现,而且挺多的战斗是不允许准备阶段开启加成的</translation></message>
+	<message><source>green_enable_help</source><translation>在战斗开始的一瞬间点击绿标,无反馈点击</translation></message>
+	<message><source>green_mark_help</source><translation>可选[左一, 左二, 左三, 左四, 左五, 主阴阳师]</translation></message>
+	<message><source>random_click_swipt_enable_help</source><translation>防封优化,每三分钟的战斗可能触发2~5次,请注意这个与绿标功能冲突,可能会乱点绿标</translation></message>
+</context>
+<context>
+    <name>Args</name>
+	<message><source>Boss Number</source><translation>挑战鬼王数量</translation></message>
+	<message><source>RaidConfig</source><translation>个人突破</translation></message>
+	<message><source>RaidMode</source><translation>挑战模式</translation></message>
+	<message><source>AttackNumber</source><translation>挑战次数</translation></message>
+	<message><source>raid_mode_help</source><translation>默认为退四打九,退四打九指每次执行前都会退出四次,然后在进攻九次</translation></message>
 </context>
 </TS>

+ 21 - 17
module/gui/qml/Component/Args.qml

@@ -160,7 +160,7 @@ Item {
                 wrapMode: Text.WrapAnywhere
                 topPadding: 6
             }
-            FluCopyableText{
+            FluText{
                 id: string_description
                 anchors{
                     top: string_title.bottom
@@ -169,7 +169,8 @@ Item {
                 width: string_title.width
                 text: ""
                 font: FluTextStyle.Caption
-                wrapMode: Text.WrapAnywhere
+                wrapMode: Text.WordWrap
+//                textFormat: Text.PlainText
                 topPadding: 6
                 rightPadding: 6
             }
@@ -184,11 +185,11 @@ Item {
                     //判断是不是时间类型的变量2023-01-01
                     stringItem.isDateTime = true
                 }
-                string_title.text = modelData.title
+                string_title.text = qsTr(modelData.title)
                 if( typeof modelData.description === 'undefined'){
                     return
                 }
-                string_description.text = modelData.description
+                string_description.text = qsTr(modelData.description.replace("\\n","\n"))
             }
         }
     }
@@ -228,7 +229,7 @@ Item {
                 wrapMode: Text.WrapAnywhere
                 topPadding: 6
             }
-            FluCopyableText{
+            FluText{
                 id: itemArg_description
                 anchors{
                     top: itemArg_title.bottom
@@ -238,6 +239,7 @@ Item {
                 text: ""
                 font: FluTextStyle.Caption
                 wrapMode: Text.WrapAnywhere
+//                textFormat: Text.PlainText
                 topPadding: 6
                 rightPadding: 6
             }
@@ -248,11 +250,11 @@ Item {
                 }
                 itemArg_text.text = modelData.value
                 itemArg_text.placeholderText = modelData["default"]
-                itemArg_title.text = modelData.title
+                itemArg_title.text = qsTr(modelData.title)
                 if( typeof modelData.description === 'undefined'){
                     return
                 }
-                itemArg_description.text = modelData.description
+                itemArg_description.text = qsTr(modelData.description)
             }
         }
     }
@@ -292,7 +294,7 @@ Item {
                 wrapMode: Text.WrapAnywhere
                 topPadding: 6
             }
-            FluCopyableText{
+            FluText{
                 id: itemArg_description
                 anchors{
                     top: itemArg_title.bottom
@@ -302,6 +304,7 @@ Item {
                 text: ""
                 font: FluTextStyle.Caption
                 wrapMode: Text.WrapAnywhere
+//                textFormat: Text.PlainText
                 topPadding: 6
                 rightPadding: 6
             }
@@ -312,11 +315,11 @@ Item {
                 }
                 itemArg_text.text = modelData.value
                 itemArg_text.placeholderText = modelData["default"]
-                itemArg_title.text = modelData.title
+                itemArg_title.text = qsTr(modelData.title)
                 if( typeof modelData.description === 'undefined'){
                     return
                 }
-                itemArg_description.text = modelData.description
+                itemArg_description.text = qsTr(modelData.description)
             }
         }
     }
@@ -357,7 +360,7 @@ Item {
                 wrapMode: Text.WrapAnywhere
                 topPadding: 6
             }
-            FluCopyableText{
+            FluText{
                 id: itemArg_description
                 anchors{
                     top: itemArg_title.bottom
@@ -376,11 +379,11 @@ Item {
                     return
                 }
                 itemArg_text.selected = modelData.value
-                itemArg_title.text = modelData.title
+                itemArg_title.text = qsTr(modelData.title)
                 if( typeof modelData.description === 'undefined'){
                     return
                 }
-                itemArg_description.text = modelData.description
+                itemArg_description.text = qsTr(modelData.description)
             }
         }
     }
@@ -420,7 +423,7 @@ Item {
                 wrapMode: Text.WrapAnywhere
                 topPadding: 6
             }
-            FluCopyableText{
+            FluText{
                 id: itemArg_description
                 anchors{
                     top: itemArg_title.bottom
@@ -430,6 +433,7 @@ Item {
                 text: ""
                 font: FluTextStyle.Caption
                 wrapMode: Text.WrapAnywhere
+//                textFormat: Text.PlainText
                 topPadding: 6
                 rightPadding: 6
             }
@@ -440,11 +444,11 @@ Item {
                 }
                 itemArg_text.model = modelData.options
                 itemArg_text.show(modelData.value)
-                itemArg_title.text = modelData.title
+                itemArg_title.text = qsTr(modelData.title)
                 if( typeof modelData.description === 'undefined'){
                     return
                 }
-                itemArg_description.text = modelData.description
+                itemArg_description.text = qsTr(modelData.description)
             }
         }
     }
@@ -499,7 +503,7 @@ Item {
         const object = group_item.createObject(contentScrollable)
         if(object !== null){
             object.groupName = groupName
-            object.groupTitle = groupTitle
+            object.groupTitle = qsTr(groupTitle)
             object.argumentValue = argumentValue
 
             contentScrollable.content.push(object)

+ 1 - 1
script.py

@@ -87,7 +87,7 @@ class Script:
         from module.base.utils import save_image
         from module.handler.sensitive_info import (handle_sensitive_image,
                                                    handle_sensitive_logs)
-        if self.config.Error_SaveError:
+        if self.config.script.error.save_error:
             if not os.path.exists('./log/error'):
                 os.mkdir('./log/error')
             folder = f'./log/error/{int(time.time() * 1000)}'

+ 1 - 1
tasks/AreaBoss/config_boss.py

@@ -8,5 +8,5 @@ from pydantic import BaseModel, ValidationError, validator, Field
 class Boss(BaseModel):
     boss_number: int = Field(title='Boss Number',
                              default=3,
-                             description='[Boss数量]:默认为3\n 可选[1-3]',
+                             description='默认为3 可选[1-3]',
                              ge=1, le=3)

+ 14 - 14
tasks/Component/GeneralBattle/config_general_battle.py

@@ -16,35 +16,35 @@ class GreenMarkType(str, Enum):
 class GeneralBattleConfig(BaseModel):
 
     # 是否锁定阵容, 有些的战斗是外边的锁定阵容甚至有些的战斗没有锁定阵容的
-    lock_team_enable: bool = Field(default=False, description='[锁定阵容]:默认为False \n如果锁定阵容将无法启用预设队伍、加成功能')
+    lock_team_enable: bool = Field(default=False, description='lock_team_enable_help')
 
     # 是否启动 预设队伍
-    preset_enable: bool = Field(default=False, description='[启用预设]:默认为False')
+    preset_enable: bool = Field(default=False, description='preset_enable_help')
     # 选哪一个预设组
-    preset_group: int = Field(default=1, description='[设置预设组]:默认为1, 可选[1-7]', ge=1, le=7)
+    preset_group: int = Field(default=1, description='preset_group_help', ge=1, le=7)
     # 选哪一个队伍
-    preset_team: int = Field(default=1, description='[设置预设队伍]:默认为1, 可选[1-5]', ge=1, le=5)
+    preset_team: int = Field(default=1, description='preset_team_help', ge=1, le=5)
     # 是否启动开启buff
-    buff_enable: bool = Field(default=False, description='[启用加成]:默认为False')
+    buff_enable: bool = Field(default=False, description='buff_enable_help')
     # 是否点击觉醒Buff
-    buff_awake_click: bool = Field(default=False, description='[觉醒加成]:默认为False')
+    buff_awake_click: bool = Field(default=False, description='')
     # 是否点击御魂buff
-    buff_soul_click: bool = Field(default=False, description='[御魂加成]:默认为False')
+    buff_soul_click: bool = Field(default=False, description='')
     # 是否点击金币50buff
-    buff_gold_50_click: bool = Field(default=False, description='[金币50加成]:默认为False')
+    buff_gold_50_click: bool = Field(default=False, description='')
     # 是否点击金币100buff
-    buff_gold_100_click: bool = Field(default=False, description='[金币100加成]:默认为False')
+    buff_gold_100_click: bool = Field(default=False, description='')
     # 是否点击经验50buff
-    buff_exp_50_click: bool = Field(default=False, description='[经验50加成]:默认为False')
+    buff_exp_50_click: bool = Field(default=False, description='')
     # 是否点击经验100buff
-    buff_exp_100_click: bool = Field(default=False, description='[经验100加成]:默认为False')
+    buff_exp_100_click: bool = Field(default=False, description='')
 
     # 是否开启绿标
-    green_enable: bool = Field(default=False, description='[启用绿标]:默认为False')
+    green_enable: bool = Field(default=False, description='green_enable_help')
     # 选哪一个绿标
-    green_mark: GreenMarkType = Field(default=GreenMarkType.GREEN_LEFT1, description='[设置绿标]:默认为左一 \n可选[左一, 左二, 左三, 左四, 左五, 主阴阳师]')
+    green_mark: GreenMarkType = Field(default=GreenMarkType.GREEN_LEFT1, description='green_mark_help')
 
     # 是否启动战斗时随机点击或者随机滑动
-    random_click_swipt_enable: bool = Field(default=False, description='[战斗时随机点击或滑动]:默认为False \n防封优化,请注意这个与绿标功能冲突,可能会乱点绿标')
+    random_click_swipt_enable: bool = Field(default=False, description='random_click_swipt_enable_help')
 
 

+ 12 - 0
tasks/Component/GeneralInvite/assets.py

@@ -0,0 +1,12 @@
+from module.atom.image import RuleImage
+from module.atom.click import RuleClick
+from module.atom.long_click import RuleLongClick
+from module.atom.swipe import RuleSwipe
+from module.atom.ocr import RuleOcr
+from module.atom.list import RuleList
+
+# This file was automatically generated by module/dev_tools/assets_extract.py.
+# Don't modify it manually.
+class GeneralInviteAssets: 
+	pass
+

+ 6 - 6
tasks/Component/config_scheduler.py

@@ -6,16 +6,16 @@ from datetime import datetime, timedelta
 from pydantic import BaseModel, ValidationError, validator, Field
 
 class Scheduler(BaseModel):
-    enable: bool = Field(default=False, description='[是否启用]:默认为False')
-    next_run: datetime = Field(default="2023-01-01 00:00:00", description='[下次执行时间]:默认为2023-01-01 00:00:00\n 清空后回车设置当前的时间')
-    interval_days: int = Field(default=1, description='[间隔天数]:默认为1\n 可选0-7')
-    interval_hours: int = Field(default=0, description='[间隔小时]:默认为0\n 可选0-23')
-    interval_minutes: int = Field(default=0, description='[间隔分钟]:默认为0\n 可选0-59')
+    enable: bool = Field(default=False, description='enable_help')
+    next_run: datetime = Field(default="2023-01-01 00:00:00", description='next_run_help')
+    priority: int = Field(default=5, description='priority_help')
+    interval_days: int = Field(default=1, description='interval_days_help')
+    interval_hours: int = Field(default=0, description='interval_hours_help')
+    interval_minutes: int = Field(default=0, description='interval_minutes_help')
 
     @validator('next_run', pre=True, always=True)
     def parse_next_run(cls, value):
         if isinstance(value, str):
-            print('parse_next_run')
             try:
                 return datetime.fromisoformat(value)
             except ValueError:

+ 0 - 2
tasks/GameUi/game_ui.py

@@ -5,8 +5,6 @@ import time
 
 from tasks.GameUi.assets import GameUiAssets
 from tasks.base_task import BaseTask
-from tasks.GeneralBattle.general_battle import GeneralBattle
-from tasks.AreaBoss.assets import AreaBossAssets
 from module.logger import logger
 
 

+ 2 - 0
tasks/RealmRaid/assets.py

@@ -45,6 +45,8 @@ class RealmRaidAssets:
 	I_UNLOCK_2 = RuleImage(roi_front=(1002,643,30,41), roi_back=(1002,643,30,41), threshold=0.9, method="Template matching", file="./tasks/RealmRaid/res/res_unlock_2.png")
 	# 以锁图片,适配呱太 
 	I_LOCK_2 = RuleImage(roi_front=(1002,645,34,38), roi_back=(1002,645,34,38), threshold=0.9, method="Template matching", file="./tasks/RealmRaid/res/res_lock_2.png")
+	# description 
+	I_MEDAL_5_FROG = RuleImage(roi_front=(903,479,201,49), roi_back=(189,182,967,376), threshold=0.8, method="Template matching", file="./tasks/RealmRaid/res/res_medal_5_frog.png")
 
 
 	# Ocr Rule Assets

+ 2 - 2
tasks/RealmRaid/config.py

@@ -18,9 +18,9 @@ class AttackNumber(str, Enum):
 
 class RaidConfig(BaseModel):
     raid_mode: RaidMode = Field(title='Raid Mode', default=RaidMode.NORMAL,
-                                description='[挑战模式]:默认为退四打九\n 退四打九指每次执行前都会退出四次,然后在进攻九次')
+                                description='raid_mode_help')
     attack_number: AttackNumber = Field(title='Attack Number', default=AttackNumber.ALL,
-                                        description='[挑战次数]:默认为all,一直打到没有\n nine为打九次')
+                                        description='')
 
 class RealmRaid(BaseModel):
     scheduler: Scheduler = Field(default_factory=Scheduler)

+ 9 - 0
tasks/RealmRaid/res/image.json

@@ -151,5 +151,14 @@
     "method": "Template matching",
     "threshold": 0.9,
     "description": "以锁图片,适配呱太"
+  },
+  {
+    "itemName": "medal_5_frog",
+    "imageName": "res_medal_5_frog.png",
+    "roiFront": "903,479,201,49",
+    "roiBack": "189,182,967,376",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
   }
 ]

BIN
tasks/RealmRaid/res/res_medal_5_frog.png


+ 4 - 0
tasks/RealmRaid/script_task.py

@@ -100,6 +100,7 @@ class ScriptTask(GeneralBattle, GameUi, RealmRaidAssets):
         :return:
         """
         # 点击勋章的挑战 和挑战
+        time.sleep(0.2)
         is_click = False
         while 1:
             self.screenshot()
@@ -118,6 +119,9 @@ class ScriptTask(GeneralBattle, GameUi, RealmRaidAssets):
 
             if is_click:
                 continue
+            if self.appear_then_click(self.I_MEDAL_5_FROG, interval=1.5):
+                is_click = True
+                continue
             if self.appear_then_click(self.I_MEDAL_5, interval=1.5):
                 is_click = True
                 continue

+ 8 - 7
tasks/Script/config_device.py

@@ -28,17 +28,18 @@ class ControlMethod(str, Enum):
 
 class Device(BaseModel):
     serial: str = Field(default="auto",
-                        description='Common emulator Serial can be queried in the list belowUse "auto" to auto-detect emulators, but if multiple emulators are running or use emulators that do not support auto-detect, "auto" cannot be used and serial must be filled in manually')
+                        description='serial_help')
     handle: str = Field(default='auto',
-                        description='you can use auto or your emulator title')
-    package_name: PackageName = Field(default=PackageName.AUTO,
-                                      description='package name')
+                        description='handle_help')
+    package_name: PackageName = Field(title='Package Name',
+                                      default=PackageName.AUTO,
+                                      description='package_name_help')
     screenshot_method: ScreenshotMethod = Field(default=ScreenshotMethod.WINDOW_BACKGROUND,
-                                                description='only support window')
+                                                description='screenshot_method_help')
     control_method: ControlMethod = Field(default=ControlMethod.WINDOW_MESSAGE,
-                                          description='only support window')
+                                          description='control_method_help')
     adb_restart: bool = Field(default=False,
-                              description='')
+                              description='adb_restart_help')
 
 
 

+ 5 - 3
tasks/Script/config_error.py

@@ -8,8 +8,10 @@ from module.logger import logger
 
 class Error(BaseModel):
     handle_error: bool = Field(default=False,
-                               description='none')
+                               description='handle_error_help')
     save_error: bool = Field(default=False,
-                             description='none')
+                             description='')
     screenshot_length: int = Field(default=1,
-                                   description='The number of recent screenshots to save when something goes wrong')
+                                   description='')
+
+

+ 5 - 4
tasks/Script/config_optimization.py

@@ -12,10 +12,11 @@ class WhenTaskQueueEmpty(str, Enum):
 
 class Optimization(BaseModel):
     screenshot_interval: float = Field(default=0.3,
-                                       description='none')
+                                       description='screenshot_interval_help')
     combat_screenshot_interval: float = Field(default=1.0,
-                                              description='none')
+                                              description='combat_screenshot_interval_help')
     task_hoarding_duration: float = Field(default=0,
-                                          description='none')
+                                          description='task_hoarding_duration_help')
     when_task_queue_empty: WhenTaskQueueEmpty = Field(default=WhenTaskQueueEmpty.GOTO_HOME,
-                                                      description='you can select goto home where nothing to do')
+                                                      description='when_task_queue_empty_help')
+

+ 1 - 0
tasks/base_task.py

@@ -370,6 +370,7 @@ class BaseTask:
                           hours=task_object.scheduler.interval_hours,
                           minutes=task_object.scheduler.interval_minutes, )
         next_run = start_time + delta
+        next_run.replace(microsecond=0)
 
         task_object.scheduler.next_run = next_run
         self.config.save()