ソースを参照

Merge pull request #1514 from runhey/dev

Automated PR 2026.04.30
huangrunheng 6 ヶ月 前
親
コミット
4cb11eaed8

+ 69 - 0
.github/workflows/assets/tasks-i18n-2026-04-22.md

@@ -0,0 +1,69 @@
+# Tasks 子目录翻译
+
+自动生成文件 - 请勿手动修改
+
+| 目录 | 中文 |
+|------|------|
+| AbyssShadows | 狭间暗域 |
+| ActivityShikigami | 当期式神爬塔 |
+| AreaBoss | 地狱鬼王 |
+| AutoCheckinBigGod | 大神签到 |
+| BondlingFairyland | 契灵之境 |
+| CollectiveMissions | 集体任务 |
+| Component | (未找到翻译) |
+| DailyTrifles | 每日琐事 |
+| Delegation | 式神委派 |
+| DemonEncounter | 封魔之时 |
+| DemonRetreat | 首领退治 |
+| Dokan | 道馆 |
+| Duel | 斗技 |
+| DyeTrials | 灵染试炼 |
+| EternitySea | 永生之海 |
+| EvoZone | 觉醒副本 |
+| ExperienceYoukai | 经验妖怪 |
+| Exploration | 探索 |
+| FallenSun | 日轮之城 |
+| FindJade | 寻找协作任务 |
+| FloatParade | 花车巡游 |
+| FrogBoss | 对弈竞猜 |
+| GameUi | (未找到翻译) |
+| General | 通用 |
+| GlobalGame | 全局游戏设置 |
+| GoldYoukai | 金币妖怪 |
+| GoryouRealm | 御灵之境 |
+| GotoMain | (未找到翻译) |
+| GuildActivityMonitor | (未找到翻译) |
+| GuildBanquet | 寮宴会 |
+| HeroTest | 英杰试炼 |
+| Hunt | 狩猎战 |
+| Hyakkiyakou | 百鬼夜行 |
+| KekkaiActivation | 结界挂卡 |
+| KekkaiUtilize | 结界蹭卡 |
+| KittyShop | 猫咪铺子 |
+| MemoryScrolls | 绘卷 |
+| MetaDemon | 超鬼王 |
+| MysteryShop | 神秘商店 |
+| Nian | 年兽 |
+| Orochi | 八岐大蛇 |
+| OrochiMoans | 御魂悲鸣 |
+| Pets | 小猫咪 |
+| Quiz | 智力竞赛 |
+| RealmRaid | 个人突破 |
+| Restart | 重启 |
+| RichMan | 大富翁 |
+| RyouToppa | 寮突破 |
+| Script | 脚本 |
+| Secret | 秘闻之境 |
+| SixRealms | 六道之门 |
+| Sougenbi | 业原火 |
+| SoulsTidy | 御魂整理 |
+| Tako | 石距 |
+| TalismanPass | 花合战 |
+| TrueOrochi | 真·八岐大蛇 |
+| Utils | (未找到翻译) |
+| WantedQuests | 悬赏封印 |
+| WeeklyTrifles | 每周琐事 |
+
+## 来源说明
+- `module\config\i18n\zh_CN.xml` - 本仓库
+- https://raw.githubusercontent.com/runhey/OASX/master/lib/config/translation/i18n_cn.dart - 外部仓库 (OASX)

ファイルの差分が大きいため隠しています
+ 726 - 0
.github/workflows/pr-review-checklist.lock.yml


+ 128 - 0
.github/workflows/pr-review-checklist.md

@@ -0,0 +1,128 @@
+---
+name: "PR Review Checklist"
+description: 自动按外部 checklist 逐条审查 Pull Request,并只输出未通过项及修改建议
+on:
+  pull_request_target:
+    types: [opened, reopened]
+    branches:
+      - dev
+
+permissions:
+  contents: read
+  issues: read
+  pull-requests: read
+  checks: read
+  statuses: read
+
+tools:
+  github:
+    toolsets: [default]
+    min-integrity: none
+    lockdown: false
+
+imports:
+  - shared/engine.md
+  - shared/network.md
+
+safe-outputs:
+  add-comment:
+    max: 1
+    target: triggering
+
+timeout-minutes: 10
+---
+
+# PR Checklist Reviewer
+
+你是 OnmyojiAutoScript 项目的 Pull Request checklist 审查员。
+
+你的职责不是做通用风格 review,而是:
+
+- 读取仓库里的外部审查清单文件
+- 按清单条目顺序逐条审查当前 PR
+- 只保留未通过项
+- 按固定模板输出一条简洁评论
+
+## Mission
+
+你必须完成以下事情:
+
+1. 读取 `.github/workflows/shared/review-checklist.md`
+2. 严格按条目编号顺序逐条审查,不要跳项,不要合并
+3. 每条规则只允许使用以下状态之一:`通过` / `风险` / `不适用` / `不确定`
+4. 每条规则必须给出定位、一句简短依据和一句修改建议
+5. 输出时只列出 `风险` 和 `不确定` 项
+
+## Runtime Context
+
+- **仓库**: ${{ github.repository }}
+- **PR 编号**: ${{ github.event.pull_request.number }}
+- **PR 标题**: ${{ github.event.pull_request.title }}
+- **PR 作者**: @${{ github.actor }}
+- **当前 head SHA**: `${{ github.event.pull_request.head.sha }}`
+- **base SHA**: `${{ github.event.pull_request.base.sha }}`
+
+## Evidence Priority
+
+按以下优先级理解 PR:
+
+1. `.github/workflows/pr-learn/review-checklist.md`
+2. PR diff
+3. 改动文件列表
+4. 与改动文件相关的源码上下文
+5. PR 标题、描述、已有评论、review、status
+
+规则:
+
+- checklist 是审查框架,必须先读
+- 代码行为优先于 PR 文本叙述
+- 如果代码与 PR 叙述冲突,以代码行为为准
+
+## Output Contract
+
+### 评论模板
+
+必须按以下模板输出,不要改标题名称:
+
+```markdown
+<!-- pr-review-checklist:sha=${{ github.event.pull_request.head.sha }} -->
+## Findings
+- Cx [风险/不确定]
+  位置:...
+  原因:...
+  修改:...
+- Cy [风险/不确定]
+  位置:...
+  原因:...
+  修改:...
+- 如果没有未通过项,写:`- 未发现未通过项`
+```
+
+### 风格要求
+
+- 使用中文
+- 句子短,结论先行
+- `Findings` 里只写未通过项
+- `通过` 和 `不适用` 不要输出
+- 每条未通过项固定写四行:编号状态、位置、原因、修改
+- `位置` 至少写到文件路径;如果能确定,继续写到函数、类、方法、资源名或配置字段
+- 不输出 Mermaid
+- 不写诗、笑话、类比、花哨总结
+
+## Procedure
+
+1. 获取 PR 元数据、文件列表、diff、已有评论、review 和状态
+2. 读取 `.github/workflows/pr-learn/review-checklist.md`
+3. 检查是否已存在当前 `head SHA` 的标记评论;如有则 `noop`
+4. 按 checklist 顺序逐条审查 C1 到 C8
+5. 为每条给出状态、定位、一句依据和一句修改建议
+6. 仅收集状态为 `风险` 或 `不确定` 的条目作为 `Findings`
+7. 使用 `add-comment` 发布评论
+
+## Guardrails
+
+1. 结束前必须有 `add-comment` 或 `noop`
+2. 不允许只做内部分析而不交付结果
+3. 不允许跳过 checklist 条目
+4. 不允许把多个条目合并成一个结论
+5. 不执行 PR 代码,不依赖 PR 分支脚本形成结论

