فهرست منبع

Merge nearaura dev through f1ba2a5c and update mall recognition

After runhey returned Repository not found, integrate both fallback
commits in 09571eb4..f1ba2a5c. Use the upstream mall PNG unchanged
and match its 0.6 threshold in the runtime rule and resource JSON.
Preserve the search area, alternate purple sign and bounded navigation.

Reuse existing automated PRs and the hosted CLI. Keep the fork's
Thursday creation and separate five-hour merge delay per 3969a93a:
the upstream replacement would immediately promote dev to master twice
a week. Retain the separate merge workflow and give the create job
read-only contents access. No new promotion or mirror targets.

Validation: 556 pytest tests passed, including both FrogBoss suites
(three deprecation warnings). Checked PNG bytes, dimensions, rule and
JSON agreement, imports, six synthetic matches and git diff --check.
Exercised both PR lookup paths offline and verified both workflow
schedules. No emulator or hosted workflow run.
unknown 5 روز پیش
والد
کامیت
74bda95908
4فایلهای تغییر یافته به همراه21 افزوده شده و 15 حذف شده
  1. 19 13
      .github/workflows/auto-create-pr.yaml
  2. 1 1
      tasks/GameUi/assets.py
  3. 1 1
      tasks/GameUi/page/image_main.json
  4. BIN
      tasks/GameUi/page/page_check_mall.png

+ 19 - 13
.github/workflows/auto-create-pr.yaml

@@ -6,27 +6,33 @@ on:
     - cron: '7 13 * * 4'
     - cron: '7 13 * * 4'
   workflow_dispatch:
   workflow_dispatch:
 
 
+permissions:
+  contents: read
+  pull-requests: write
+
 jobs:
 jobs:
   create-pr:
   create-pr:
     runs-on: ubuntu-latest
     runs-on: ubuntu-latest
     steps:
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Install GitHub CLI
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y curl
-          curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg
-          echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null
-          sudo apt-get update
-          sudo apt-get install -y gh
-
-      - name: Create Pull Request
+      - name: Create or find automated sync PR
         env:
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GH_REPO: ${{ github.repository }}
           TZ: Asia/Shanghai
           TZ: Asia/Shanghai
         run: |
         run: |
+          PR_NUMBER=$(gh pr list \
+            --base master \
+            --head dev \
+            --state open \
+            --label automated \
+            --json number \
+            --jq '.[0].number')
+
+          if [ -n "$PR_NUMBER" ]; then
+            echo "Automated sync PR #$PR_NUMBER is already open."
+            exit 0
+          fi
+
           CURRENT_DATE=$(date +%Y.%m.%d)
           CURRENT_DATE=$(date +%Y.%m.%d)
           gh pr create \
           gh pr create \
             --base master \
             --base master \

+ 1 - 1
tasks/GameUi/assets.py

@@ -144,7 +144,7 @@ class GameUiAssets:
 	# 花合战页面标志
 	# 花合战页面标志
 	I_CHECK_DAILY = RuleImage(roi_front=(28,515,58,62), roi_back=(1,487,154,145), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_check_daily.png")
 	I_CHECK_DAILY = RuleImage(roi_front=(28,515,58,62), roi_back=(1,487,154,145), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_check_daily.png")
 	# 商店页面标志
 	# 商店页面标志
-	I_CHECK_MALL = RuleImage(roi_front=(1087,413,47,114), roi_back=(1043,397,116,155), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_check_mall.png")
+	I_CHECK_MALL = RuleImage(roi_front=(1087,413,47,114), roi_back=(1043,397,116,155), threshold=0.6, method="Template matching", file="./tasks/GameUi/page/page_check_mall.png")
 	# 商店页面标志(紫色招牌)
 	# 商店页面标志(紫色招牌)
 	I_CHECK_MALL_PURPLE = RuleImage(roi_front=(231,455,131,78), roi_back=(201,432,185,121), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_check_mall_purple.png")
 	I_CHECK_MALL_PURPLE = RuleImage(roi_front=(231,455,131,78), roi_back=(201,432,185,121), threshold=0.8, method="Template matching", file="./tasks/GameUi/page/page_check_mall_purple.png")
 	# 商店推荐页面标志
 	# 商店推荐页面标志

+ 1 - 1
tasks/GameUi/page/image_main.json

@@ -167,7 +167,7 @@
     "roiFront": "1087,413,47,114",
     "roiFront": "1087,413,47,114",
     "roiBack": "1043,397,116,155",
     "roiBack": "1043,397,116,155",
     "method": "Template matching",
     "method": "Template matching",
-    "threshold": 0.8,
+    "threshold": 0.6,
     "description": "商店页面标志"
     "description": "商店页面标志"
   },
   },
   {
   {

BIN
tasks/GameUi/page/page_check_mall.png