+ 46 - 15
.github/workflows/pr-review-intent.lock.yml

@@ -1,4 +1,4 @@
-# gh-aw-metadata: {"schema_version":"v3","frontmatter_hash":"58150fb525111e29c3624e99680fb7d157a06878e3af2083b9f24fe4e12d7065","compiler_version":"v0.68.3","strict":true,"agent_id":"claude","agent_model":"MiniMax-M2.7"}
+# gh-aw-metadata: {"schema_version":"v3","frontmatter_hash":"becc5fed9e22fd07d745f90ba113bf84ee1cb0fc0bbf5b96af9cfc43c0545de2","compiler_version":"v0.68.3","strict":true,"agent_id":"claude","agent_model":"MiniMax-M2.7"}
 # gh-aw-manifest: {"version":1,"secrets":["GH_AW_GITHUB_MCP_SERVER_TOKEN","GH_AW_GITHUB_TOKEN","GITHUB_TOKEN","MINIMAX_API_KEY"],"actions":[{"repo":"actions/checkout","sha":"de0fac2e4500dabe0009e67214ff5f5447ce83dd","version":"v6.0.2"},{"repo":"actions/download-artifact","sha":"3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c","version":"v8.0.1"},{"repo":"actions/github-script","sha":"373c709c69115d41ff229c7e5df9f8788daa9553","version":"v9"},{"repo":"actions/setup-node","sha":"53b83947a5a98c8d113130e565377fae1a50d02f","version":"v6.3.0"},{"repo":"actions/upload-artifact","sha":"043fb46d1a93c77aae656e7c1c64a875d1fc6a0a","version":"v7.0.1"},{"repo":"github/gh-aw-actions/setup","sha":"ba90f2186d7ad780ec640f364005fa24e797b360","version":"v0.68.3"}],"containers":[{"image":"ghcr.io/github/gh-aw-firewall/agent:0.25.20"},{"image":"ghcr.io/github/gh-aw-firewall/api-proxy:0.25.20"},{"image":"ghcr.io/github/gh-aw-firewall/squid:0.25.20"},{"image":"ghcr.io/github/gh-aw-mcpg:v0.2.19"},{"image":"ghcr.io/github/github-mcp-server:v0.32.0"},{"image":"node:lts-alpine"}]}
 # gh-aw-manifest: {"version":1,"secrets":["GH_AW_GITHUB_MCP_SERVER_TOKEN","GH_AW_GITHUB_TOKEN","GITHUB_TOKEN","MINIMAX_API_KEY"],"actions":[{"repo":"actions/checkout","sha":"de0fac2e4500dabe0009e67214ff5f5447ce83dd","version":"v6.0.2"},{"repo":"actions/download-artifact","sha":"3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c","version":"v8.0.1"},{"repo":"actions/github-script","sha":"373c709c69115d41ff229c7e5df9f8788daa9553","version":"v9"},{"repo":"actions/setup-node","sha":"53b83947a5a98c8d113130e565377fae1a50d02f","version":"v6.3.0"},{"repo":"actions/upload-artifact","sha":"043fb46d1a93c77aae656e7c1c64a875d1fc6a0a","version":"v7.0.1"},{"repo":"github/gh-aw-actions/setup","sha":"ba90f2186d7ad780ec640f364005fa24e797b360","version":"v0.68.3"}],"containers":[{"image":"ghcr.io/github/gh-aw-firewall/agent:0.25.20"},{"image":"ghcr.io/github/gh-aw-firewall/api-proxy:0.25.20"},{"image":"ghcr.io/github/gh-aw-firewall/squid:0.25.20"},{"image":"ghcr.io/github/gh-aw-mcpg:v0.2.19"},{"image":"ghcr.io/github/github-mcp-server:v0.32.0"},{"image":"node:lts-alpine"}]}
 #    ___                   _   _      
 #    ___                   _   _      
 #   / _ \                 | | (_)     
 #   / _ \                 | | (_)     
@@ -53,11 +53,12 @@
 
 
 name: "PR Review Intent"
 name: "PR Review Intent"
 "on":
 "on":
-  pull_request:
+  pull_request_target:
+    branches:
+    - dev
     types:
     types:
     - opened
     - opened
     - reopened
     - reopened
-  # roles: all # Roles processed as role check in pre-activation job
 
 
 permissions: {}
 permissions: {}
 
 
@@ -69,7 +70,8 @@ run-name: "PR Review Intent"
 
 
 jobs:
 jobs:
   activation:
   activation:
-    if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.id == github.repository_id
+    needs: pre_activation
+    if: needs.pre_activation.outputs.activated == 'true'
     runs-on: ubuntu-slim
     runs-on: ubuntu-slim
     permissions:
     permissions:
       actions: read
       actions: read
@@ -92,6 +94,7 @@ jobs:
         with:
         with:
           destination: ${{ runner.temp }}/gh-aw/actions
           destination: ${{ runner.temp }}/gh-aw/actions
           job-name: ${{ github.job }}
           job-name: ${{ github.job }}
+          trace-id: ${{ needs.pre_activation.outputs.setup-trace-id }}
       - name: Generate agentic run info
       - name: Generate agentic run info
         id: generate_aw_info
         id: generate_aw_info
         env:
         env:
@@ -182,14 +185,14 @@ jobs:
         run: |
         run: |
           bash "${RUNNER_TEMP}/gh-aw/actions/create_prompt_first.sh"
           bash "${RUNNER_TEMP}/gh-aw/actions/create_prompt_first.sh"
           {
           {
-          cat << 'GH_AW_PROMPT_8481873d5c4b6813_EOF'
+          cat << 'GH_AW_PROMPT_a147d06b37f19aa5_EOF'
           <system>
           <system>
-          GH_AW_PROMPT_8481873d5c4b6813_EOF
+          GH_AW_PROMPT_a147d06b37f19aa5_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/xpia.md"
           cat "${RUNNER_TEMP}/gh-aw/prompts/xpia.md"
           cat "${RUNNER_TEMP}/gh-aw/prompts/temp_folder_prompt.md"
           cat "${RUNNER_TEMP}/gh-aw/prompts/temp_folder_prompt.md"
           cat "${RUNNER_TEMP}/gh-aw/prompts/markdown.md"
           cat "${RUNNER_TEMP}/gh-aw/prompts/markdown.md"
           cat "${RUNNER_TEMP}/gh-aw/prompts/safe_outputs_prompt.md"
           cat "${RUNNER_TEMP}/gh-aw/prompts/safe_outputs_prompt.md"
-          cat << 'GH_AW_PROMPT_8481873d5c4b6813_EOF'
+          cat << 'GH_AW_PROMPT_a147d06b37f19aa5_EOF'
           <safe-output-tools>
           <safe-output-tools>
           Tools: add_comment, missing_tool, missing_data, noop
           Tools: add_comment, missing_tool, missing_data, noop
           </safe-output-tools>
           </safe-output-tools>
@@ -221,14 +224,14 @@ jobs:
           {{/if}}
           {{/if}}
           </github-context>
           </github-context>
           
           
-          GH_AW_PROMPT_8481873d5c4b6813_EOF
+          GH_AW_PROMPT_a147d06b37f19aa5_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          cat << 'GH_AW_PROMPT_8481873d5c4b6813_EOF'
+          cat << 'GH_AW_PROMPT_a147d06b37f19aa5_EOF'
           </system>
           </system>
           {{#runtime-import .github/workflows/shared/engine.md}}
           {{#runtime-import .github/workflows/shared/engine.md}}
           {{#runtime-import .github/workflows/shared/network.md}}
           {{#runtime-import .github/workflows/shared/network.md}}
           {{#runtime-import .github/workflows/pr-review-intent.md}}
           {{#runtime-import .github/workflows/pr-review-intent.md}}
-          GH_AW_PROMPT_8481873d5c4b6813_EOF
+          GH_AW_PROMPT_a147d06b37f19aa5_EOF
           } > "$GH_AW_PROMPT"
           } > "$GH_AW_PROMPT"
       - name: Interpolate variables and render templates
       - name: Interpolate variables and render templates
         uses: actions/github-script@373c709c69115d41ff229c7e5df9f8788daa9553 # v9
         uses: actions/github-script@373c709c69115d41ff229c7e5df9f8788daa9553 # v9
@@ -261,6 +264,7 @@ jobs:
           GH_AW_GITHUB_REPOSITORY: ${{ github.repository }}
           GH_AW_GITHUB_REPOSITORY: ${{ github.repository }}
           GH_AW_GITHUB_RUN_ID: ${{ github.run_id }}
           GH_AW_GITHUB_RUN_ID: ${{ github.run_id }}
           GH_AW_GITHUB_WORKSPACE: ${{ github.workspace }}
           GH_AW_GITHUB_WORKSPACE: ${{ github.workspace }}
+          GH_AW_NEEDS_PRE_ACTIVATION_OUTPUTS_ACTIVATED: ${{ needs.pre_activation.outputs.activated }}
         with:
         with:
           script: |
           script: |
             const { setupGlobals } = require('${{ runner.temp }}/gh-aw/actions/setup_globals.cjs');
             const { setupGlobals } = require('${{ runner.temp }}/gh-aw/actions/setup_globals.cjs');
@@ -282,7 +286,8 @@ jobs:
                 GH_AW_GITHUB_EVENT_PULL_REQUEST_TITLE: process.env.GH_AW_GITHUB_EVENT_PULL_REQUEST_TITLE,
                 GH_AW_GITHUB_EVENT_PULL_REQUEST_TITLE: process.env.GH_AW_GITHUB_EVENT_PULL_REQUEST_TITLE,
                 GH_AW_GITHUB_REPOSITORY: process.env.GH_AW_GITHUB_REPOSITORY,
                 GH_AW_GITHUB_REPOSITORY: process.env.GH_AW_GITHUB_REPOSITORY,
                 GH_AW_GITHUB_RUN_ID: process.env.GH_AW_GITHUB_RUN_ID,
                 GH_AW_GITHUB_RUN_ID: process.env.GH_AW_GITHUB_RUN_ID,
-                GH_AW_GITHUB_WORKSPACE: process.env.GH_AW_GITHUB_WORKSPACE
+                GH_AW_GITHUB_WORKSPACE: process.env.GH_AW_GITHUB_WORKSPACE,
+                GH_AW_NEEDS_PRE_ACTIVATION_OUTPUTS_ACTIVATED: process.env.GH_AW_NEEDS_PRE_ACTIVATION_OUTPUTS_ACTIVATED
               }
               }
             });
             });
       - name: Validate prompt placeholders
       - name: Validate prompt placeholders
@@ -407,9 +412,9 @@ jobs:
           mkdir -p "${RUNNER_TEMP}/gh-aw/safeoutputs"
           mkdir -p "${RUNNER_TEMP}/gh-aw/safeoutputs"
           mkdir -p /tmp/gh-aw/safeoutputs
           mkdir -p /tmp/gh-aw/safeoutputs
           mkdir -p /tmp/gh-aw/mcp-logs/safeoutputs
           mkdir -p /tmp/gh-aw/mcp-logs/safeoutputs
-          cat > "${RUNNER_TEMP}/gh-aw/safeoutputs/config.json" << 'GH_AW_SAFE_OUTPUTS_CONFIG_cdffe0403f80a342_EOF'
+          cat > "${RUNNER_TEMP}/gh-aw/safeoutputs/config.json" << 'GH_AW_SAFE_OUTPUTS_CONFIG_cfb86eaf8debc52f_EOF'
           {"add_comment":{"max":1,"target":"triggering"},"create_report_incomplete_issue":{},"missing_data":{},"missing_tool":{},"noop":{"max":1,"report-as-issue":"true"},"report_incomplete":{}}
           {"add_comment":{"max":1,"target":"triggering"},"create_report_incomplete_issue":{},"missing_data":{},"missing_tool":{},"noop":{"max":1,"report-as-issue":"true"},"report_incomplete":{}}
-          GH_AW_SAFE_OUTPUTS_CONFIG_cdffe0403f80a342_EOF
+          GH_AW_SAFE_OUTPUTS_CONFIG_cfb86eaf8debc52f_EOF
       - name: Write Safe Outputs Tools
       - name: Write Safe Outputs Tools
         env:
         env:
           GH_AW_TOOLS_META_JSON: |
           GH_AW_TOOLS_META_JSON: |
@@ -590,7 +595,7 @@ jobs:
           export GH_AW_ENGINE="claude"
           export GH_AW_ENGINE="claude"
           export MCP_GATEWAY_DOCKER_COMMAND='docker run -i --rm --network host -v /var/run/docker.sock:/var/run/docker.sock -e MCP_GATEWAY_PORT -e MCP_GATEWAY_DOMAIN -e MCP_GATEWAY_API_KEY -e MCP_GATEWAY_PAYLOAD_DIR -e MCP_GATEWAY_PAYLOAD_SIZE_THRESHOLD -e DEBUG -e MCP_GATEWAY_LOG_DIR -e GH_AW_MCP_LOG_DIR -e GH_AW_SAFE_OUTPUTS -e GH_AW_SAFE_OUTPUTS_CONFIG_PATH -e GH_AW_SAFE_OUTPUTS_TOOLS_PATH -e GH_AW_ASSETS_BRANCH -e GH_AW_ASSETS_MAX_SIZE_KB -e GH_AW_ASSETS_ALLOWED_EXTS -e DEFAULT_BRANCH -e GITHUB_MCP_SERVER_TOKEN -e GITHUB_MCP_GUARD_MIN_INTEGRITY -e GITHUB_MCP_GUARD_REPOS -e GITHUB_REPOSITORY -e GITHUB_SERVER_URL -e GITHUB_SHA -e GITHUB_WORKSPACE -e GITHUB_TOKEN -e GITHUB_RUN_ID -e GITHUB_RUN_NUMBER -e GITHUB_RUN_ATTEMPT -e GITHUB_JOB -e GITHUB_ACTION -e GITHUB_EVENT_NAME -e GITHUB_EVENT_PATH -e GITHUB_ACTOR -e GITHUB_ACTOR_ID -e GITHUB_TRIGGERING_ACTOR -e GITHUB_WORKFLOW -e GITHUB_WORKFLOW_REF -e GITHUB_WORKFLOW_SHA -e GITHUB_REF -e GITHUB_REF_NAME -e GITHUB_REF_TYPE -e GITHUB_HEAD_REF -e GITHUB_BASE_REF -e GH_AW_SAFE_OUTPUTS_PORT -e GH_AW_SAFE_OUTPUTS_API_KEY -v /tmp/gh-aw/mcp-payloads:/tmp/gh-aw/mcp-payloads:rw -v /opt:/opt:ro -v /tmp:/tmp:rw -v '"${GITHUB_WORKSPACE}"':'"${GITHUB_WORKSPACE}"':rw ghcr.io/github/gh-aw-mcpg:v0.2.19'
           export MCP_GATEWAY_DOCKER_COMMAND='docker run -i --rm --network host -v /var/run/docker.sock:/var/run/docker.sock -e MCP_GATEWAY_PORT -e MCP_GATEWAY_DOMAIN -e MCP_GATEWAY_API_KEY -e MCP_GATEWAY_PAYLOAD_DIR -e MCP_GATEWAY_PAYLOAD_SIZE_THRESHOLD -e DEBUG -e MCP_GATEWAY_LOG_DIR -e GH_AW_MCP_LOG_DIR -e GH_AW_SAFE_OUTPUTS -e GH_AW_SAFE_OUTPUTS_CONFIG_PATH -e GH_AW_SAFE_OUTPUTS_TOOLS_PATH -e GH_AW_ASSETS_BRANCH -e GH_AW_ASSETS_MAX_SIZE_KB -e GH_AW_ASSETS_ALLOWED_EXTS -e DEFAULT_BRANCH -e GITHUB_MCP_SERVER_TOKEN -e GITHUB_MCP_GUARD_MIN_INTEGRITY -e GITHUB_MCP_GUARD_REPOS -e GITHUB_REPOSITORY -e GITHUB_SERVER_URL -e GITHUB_SHA -e GITHUB_WORKSPACE -e GITHUB_TOKEN -e GITHUB_RUN_ID -e GITHUB_RUN_NUMBER -e GITHUB_RUN_ATTEMPT -e GITHUB_JOB -e GITHUB_ACTION -e GITHUB_EVENT_NAME -e GITHUB_EVENT_PATH -e GITHUB_ACTOR -e GITHUB_ACTOR_ID -e GITHUB_TRIGGERING_ACTOR -e GITHUB_WORKFLOW -e GITHUB_WORKFLOW_REF -e GITHUB_WORKFLOW_SHA -e GITHUB_REF -e GITHUB_REF_NAME -e GITHUB_REF_TYPE -e GITHUB_HEAD_REF -e GITHUB_BASE_REF -e GH_AW_SAFE_OUTPUTS_PORT -e GH_AW_SAFE_OUTPUTS_API_KEY -v /tmp/gh-aw/mcp-payloads:/tmp/gh-aw/mcp-payloads:rw -v /opt:/opt:ro -v /tmp:/tmp:rw -v '"${GITHUB_WORKSPACE}"':'"${GITHUB_WORKSPACE}"':rw ghcr.io/github/gh-aw-mcpg:v0.2.19'
           
           
-          cat << GH_AW_MCP_CONFIG_fa6d20bbab34cf23_EOF | bash "${RUNNER_TEMP}/gh-aw/actions/start_mcp_gateway.sh"
+          cat << GH_AW_MCP_CONFIG_f2bb9d437316fc33_EOF | bash "${RUNNER_TEMP}/gh-aw/actions/start_mcp_gateway.sh"
           {
           {
             "mcpServers": {
             "mcpServers": {
               "github": {
               "github": {
@@ -633,7 +638,7 @@ jobs:
               "payloadDir": "${MCP_GATEWAY_PAYLOAD_DIR}"
               "payloadDir": "${MCP_GATEWAY_PAYLOAD_DIR}"
             }
             }
           }
           }
-          GH_AW_MCP_CONFIG_fa6d20bbab34cf23_EOF
+          GH_AW_MCP_CONFIG_f2bb9d437316fc33_EOF
       - name: Download activation artifact
       - name: Download activation artifact
         uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
         with:
@@ -1185,6 +1190,32 @@ jobs:
             const { main } = require('${{ runner.temp }}/gh-aw/actions/parse_threat_detection_results.cjs');
             const { main } = require('${{ runner.temp }}/gh-aw/actions/parse_threat_detection_results.cjs');
             await main();
             await main();
 
 
+  pre_activation:
+    runs-on: ubuntu-slim
+    outputs:
+      activated: ${{ steps.check_membership.outputs.is_team_member == 'true' }}
+      matched_command: ''
+      setup-trace-id: ${{ steps.setup.outputs.trace-id }}
+    steps:
+      - name: Setup Scripts
+        id: setup
+        uses: github/gh-aw-actions/setup@ba90f2186d7ad780ec640f364005fa24e797b360 # v0.68.3
+        with:
+          destination: ${{ runner.temp }}/gh-aw/actions
+          job-name: ${{ github.job }}
+      - name: Check team membership for workflow
+        id: check_membership
+        uses: actions/github-script@373c709c69115d41ff229c7e5df9f8788daa9553 # v9
+        env:
+          GH_AW_REQUIRED_ROLES: "admin,maintainer,write"
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            const { setupGlobals } = require('${{ runner.temp }}/gh-aw/actions/setup_globals.cjs');
+            setupGlobals(core, github, context, exec, io, getOctokit);
+            const { main } = require('${{ runner.temp }}/gh-aw/actions/check_membership.cjs');
+            await main();
+
   safe_outputs:
   safe_outputs:
     needs:
     needs:
       - activation
       - activation

+ 11 - 2
.github/workflows/pr-review-intent.md

@@ -2,9 +2,10 @@
 name: "PR Review Intent"
 name: "PR Review Intent"
 description: 自动审计 Pull Request 的代码意图、隐含约束、实现对齐情况与发布风险
 description: 自动审计 Pull Request 的代码意图、隐含约束、实现对齐情况与发布风险
 on:
 on:
-  pull_request:
+  pull_request_target:
     types: [opened, reopened]
     types: [opened, reopened]
-  roles: all
+    branches:
+      - dev
 
 
 permissions:
 permissions:
   contents: read
   contents: read
@@ -186,10 +187,16 @@ Intent/Constraint 审计应尽量收敛到以下结论之一:
 - [用 2-4 条短句概括这次改动实际改变了什么行为或结构]
 - [用 2-4 条短句概括这次改动实际改变了什么行为或结构]
 
 
 ## Reconstructed Intent
 ## Reconstructed Intent
+<details><summary>点击此处展开</summary>
 - [仅在需要时输出:从代码推断出的最可能 intent]
 - [仅在需要时输出:从代码推断出的最可能 intent]
+</details>
+
 
 
 ## Observed Constraints
 ## Observed Constraints
+<details><summary>点击此处展开</summary>
 - [仅在需要时输出:这次实现依赖的关键约束、前提或边界]
 - [仅在需要时输出:这次实现依赖的关键约束、前提或边界]
+</details>
+
 
 
 ## Intent Alignment
 ## Intent Alignment
 - [明确说明:基本一致 / 只部分覆盖 / 引入额外行为变化 / 仍有关键不确定性]
 - [明确说明:基本一致 / 只部分覆盖 / 引入额外行为变化 / 仍有关键不确定性]
@@ -199,7 +206,9 @@ Intent/Constraint 审计应尽量收敛到以下结论之一:
 - [指出维护者应重点关注的 1-3 个风险点,聚焦影响范围与行为风险]
 - [指出维护者应重点关注的 1-3 个风险点,聚焦影响范围与行为风险]
 
 
 ## Validation Gaps
 ## Validation Gaps
+<details><summary>点击此处展开</summary>
 - [列出最重要的验证缺口;如果验证已经足够,也要明确写“未看到明显额外验证缺口”]
 - [列出最重要的验证缺口;如果验证已经足够,也要明确写“未看到明显额外验证缺口”]
+</details>
 ```
 ```
 
 
 ## Procedure
 ## Procedure

+ 67 - 0
.github/workflows/shared/review-checklist.md

@@ -0,0 +1,67 @@
+# PR Review Checklist
+
+这份清单用于 `gh-aw` 的 PR review。审查时必须按条目顺序逐条检查,不要跳项,不要合并。
+
+每条规则只允许给出以下四种状态之一:
+
+- `通过`:当前 PR 没看到明显问题
+- `风险`:当前 PR 存在明确风险或违反规则
+- `不适用`:这条规则与当前改动无关
+- `不确定`:证据不足,无法做出强结论
+
+输出时请使用条目编号,不要改编号。
+
+## C1. 变更范围与意图是否收敛
+
+- 检查这次 PR 是否围绕一个清晰目标展开,而不是把多个独立功能、修复、清理、顺手重构打包在一起。
+- 如果代码行为和 PR 标题/描述不一致,按代码行为判断,并指出叙述偏差。
+- 如果看起来是“顺手塞功能”或“把无关改动一起带进来”,标为 `风险`。
+
+## C2. 任务流程是否有明确退出条件
+
+- 重点看 `tasks/**/script_task.py`、`tasks/**/solo.py` 及同类任务入口。
+- 不接受把 `sleep` 当主控制逻辑,也不接受把 `wait_*` 伪装成另一种 `sleep`。
+- 点击、翻页、进入战斗、邀请、退出等流程应有失败重试、超时、异常或显式失败返回。
+- 出现理论上“不应继续执行”的路径时,不能静默卡住。
+
+## C3. 是否复用既有组件与全局能力
+
+- 优先复用现有组件、全局导航、通用战斗、通用邀请、调度逻辑。
+- 如果在任务侧或组件侧重复实现仓库已有能力,标为 `风险`。
+- 如果改动下沉到 `tasks/Component/**`、`module/**`、`tasks/GameUi/**`,要额外判断它是否真有共享价值。
+
+## C4. 页面导航与状态图是否闭环
+
+- 重点看 `tasks/GameUi/**/*.py`、`tasks/GameUi/page.py`、页面 JSON、页面图片与任务入口调用。
+- 新增或修改页面节点时,检查 link 是否有进有出,避免孤立节点。
+- 不要把 `page` 层扩展成承接过多业务判断的万能层。
+- 页面跳转、关闭弹窗、未知页面回退应优先复用现有 `ui_*` 体系。
+
+## C5. 资源、元数据、图片是否同步
+
+- 重点看 `tasks/**/assets.py`、`tasks/**/image.json`、`tasks/**/ocr.json`、`tasks/**/click.json` 与实际 PNG。
+- 不接受半同步状态:只改 `assets.py` 不改 JSON、只改 JSON 不改图、只换图不改声明。
+- 如果新增图片引用或新增 PNG,要检查是否与 `tasks/GlobalGame/**/*.png` 下已有素材重复。
+- 对全局通用按钮、确认框、取消框类资源,优先复用全局素材。
+
+## C6. 配置字段与翻译是否同步
+
+- 重点看 `tasks/**/config.py`、`tasks/Component/**/config.py`、`module/config/**/*.py`、`config/template.json`。
+- 新字段不应只是内部实现细节的外露。
+- 不要扭曲已有字段的既定语义。
+- 如果新增、重命名或删除了 Pydantic 字段,必须检查 `assets/i18n/**/*.json` 是否同步更新。
+- 如果需要校验器,优先写在对应 `config.py` 中并补齐必要导入。
+
+## C7. 基础层改动是否具有全局收益
+
+- 重点看 `module/atom/**/*.py`、`module/ocr/**/*.py`、`module/device/method/**/*.py`、`tasks/base_task.py`。
+- 对基础能力层改动要保守;如果收益只是局部性的,应优先留在任务侧处理。
+- 不要为了单任务、单活动或单场景收益破坏全局兼容性。
+- 涉及截图通道、输入方式、OCR 基础行为时,要特别关注真实运行兼容性。
+
+## C8. 依赖与运行材料是否改到真正生效的位置
+
+- 重点看 `requirements.txt`、`requirements-in.txt`、`deploy/docker/**/*`、`bin/droidcast/**/*`。
+- 不要只修改中间输入文件而遗漏最终生效文件。
+- 如果 `deploy/docker` 也维护 Python 依赖或镜像安装项,要把它视为最终生效路径的一部分。
+- 接入包、APK、外部运行材料要以真实可跑为准,而不是只看代码里能 import 或能调用。

BIN
tasks/ActivityShikigami/as/as_battle_main_to_records.png


BIN
tasks/ActivityShikigami/as/as_check_battle_main.png


BIN
tasks/ActivityShikigami/as/as_shi.png


BIN
tasks/ActivityShikigami/as/as_to_battle_main.png


+ 7 - 7
tasks/ActivityShikigami/as/pages.json

@@ -2,7 +2,7 @@
   {
   {
     "itemName": "shi",
     "itemName": "shi",
     "imageName": "as_shi.png",
     "imageName": "as_shi.png",
-    "roiFront": "1187,301,43,29",
+    "roiFront": "1182,379,43,29",
     "roiBack": "1164,134,83,393",
     "roiBack": "1164,134,83,393",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.7,
     "threshold": 0.7,
@@ -38,8 +38,8 @@
   {
   {
     "itemName": "to_battle_main",
     "itemName": "to_battle_main",
     "imageName": "as_to_battle_main.png",
     "imageName": "as_to_battle_main.png",
-    "roiFront": "861,229,39,176",
-    "roiBack": "752,170,238,269",
+    "roiFront": "825,309,39,176",
+    "roiBack": "737,264,238,269",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "进入主要的战斗界面"
     "description": "进入主要的战斗界面"
@@ -56,8 +56,8 @@
   {
   {
     "itemName": "check_battle_main",
     "itemName": "check_battle_main",
     "imageName": "as_check_battle_main.png",
     "imageName": "as_check_battle_main.png",
-    "roiFront": "845,560,39,45",
-    "roiBack": "626,477,415,203",
+    "roiFront": "27,637,62,58",
+    "roiBack": "1,510,415,203",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "description"
     "description": "description"
@@ -74,8 +74,8 @@
   {
   {
     "itemName": "battle_main_to_records",
     "itemName": "battle_main_to_records",
     "imageName": "as_battle_main_to_records.png",
     "imageName": "as_battle_main_to_records.png",
-    "roiFront": "1017,572,39,42",
-    "roiBack": "976,539,146,100",
+    "roiFront": "999,557,39,42",
+    "roiBack": "966,534,140,100",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.7,
     "threshold": 0.7,
     "description": "从main进入到式神录"
     "description": "从main进入到式神录"

+ 5 - 5
tasks/ActivityShikigami/assets.py

@@ -38,7 +38,7 @@ class ActivityShikigamiAssets:
 
 
 	# Image Rule Assets
 	# Image Rule Assets
 	# 进入活动 
 	# 进入活动 
-	I_SHI = RuleImage(roi_front=(1187,301,43,29), roi_back=(1164,134,83,393), threshold=0.7, method="Template matching", file="./tasks/ActivityShikigami/as/as_shi.png")
+	I_SHI = RuleImage(roi_front=(1182,379,43,29), roi_back=(1164,134,83,393), threshold=0.7, method="Template matching", file="./tasks/ActivityShikigami/as/as_shi.png")
 	# 左上角返回 
 	# 左上角返回 
 	I_BACK_GREEN = RuleImage(roi_front=(27,19,34,38), roi_back=(2,1,170,75), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_back_green.png")
 	I_BACK_GREEN = RuleImage(roi_front=(27,19,34,38), roi_back=(2,1,170,75), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_back_green.png")
 	# 右上跳过按钮 
 	# 右上跳过按钮 
@@ -46,15 +46,15 @@ class ActivityShikigamiAssets:
 	# 红色退出 
 	# 红色退出 
 	I_RED_EXIT = RuleImage(roi_front=(1162,96,39,38), roi_back=(1120,49,110,135), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_red_exit.png")
 	I_RED_EXIT = RuleImage(roi_front=(1162,96,39,38), roi_back=(1120,49,110,135), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_red_exit.png")
 	# 进入主要的战斗界面 
 	# 进入主要的战斗界面 
-	I_TO_BATTLE_MAIN = RuleImage(roi_front=(861,229,39,176), roi_back=(752,170,238,269), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_to_battle_main.png")
+	I_TO_BATTLE_MAIN = RuleImage(roi_front=(825,309,39,176), roi_back=(737,264,238,269), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_to_battle_main.png")
 	# 点击进入boss战斗页面 
 	# 点击进入boss战斗页面 
 	I_TO_BATTLE_BOSS = RuleImage(roi_front=(1076,241,37,136), roi_back=(934,209,234,327), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_to_battle_boss.png")
 	I_TO_BATTLE_BOSS = RuleImage(roi_front=(1076,241,37,136), roi_back=(934,209,234,327), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_to_battle_boss.png")
 	# description 
 	# description 
-	I_CHECK_BATTLE_MAIN = RuleImage(roi_front=(845,560,39,45), roi_back=(626,477,415,203), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_check_battle_main.png")
+	I_CHECK_BATTLE_MAIN = RuleImage(roi_front=(27,637,62,58), roi_back=(1,510,415,203), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_check_battle_main.png")
 	# description 
 	# description 
 	I_CHECK_BATTLE_BOSS = RuleImage(roi_front=(34,365,45,35), roi_back=(20,328,100,100), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_check_battle_boss.png")
 	I_CHECK_BATTLE_BOSS = RuleImage(roi_front=(34,365,45,35), roi_back=(20,328,100,100), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_check_battle_boss.png")
 	# 从main进入到式神录 
 	# 从main进入到式神录 
-	I_BATTLE_MAIN_TO_RECORDS = RuleImage(roi_front=(1017,572,39,42), roi_back=(976,539,146,100), threshold=0.7, method="Template matching", file="./tasks/ActivityShikigami/as/as_battle_main_to_records.png")
+	I_BATTLE_MAIN_TO_RECORDS = RuleImage(roi_front=(999,557,39,42), roi_back=(966,534,140,100), threshold=0.7, method="Template matching", file="./tasks/ActivityShikigami/as/as_battle_main_to_records.png")
 	# description 
 	# description 
 	I_TO_BATTLE_MAIN_2 = RuleImage(roi_front=(15,94,247,38), roi_back=(2,68,311,100), threshold=0.65, method="Template matching", file="./tasks/ActivityShikigami/as/as_to_battle_main_2.png")
 	I_TO_BATTLE_MAIN_2 = RuleImage(roi_front=(15,94,247,38), roi_back=(2,68,311,100), threshold=0.65, method="Template matching", file="./tasks/ActivityShikigami/as/as_to_battle_main_2.png")
 	# 确认跳过 
 	# 确认跳过 
@@ -94,7 +94,7 @@ class ActivityShikigamiAssets:
 	# 挑战 
 	# 挑战 
 	O_FIRE = RuleOcr(roi=(1124,599,96,50), area=(1123,570,106,100), mode="Single", method="Default", keyword="挑战", name="fire")
 	O_FIRE = RuleOcr(roi=(1124,599,96,50), area=(1123,570,106,100), mode="Single", method="Default", keyword="挑战", name="fire")
 	# 体力的数量检测 
 	# 体力的数量检测 
-	O_REMAIN_AP = RuleOcr(roi=(836,25,51,30), area=(836,25,51,30), mode="DigitCounter", method="Default", keyword="", name="remain_ap")
+	O_REMAIN_AP = RuleOcr(roi=(761,25,51,30), area=(761,25,51,30), mode="DigitCounter", method="Default", keyword="", name="remain_ap")
 	# 活动体力的剩余检测 
 	# 活动体力的剩余检测 
 	O_REMAIN_PASS = RuleOcr(roi=(518,18,88,28), area=(514,12,97,38), mode="DigitCounter", method="Default", keyword="", name="remain_pass")
 	O_REMAIN_PASS = RuleOcr(roi=(518,18,88,28), area=(514,12,97,38), mode="DigitCounter", method="Default", keyword="", name="remain_pass")
 	# 还有多少次购买体力的机会 
 	# 还有多少次购买体力的机会 

+ 2 - 2
tasks/ActivityShikigami/fire/ocr.json

@@ -10,8 +10,8 @@
   },
   },
   {
   {
     "itemName": "remain_ap",
     "itemName": "remain_ap",
-    "roiFront": "836,25,51,30",
-    "roiBack": "836,25,51,30",
+    "roiFront": "761,25,51,30",
+    "roiBack": "761,25,51,30",
     "mode": "DigitCounter",
     "mode": "DigitCounter",
     "method": "Default",
     "method": "Default",
     "keyword": "",
     "keyword": "",

+ 1 - 1
tasks/Component/GeneralInvite/assets.py

@@ -54,7 +54,7 @@ class GeneralInviteAssets:
 	# description 
 	# description 
 	I_FLAG_1_OFF = RuleImage(roi_front=(353,126,58,22), roi_back=(353,126,58,22), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_flag_1_off.png")
 	I_FLAG_1_OFF = RuleImage(roi_front=(353,126,58,22), roi_back=(353,126,58,22), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_flag_1_off.png")
 	# description 
 	# description 
-	I_FLAG_2_ON = RuleImage(roi_front=(471,128,54,18), roi_back=(471,128,54,18), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_flag_2_on.png")
+	I_FLAG_2_ON = RuleImage(roi_front=(472,82,32,11), roi_back=(454,74,56,26), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_flag_2_on.png")
 	# description 
 	# description 
 	I_FLAG_2_OFF = RuleImage(roi_front=(469,127,58,21), roi_back=(469,127,58,21), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_flag_2_off.png")
 	I_FLAG_2_OFF = RuleImage(roi_front=(469,127,58,21), roi_back=(469,127,58,21), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_flag_2_off.png")
 	# description 
 	# description 

BIN
tasks/Component/GeneralInvite/gi/gi_flag_2_on.png


+ 2 - 2
tasks/Component/GeneralInvite/gi/image.json

@@ -191,8 +191,8 @@
   {
   {
     "itemName": "flag_2_on",
     "itemName": "flag_2_on",
     "imageName": "gi_flag_2_on.png",
     "imageName": "gi_flag_2_on.png",
-    "roiFront": "471,128,54,18",
-    "roiBack": "471,128,54,18",
+    "roiFront": "472,82,32,11",
+    "roiBack": "454,74,56,26",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "description"
     "description": "description"

+ 21 - 2
tasks/DemonEncounter/script_task.py

@@ -15,7 +15,7 @@ from module.base.timer import Timer
 from tasks.Component.SwitchSoul.switch_soul import SwitchSoul
 from tasks.Component.SwitchSoul.switch_soul import SwitchSoul
 from tasks.DemonEncounter.config import BossType, DemonEncounter, convert_to_general_battle_config
 from tasks.DemonEncounter.config import BossType, DemonEncounter, convert_to_general_battle_config
 from tasks.GameUi.game_ui import GameUi
 from tasks.GameUi.game_ui import GameUi
-from tasks.GameUi.page import page_demon_encounter, page_shikigami_records
+from tasks.GameUi.page import page_demon_encounter, page_demon_encounter_realworld, page_shikigami_records
 from tasks.DemonEncounter.assets import DemonEncounterAssets
 from tasks.DemonEncounter.assets import DemonEncounterAssets
 from tasks.Component.GeneralBattle.general_battle import GeneralBattle
 from tasks.Component.GeneralBattle.general_battle import GeneralBattle
 from tasks.Component.GeneralBattle.config_general_battle import GeneralBattleConfig
 from tasks.Component.GeneralBattle.config_general_battle import GeneralBattleConfig
@@ -47,7 +47,7 @@ class ScriptTask(GameUi, GeneralBattle, DemonEncounterAssets, SwitchSoul):
         if soul_config.enable or best_soul_config.enable:
         if soul_config.enable or best_soul_config.enable:
             self.ui_goto(page_shikigami_records)
             self.ui_goto(page_shikigami_records)
             self.checkout_soul()
             self.checkout_soul()
-        self.ui_goto(page_demon_encounter)
+        self.ui_goto(page_demon_encounter_realworld)
         self.execute_lantern()
         self.execute_lantern()
         self.execute_boss()
         self.execute_boss()
 
 
@@ -544,6 +544,25 @@ class ScriptTask(GameUi, GeneralBattle, DemonEncounterAssets, SwitchSoul):
         boss_name = BossType(datetime.now().weekday()).name
         boss_name = BossType(datetime.now().weekday()).name
         return getattr(self.conf.best_demon_boss_config, f'best_demon_{boss_name}_select', False)
         return getattr(self.conf.best_demon_boss_config, f'best_demon_{boss_name}_select', False)
 
 
+    def wait_and_click(self, target) -> bool:
+        """
+        等待目标出现并点击,然后返回True
+        :param target: 图片规则
+        :return: 点击成功返回True
+        """
+        from module.base.timer import Timer
+        from module.exception import TaskEnd
+        timeout = 60
+        timer = Timer(timeout)
+        timer.start()
+        while not timer.reached():
+            self.screenshot()
+            if self.appear(target):
+                if self.appear_then_click(target, interval=1):
+                    return True
+        logger.warning(f'wait_and_click {target.name} timeout')
+        return False
+
 
 
 if __name__ == '__main__':
 if __name__ == '__main__':
     from module.config.config import Config
     from module.config.config import Config

+ 7 - 1
tasks/GameUi/assets.py

@@ -115,7 +115,11 @@ class GameUiAssets:
 	# 斗技主界面左上角文字图像 
 	# 斗技主界面左上角文字图像 
 	I_CHECK_DUEL = RuleImage(roi_front=(149,16,64,38), roi_back=(133,0,110,74), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_check_duel.png")
 	I_CHECK_DUEL = RuleImage(roi_front=(149,16,64,38), roi_back=(133,0,110,74), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_check_duel.png")
 	# description 
 	# description 
-	I_CHECK_DEMON_ENCOUNTER = RuleImage(roi_front=(26,658,42,43), roi_back=(2,619,100,100), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_check_demon_encounter.png")
+	I_CHECK_DEMON_ENCOUNTER = RuleImage(roi_front=(153,16,129,38), roi_back=(153,16,129,38), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_check_demon_encounter.png")
+	# 检查逢魔之时现世逢魔界面 
+	I_CHECK_DEMON_ENCOUNTER_REALWORLD = RuleImage(roi_front=(26,658,42,43), roi_back=(2,619,100,100), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_check_demon_encounter_realworld.png")
+	# 逢魔之时进入现世逢魔 
+	I_DEMON_ENCOUNTER_REALWORLD_GOTO = RuleImage(roi_front=(994,485,106,30), roi_back=(994,485,106,30), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_demon_encounter_realworld.png")
 	# 检查狩猎战界面 
 	# 检查狩猎战界面 
 	I_CHECK_HUNT = RuleImage(roi_front=(575,30,46,25), roi_back=(553,1,81,68), threshold=0.7, method="Template matching", file="./tasks/GameUi/page/page_check_hunt.png")
 	I_CHECK_HUNT = RuleImage(roi_front=(575,30,46,25), roi_back=(553,1,81,68), threshold=0.7, method="Template matching", file="./tasks/GameUi/page/page_check_hunt.png")
 	# 检查狩猎战麒麟界面 
 	# 检查狩猎战麒麟界面 
@@ -183,6 +187,8 @@ class GameUiAssets:
 	I_DLC_CLOSE = RuleImage(roi_front=(916,147,24,25), roi_back=(916,147,24,25), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/store_dlc_close.png")
 	I_DLC_CLOSE = RuleImage(roi_front=(916,147,24,25), roi_back=(916,147,24,25), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/store_dlc_close.png")
 	# 退出战斗按钮 
 	# 退出战斗按钮 
 	I_BACK_BATTLE = RuleImage(roi_front=(24,19,40,38), roi_back=(0,0,90,85), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_back_battle.png")
 	I_BACK_BATTLE = RuleImage(roi_front=(24,19,40,38), roi_back=(0,0,90,85), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_back_battle.png")
+	# 进入现世逢魔 
+	I_DEMON_ENCOUNTER_REALWORLD = RuleImage(roi_front=(994,485,106,30), roi_back=(994,485,106,30), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_demon_encounter_realworld.png")
 
 
 
 
 	# Image Rule Assets
 	# Image Rule Assets

+ 4 - 0
tasks/GameUi/page.py

@@ -127,6 +127,10 @@ page_town.link(button=G.I_TOWN_GOTO_DUEL, destination=page_duel)
 page_demon_encounter = Page(G.I_CHECK_DEMON_ENCOUNTER)
 page_demon_encounter = Page(G.I_CHECK_DEMON_ENCOUNTER)
 page_demon_encounter.link(button=G.I_BACK_YOLLOW, destination=page_town)
 page_demon_encounter.link(button=G.I_BACK_YOLLOW, destination=page_town)
 page_town.link(button=G.I_TOWN_GOTO_DEMON_ENCOUNTER, destination=page_demon_encounter)
 page_town.link(button=G.I_TOWN_GOTO_DEMON_ENCOUNTER, destination=page_demon_encounter)
+# 逢魔之时现世逢魔 demon_encounter_realworld
+page_demon_encounter_realworld = Page(G.I_CHECK_DEMON_ENCOUNTER_REALWORLD)
+page_demon_encounter_realworld.link(button=G.I_BACK_YOLLOW, destination=page_demon_encounter)
+page_demon_encounter.link(button=G.I_DEMON_ENCOUNTER_REALWORLD_GOTO, destination=page_demon_encounter_realworld)
 # 狩猎战 hunt
 # 狩猎战 hunt
 page_hunt = Page(G.I_CHECK_HUNT)
 page_hunt = Page(G.I_CHECK_HUNT)
 page_hunt.link(button=G.I_BACK_YOLLOW, destination=page_town)
 page_hunt.link(button=G.I_BACK_YOLLOW, destination=page_town)

BIN
tasks/GameUi/page/page_check_demon_encounter.png


BIN
tasks/GameUi/page/page_check_demon_encounter_realworld.png


BIN
tasks/GameUi/page/page_demon_encounter_realworld.png


+ 19 - 1
tasks/GameUi/page/page_img_2.json

@@ -83,11 +83,29 @@
   {
   {
     "itemName": "check_demon_encounter",
     "itemName": "check_demon_encounter",
     "imageName": "page_check_demon_encounter.png",
     "imageName": "page_check_demon_encounter.png",
+    "roiFront": "153,16,129,38",
+    "roiBack": "153,16,129,38",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "check_demon_encounter_realworld",
+    "imageName": "page_check_demon_encounter_realworld.png",
     "roiFront": "26,658,42,43",
     "roiFront": "26,658,42,43",
     "roiBack": "2,619,100,100",
     "roiBack": "2,619,100,100",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
-    "description": "description"
+    "description": "检查逢魔之时现世逢魔界面"
+  },
+  {
+    "itemName": "demon_encounter_realworld_goto",
+    "imageName": "page_demon_encounter_realworld.png",
+    "roiFront": "994,485,106,30",
+    "roiBack": "994,485,106,30",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "逢魔之时进入现世逢魔"
   },
   },
   {
   {
     "itemName": "check_hunt",
     "itemName": "check_hunt",

+ 9 - 0
tasks/GameUi/page/page_img_3.json

@@ -205,5 +205,14 @@
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "退出战斗按钮"
     "description": "退出战斗按钮"
+  },
+  {
+    "itemName": "demon_encounter_realworld",
+    "imageName": "page_demon_encounter_realworld.png",
+    "roiFront": "994,485,106,30",
+    "roiBack": "994,485,106,30",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "进入现世逢魔"
   }
   }
 ]
 ]

この差分においてかなりの量のファイルが変更されているため、一部のファイルを表示していません