Merge branch 'test'

update:修改mvp字段
Merge branch 'test'
2026-07-15 15:23:57 +08:00 · 2026-07-15 15:22:31 +08:00 · 2026-07-15 09:55:37 +08:00 · 2026-07-15 09:55:01 +08:00 · 2026-07-14 17:59:52 +08:00 · 2026-07-13 14:50:21 +08:00
69 changed files with 6255 additions and 1092 deletions
@@ -1,3 +1,9 @@
 {
-    "i18n-ally.localesPaths": []
-}
+  "i18n-ally.localesPaths": [],
+  "files.watcherExclude": {
+    "**/dist/**": true
+  },
+  "search.exclude": {
+    "**/dist/**": true
+  }
+}
@@ -12,5 +12,6 @@
  },
  "vueCompilerOptions": {
    "plugins": ["@uni-helper/uni-types/volar-plugin"]
-  }
+  },
+  "exclude": ["node_modules", "dist"]
 }
@@ -26,6 +26,8 @@
        "@dcloudio/uni-quickapp-webview": "3.0.0-4060620250520001",
        "@dcloudio/uni-ui": "^1.5.11",
        "pinia": "2.0.36",
+        "pinia-plugin-persistedstate": "3.2.1",
+        "protobufjs": "^8.7.0",
        "vue": "^3.4.21",
        "vue-i18n": "^9.1.9"
      },
@@ -2422,6 +2424,70 @@
        "vite": "^5.2.8"
      }
    },
+    "node_modules/@esbuild/aix-ppc64": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.20.2.tgz",
+      "integrity": "sha512-D+EBOJHXdNZcLJRBkhENNG8Wji2kgc9AZ9KiPr1JuZjsNtyHzrsfLRrY0tk2H2aoFu6RANO1y1iPPUCDYWkb5g==",
+      "cpu": [
+        "ppc64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "aix"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/android-arm": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.20.2.tgz",
+      "integrity": "sha512-t98Ra6pw2VaDhqNWO2Oph2LXbz/EJcnLmKLGBJwEwXX/JAN83Fym1rU8l0JUWK6HkIbWONCSSatf4sf2NBRx/w==",
+      "cpu": [
+        "arm"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/android-arm64": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.20.2.tgz",
+      "integrity": "sha512-mRzjLacRtl/tWU0SvD8lUEwb61yP9cqQo6noDZP/O8VkwafSYwZ4yWy24kan8jE/IMERpYncRt2dw438LP3Xmg==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/android-x64": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.20.2.tgz",
+      "integrity": "sha512-btzExgV+/lMGDDa194CcUQm53ncxzeBrWJcncOBxuC6ndBkKxnHdFJn86mCIgTELsooUmwUm9FkhSp5HYu00Rg==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
    "node_modules/@esbuild/darwin-arm64": {
      "version": "0.20.2",
      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.20.2.tgz",
@@ -2438,6 +2504,294 @@
        "node": ">=12"
      }
    },
+    "node_modules/@esbuild/darwin-x64": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.20.2.tgz",
+      "integrity": "sha512-tBcXp9KNphnNH0dfhv8KYkZhjc+H3XBkF5DKtswJblV7KlT9EI2+jeA8DgBjp908WEuYll6pF+UStUCfEpdysA==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/freebsd-arm64": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.20.2.tgz",
+      "integrity": "sha512-d3qI41G4SuLiCGCFGUrKsSeTXyWG6yem1KcGZVS+3FYlYhtNoNgYrWcvkOoaqMhwXSMrZRl69ArHsGJ9mYdbbw==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/freebsd-x64": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.20.2.tgz",
+      "integrity": "sha512-d+DipyvHRuqEeM5zDivKV1KuXn9WeRX6vqSqIDgwIfPQtwMP4jaDsQsDncjTDDsExT4lR/91OLjRo8bmC1e+Cw==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-arm": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.20.2.tgz",
+      "integrity": "sha512-VhLPeR8HTMPccbuWWcEUD1Az68TqaTYyj6nfE4QByZIQEQVWBB8vup8PpR7y1QHL3CpcF6xd5WVBU/+SBEvGTg==",
+      "cpu": [
+        "arm"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-arm64": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.20.2.tgz",
+      "integrity": "sha512-9pb6rBjGvTFNira2FLIWqDk/uaf42sSyLE8j1rnUpuzsODBq7FvpwHYZxQ/It/8b+QOS1RYfqgGFNLRI+qlq2A==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-ia32": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.20.2.tgz",
+      "integrity": "sha512-o10utieEkNPFDZFQm9CoP7Tvb33UutoJqg3qKf1PWVeeJhJw0Q347PxMvBgVVFgouYLGIhFYG0UGdBumROyiig==",
+      "cpu": [
+        "ia32"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-loong64": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.20.2.tgz",
+      "integrity": "sha512-PR7sp6R/UC4CFVomVINKJ80pMFlfDfMQMYynX7t1tNTeivQ6XdX5r2XovMmha/VjR1YN/HgHWsVcTRIMkymrgQ==",
+      "cpu": [
+        "loong64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-mips64el": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.20.2.tgz",
+      "integrity": "sha512-4BlTqeutE/KnOiTG5Y6Sb/Hw6hsBOZapOVF6njAESHInhlQAghVVZL1ZpIctBOoTFbQyGW+LsVYZ8lSSB3wkjA==",
+      "cpu": [
+        "mips64el"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-ppc64": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.20.2.tgz",
+      "integrity": "sha512-rD3KsaDprDcfajSKdn25ooz5J5/fWBylaaXkuotBDGnMnDP1Uv5DLAN/45qfnf3JDYyJv/ytGHQaziHUdyzaAg==",
+      "cpu": [
+        "ppc64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-riscv64": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.20.2.tgz",
+      "integrity": "sha512-snwmBKacKmwTMmhLlz/3aH1Q9T8v45bKYGE3j26TsaOVtjIag4wLfWSiZykXzXuE1kbCE+zJRmwp+ZbIHinnVg==",
+      "cpu": [
+        "riscv64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-s390x": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.20.2.tgz",
+      "integrity": "sha512-wcWISOobRWNm3cezm5HOZcYz1sKoHLd8VL1dl309DiixxVFoFe/o8HnwuIwn6sXre88Nwj+VwZUvJf4AFxkyrQ==",
+      "cpu": [
+        "s390x"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-x64": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.20.2.tgz",
+      "integrity": "sha512-1MdwI6OOTsfQfek8sLwgyjOXAu+wKhLEoaOLTjbijk6E2WONYpH9ZU2mNtR+lZ2B4uwr+usqGuVfFT9tMtGvGw==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/netbsd-x64": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.20.2.tgz",
+      "integrity": "sha512-K8/DhBxcVQkzYc43yJXDSyjlFeHQJBiowJ0uVL6Tor3jGQfSGHNNJcWxNbOI8v5k82prYqzPuwkzHt3J1T1iZQ==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/openbsd-x64": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.20.2.tgz",
+      "integrity": "sha512-eMpKlV0SThJmmJgiVyN9jTPJ2VBPquf6Kt/nAoo6DgHAoN57K15ZghiHaMvqjCye/uU4X5u3YSMgVBI1h3vKrQ==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/sunos-x64": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.20.2.tgz",
+      "integrity": "sha512-2UyFtRC6cXLyejf/YEld4Hajo7UHILetzE1vsRcGL3earZEW77JxrFjH4Ez2qaTiEfMgAXxfAZCm1fvM/G/o8w==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "sunos"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/win32-arm64": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.20.2.tgz",
+      "integrity": "sha512-GRibxoawM9ZCnDxnP3usoUDO9vUkpAxIIZ6GQI+IlVmr5kP3zUq+l17xELTHMWTWzjxa2guPNyrpq1GWmPvcGQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/win32-ia32": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.20.2.tgz",
+      "integrity": "sha512-HfLOfn9YWmkSKRQqovpnITazdtquEW8/SoHW7pWpuEeguaZI4QnCRW6b+oZTztdBnZOS2hqJ6im/D5cPzBTTlQ==",
+      "cpu": [
+        "ia32"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/win32-x64": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.20.2.tgz",
+      "integrity": "sha512-N49X4lJX27+l9jbLKSqZ6bKNjzQvHaT8IIFUy+YIqmXQdjYCToGWwOItDrfby14c78aDd5NHQl29xingXfCdLQ==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
    "node_modules/@intlify/core-base": {
      "version": "9.1.9",
      "resolved": "https://registry.npmjs.org/@intlify/core-base/-/core-base-9.1.9.tgz",
@@ -3424,6 +3778,32 @@
        }
      }
    },
+    "node_modules/@rollup/rollup-android-arm-eabi": {
+      "version": "4.39.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.39.0.tgz",
+      "integrity": "sha512-lGVys55Qb00Wvh8DMAocp5kIcaNzEFTmGhfFd88LfaogYTRKrdxgtlO5H6S49v2Nd8R2C6wLOal0qv6/kCkOwA==",
+      "cpu": [
+        "arm"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ]
+    },
+    "node_modules/@rollup/rollup-android-arm64": {
+      "version": "4.39.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.39.0.tgz",
+      "integrity": "sha512-It9+M1zE31KWfqh/0cJLrrsCPiF72PoJjIChLX+rEcujVRCb4NLQ5QzFkzIZW8Kn8FTbvGQBY5TkKBau3S8cCQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ]
+    },
    "node_modules/@rollup/rollup-darwin-arm64": {
      "version": "4.39.0",
      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.39.0.tgz",
@@ -3437,6 +3817,227 @@
        "darwin"
      ]
    },
+    "node_modules/@rollup/rollup-darwin-x64": {
+      "version": "4.39.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.39.0.tgz",
+      "integrity": "sha512-mKXpNZLvtEbgu6WCkNij7CGycdw9cJi2k9v0noMb++Vab12GZjFgUXD69ilAbBh034Zwn95c2PNSz9xM7KYEAQ==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@rollup/rollup-freebsd-arm64": {
+      "version": "4.39.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.39.0.tgz",
+      "integrity": "sha512-jivRRlh2Lod/KvDZx2zUR+I4iBfHcu2V/BA2vasUtdtTN2Uk3jfcZczLa81ESHZHPHy4ih3T/W5rPFZ/hX7RtQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ]
+    },
+    "node_modules/@rollup/rollup-freebsd-x64": {
+      "version": "4.39.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.39.0.tgz",
+      "integrity": "sha512-8RXIWvYIRK9nO+bhVz8DwLBepcptw633gv/QT4015CpJ0Ht8punmoHU/DuEd3iw9Hr8UwUV+t+VNNuZIWYeY7Q==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
+      "version": "4.39.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.39.0.tgz",
+      "integrity": "sha512-mz5POx5Zu58f2xAG5RaRRhp3IZDK7zXGk5sdEDj4o96HeaXhlUwmLFzNlc4hCQi5sGdR12VDgEUqVSHer0lI9g==",
+      "cpu": [
+        "arm"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm-musleabihf": {
+      "version": "4.39.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.39.0.tgz",
+      "integrity": "sha512-+YDwhM6gUAyakl0CD+bMFpdmwIoRDzZYaTWV3SDRBGkMU/VpIBYXXEvkEcTagw/7VVkL2vA29zU4UVy1mP0/Yw==",
+      "cpu": [
+        "arm"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm64-gnu": {
+      "version": "4.39.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.39.0.tgz",
+      "integrity": "sha512-EKf7iF7aK36eEChvlgxGnk7pdJfzfQbNvGV/+l98iiMwU23MwvmV0Ty3pJ0p5WQfm3JRHOytSIqD9LB7Bq7xdQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm64-musl": {
+      "version": "4.39.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.39.0.tgz",
+      "integrity": "sha512-vYanR6MtqC7Z2SNr8gzVnzUul09Wi1kZqJaek3KcIlI/wq5Xtq4ZPIZ0Mr/st/sv/NnaPwy/D4yXg5x0B3aUUA==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-loongarch64-gnu": {
+      "version": "4.39.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.39.0.tgz",
+      "integrity": "sha512-NMRUT40+h0FBa5fb+cpxtZoGAggRem16ocVKIv5gDB5uLDgBIwrIsXlGqYbLwW8YyO3WVTk1FkFDjMETYlDqiw==",
+      "cpu": [
+        "loong64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
+      "version": "4.39.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.39.0.tgz",
+      "integrity": "sha512-0pCNnmxgduJ3YRt+D+kJ6Ai/r+TaePu9ZLENl+ZDV/CdVczXl95CbIiwwswu4L+K7uOIGf6tMo2vm8uadRaICQ==",
+      "cpu": [
+        "ppc64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-riscv64-gnu": {
+      "version": "4.39.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.39.0.tgz",
+      "integrity": "sha512-t7j5Zhr7S4bBtksT73bO6c3Qa2AV/HqiGlj9+KB3gNF5upcVkx+HLgxTm8DK4OkzsOYqbdqbLKwvGMhylJCPhQ==",
+      "cpu": [
+        "riscv64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-riscv64-musl": {
+      "version": "4.39.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.39.0.tgz",
+      "integrity": "sha512-m6cwI86IvQ7M93MQ2RF5SP8tUjD39Y7rjb1qjHgYh28uAPVU8+k/xYWvxRO3/tBN2pZkSMa5RjnPuUIbrwVxeA==",
+      "cpu": [
+        "riscv64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-s390x-gnu": {
+      "version": "4.39.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.39.0.tgz",
+      "integrity": "sha512-iRDJd2ebMunnk2rsSBYlsptCyuINvxUfGwOUldjv5M4tpa93K8tFMeYGpNk2+Nxl+OBJnBzy2/JCscGeO507kA==",
+      "cpu": [
+        "s390x"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-x64-gnu": {
+      "version": "4.39.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.39.0.tgz",
+      "integrity": "sha512-t9jqYw27R6Lx0XKfEFe5vUeEJ5pF3SGIM6gTfONSMb7DuG6z6wfj2yjcoZxHg129veTqU7+wOhY6GX8wmf90dA==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-x64-musl": {
+      "version": "4.39.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.39.0.tgz",
+      "integrity": "sha512-ThFdkrFDP55AIsIZDKSBWEt/JcWlCzydbZHinZ0F/r1h83qbGeenCt/G/wG2O0reuENDD2tawfAj2s8VK7Bugg==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-arm64-msvc": {
+      "version": "4.39.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.39.0.tgz",
+      "integrity": "sha512-jDrLm6yUtbOg2TYB3sBF3acUnAwsIksEYjLeHL+TJv9jg+TmTwdyjnDex27jqEMakNKf3RwwPahDIt7QXCSqRQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-ia32-msvc": {
+      "version": "4.39.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.39.0.tgz",
+      "integrity": "sha512-6w9uMuza+LbLCVoNKL5FSLE7yvYkq9laSd09bwS0tMjkwXrmib/4KmoJcrKhLWHvw19mwU+33ndC69T7weNNjQ==",
+      "cpu": [
+        "ia32"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-x64-msvc": {
+      "version": "4.39.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.39.0.tgz",
+      "integrity": "sha512-yAkUOkIKZlK5dl7u6dg897doBgLXmUHhIINM2c+sND3DZwnrdQkkSiDh7N75Ll4mM4dxSkYfXqU9fW3lLkMFug==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
    "node_modules/@sinonjs/commons": {
      "version": "1.8.6",
      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.6.tgz",
@@ -7535,6 +8136,12 @@
      "dev": true,
      "license": "MIT"
    },
+    "node_modules/long": {
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/long/-/long-5.3.2.tgz",
+      "integrity": "sha512-mNAgZ1GmyNhD7AuqnTG3/VQ26o760+ZYBPKjPvugO8+nLbYfX6TVpJPseBvopbdY+qpZ/lKUnmEc1LeZYS3QAA==",
+      "license": "Apache-2.0"
+    },
    "node_modules/lru-cache": {
      "version": "5.1.1",
      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
@@ -8222,6 +8829,15 @@
        }
      }
    },
+    "node_modules/pinia-plugin-persistedstate": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/pinia-plugin-persistedstate/-/pinia-plugin-persistedstate-3.2.1.tgz",
+      "integrity": "sha512-MK++8LRUsGF7r45PjBFES82ISnPzyO6IZx3CH5vyPseFLZCk1g2kgx6l/nW8pEBKxxd4do0P6bJw+mUSZIEZUQ==",
+      "license": "MIT",
+      "peerDependencies": {
+        "pinia": "^2.0.0"
+      }
+    },
    "node_modules/pirates": {
      "version": "4.0.7",
      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.7.tgz",
@@ -8530,6 +9146,18 @@
        "node": ">= 6"
      }
    },
+    "node_modules/protobufjs": {
+      "version": "8.7.0",
+      "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-8.7.0.tgz",
+      "integrity": "sha512-uu52JNxLh3vsL7tXU/h0gDaywufvuUCTbGSi0NKQKBZ2ZopkmrWQJSQO/EFqzu/5YhiwgVM8rq/a/iVpx4eZ0g==",
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "long": "^5.3.2"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
    "node_modules/proxy-addr": {
      "version": "2.0.7",
      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
@@ -26,6 +26,7 @@
    "@dcloudio/uni-ui": "^1.5.11",
    "pinia": "2.0.36",
    "pinia-plugin-persistedstate": "3.2.1",
+    "protobufjs": "^8.7.0",
    "vue": "^3.4.21",
    "vue-i18n": "^9.1.9"
  },
@@ -3,7 +3,240 @@
  "compileType": "miniprogram",
  "libVersion": "3.7.7",
  "packOptions": {
-    "ignore": [],
+    "ignore": [
+      {
+        "type": "file",
+        "value": "static/common/dialog-light.png"
+      },
+      {
+        "type": "file",
+        "value": "static/common/dialog-bg.png"
+      },
+      {
+        "type": "file",
+        "value": "static/common/dialog-icon.png"
+      },
+      {
+        "type": "file",
+        "value": "static/prompt-bg-square.png"
+      },
+      {
+        "type": "file",
+        "value": "static/coach-comment.png"
+      },
+      {
+        "type": "file",
+        "value": "static/screen-hint-bg.png"
+      },
+      {
+        "type": "file",
+        "value": "static/red-team-win.png"
+      },
+      {
+        "type": "file",
+        "value": "static/blue-team-win.png"
+      },
+      {
+        "type": "file",
+        "value": "static/my-grow.png"
+      },
+      {
+        "type": "file",
+        "value": "static/gold-shining.png"
+      },
+      {
+        "type": "file",
+        "value": "static/bow-target.png"
+      },
+      {
+        "type": "file",
+        "value": "static/matching-bg.png"
+      },
+      {
+        "type": "file",
+        "value": "static/versus.png"
+      },
+      {
+        "type": "file",
+        "value": "static/point-champion.png"
+      },
+      {
+        "type": "file",
+        "value": "static/my-practise.png"
+      },
+      {
+        "type": "file",
+        "value": "static/shining-bg.png"
+      },
+      {
+        "type": "file",
+        "value": "static/donate.png"
+      },
+      {
+        "type": "file",
+        "value": "static/friend-battle.png"
+      },
+      {
+        "type": "file",
+        "value": "static/user-upgrade.png"
+      },
+      {
+        "type": "file",
+        "value": "static/finish-frame.png"
+      },
+      {
+        "type": "file",
+        "value": "static/vip/svip-jian.png"
+      },
+      {
+        "type": "file",
+        "value": "static/battle-header.png"
+      },
+      {
+        "type": "file",
+        "value": "static/battle-header-melee.png"
+      },
+      {
+        "type": "file",
+        "value": "static/player-bg.png"
+      },
+      {
+        "type": "file",
+        "value": "static/mvp-blue.png"
+      },
+      {
+        "type": "file",
+        "value": "static/finish-tip.png"
+      },
+      {
+        "type": "file",
+        "value": "static/2unfinish-tip.png"
+      },
+      {
+        "type": "file",
+        "value": "static/have-no-device.png"
+      },
+      {
+        "type": "file",
+        "value": "static/device-icon.png"
+      },
+      {
+        "type": "file",
+        "value": "static/unfinish-tip.png"
+      },
+      {
+        "type": "file",
+        "value": "static/test-tip.png"
+      },
+      {
+        "type": "file",
+        "value": "static/mvp-red.png"
+      },
+      {
+        "type": "file",
+        "value": "static/vip/svip-lie.png"
+      },
+      {
+        "type": "file",
+        "value": "static/mvp-tip.png"
+      },
+      {
+        "type": "file",
+        "value": "static/rank/battle-choose.png"
+      },
+      {
+        "type": "file",
+        "value": "static/back-to-game-bg.png"
+      },
+      {
+        "type": "file",
+        "value": "static/complete-light1.png"
+      },
+      {
+        "type": "file",
+        "value": "static/complete-light2.png"
+      },
+      {
+        "type": "file",
+        "value": "static/title-2v2.png"
+      },
+      {
+        "type": "file",
+        "value": "static/tab-bg.png"
+      },
+      {
+        "type": "file",
+        "value": "static/scan.png"
+      },
+      {
+        "type": "file",
+        "value": "static/choose-battle-mode.png"
+      },
+      {
+        "type": "file",
+        "value": "static/shooter.png"
+      },
+      {
+        "type": "file",
+        "value": "static/my-growth.png"
+      },
+      {
+        "type": "file",
+        "value": "static/juezhanbang.png"
+      },
+      {
+        "type": "file",
+        "value": "static/title-3v3.png"
+      },
+      {
+        "type": "file",
+        "value": "static/point-book-tip-bg.png"
+      },
+      {
+        "type": "file",
+        "value": "static/reward-us.png"
+      },
+      {
+        "type": "file",
+        "value": "static/rank/star.png"
+      },
+      {
+        "type": "file",
+        "value": "static/tab-point-book.png"
+      },
+      {
+        "type": "file",
+        "value": "static/pk-icon.png"
+      },
+      {
+        "type": "file",
+        "value": "static/first-try.png"
+      },
+      {
+        "type": "file",
+        "value": "static/row-yellow-bg.png"
+      },
+      {
+        "type": "file",
+        "value": "static/room-notfound-title.png"
+      },
+      {
+        "type": "file",
+        "value": "static/title-mvp.png"
+      },
+      {
+        "type": "file",
+        "value": "static/long-bubble-tall.png"
+      },
+      {
+        "type": "file",
+        "value": "static/battle-result.png"
+      },
+      {
+        "type": "file",
+        "value": "static/tab-mall.png"
+      }
+    ],
    "include": []
  },
  "setting": {
@@ -7,9 +7,13 @@
 		onHide
 	} from "@dcloudio/uni-app";
 	import websocket from "@/websocket";
+	import matchWebsocket from "@/matchWebsocket";
 	import {
 		getDeviceBatteryAPI
 	} from "@/apis";
+	import {
+		MESSAGETYPES
+	} from "@/constants";
 	import useStore from "@/store";
 	import {
 		storeToRefs
@@ -36,6 +40,9 @@
 				websocket.createWebSocket(token, onShootWsMsg);
 			}
 			if (!newVal) {
+				matchWebsocket.closeMatchWebSocket({
+					reason: "logout"
+				});
 				websocket.closeWebSocket();
 			}
 		}, {
@@ -73,18 +80,50 @@
 		// audioManager.play("射箭声音")
 	}

+	function onNetworkStatusChange(status) {
+		matchWebsocket.handleMatchNetworkStatusChange(status);
+	}
+
+	function connectMatchServerFromMessage(content) {
+		const messages = Array.isArray(content) ? content : [content];
+		messages.forEach((message) => {
+			if (
+				message?.constructor ===
+				MESSAGETYPES.ShootSyncBattleCreateMatchLinkID
+			) {
+				matchWebsocket.connectMatchWebSocketFromNotice(
+					message,
+					user.value.id
+				);
+			}
+		});
+	}
+
 	function onShootWsMsg(content) {
 		if(content.type === 'shoot-trigger'){
 			onDeviceShoot()
 		}
+		connectMatchServerFromMessage(content);
 		uni.$emit("socket-inbox", content);
 	}

 	onShow(() => {
+		void audioManager.warmButton();
 		uni.$on("update-user", emitUpdateUser);
 		uni.$on("update-online", emitUpdateOnline);
 		uni.$on("session-kicked-out", onSessionKickedOut);
 		uni.$on("device-bind-invalid", onDeviceBindInvalid);
+		if (typeof uni.offNetworkStatusChange === "function") {
+			uni.offNetworkStatusChange(onNetworkStatusChange);
+		}
+		if (typeof uni.onNetworkStatusChange === "function") {
+			uni.onNetworkStatusChange(onNetworkStatusChange);
+		}
+		if (typeof uni.getNetworkType === "function") {
+			uni.getNetworkType({
+				success: onNetworkStatusChange
+			});
+		}
 		const token = uni.getStorageSync(
 			`${uni.getAccountInfoSync().miniProgram.envVersion}_token`
 		);
@@ -99,6 +138,12 @@
 		uni.$off("update-online", emitUpdateOnline);
 		uni.$off("session-kicked-out", onSessionKickedOut);
 		uni.$off("device-bind-invalid", onDeviceBindInvalid);
+		if (typeof uni.offNetworkStatusChange === "function") {
+			uni.offNetworkStatusChange(onNetworkStatusChange);
+		}
+		matchWebsocket.closeMatchWebSocket({
+			reason: "app-hide"
+		});
 		websocket.closeWebSocket();
 	});
 </script>
@@ -1,3 +1,5 @@
+import { normalizeBattleApiResult } from "@/utils/matchAdapter";
+
 let BASE_URL = "https://api.shelingxingqiu.com/api/shoot"; // 默认正式版

 try {
@@ -6,7 +8,7 @@ try {

    switch (envVersion) {
        case "develop": // 开发版
-            // BASE_URL = "http://192.168.1.30:8000/api/shoot";
+            // BASE_URL = "http://192.168.1.2:8000/api/shoot";
            BASE_URL = "https://apitest.shelingxingqiu.com/api/shoot";
            break;
        case "trial": // 体验版
@@ -24,6 +26,7 @@ try {
 }

 const ADDONS_BASE_URL = BASE_URL.replace(/\/api\/shoot$/, "/api/shoot");
+const PRACTICE_BASE_URL = BASE_URL.replace(/\/api\/shoot$/, "/api");

 // 统一处理业务接口请求，包含登录态、业务错误和 WiFi 连接空响应兼容。
 function request(method, url, data = {}, baseUrl = BASE_URL) {
@@ -261,12 +264,21 @@ export const createPractiseAPI = (arrows, time, target) => {
    });
 };

-export const startPractiseAPI = () => {
-    return request("POST", "/user/practice/begin");
+export const createPractiseV2API = (arrows, time, target, deviceId) => {
+    return request("POST", "/practice/create-v2", {
+        shootNumber: arrows,
+        shootTime: time,
+        targetType: Number(target || 1) * 20,
+        deviceId,
+    }, PRACTICE_BASE_URL);
 };

-export const endPractiseAPI = () => {
-    return request("POST", "/user/practice/stop");
+export const startPractiseAPI = (id) => {
+    return request("POST", "/user/practice/begin", { id });
+};
+
+export const endPractiseAPI = (id) => {
+    return request("POST", "/user/practice/stop", { id });
 };

 export const getPractiseAPI = async (id) => {
@@ -553,9 +565,10 @@ export const getReadyAPI = (roomId) => {
 };

 export const getBattleAPI = async (battleId) => {
-    return request("POST", "/user/match/info", {
+    const result = await request("POST", "/user/match/info", {
        id: battleId,
    });
+    return normalizeBattleApiResult(result);
 };

 export const kickPlayerAPI = (number, userId) => {
@@ -95,6 +95,28 @@ export const audioFils = {
 	"https://static.shelingxingqiu.com/shootaudio/%E5%91%BD%E4%B8%AD.mp3"
 };

+const AUDIO_LOAD_TIMEOUT_MS = 5000;
+const AUDIO_WARM_CONCURRENCY = 3;
+const AUDIO_WARM_RETRIES = 1;
+const AUDIO_WARM_PRIORITY_KEYS = [
+  "点击按钮",
+  "比赛开始",
+  "练习开始",
+  "请开始射击",
+  "轮到你了",
+  "比赛结束",
+  "射击无效",
+  "中场休息",
+  "下半场开始",
+  "决金箭轮",
+  "请蓝方射箭",
+  "请红方射箭",
+  "距离合格",
+  "距离不足",
+  "未上靶",
+  "X环",
+];
+
 // 版本控制日志函数
 function debugLog(...args) {
  // 获取当前环境信息
@@ -111,18 +133,15 @@ class AudioManager {
  constructor() {
    this.audioMap = new Map();
    this.currentPlayingKey = null;
-    this.maxRetries = 3;
-    // 多轮统一重试：最多重试的轮次与每轮间隔
-    this.maxRetryRounds = 10;
-    this.retryRoundIntervalMs = 1500;
    // 显式授权播放标记，防止 iOS 在设置 src 后误播
    this.allowPlayMap = new Map();

-    // 串行加载相关属性
-    this.audioKeys = [];
-    this.currentLoadingIndex = 0;
+    // 后台预热与单条加载状态
    this.isLoading = false;
-    this.loadingPromise = null;
+    this.loadingKeyPromises = new Map();
+    this.pendingPlayKeys = new Set();
+    this.cacheWritePromises = new Map();
+    this.warmAllPromise = null;

    // 连续播放队列相关属性
    this.sequenceQueue = [];
@@ -141,19 +160,14 @@ class AudioManager {
    // 静音开关
    this.isMuted = false;
    this.pendingPlayKey = null;
-    // 新增：就绪状态映射
    this.readyMap = new Map();
-    // 新增：首轮失败的音频集合与重试阶段标识
-    this.failedLoadKeys = new Set();
-    // 加载代数，用于 reloadAll 时作废旧的加载循环
+    // 加载代数，用于 reloadAll 时作废旧的异步加载
    this.loadGeneration = 0;
    // 本地路径缓存 Map: { url: localPath }
    this.localFileCache = uni.getStorageSync("audio_local_files") || {};
    // 启动时自动清理过期的缓存文件（URL 已不在 audioFils 中的文件）
    this.cleanObsoleteCache();
    this.bindAudioInterruptionEvents();
-
-    this.initAudios();
  }

  bindAudioInterruptionEvents() {
@@ -217,128 +231,122 @@ class AudioManager {
    }
  }

-  // 初始化音频（两阶段：首轮串行加载全部，次轮仅串行加载失败项一次）
-  initAudios() {
-    if (this.isLoading) {
-      debugLog("音频正在加载中，跳过重复初始化");
-      return this.loadingPromise;
-    }
-    debugLog("开始串行加载音频...");
-    this.isLoading = true;
-    this.audioKeys = Object.keys(audioFils);
-    this.currentLoadingIndex = 0;
-    this.failedLoadKeys.clear();
-
-    // 增加代数，使得旧的加载循环失效
-    this.loadGeneration = (this.loadGeneration || 0) + 1;
-    const currentGen = this.loadGeneration;
-
-    this.loadingPromise = new Promise((resolve) => {
-      const finalize = () => {
-        if (currentGen !== this.loadGeneration) return;
-        const runRounds = (round) => {
-          if (currentGen !== this.loadGeneration) return;
-          // 达到最大轮次或没有失败项，收尾
-          if (this.failedLoadKeys.size === 0 || round > this.maxRetryRounds) {
-            this.isLoading = false;
-            resolve();
-            return;
-          }
-
-          const retryKeys = Array.from(this.failedLoadKeys);
-          this.failedLoadKeys.clear();
-          debugLog(`开始第 ${round} 轮串行加载，共 ${retryKeys.length} 个`);
-
-          this.loadKeysSequentially(
-            retryKeys,
-            () => {
-              if (currentGen !== this.loadGeneration) return;
-              // 如仍有失败项，继续下一轮；否则结束
-              if (this.failedLoadKeys.size > 0 && round < this.maxRetryRounds) {
-                setTimeout(
-                  () => runRounds(round + 1),
-                  this.retryRoundIntervalMs
-                );
-              } else {
-                this.isLoading = false;
-                resolve();
-              }
-            },
-            currentGen
-          );
-        };
-
-        // 启动第 1 轮重试（如有失败项）
-        runRounds(1);
-      };
-      this.loadNextAudio(finalize, currentGen);
-    });
-    return this.loadingPromise;
+  getWarmupKeys() {
+    return Array.from(
+      new Set([...AUDIO_WARM_PRIORITY_KEYS, ...Object.keys(audioFils)])
+    );
  }

-  // 按自定义列表串行加载音频（避免并发过多）
-  loadKeysSequentially(keys, onComplete, gen) {
-    if (gen !== undefined && gen !== this.loadGeneration) return;
-    let idx = 0;
-    const list = Array.from(keys);
-    const next = () => {
-      if (gen !== undefined && gen !== this.loadGeneration) return;
-      if (idx >= list.length) {
-        if (onComplete) onComplete();
-        return;
-      }
-      const k = list[idx++];
+  ensureAudio(key) {
+    if (!audioFils[key]) return Promise.resolve(false);
+    if (this.readyMap.get(key) && this.audioMap.has(key)) {
+      return Promise.resolve(true);
+    }

-      // 已就绪的音频不再重载，避免把 ready 状态重置为 false
-      if (this.readyMap.get(k)) {
-        setTimeout(next, 50);
-        return;
-      }
+    const loadingPromise = this.loadingKeyPromises.get(key);
+    if (loadingPromise) return loadingPromise;

-      // 未就绪：已存在则重载；不存在则创建
-      if (this.audioMap.has(k)) {
-        this.retryLoadAudio(k);
-        setTimeout(next, 100);
-      } else {
-        this.createAudio(k, () => {
-          setTimeout(next, 100);
+    let promise;
+    promise = new Promise((resolve) => {
+      try {
+        this.createAudio(key, () => {
+          resolve(this.readyMap.get(key) === true && this.audioMap.has(key));
        });
-        return; // createAudio 内部会触发 next
+      } catch (error) {
+        debugLog(`音频 ${key} 创建失败`, error);
+        resolve(false);
+      }
+    }).finally(() => {
+      if (this.loadingKeyPromises.get(key) === promise) {
+        this.loadingKeyPromises.delete(key);
+      }
+    });
+    this.loadingKeyPromises.set(key, promise);
+    return promise;
+  }
+
+  async warmKeys(
+    keys,
+    { concurrency = AUDIO_WARM_CONCURRENCY, retries = AUDIO_WARM_RETRIES } = {}
+  ) {
+    const queue = Array.from(new Set(keys)).filter((key) => !!audioFils[key]);
+    if (!queue.length) return;
+
+    let index = 0;
+    const worker = async () => {
+      while (index < queue.length) {
+        const key = queue[index++];
+        let ready = await this.ensureAudio(key);
+        for (let attempt = 0; !ready && attempt < retries; attempt += 1) {
+          ready = await this.retryLoadAudio(key);
+        }
      }
    };
-    next();
+
+    const workerCount = Math.min(Math.max(1, concurrency), queue.length);
+    await Promise.all(Array.from({ length: workerCount }, () => worker()));
  }

-  // 串行加载下一个音频（首轮）
-  loadNextAudio(onComplete, gen) {
-    if (gen !== undefined && gen !== this.loadGeneration) return;
-    if (this.currentLoadingIndex >= this.audioKeys.length) {
-      debugLog("首轮加载遍历完成", this.currentLoadingIndex);
-      if (onComplete) onComplete();
+  warmButton() {
+    return this.warmKeys(["点击按钮"], { concurrency: 1, retries: 1 });
+  }
+
+  warmAll() {
+    if (this.warmAllPromise) return this.warmAllPromise;
+
+    debugLog("开始后台分级预热全部语音");
+    this.isLoading = true;
+    this.warmAllPromise = this.warmKeys(this.getWarmupKeys())
+      .catch((error) => {
+        debugLog("后台语音预热异常", error);
+      })
+      .finally(() => {
+        this.isLoading = false;
+        debugLog("后台语音预热结束", this.getLoadProgress());
+      });
+    return this.warmAllPromise;
+  }
+
+  // 保留旧入口兼容测试页或其他历史调用，实际行为改为非阻塞后台预热。
+  initAudios() {
+    return this.warmAll();
+  }
+
+  // 创建单个音频实例：缓存命中优先使用，未命中直接使用 CDN。
+  createAudio(key, callback) {
+    const src = audioFils[key];
+    const generation = this.loadGeneration;
+    let completed = false;
+
+    const complete = () => {
+      if (completed) return;
+      completed = true;
+      if (callback) callback();
+    };
+
+    if (!src) {
+      complete();
      return;
    }
-    const key = this.audioKeys[this.currentLoadingIndex];
-    debugLog(
-      `开始加载音频 ${this.currentLoadingIndex + 1}/${
-        this.audioKeys.length
-      }: ${key}`
-    );
-    this.createAudio(key, () => {
-      setTimeout(() => {
-        this.loadNextAudio(onComplete, gen);
-      }, 100);
-    });
-  }

-  // 创建单个音频实例（支持本地缓存）
-  createAudio(key, callback) {
-    this.currentLoadingIndex++;
-    const src = audioFils[key];
+    const existingAudio = this.audioMap.get(key);
+    if (existingAudio && !this.readyMap.get(key)) {
+      try {
+        existingAudio.destroy();
+      } catch (_) {}
+      this.audioMap.delete(key);
+    }
+
+    const isCurrentGeneration = () => generation === this.loadGeneration;
+
+    const setupAudio = (realSrc, resumeAfterReady = false) => {
+      if (!isCurrentGeneration()) {
+        complete();
+        return;
+      }

-    const setupAudio = (realSrc) => {
      const audio = uni.createInnerAudioContext();
      audio.autoplay = false;
-      audio.src = realSrc;
      try {
        if (typeof audio.volume === "number") {
          audio.volume = this.isMuted ? 0 : 1;
@@ -355,63 +363,99 @@ class AudioManager {
        }
      });

-      const loadTimeout = setTimeout(() => {
-        debugLog(`音频 ${key} 加载超时`);
-        this.recordLoadFailure(key);
+      let loadTimeout = null;
+      let readyHandled = false;
+      const clearLoadTimeout = () => {
+        if (!loadTimeout) return;
+        clearTimeout(loadTimeout);
+        loadTimeout = null;
+      };
+
+      const handleLoadFailure = (message) => {
+        if (this.audioMap.get(key) !== audio) return;
+        clearLoadTimeout();
+        debugLog(`音频 ${key} ${message}`);
+
+        const isLocalCache =
+          realSrc !== src && this.localFileCache[src] === realSrc;
+        const shouldResume =
+          this.allowPlayMap.get(key) === true || this.currentPlayingKey === key;
+        const shouldResumeDirectly = shouldResume && completed;
+
+        this.clearPlayWatchdog(key);
+        this.allowPlayMap.set(key, false);
+        if (this.currentPlayingKey === key) {
+          this.currentPlayingKey = null;
+        }
+        if (this.lastPlayKey === key) {
+          this.lastPlayKey = null;
+          this.lastPlayAt = 0;
+        }
+        this.readyMap.set(key, false);
        this.audioMap.delete(key);
        try {
          audio.destroy();
        } catch (_) {}
+
+        if (isLocalCache && isCurrentGeneration()) {
+          debugLog(`本地缓存失效，立即切换 CDN: ${key}`);
+          delete this.localFileCache[src];
+          uni.setStorageSync("audio_local_files", this.localFileCache);
+          uni.removeSavedFile({ filePath: realSrc });
+          setupAudio(src, shouldResumeDirectly);
+          void this.cacheRemoteFile(src, key);
+          return;
+        }
+
        this.finishPlayback(key, {
          advanceSequence: true,
          emitEnded: true,
        });
-        if (callback) callback();
-      }, 10000);
+        complete();
+      };
+
+      loadTimeout = setTimeout(() => {
+        handleLoadFailure("加载超时");
+      }, AUDIO_LOAD_TIMEOUT_MS);

      audio.onCanplay(() => {
+        if (this.audioMap.get(key) !== audio) return;
+        if (readyHandled) return;
+        readyHandled = true;
+        if (!isCurrentGeneration()) {
+          clearLoadTimeout();
+          this.audioMap.delete(key);
+          try {
+            audio.destroy();
+          } catch (_) {}
+          complete();
+          return;
+        }
        if (!this.allowPlayMap.get(key)) {
          try {
            audio.pause();
          } catch (_) {}
        }
-        clearTimeout(loadTimeout);
+        clearLoadTimeout();
        this.readyMap.set(key, true);
-        this.failedLoadKeys.delete(key);
-        // debugLog(`音频 ${key} 已加载完成`, this.getLoadProgress());
        uni.$emit("audioLoaded", key);
        const loadedAudioKeys = uni.getStorageSync("loadedAudioKeys") || {};
        loadedAudioKeys[key] = true;
        uni.setStorageSync("loadedAudioKeys", loadedAudioKeys);
-        if (callback) callback();
+        complete();
+
+        if (resumeAfterReady) {
+          setTimeout(() => {
+            const isSequenceCurrent =
+              this.isSequenceRunning &&
+              this.sequenceQueue[this.sequenceIndex] === key;
+            if (isSequenceCurrent) this._playSingle(key, false);
+          }, 0);
+        }
      });

      audio.onError((res) => {
-        clearTimeout(loadTimeout);
-        debugLog(`音频 ${key} 加载失败：`, res.errMsg);
-        // 如果是本地文件加载失败，可能是文件损坏，清除缓存以便下次重新下载
-        if (realSrc !== src && this.localFileCache[src] === realSrc) {
-          debugLog(`本地缓存失效，移除记录: ${key}`);
-          delete this.localFileCache[src];
-          uni.setStorageSync("audio_local_files", this.localFileCache);
-          // 移除文件
-          uni.removeSavedFile({ filePath: realSrc });
-        }
-        this.recordLoadFailure(key);
-        this.audioMap.delete(key);
-        try {
-          audio.destroy();
-        } catch (_) {}
-        this.finishPlayback(key, {
-          advanceSequence: true,
-          emitEnded: true,
-        });
-        if (this.readyMap.get(key)) {
-          // 这里不要去除，不然检查进度的时候由于没有重新加载而进度卡住，等播放失败的时候会重新加载
-          // this.readyMap.set(key, false);
-        } else {
-          if (callback) callback();
-        }
+        handleLoadFailure(`加载失败：${res.errMsg || "unknown"}`);
      });

      audio.onEnded(() => {
@@ -426,58 +470,78 @@ class AudioManager {
      });

      this.audioMap.set(key, audio);
+      audio.src = realSrc;
    };

    // 检查是否有可用的本地缓存
    this.checkLocalFile(src).then((localPath) => {
+      if (!isCurrentGeneration()) {
+        complete();
+        return;
+      }
      if (localPath) {
        debugLog(`命中本地缓存: ${key}`);
        setupAudio(localPath);
      } else {
-        // 下载并尝试保存
-        uni.downloadFile({
-          url: src,
-          timeout: 20000,
-          success: (res) => {
-            if (res.tempFilePath) {
-              // 尝试保存文件到本地存储（持久化）
-              uni.getFileSystemManager().saveFile({
-                tempFilePath: res.tempFilePath,
-                success: (saveRes) => {
-                  const savedPath = saveRes.savedFilePath;
-                  this.localFileCache[src] = savedPath;
-                  uni.setStorageSync("audio_local_files", this.localFileCache);
-                  debugLog(`音频已缓存到本地: ${key}`);
-                  setupAudio(savedPath);
-                },
-                fail: (err) => {
-                  debugLog(
-                    `保存音频失败(可能空间不足)，使用临时文件: ${key}`,
-                    err
-                  );
-                  setupAudio(res.tempFilePath);
-                },
-              });
-            } else {
-              this.recordLoadFailure(key);
-              this.finishPlayback(key, {
-                advanceSequence: true,
-                emitEnded: true,
-              });
-              if (callback) callback();
-            }
-          },
-          fail: () => {
-            this.recordLoadFailure(key);
-            this.finishPlayback(key, {
-              advanceSequence: true,
-              emitEnded: true,
-            });
-            if (callback) callback();
-          },
-        });
+        setupAudio(src);
+        void this.cacheRemoteFile(src, key);
+      }
+    }).catch(() => {
+      setupAudio(src);
+      void this.cacheRemoteFile(src, key);
+    });
+  }
+
+  cacheRemoteFile(url, key) {
+    if (this.localFileCache[url]) return Promise.resolve(true);
+    const currentPromise = this.cacheWritePromises.get(url);
+    if (currentPromise) return currentPromise;
+
+    let promise;
+    promise = new Promise((resolve) => {
+      if (typeof uni.downloadFile !== "function") {
+        resolve(false);
+        return;
+      }
+
+      uni.downloadFile({
+        url,
+        timeout: 20000,
+        success: (res) => {
+          if (!res.tempFilePath) {
+            resolve(false);
+            return;
+          }
+
+          let fileSystemManager;
+          try {
+            fileSystemManager = uni.getFileSystemManager();
+          } catch (_) {
+            resolve(false);
+            return;
+          }
+
+          fileSystemManager.saveFile({
+            tempFilePath: res.tempFilePath,
+            success: (saveRes) => {
+              this.localFileCache[url] = saveRes.savedFilePath;
+              uni.setStorageSync("audio_local_files", this.localFileCache);
+              debugLog(`音频已后台缓存到本地: ${key}`);
+              resolve(true);
+            },
+            fail: () => resolve(false),
+          });
+        },
+        fail: () => resolve(false),
+      });
+    }).finally(() => {
+      if (this.cacheWritePromises.get(url) === promise) {
+        this.cacheWritePromises.delete(url);
      }
    });
+
+    this.cacheWritePromises.set(url, promise);
+    return promise;
  }

  // 检查本地文件是否有效
@@ -504,11 +568,6 @@ class AudioManager {
    });
  }

-  // 新增：记录失败（首轮与次轮都会用到）
-  recordLoadFailure(key) {
-    this.failedLoadKeys.add(key);
-  }
-
  clearPlayWatchdog(key) {
    const timer = this.playWatchdogTimers.get(key);
    if (timer) {
@@ -612,19 +671,14 @@ class AudioManager {
  }

  reloadAudioKey(key) {
-    const audio = this.audioMap.get(key);
-    if (audio) {
-      try {
-        audio.destroy();
-      } catch (_) {}
-      this.audioMap.delete(key);
-    }
-    this.readyMap.set(key, false);
-    this.retryLoadAudio(key);
+    return this.retryLoadAudio(key);
  }

  // 重新加载音频
  retryLoadAudio(key) {
+    const loadingPromise = this.loadingKeyPromises.get(key);
+    if (loadingPromise) return loadingPromise;
+
    this.clearPlayWatchdog(key);
    const oldAudio = this.audioMap.get(key);
    if (oldAudio) {
@@ -632,7 +686,9 @@ class AudioManager {
        oldAudio.destroy();
      } catch (_) {}
    }
-    this.createAudio(key);
+    this.audioMap.delete(key);
+    this.readyMap.set(key, false);
+    return this.ensureAudio(key);
  }

  // 播放指定音频或音频数组（数组则按顺序连续播放）
@@ -695,6 +751,32 @@ class AudioManager {
    }
  }

+  waitForAudioAndPlay(key) {
+    if (this.pendingPlayKeys.has(key)) return;
+    this.pendingPlayKeys.add(key);
+
+    this.ensureAudio(key)
+      .then((ready) => {
+        const isSequenceCurrent =
+          this.isSequenceRunning && this.sequenceQueue[this.sequenceIndex] === key;
+        if (!isSequenceCurrent) return;
+
+        if (ready) {
+          this._playSingle(key, false);
+          return;
+        }
+
+        this.finishPlayback(key, {
+          advanceSequence: true,
+          emitEnded: true,
+          force: true,
+        });
+      })
+      .finally(() => {
+        this.pendingPlayKeys.delete(key);
+      });
+  }
+
  // 内部方法：播放单个 key
  _playSingle(key, forceStopAll = false) {
    if (this.isInterrupted) {
@@ -726,7 +808,7 @@ class AudioManager {
    }

    const audio = this.audioMap.get(key);
-    if (audio) {
+    if (audio && this.readyMap.get(key)) {
      // 播放前确保遵循当前静音状态
      try {
        if (typeof audio.volume === "number") {
@@ -768,32 +850,8 @@ class AudioManager {
      this.lastPlayAt = Date.now();
      this.startPlayWatchdog(key);
    } else {
-      debugLog(`音频 ${key} 不存在，尝试重新加载...`);
-      this.retryLoadAudio(key);
-      let loadWaitTimer = null;
-      const cleanup = () => {
-        try {
-          uni.$off("audioLoaded", handler);
-        } catch (_) {}
-        if (loadWaitTimer) {
-          clearTimeout(loadWaitTimer);
-          loadWaitTimer = null;
-        }
-      };
-      const handler = (loadedKey) => {
-        if (loadedKey === key) {
-          cleanup();
-          // 再次校验是否存在且就绪
-          const a = this.audioMap.get(key);
-          if (a && this.readyMap.get(key)) {
-            this._playSingle(key, false);
-          }
-        }
-      };
-      try {
-        uni.$on("audioLoaded", handler);
-      } catch (_) {}
-      loadWaitTimer = setTimeout(cleanup, 12000);
+      debugLog(`音频 ${key} 尚未就绪，按需加载后播放...`);
+      this.waitForAudioAndPlay(key);
    }
  }

@@ -886,9 +944,11 @@ class AudioManager {
    debugLog("本地音频缓存清理完成");
  }

-  // 手动重置并重新加载所有音频（用于卡住时恢复）
+  // 手动重置音频实例，并按之前的预热范围在后台恢复。
  reloadAll() {
-    debugLog("执行 reloadAll: 重置所有状态并重新加载");
+    debugLog("执行 reloadAll: 重置音频实例并后台恢复");
+    const shouldWarmAll = this.warmAllPromise !== null;
+    this.loadGeneration += 1;

    // 1. 停止所有播放
    this.stopAll();
@@ -903,8 +963,9 @@ class AudioManager {

    // 3. 重置状态
    this.readyMap.clear();
-    this.failedLoadKeys.clear();
    this.allowPlayMap.clear();
+    this.loadingKeyPromises.clear();
+    this.pendingPlayKeys.clear();
    this.clearAllPlayWatchdogs();
    this.currentPlayingKey = null;
    this.sequenceQueue = [];
@@ -915,13 +976,12 @@ class AudioManager {
    // 这里选择不自动全清，而是依赖 onError 里的单点清除。如果需要彻底重置，可取消注释：
    // this.clearCache();

-    // 4. 强制重置加载锁
+    // 4. 重置后台预热状态
    this.isLoading = false;
-    this.loadingPromise = null;
-    this.currentLoadingIndex = 0;
+    this.warmAllPromise = null;

-    // 5. 重新初始化 (initAudios 会自增 loadGeneration，从而终止之前的任何异步循环)
-    return this.initAudios();
+    // 5. 之前已启动过全量预热则继续全量恢复，否则只恢复按钮音效。
+    return shouldWarmAll ? this.warmAll() : this.warmButton();
  }
 }

@@ -1,8 +1,8 @@
 <script setup>
 const tabs = [
  { image: "../static/tab-vip.png" },
-  { image: "../static/tab-point-book.png" },
-  { image: "../static/tab-mall.png" },
+  { image: "https://static.shelingxingqiu.com/shootmini/static/tab-point-book.png" },
+  { image: "https://static.shelingxingqiu.com/shootmini/static/tab-mall.png" },
 ];

 function handleTabClick(index) {
@@ -26,7 +26,7 @@ function handleTabClick(index) {

 <template>
  <view class="footer">
-    <image class="footer-bg" src="../static/tab-bg.png" mode="widthFix" />
+    <image class="footer-bg" src="https://static.shelingxingqiu.com/shootmini/static/tab-bg.png" mode="widthFix" />
    <view
      v-for="(tab, index) in tabs"
      :key="index"
@@ -4,6 +4,7 @@ import { onShow } from "@dcloudio/uni-app";

 import { getBattleAPI, getUserGameState } from "@/apis";
 import { debounce } from "@/util";
+import { returnToBattle } from "@/utils/matchReturn";

 import useStore from "@/store";
 import { storeToRefs } from "pinia";
@@ -66,12 +67,7 @@ const onClick = debounce(async () => {
    loading.value = true;
    const result = await getBattleAPI();
    if (result && result.matchId) {
-      await uni.$checkAudio();
-      if (result.mode <= 3) {
-        await navigateOnce(`/pages/team-battle/index?battleId=${result.matchId}`);
-      } else {
-        await navigateOnce(`/pages/melee-battle?battleId=${result.matchId}`);
-      }
+      await returnToBattle(result, navigateOnce);
      return;
    }
    if (game.value.roomID) {
@@ -100,9 +96,9 @@ onBeforeUnmount(() => {
    class="back-to-game"
    @click="onClick"
  >
-    <image src="../static/back-to-game-bg.png" mode="widthFix" />
+    <image src="https://static.shelingxingqiu.com/shootmini/static/back-to-game-bg.png" mode="widthFix" />
    <block v-if="game.inBattle">
-      <image src="../static/pk-icon.png" mode="widthFix" />
+      <image src="https://static.shelingxingqiu.com/shootmini/static/pk-icon.png" mode="widthFix" />
      <text>返回进行中的对局</text>
    </block>
    <block v-else-if="game.roomID">
@@ -31,7 +31,7 @@ const normalRounds = computed(() => {
 <template>
  <view class="container">
    <view class="guide-row">
-      <image src="../static/shooter.png" mode="widthFix" />
+      <image src="https://static.shelingxingqiu.com/shootmini/static/shooter.png" mode="widthFix" />
      <view
        :style="{
          marginBottom: '10px',
@@ -42,7 +42,7 @@ const normalRounds = computed(() => {
      </view>
    </view>
    <view>
-      <image src="../static/battle-header-melee.png" mode="widthFix" />
+      <image src="https://static.shelingxingqiu.com/shootmini/static/battle-header-melee.png" mode="widthFix" />
      <text>蓝队({{ bluePoints }})</text>
      <text>红队({{ redPoints }})</text>
    </view>
@@ -41,7 +41,7 @@ const isMember = (player = {}) => player.vip === true || player.sVip === true;
  <view class="container" :style="{ paddingTop: showHeader ? '5px' : '0' }">
    <image
      v-if="showHeader"
-      :src="`../static/battle-header${players.length ? '-melee' : ''}.png`"
+      :src="`https://static.shelingxingqiu.com/shootmini/static/battle-header${players.length ? '-melee' : ''}.png`"
      mode="widthFix"
    />
    <view
@@ -246,7 +246,7 @@ onBeforeUnmount(() => {
    >
      <image
        class="shot-arrow"
-        src="../static/vip/svip-jian.png"
+        src="https://static.shelingxingqiu.com/shootmini/static/vip/svip-jian.png"
        mode="heightFix"
      />
    </view>
@@ -263,7 +263,7 @@ onBeforeUnmount(() => {
      <image
        :key="`crack-${animationKey}`"
        class="shot-crack"
-        src="../static/vip/svip-lie.png"
+        src="https://static.shelingxingqiu.com/shootmini/static/vip/svip-lie.png"
        mode="aspectFit"
        @animationend="handleCrackAnimationEnd"
      />
@@ -43,6 +43,10 @@ const props = defineProps({
    type: String,
    default: "solo", // solo 单排，team 双排
  },
+  missAsZero: {
+    type: Boolean,
+    default: false,
+  },
  stop: {
    type: Boolean,
    default: false,
@@ -78,6 +82,12 @@ const instance = getCurrentInstance();
 const ROUND_TIP_OFFSET_Y = -32;
 const EXPERIENCE_TIP_OFFSET_Y = -68;

+function getRoundText(shot) {
+  if (shot?.ringX) return "X环";
+  if (shot?.ring) return `${shot.ring}环`;
+  return props.missAsZero ? "0环" : "未上靶";
+}
+
 function buildShotEffectKey(team, shot, index) {
  return [
    team,
@@ -433,8 +443,7 @@ onBeforeUnmount(() => {
        v-if="latestOne"
        class="round-tip fade-in-out"
        :style="getRoundTipStyle(latestOne)"
-        >{{ latestOne.ringX ? "X" : latestOne.ring || "未上靶"
-        }}<text v-if="latestOne.ring">环</text>
+        >{{ getRoundText(latestOne) }}
      </view>
      <view
        v-if="
@@ -451,8 +460,7 @@ onBeforeUnmount(() => {
        v-if="bluelatestOne"
        class="round-tip fade-in-out"
        :style="getRoundTipStyle(bluelatestOne)"
-        >{{ bluelatestOne.ringX ? "X" : bluelatestOne.ring || "未上靶"
-        }}<text v-if="bluelatestOne.ring">环</text></view
+        >{{ getRoundText(bluelatestOne) }}</view
      >
      <block v-for="(bow, index) in scores" :key="index">
        <image
@@ -505,7 +513,7 @@ onBeforeUnmount(() => {
        @impact="shakeTarget"
        @complete="completeShotEffect"
      />
-      <image src="../static/bow-target.png" mode="widthFix" />
+      <image src="https://static.shelingxingqiu.com/shootmini/static/bow-target.png" mode="widthFix" />
    </view>
    <view class="footer">
      <PointSwitcher
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, computed, onMounted, onBeforeUnmount } from "vue";
+import { ref } from "vue";
 import { onShow } from "@dcloudio/uni-app";
 import AppBackground from "@/components/AppBackground.vue";
 import Header from "@/components/Header.vue";
@@ -7,7 +7,7 @@ import ScreenHint from "@/components/ScreenHint.vue";
 import BackToGame from "@/components/BackToGame.vue";
 import {laserAimAPI, getBattleAPI, matchGameAPI} from "@/apis";
 import { capsuleHeight, debounce } from "@/util";
-import AudioManager from "@/audioManager";
+import { returnToBattle } from "@/utils/matchReturn";
 const props = defineProps({
  title: {
    type: String,
@@ -54,9 +54,6 @@ const isIOS = uni.getDeviceInfo().osName === "ios";
 const showHint = ref(false);
 const hintType = ref(0);
 const isLoading = ref(false);
-const audioInitProgress = ref(1);
-const audioProgress = ref(0);
-const audioTimer = ref(null);

 const showGlobalHint = (type) => {
  hintType.value = type;
@@ -67,49 +64,21 @@ const hideGlobalHint = () => {
  showHint.value = false;
 };

-const restart = () => {
-  uni.restartMiniProgram({
-    path: "/pages/index",
-  });
-};
-
-const checkAudioProgress = async () => {
-  return new Promise((resolve, reject) => {
-    try {
-      audioInitProgress.value = AudioManager.getLoadProgress();
-      if (audioInitProgress.value === 1) return resolve();
-      audioTimer.value = setInterval(() => {
-        audioProgress.value = AudioManager.getLoadProgress();
-        if (audioProgress.value === 1) {
-          setTimeout(() => {
-            audioInitProgress.value = 1;
-          }, 200);
-          clearInterval(audioTimer.value);
-          resolve();
-        }
-      }, 200);
-    } catch (err) {
-      reject(err);
-    }
-  });
-};
-
-const audioFinalProgress = computed(() => {
-  const left = 1 - audioInitProgress.value;
-  return Math.max(0, (audioProgress.value - audioInitProgress.value) / left);
-});
-
-onBeforeUnmount(() => {
-  if (audioTimer.value) clearInterval(audioTimer.value);
-});
-
 onShow(() => {
  uni.$showHint = showGlobalHint;
  uni.$hideHint = hideGlobalHint;
-  uni.$checkAudio = checkAudioProgress;
  showHint.value = false;
 });

+const navigateTo = (url) =>
+  new Promise((resolve, reject) => {
+    uni.navigateTo({
+      url,
+      success: resolve,
+      fail: reject,
+    });
+  });
+
 const backToGame = debounce(async () => {
  if (isLoading.value) return; // 防止重复点击

@@ -117,16 +86,7 @@ const backToGame = debounce(async () => {
    isLoading.value = true;
    const result = await getBattleAPI();
    if (result && result.matchId) {
-      await checkAudioProgress();
-      if (result.mode <= 3) {
-        uni.navigateTo({
-          url: `/pages/team-battle/index?battleId=${result.matchId}`,
-        });
-      } else {
-        uni.navigateTo({
-          url: `/pages/melee-battle?battleId=${result.matchId}`,
-        });
-      }
+      await returnToBattle(result, navigateTo);
    }
  } catch (error) {
    console.error("获取当前游戏失败:", error);
@@ -224,24 +184,6 @@ const goCalibration = async () => {
        </view>
      </view>
    </ScreenHint>
-    <view v-if="audioInitProgress < 1" class="audio-progress">
-      <image
-        src="https://static.shelingxingqiu.com/attachment/2025-11-26/deihtj15xjwcz3c1tx.png"
-        mode="widthFix"
-      />
-      <view>
-        <view :style="{ width: `${audioFinalProgress * 100}%` }">
-          <!-- <image
-            src="https://static.shelingxingqiu.com/attachment/2025-11-24/degu91a7si77sg9jqv.png"
-            mode="widthFix"
-          /> -->
-        </view>
-      </view>
-      <view>
-        <text>若加载时间过长，请</text>
-        <button hover-class="none" @click="restart">点击这里重启</button>
-      </view>
-    </view>
  </view>
 </template>

@@ -283,62 +225,4 @@ const goCalibration = async () => {
  color: #666;
  opacity: 0.6;
 }
-.audio-progress {
-  z-index: 999;
-  width: 100vw;
-  height: 100vh;
-  position: fixed;
-  top: 0;
-  left: 0;
-  background: rgb(0 0 0 / 0.8);
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-}
-.audio-progress > image:nth-child(1) {
-  width: 140rpx;
-  height: 150rpx;
-  margin-bottom: 20rpx;
-}
-.audio-progress > view:nth-child(2) {
-  width: 380rpx;
-  height: 6rpx;
-  background: #595959;
-  border-radius: 4rpx;
-  display: flex;
-  flex-direction: column;
-  align-items: flex-start;
-  justify-content: flex-start;
-}
-.audio-progress > view:nth-child(2) > view {
-  background: #ffe431;
-  min-height: 6rpx;
-  border-radius: 4rpx;
-  display: flex;
-  align-items: center;
-  justify-content: flex-end;
-  transition: width 0.5s ease;
-}
-.audio-progress > view:nth-child(2) > view > image {
-  width: 46rpx;
-  height: 26rpx;
-}
-.audio-progress > view:nth-child(3) {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
-.audio-progress > view:nth-child(3) > text {
-  font-size: 22rpx;
-  color: #a2a2a2;
-  text-align: center;
-  line-height: 32rpx;
-}
-.audio-progress > view:nth-child(3) > button {
-  font-size: 22rpx;
-  color: #ffe431;
-  line-height: 32rpx;
-  padding: 20rpx 0;
-}
 </style>
@@ -36,6 +36,7 @@ const createRoom = debounce(async () => {
  }
  if (loading.value === true) return;
  loading.value = true;
+  let keepLoading = false;
  let size = 2;
  if (battleMode.value === 2) size = 10;
  if (battleMode.value === 3) size = 4;
@@ -49,14 +50,18 @@ const createRoom = debounce(async () => {
    if (result.number) {
      props.onConfirm();
      await joinRoomAPI(result.number);
+      keepLoading = true;
      uni.navigateTo({
        url: "/pages/battle-room?roomNumber=" + result.number + "&target=" + targetMode.value,
+        fail: () => {
+          loading.value = false;
+        },
      });
    }
  } catch (error) {
    console.log(error);
  } finally {
-    loading.value = false;
+    if (!keepLoading) loading.value = false;
  }
 });
 </script>
@@ -64,7 +69,7 @@ const createRoom = debounce(async () => {
  <view class="container">
    <view class="target-options-header">
      <view class="target-options-header-line-left"></view>
-      <image class="target-options-header-title-img" src="../static/choose-battle-mode.png" mode="widthFix" />
+      <image class="target-options-header-title-img" src="https://static.shelingxingqiu.com/shootmini/static/choose-battle-mode.png" mode="widthFix" />
      <view class="target-options-header-line-right"></view>
    </view>
    <view class="create-options">
@@ -112,7 +117,7 @@ const createRoom = debounce(async () => {
        <text>40厘米全环靶</text>
      </view>
    </view>
-    <SButton :onClick="() => $clickSound(createRoom)">创建房间</SButton>
+    <SButton :disabled="loading" :onClick="() => { $clickSound(); return createRoom(); }">创建房间</SButton>
  </view>
 </template>

@@ -12,13 +12,13 @@ defineProps({
 const bubbleTypes = [
  "../static/long-bubble.png",
  "../static/long-bubble-middle.png",
-  "../static/long-bubble-tall.png",
+  "https://static.shelingxingqiu.com/shootmini/static/long-bubble-tall.png",
 ];
 </script>

 <template>
  <view class="container">
-    <image src="../static/shooter.png" mode="widthFix" />
+    <image src="https://static.shelingxingqiu.com/shootmini/static/shooter.png" mode="widthFix" />
    <view>
      <image
        v-if="!noBg"
@@ -105,7 +105,7 @@ onBeforeUnmount(() => {
 <template>
  <view class="matching">
    <image
-      src="../static/matching-bg.png"
+      src="https://static.shelingxingqiu.com/shootmini/static/matching-bg.png"
      mode="widthFix"
      class="matching-bg"
    />
@@ -52,19 +52,19 @@ const handleConfirm = () => {
    <view class="modal-wrap scale-in">
      <image
        class="dialog-light"
-        src="../static/common/dialog-light.png"
+        src="https://static.shelingxingqiu.com/shootmini/static/common/dialog-light.png"
        mode="widthFix"
      />
      <image
        class="dialog-icon"
-        src="../static/common/dialog-icon.png"
+        src="https://static.shelingxingqiu.com/shootmini/static/common/dialog-icon.png"
        mode="widthFix"
      />

      <view class="dialog-panel">
        <image
          class="dialog-bg"
-          src="../static/common/dialog-bg.png"
+          src="https://static.shelingxingqiu.com/shootmini/static/common/dialog-bg.png"
          mode="scaleToFill"
        />
        <view class="dialog-content">
@@ -19,7 +19,7 @@ const rowCount = new Array(6).fill(0);
 const getRingText = (arrow) => {
  if (!arrow) return "-";
  if (arrow.ringX && arrow.ring) return "X环";
-  return arrow.ring ? `${arrow.ring}环` : "-";
+  return `${Number(arrow.ring) || 0}环`;
 };
 const isMember = (player = {}) => player.vip === true || player.sVip === true;

@@ -20,13 +20,22 @@ const props = defineProps({
    default: false,
  },
 });
+
+const isMember = (player = {}) => player.vip === true || player.sVip === true;
+
+const getMemberNicknameClass = (player = {}) => [
+  "member-nickname",
+  player.vip === true && player.sVip !== true ? "member-nickname--vip" : "",
+  player.sVip === true ? "member-nickname--svip" : "",
+];
+
 const seats = new Array(props.total).fill(1);
 </script>

 <template>
  <view class="players">
    <view v-for="(_, index) in seats" :key="index">
-      <image src="../static/player-bg.png" mode="widthFix" />
+      <image src="https://static.shelingxingqiu.com/shootmini/static/player-bg.png" mode="widthFix" />
      <view v-if="players[index] && players[index].name" class="avatar">
        <Avatar
          :src="players[index].avatar || '../static/user-icon.png'"
@@ -40,10 +49,27 @@ const seats = new Array(props.total).fill(1);
      <view v-else class="player-unknow">
        <image src="../static/question-mark.png" mode="widthFix" />
      </view>
-      <text v-if="players[index] && players[index].name">{{
-        players[index].name
-      }}</text>
-      <text v-else :style="{ color: '#fff9' }">虚位以待</text>
+      <view
+        v-if="players[index] && players[index].name && isMember(players[index])"
+        :class="['player-seat-name', ...getMemberNicknameClass(players[index])]"
+      >
+        <text class="member-nickname__text">{{ players[index].name }}</text>
+        <text
+          v-if="players[index].sVip === true"
+          class="member-nickname__shine"
+        >
+          {{ players[index].name }}
+        </text>
+      </view>
+      <text
+        v-else-if="players[index] && players[index].name"
+        class="player-seat-name"
+      >
+        {{ players[index].name }}
+      </text>
+      <text v-else class="player-seat-name" :style="{ color: '#fff9' }">
+        虚位以待
+      </text>
      <view v-if="index === 0" class="founder">管理员</view>
      <!-- <image
        :src="`../static/player-${index + 1}.png`"
@@ -108,7 +134,7 @@ const seats = new Array(props.total).fill(1);
  height: 28rpx;
  line-height: 28rpx;
 }
-.players > view > text:nth-child(3) {
+.player-seat-name {
  width: 20vw;
  white-space: nowrap;
  overflow: hidden;
@@ -65,7 +65,7 @@ onMounted(() => {
      </view>
    </view>
    <view class="right-part">
-      <image src="../static/bow-target.png" mode="widthFix" />
+      <image src="https://static.shelingxingqiu.com/shootmini/static/bow-target.png" mode="widthFix" />
      <view class="arrow-amount">
        <text>{{ data.actualTotalRing }}</text>
        <text>/</text>
@@ -93,7 +93,7 @@ onMounted(async () => {

 <template>
  <view class="container">
-    <image src="../static/donate.png" mode="widthFix" />
+    <image src="https://static.shelingxingqiu.com/shootmini/static/donate.png" mode="widthFix" />
    <text>感谢您对我们公益项目的支持！</text>
    <view class="amounts">
      <button
@@ -26,8 +26,8 @@ const items = ref(new Array(props.total).fill(9));
 const width = ref(92);
 const itemWidth = ref(0);
 const bgImages = [
-  "../static/complete-light1.png",
-  "../static/complete-light2.png",
+  "https://static.shelingxingqiu.com/shootmini/static/complete-light1.png",
+  "https://static.shelingxingqiu.com/shootmini/static/complete-light2.png",
 ];
 const bgIndex = ref(0);
 watch(
@@ -81,7 +81,7 @@ const openCoachComment = () => {
  <view class="container">
    <view :class="['container-header', showPanel ? 'scale-in' : 'scale-out']">
      <image :src="tipSrc" mode="widthFix" />
-      <image src="../static/finish-frame.png" mode="widthFix" />
+      <image src="https://static.shelingxingqiu.com/shootmini/static/finish-frame.png" mode="widthFix" />
      <text
        >完成<text class="gold-text">{{ validArrows }}</text
        >箭，获得<text class="gold-text">{{ validArrows }}</text
@@ -27,22 +27,22 @@ const getContentHeight = () => {
    <view class="scale-in" :style="{ height: getContentHeight() }">
      <image
        v-if="mode === 'normal'"
-        src="../static/screen-hint-bg.png"
+        src="https://static.shelingxingqiu.com/shootmini/static/screen-hint-bg.png"
        mode="widthFix"
      />
      <image
        v-if="mode === 'tall'"
-        src="../static/coach-comment.png"
+        src="https://static.shelingxingqiu.com/shootmini/static/coach-comment.png"
        mode="widthFix"
      />
      <image
        v-if="mode === 'square'"
-        src="../static/prompt-bg-square.png"
+        src="https://static.shelingxingqiu.com/shootmini/static/prompt-bg-square.png"
        mode="widthFix"
      />
      <image
        v-if="mode === 'small'"
-        src="../static/finish-frame.png"
+        src="https://static.shelingxingqiu.com/shootmini/static/finish-frame.png"
        mode="widthFix"
      />
      <slot />
@@ -20,7 +20,7 @@ const props = defineProps({
 <template>
  <view class="container" :style="{ display: show ? 'flex' : 'none' }">
    <view class="scale-in">
-      <image src="../static/point-book-tip-bg.png" mode="widthFix" />
+      <image src="https://static.shelingxingqiu.com/shootmini/static/point-book-tip-bg.png" mode="widthFix" />
      <slot />
    </view>
    <IconButton
@@ -150,12 +150,12 @@ async function onReceiveMessage(msg) {
    if (msg.details && Array.isArray(msg.details)) {
      arrow = msg.details[msg.details.length - 1];
    } else {
-      if (msg.shootData.playerId !== user.value.id) return;
+      if (!msg.shootData || String(msg.shootData.playerId) !== String(user.value.id)) return;
      if (msg.shootData) arrow = msg.shootData;
    }
    let key = [];
    key.push(arrow.ring ? `${arrow.ringX ? "X" : arrow.ring}环` : "未上靶");
-    if (arrow.angle !== null)
+    if (arrow.angle)
      key.push(`向${getDirectionText(arrow.angle)}调整`);
    audioManager.play(key, false);
  } else if (msg.type === MESSAGETYPESV2.HalfRest) {
@@ -191,7 +191,7 @@ onBeforeUnmount(() => {
 <template>
  <view class="container" :style="{ display: show ? 'block' : 'none' }">
    <view>
-      <image src="../static/shooter.png" mode="widthFix" />
+      <image src="https://static.shelingxingqiu.com/shootmini/static/shooter.png" mode="widthFix" />
      <text>{{ tipContent }}</text>
      <button hover-class="none" @click="updateSound">
        <image
@@ -111,7 +111,7 @@ onBeforeUnmount(() => {
      </view>
    </view>
    <view v-if="isBattle" class="ready-timer">
-      <image src="../static/test-tip.png" mode="widthFix" />
+      <image src="https://static.shelingxingqiu.com/shootmini/static/test-tip.png" mode="widthFix" />
      <view v-if="count >= 0">
        <text>具体正式比赛还有</text>
        <text>{{ count }}</text>
@@ -54,23 +54,23 @@ onBeforeUnmount(() => {
    <view v-if="showRank" class="up-rank">
      <image :src="user.avatar || '../static/user-icon.png'" mode="widthFix" />
      <image :src="nextRankImage" mode="widthFix" />
-      <image class="bg-effect" src="../static/shining-bg.png" mode="widthFix" />
+      <image class="bg-effect" src="https://static.shelingxingqiu.com/shootmini/static/shining-bg.png" mode="widthFix" />
      <image
        class="bg-effect"
-        src="../static/gold-shining.png"
+        src="https://static.shelingxingqiu.com/shootmini/static/gold-shining.png"
        mode="widthFix"
      />
    </view>
    <view v-if="showGrade" class="up-grade">
      <image
        class="scale-in"
-        src="../static/user-upgrade.png"
+        src="https://static.shelingxingqiu.com/shootmini/static/user-upgrade.png"
        mode="widthFix"
      />
-      <image class="bg-effect" src="../static/shining-bg.png" mode="widthFix" />
+      <image class="bg-effect" src="https://static.shelingxingqiu.com/shootmini/static/shining-bg.png" mode="widthFix" />
      <image
        class="bg-effect"
-        src="../static/gold-shining.png"
+        src="https://static.shelingxingqiu.com/shootmini/static/gold-shining.png"
        mode="widthFix"
      />
    </view>
@@ -1,6 +1,7 @@
 export const MESSAGETYPES = {
  ShootSyncMeArrowID: parseInt("0x789b6b0d"), // 2023451405
  ShootSyncMePracticeID: parseInt("0xD88AE05E"), // 3632980062
+  ShootSyncBattleCreateMatchLinkID: parseInt("0xF86FF466"), // 2538869862
  WaitForAllReady: parseInt("0x615C13BE"), // 1633424318
  AllReady: parseInt("0x1CCB49FD"), // 483084797
  MeleeAllReady: parseInt("0x37132BD5"), // 924003285
@@ -53,6 +53,242 @@
    "quickapp" : {},
    "mp-weixin" : {
        "appid" : "wxa8f5989dcd45cc23",
+        "packOptions" : {
+            "ignore" : [
+                {
+                    "type" : "file",
+                    "value" : "static/common/dialog-light.png"
+                },
+                {
+                    "type" : "file",
+                    "value" : "static/common/dialog-bg.png"
+                },
+                {
+                    "type" : "file",
+                    "value" : "static/common/dialog-icon.png"
+                },
+                {
+                    "type" : "file",
+                    "value" : "static/prompt-bg-square.png"
+                },
+                {
+                    "type" : "file",
+                    "value" : "static/coach-comment.png"
+                },
+                {
+                    "type" : "file",
+                    "value" : "static/screen-hint-bg.png"
+                },
+                {
+                    "type" : "file",
+                    "value" : "static/red-team-win.png"
+                },
+                {
+                    "type" : "file",
+                    "value" : "static/blue-team-win.png"
+                },
+                {
+                    "type" : "file",
+                    "value" : "static/my-grow.png"
+                },
+                {
+                    "type" : "file",
+                    "value" : "static/gold-shining.png"
+                },
+                {
+                    "type" : "file",
+                    "value" : "static/bow-target.png"
+                },
+                {
+                    "type" : "file",
+                    "value" : "static/matching-bg.png"
+                },
+                {
+                    "type" : "file",
+                    "value" : "static/versus.png"
+                },
+                {
+                    "type" : "file",
+                    "value" : "static/point-champion.png"
+                },
+                {
+                    "type" : "file",
+                    "value" : "static/my-practise.png"
+                },
+                {
+                    "type" : "file",
+                    "value" : "static/shining-bg.png"
+                },
+                {
+                    "type" : "file",
+                    "value" : "static/donate.png"
+                },
+                {
+                    "type" : "file",
+                    "value" : "static/friend-battle.png"
+                },
+                {
+                    "type" : "file",
+                    "value" : "static/user-upgrade.png"
+                },
+                {
+                    "type" : "file",
+                    "value" : "static/finish-frame.png"
+                },
+                {
+                    "type" : "file",
+                    "value" : "static/vip/svip-jian.png"
+                },
+                {
+                    "type" : "file",
+                    "value" : "static/battle-header.png"
+                },
+                {
+                    "type" : "file",
+                    "value" : "static/battle-header-melee.png"
+                },
+                {
+                    "type" : "file",
+                    "value" : "static/player-bg.png"
+                },
+                {
+                    "type" : "file",
+                    "value" : "static/mvp-blue.png"
+                },
+                {
+                    "type" : "file",
+                    "value" : "static/finish-tip.png"
+                },
+                {
+                    "type" : "file",
+                    "value" : "static/2unfinish-tip.png"
+                },
+                {
+                    "type" : "file",
+                    "value" : "static/have-no-device.png"
+                },
+                {
+                    "type" : "file",
+                    "value" : "static/device-icon.png"
+                },
+                {
+                    "type" : "file",
+                    "value" : "static/unfinish-tip.png"
+                },
+                {
+                    "type" : "file",
+                    "value" : "static/test-tip.png"
+                },
+                {
+                    "type" : "file",
+                    "value" : "static/mvp-red.png"
+                },
+                {
+                    "type" : "file",
+                    "value" : "static/vip/svip-lie.png"
+                },
+                {
+                    "type" : "file",
+                    "value" : "static/mvp-tip.png"
+                },
+                {
+                    "type" : "file",
+                    "value" : "static/rank/battle-choose.png"
+                },
+                {
+                    "type" : "file",
+                    "value" : "static/back-to-game-bg.png"
+                },
+                {
+                    "type" : "file",
+                    "value" : "static/complete-light1.png"
+                },
+                {
+                    "type" : "file",
+                    "value" : "static/complete-light2.png"
+                },
+                {
+                    "type" : "file",
+                    "value" : "static/title-2v2.png"
+                },
+                {
+                    "type" : "file",
+                    "value" : "static/tab-bg.png"
+                },
+                {
+                    "type" : "file",
+                    "value" : "static/scan.png"
+                },
+                {
+                    "type" : "file",
+                    "value" : "static/choose-battle-mode.png"
+                },
+                {
+                    "type" : "file",
+                    "value" : "static/shooter.png"
+                },
+                {
+                    "type" : "file",
+                    "value" : "static/my-growth.png"
+                },
+                {
+                    "type" : "file",
+                    "value" : "static/juezhanbang.png"
+                },
+                {
+                    "type" : "file",
+                    "value" : "static/title-3v3.png"
+                },
+                {
+                    "type" : "file",
+                    "value" : "static/point-book-tip-bg.png"
+                },
+                {
+                    "type" : "file",
+                    "value" : "static/reward-us.png"
+                },
+                {
+                    "type" : "file",
+                    "value" : "static/rank/star.png"
+                },
+                {
+                    "type" : "file",
+                    "value" : "static/tab-point-book.png"
+                },
+                {
+                    "type" : "file",
+                    "value" : "static/pk-icon.png"
+                },
+                {
+                    "type" : "file",
+                    "value" : "static/first-try.png"
+                },
+                {
+                    "type" : "file",
+                    "value" : "static/row-yellow-bg.png"
+                },
+                {
+                    "type" : "file",
+                    "value" : "static/room-notfound-title.png"
+                },
+                {
+                    "type" : "file",
+                    "value" : "static/title-mvp.png"
+                },
+                {
+                    "type" : "file",
+                    "value" : "static/long-bubble-tall.png"
+                },
+                {
+                    "type" : "file",
+                    "value" : "static/battle-result.png"
+                },
+                {
+                    "type" : "file",
+                    "value" : "static/tab-mall.png"
+                }
+            ]
+        },
        "setting" : {
            "urlCheck" : false,
            "minified" : true,
@@ -0,0 +1,977 @@
+import {
+  ClientMessageType,
+  ServerMessageType,
+  createAckMessage,
+  createHeartbeatAckMessage,
+  createLeaveMessage,
+  decodeServerMessage,
+  getServerMessageTypeName,
+} from "@/utils/matchProtocol";
+import { MESSAGETYPESV2 } from "@/constants";
+import { getDirectionText } from "@/util";
+import {
+  normalizeId,
+  normalizeMatchInfo,
+  normalizePlainObject,
+  pickField,
+} from "@/utils/matchAdapter";
+
+// 比赛服 websocket 独立管理器：
+// 负责连接、解码、ACK/LEAVE，并把比赛服消息适配成项目现有 socket-inbox 业务事件。
+let socket = null;
+let currentContext = null;
+let isConnecting = false;
+let manualClose = false;
+let audioAckListenerReady = false;
+let lastReadyRouteKey = "";
+let reconnectTimer = null;
+let connectTimeoutTimer = null;
+let livenessTimer = null;
+let reconnectAttempt = 0;
+let networkConnected = true;
+let lastNetworkType = "";
+
+// 后端要求非心跳消息必须等前端语音播报完成后再 ACK。
+const pendingAcks = [];
+const ACK_AUDIO_TIMEOUT_MS = 9000;
+const READY_ROUTE_FALLBACK_DELAY_MS = 300;
+const CONNECT_TIMEOUT_MS = 8000;
+const LIVENESS_TIMEOUT_MS = 30000;
+const RECONNECT_DELAYS_MS = [1000, 2000, 4000, 8000, 15000];
+const ROUND_AUDIO_NAMES = ["一", "二", "三", "四", "五"];
+const MATCH_STATUS_HALF_REST = 3;
+
+// 比赛服消息类型先映射成项目里已有的 V2 业务消息，页面仍然复用原来的 socket-inbox 流程。
+const BUSINESS_TYPE_BY_SERVER_TYPE = {
+  [ServerMessageType.SERVER_MSG_MATCH_READY]: MESSAGETYPESV2.AboutToStart,
+  [ServerMessageType.SERVER_MSG_MATCH_START]: MESSAGETYPESV2.BattleStart,
+  [ServerMessageType.SERVER_MSG_NOW_YOU]: MESSAGETYPESV2.ToSomeoneShoot,
+  [ServerMessageType.SERVER_MSG_SHOT]: MESSAGETYPESV2.ShootResult,
+  [ServerMessageType.SERVER_MSG_NEW_ROUND]: MESSAGETYPESV2.NewRound,
+  [ServerMessageType.SERVER_MSG_MATCH_END]: MESSAGETYPESV2.BattleEnd,
+  [ServerMessageType.SERVER_MSG_CHECK]: MESSAGETYPESV2.TestDistance,
+  [ServerMessageType.SERVER_MSG_NOT_ENOUGH_DISTANCE]: MESSAGETYPESV2.InvalidShot,
+  [ServerMessageType.SERVER_MSG_PRACTICE_END]: MESSAGETYPESV2.BattleEnd,
+};
+
+const MATCH_READY_SNAPSHOT_PREFIX = "match-ready-snapshot:";
+export const MATCH_WS_AUDIO_ACK_EVENT = "match-ws-audio-ack";
+export const MATCH_WS_STATE_EVENT = "match-ws-state";
+
+function normalizeShootData(shootData) {
+  if (!shootData || typeof shootData !== "object") return shootData;
+  const normalized = { ...shootData };
+  if (normalized.distance === undefined && normalized.dst !== undefined) {
+    normalized.distance = normalized.dst;
+  }
+  return normalized;
+}
+
+// 兼容普通接口通知的 camelCase 和 protobuf 解码后的 snake_case。
+function normalizePracticeInfo(practiceInfo = {}) {
+  if (!practiceInfo || typeof practiceInfo !== "object") return {};
+
+  const normalized = normalizePlainObject(practiceInfo);
+  if (practiceInfo.shoot_data || normalized.shootData) {
+    normalized.shootData = normalizeShootData(
+      normalizePlainObject(practiceInfo.shoot_data || normalized.shootData)
+    );
+  }
+  if (Array.isArray(practiceInfo.details || normalized.details)) {
+    normalized.details = (practiceInfo.details || normalized.details)
+      .map(normalizePlainObject)
+      .map(normalizeShootData);
+  }
+
+  return normalized;
+}
+
+function getCurrentMode(message = {}, normalizedInfo = {}) {
+  const mode = Number(
+    pickField(message, "mode") ??
+      normalizedInfo.mode ??
+      currentContext?.mode
+  );
+  return Number.isFinite(mode) ? mode : undefined;
+}
+
+function isMeleeMessage(message = {}, normalizedInfo = {}) {
+  const mode = getCurrentMode(message, normalizedInfo);
+  if (mode !== undefined) return mode > 3;
+  if (currentContext?.isMelee !== undefined) return currentContext.isMelee;
+  return normalizeRoute(getCurrentPageInfo()?.route) === "pages/melee-battle";
+}
+
+function isHalfRestTimeout(message = {}, matchInfo = {}) {
+  if (message.type !== ServerMessageType.SERVER_MSG_TIMEOUT) return false;
+  if (!isMeleeMessage(message, matchInfo)) return false;
+
+  const status = Number(pickField(message, "status") ?? matchInfo.status);
+  return status === MATCH_STATUS_HALF_REST || !Number.isFinite(status);
+}
+
+function getBusinessType(message, matchInfo) {
+  if (isHalfRestTimeout(message, matchInfo)) return MESSAGETYPESV2.HalfRest;
+  if (message.type === ServerMessageType.SERVER_MSG_TIMEOUT) {
+    return MESSAGETYPESV2.BattleEnd;
+  }
+  return BUSINESS_TYPE_BY_SERVER_TYPE[message.type];
+}
+
+function buildBusinessMessage(message) {
+  const matchInfo = normalizeMatchInfo(message.match_info);
+  if (
+    message.type === ServerMessageType.SERVER_MSG_MATCH_READY &&
+    (matchInfo.status === undefined ||
+      matchInfo.status === null ||
+      matchInfo.status === "")
+  ) {
+    matchInfo.status = 0;
+  }
+  const practiceInfo = normalizePracticeInfo(message.practice_info);
+  const businessType = getBusinessType(message, matchInfo);
+  if (!businessType) return null;
+
+  const mode = getCurrentMode(message, matchInfo);
+  const isMelee = isMeleeMessage(message, matchInfo);
+  const isSecondHalfStart =
+    message.type === ServerMessageType.SERVER_MSG_MATCH_START &&
+    isMelee &&
+    currentContext?.meleeHalfRest === true;
+
+  if (currentContext) {
+    if (mode !== undefined) {
+      currentContext.mode = mode;
+      currentContext.isMelee = isMelee;
+    } else if (isMelee) {
+      currentContext.isMelee = true;
+    }
+    if (businessType === MESSAGETYPESV2.HalfRest) {
+      currentContext.meleeHalfRest = true;
+    } else if (message.type === ServerMessageType.SERVER_MSG_MATCH_START) {
+      currentContext.meleeHalfRest = false;
+    }
+  }
+
+  const matchId = normalizeId(
+    pickField(message, "matchId", "match_id") ||
+      matchInfo.matchId ||
+      practiceInfo.id ||
+      currentContext?.matchId
+  );
+  const shootData = normalizeShootData(
+    matchInfo.shootData ||
+      practiceInfo.shootData ||
+      (message.shoot_data ? normalizePlainObject(message.shoot_data) : undefined)
+  );
+  const details = Array.isArray(practiceInfo.details)
+    ? practiceInfo.details
+    : matchInfo.details;
+
+  return {
+    ...matchInfo,
+    ...practiceInfo,
+    type: businessType,
+    id: matchId,
+    matchId,
+    shootData,
+    details,
+    sequence: message.sequence,
+    timestamp: message.timestamp,
+    matchWsType: message.type,
+    matchWsTypeName: getServerMessageTypeName(message.type),
+    isSecondHalfStart,
+  };
+}
+
+function getReadySnapshotKey(matchId) {
+  return `${MATCH_READY_SNAPSHOT_PREFIX}${normalizeId(matchId)}`;
+}
+
+function persistReadyTeams(message) {
+  const teams = message?.teams || {};
+  if (Number(message?.mode) > 3) return;
+
+  const bluePlayers = teams[1]?.players || teams["1"]?.players;
+  const redPlayers = teams[2]?.players || teams["2"]?.players;
+  if (Array.isArray(bluePlayers)) uni.setStorageSync("blue-team", bluePlayers);
+  if (Array.isArray(redPlayers)) uni.setStorageSync("red-team", redPlayers);
+}
+
+function persistReadySnapshot(message) {
+  const matchId = normalizeId(message?.matchId || message?.id);
+  if (!matchId) return;
+  uni.setStorageSync(getReadySnapshotKey(matchId), {
+    ...message,
+    savedAt: Date.now(),
+  });
+}
+
+function getBattlePageUrl(message) {
+  const matchId = normalizeId(message?.matchId || message?.id);
+  const mode = Number(message?.mode);
+  if (!matchId) return "";
+  if (!Number.isFinite(mode)) return "";
+  return mode <= 3
+    ? `/pages/team-battle/index?battleId=${matchId}`
+    : `/pages/melee-battle?battleId=${matchId}`;
+}
+
+function getCurrentPageInfo() {
+  if (typeof getCurrentPages !== "function") return null;
+  const pages = getCurrentPages();
+  return pages[pages.length - 1] || null;
+}
+
+function normalizeRoute(route) {
+  return String(route || "").replace(/^\//, "");
+}
+
+function isCurrentBattlePage(matchId) {
+  const page = getCurrentPageInfo();
+  const route = normalizeRoute(page?.route);
+  if (route !== "pages/team-battle/index" && route !== "pages/melee-battle") {
+    return false;
+  }
+
+  const options = page?.options || page?.$page?.options || {};
+  return !matchId || normalizeId(options.battleId) === normalizeId(matchId);
+}
+
+function scheduleReadyRouteFallback(message) {
+  const url = getBattlePageUrl(message);
+  const matchId = normalizeId(message?.matchId || message?.id);
+  const routeKey = `${matchId}:${url}`;
+  if (!url || lastReadyRouteKey === routeKey) return;
+
+  lastReadyRouteKey = routeKey;
+  setTimeout(() => {
+    if (isCurrentBattlePage(matchId)) return;
+
+    const currentRoute = normalizeRoute(getCurrentPageInfo()?.route);
+    // battle-room 和 match-page 本身会消费 AboutToStart；这里不绕过页面内状态，避免好友房误触退房逻辑。
+    if (currentRoute === "pages/battle-room" || currentRoute === "pages/match-page") return;
+
+    uni.redirectTo({
+      url,
+      fail: (err) => {
+        console.log("[match-ws] ready route fallback failed", err, { url });
+      },
+    });
+  }, READY_ROUTE_FALLBACK_DELAY_MS);
+}
+
+function emitBusinessMessage(message) {
+  if (!message) return;
+  if (message.type === MESSAGETYPESV2.AboutToStart) {
+    persistReadyTeams(message);
+    persistReadySnapshot(message);
+    scheduleReadyRouteFallback(message);
+  }
+
+  uni.$emit("socket-inbox", message);
+}
+
+function resolvePlayerTeam(message, playerId) {
+  const teams = message?.teams || {};
+  const redPlayers = teams[2]?.players || teams["2"]?.players || [];
+  return redPlayers.some((item) => String(item.id) === String(playerId))
+    ? "red"
+    : "blue";
+}
+
+function getNowYouAudioKeys(message) {
+  const current = message?.current || {};
+  const keys = [];
+
+  if (current.goldRound) {
+    keys.push("决金箭轮");
+  } else if (current.round) {
+    const roundIndex = Math.max(0, Number(current.round) - 1);
+    const roundName = ROUND_AUDIO_NAMES[roundIndex] || current.round;
+    keys.push(`第${roundName}轮`);
+  }
+
+  if (String(current.playerId) === String(currentContext?.userId)) {
+    keys.push("轮到你了");
+    return keys;
+  }
+
+  const team = resolvePlayerTeam(message, current.playerId);
+  keys.push(team === "red" ? "请红方射箭" : "请蓝方射箭");
+  return keys;
+}
+
+function getShootResultAudioKeys(shootData) {
+  if (!shootData) return [];
+  const keys = [
+    shootData.ring ? `${shootData.ringX ? "X" : shootData.ring}环` : "未上靶",
+  ];
+  if (shootData.angle !== null && shootData.angle !== undefined) {
+    keys.push(`向${getDirectionText(shootData.angle)}调整`);
+  }
+  return keys;
+}
+
+function getTestDistanceAudioKeys(shootData) {
+  const distance = Number(shootData?.distance ?? shootData?.dst);
+  if (Number.isNaN(distance)) return [];
+  return [distance / 100 >= 5 ? "\u8ddd\u79bb\u5408\u683c" : "\u8ddd\u79bb\u4e0d\u8db3"];
+}
+
+function getAckAudioKeys(message, businessMessage) {
+  switch (message.type) {
+    case ServerMessageType.SERVER_MSG_MATCH_START:
+      return [businessMessage?.isSecondHalfStart ? "下半场开始" : "比赛开始"];
+    case ServerMessageType.SERVER_MSG_NOW_YOU:
+      if (isMeleeMessage(message, businessMessage)) return [];
+      return getNowYouAudioKeys(businessMessage);
+    case ServerMessageType.SERVER_MSG_SHOT:
+      if (
+        isMeleeMessage(message, businessMessage) &&
+        String(businessMessage?.shootData?.playerId) !== String(currentContext?.userId)
+      ) {
+        return [];
+      }
+      return getShootResultAudioKeys(businessMessage?.shootData);
+    case ServerMessageType.SERVER_MSG_MATCH_END:
+      return ["比赛结束"];
+    case ServerMessageType.SERVER_MSG_TIMEOUT:
+      if (businessMessage?.type === MESSAGETYPESV2.HalfRest) return ["中场休息"];
+      return ["比赛结束"];
+    case ServerMessageType.SERVER_MSG_PRACTICE_END:
+      return ["比赛结束"];
+    case ServerMessageType.SERVER_MSG_CHECK:
+      return getTestDistanceAudioKeys(businessMessage?.shootData);
+    case ServerMessageType.SERVER_MSG_NOT_ENOUGH_DISTANCE:
+      return ["射击无效"];
+    default:
+      return [];
+  }
+}
+
+function shouldCloseAfterAck(message, businessMessage) {
+  if (
+    message.type === ServerMessageType.SERVER_MSG_TIMEOUT &&
+    businessMessage?.type === MESSAGETYPESV2.HalfRest
+  ) {
+    return false;
+  }
+
+  return (
+    message.type === ServerMessageType.SERVER_MSG_MATCH_END ||
+    message.type === ServerMessageType.SERVER_MSG_TIMEOUT ||
+    message.type === ServerMessageType.SERVER_MSG_PRACTICE_END
+  );
+}
+
+// 追加 token 查询参数；如果后端地址已经带 token，则保持原样。
+function appendQuery(url, key, value) {
+  if (!value || new RegExp(`[?&]${key}=`).test(url)) return url;
+  return `${url}${url.includes("?") ? "&" : "?"}${key}=${encodeURIComponent(
+    value
+  )}`;
+}
+
+// 后端可能下发完整 ws 地址，也可能只给 host:port，这里统一转成可连接地址。
+function normalizeServerUrl(serverAddr, token) {
+  if (!serverAddr || typeof serverAddr !== "string") return "";
+
+  let url = serverAddr.trim();
+  if (!url) return "";
+
+  if (!/^wss?:\/\//i.test(url)) {
+    const [address, query = ""] = url.split("?");
+    const hasPath = address.includes("/");
+    const host = hasPath
+      ? address
+      : `${address}${address.includes(":") ? "" : ":8011"}/ws`;
+    url = `ws://${host}${query ? `?${query}` : ""}`;
+  }
+
+  return appendQuery(url, "token", token);
+}
+
+function getServerEndpoint(url) {
+  return String(url || "").split("?")[0];
+}
+
+function getUrlToken(url) {
+  const match = String(url || "").match(/[?&]token=([^&#]+)/i);
+  if (!match?.[1]) return "";
+  try {
+    return decodeURIComponent(match[1]);
+  } catch (_) {
+    return match[1];
+  }
+}
+
+function emitMatchSocketState(state, extra = {}) {
+  uni.$emit(MATCH_WS_STATE_EVENT, {
+    state,
+    matchId: currentContext?.matchId || "",
+    ...extra,
+  });
+}
+
+function clearReconnectTimer() {
+  if (!reconnectTimer) return;
+  clearTimeout(reconnectTimer);
+  reconnectTimer = null;
+}
+
+function clearConnectTimeout() {
+  if (!connectTimeoutTimer) return;
+  clearTimeout(connectTimeoutTimer);
+  connectTimeoutTimer = null;
+}
+
+function clearLivenessTimer() {
+  if (!livenessTimer) return;
+  clearTimeout(livenessTimer);
+  livenessTimer = null;
+}
+
+function clearSocketHealthTimers() {
+  clearConnectTimeout();
+  clearLivenessTimer();
+}
+
+function closeSocketTask(socketTask, reason) {
+  if (!socketTask) return;
+  try {
+    socketTask.close({ reason });
+  } catch (err) {
+    console.log("[match-ws] close socket task failed", reason, err);
+  }
+}
+
+function detachCurrentSocket(reason) {
+  const currentSocket = socket;
+  socket = null;
+  isConnecting = false;
+  clearSocketHealthTimers();
+  closeSocketTask(currentSocket, reason);
+}
+
+function scheduleReconnect(reason, { immediate = false } = {}) {
+  if (
+    manualClose ||
+    !currentContext ||
+    !networkConnected ||
+    reconnectTimer ||
+    socket ||
+    isConnecting
+  ) {
+    return;
+  }
+
+  const delay = immediate
+    ? 0
+    : RECONNECT_DELAYS_MS[
+        Math.min(reconnectAttempt, RECONNECT_DELAYS_MS.length - 1)
+      ];
+  const attempt = reconnectAttempt + 1;
+  reconnectAttempt = attempt;
+  emitMatchSocketState("reconnecting", { reason, delay, attempt });
+
+  reconnectTimer = setTimeout(() => {
+    reconnectTimer = null;
+    if (manualClose || !currentContext || !networkConnected) return;
+    connectMatchWebSocket({
+      ...currentContext,
+      force: true,
+      reconnecting: true,
+      reconnectReason: reason,
+    });
+  }, delay);
+}
+
+function handleUnexpectedDisconnect(
+  socketTask,
+  reason,
+  detail,
+  { closeTask = true } = {}
+) {
+  if (socket !== socketTask) return;
+
+  socket = null;
+  isConnecting = false;
+  clearSocketHealthTimers();
+  if (closeTask) closeSocketTask(socketTask, reason);
+
+  console.log("[match-ws] unexpected disconnect", {
+    reason,
+    detail,
+    context: currentContext,
+  });
+  emitMatchSocketState(networkConnected ? "disconnected" : "offline", {
+    reason,
+  });
+  scheduleReconnect(reason);
+}
+
+function startConnectTimeout(socketTask) {
+  clearConnectTimeout();
+  connectTimeoutTimer = setTimeout(() => {
+    handleUnexpectedDisconnect(socketTask, "connect-timeout");
+  }, CONNECT_TIMEOUT_MS);
+}
+
+function resetLivenessTimer(socketTask) {
+  clearLivenessTimer();
+  livenessTimer = setTimeout(() => {
+    handleUnexpectedDisconnect(socketTask, "heartbeat-timeout");
+  }, LIVENESS_TIMEOUT_MS);
+}
+
+export function forceReconnectMatchWebSocket(reason = "force-reconnect") {
+  if (manualClose || !currentContext) return false;
+
+  clearReconnectTimer();
+  detachCurrentSocket(reason);
+  if (!networkConnected) {
+    emitMatchSocketState("offline", { reason });
+    return false;
+  }
+
+  reconnectAttempt = 0;
+  scheduleReconnect(reason, { immediate: true });
+  return true;
+}
+
+export function handleMatchNetworkStatusChange(status = {}) {
+  const previousConnected = networkConnected;
+  const networkType = String(status.networkType || "");
+  const nextConnected =
+    status.isConnected !== false && networkType.toLowerCase() !== "none";
+  const networkTypeChanged =
+    !!lastNetworkType && !!networkType && lastNetworkType !== networkType;
+
+  networkConnected = nextConnected;
+  if (networkType) lastNetworkType = networkType;
+  if (manualClose || !currentContext) return;
+
+  if (!nextConnected) {
+    clearReconnectTimer();
+    detachCurrentSocket("network-offline");
+    emitMatchSocketState("offline", { reason: "network-offline" });
+    return;
+  }
+
+  if (!previousConnected || networkTypeChanged) {
+    forceReconnectMatchWebSocket(
+      networkTypeChanged ? "network-type-changed" : "network-recovered"
+    );
+  }
+}
+
+// 统一发送二进制 protobuf 消息，并在日志里保留发送类型。
+function sendBuffer(buffer, label, clientMessage) {
+  if (!socket || !buffer) return;
+
+  const currentSocket = socket;
+  currentSocket.send({
+    data: buffer,
+    success: () => {
+      console.log("发送比赛服 WebSocket 消息", label, clientMessage);
+    },
+    fail: (err) => {
+      if (socket !== currentSocket) return;
+      console.log("比赛服 WebSocket 消息发送失败", label, clientMessage, err);
+      handleUnexpectedDisconnect(currentSocket, "send-failed", err);
+    },
+  });
+}
+
+function sendHeartbeatAck() {
+  // 心跳 ACK 不进入 pendingAcks，收到后立即回复。
+  const clientMessage = {
+    type: ClientMessageType.CLIENT_MSG_HEARTBEAT_ACK,
+  };
+  sendBuffer(
+    createHeartbeatAckMessage(),
+    "CLIENT_MSG_HEARTBEAT_ACK",
+    clientMessage
+  );
+}
+
+function sendAck({ matchId, sequence }) {
+  // sequence 由后端处理，前端只原样带回，不做重排和断线补发。
+  if (sequence === undefined || sequence === null || sequence === "") return;
+  const clientMessage = {
+    type: ClientMessageType.CLIENT_MSG_ACK,
+    match_id: matchId,
+    sequence,
+  };
+  sendBuffer(
+    createAckMessage({ matchId, sequence }),
+    "CLIENT_MSG_ACK",
+    clientMessage
+  );
+}
+
+function completeAckTask(task) {
+  if (task?.timer) clearTimeout(task.timer);
+  sendAck(task);
+  if (task.leaveAfterAck) {
+    setTimeout(() => {
+      closeMatchWebSocket({ reason: "match-end" });
+    }, 0);
+  }
+}
+
+function isSameAckTask(task, payload = {}) {
+  if (String(task?.sequence) !== String(payload.sequence)) return false;
+  if (!payload.matchId) return true;
+  return String(task?.matchId) === String(payload.matchId);
+}
+
+function completePendingAckByMessage(payload = {}) {
+  if (payload.sequence === undefined || payload.sequence === null || payload.sequence === "") {
+    return;
+  }
+
+  const index = pendingAcks.findIndex((task) => isSameAckTask(task, payload));
+  if (index === -1) return;
+
+  const [task] = pendingAcks.splice(index, 1);
+  console.log("[match-ws] ack after page audio", task.sequence, payload);
+  completeAckTask(task);
+}
+
+function flushPendingAcks() {
+  // 每次语音播报完成，只确认队首那条等待相同语音 key 的服务端消息。
+  if (!pendingAcks.length) return;
+  const endedKey = arguments[0];
+  const task = pendingAcks[0];
+  if (task.expectedAudioKey && endedKey && task.expectedAudioKey !== endedKey) {
+    return;
+  }
+  completeAckTask(pendingAcks.shift());
+}
+
+function ensureAudioAckListener() {
+  // 复用现有全局 audioEnded 事件，确保 ACK 时机落在播报结束之后。
+  if (audioAckListenerReady) return;
+  uni.$on("audioEnded", flushPendingAcks);
+  uni.$on(MATCH_WS_AUDIO_ACK_EVENT, completePendingAckByMessage);
+  audioAckListenerReady = true;
+}
+
+function removeAudioAckListener() {
+  if (!audioAckListenerReady) return;
+  uni.$off("audioEnded", flushPendingAcks);
+  uni.$off(MATCH_WS_AUDIO_ACK_EVENT, completePendingAckByMessage);
+  audioAckListenerReady = false;
+}
+
+function queueAckAfterAudio(message, businessMessage) {
+  // 除心跳外，只要服务端带了 sequence，都需要走 ACK；没有语音的消息立即 ACK。
+  if (
+    message.sequence === undefined ||
+    message.sequence === null ||
+    message.sequence === ""
+  ) {
+    return;
+  }
+  const task = {
+    matchId: normalizeId(
+      pickField(message, "matchId", "match_id") || currentContext?.matchId
+    ),
+    sequence: message.sequence,
+    leaveAfterAck: shouldCloseAfterAck(message, businessMessage),
+  };
+
+  const audioKeys = getAckAudioKeys(message, businessMessage).filter(Boolean);
+  if (!audioKeys.length) {
+    console.log(
+      "[match-ws] ack immediately without audio",
+      getServerMessageTypeName(message.type),
+      message.sequence
+    );
+    completeAckTask(task);
+    return;
+  }
+
+  task.expectedAudioKey = audioKeys[audioKeys.length - 1];
+  task.timer = setTimeout(() => {
+    const index = pendingAcks.indexOf(task);
+    if (index === -1) return;
+    pendingAcks.splice(index, 1);
+    console.log(
+      "[match-ws] ack audio wait timeout",
+      getServerMessageTypeName(message.type),
+      message.sequence,
+      task.expectedAudioKey
+    );
+    completeAckTask(task);
+  }, ACK_AUDIO_TIMEOUT_MS);
+  pendingAcks.push(task);
+  console.log(
+    "[match-ws] ack queued until audioEnded",
+    getServerMessageTypeName(message.type),
+    message.sequence,
+    task.expectedAudioKey
+  );
+}
+
+function handleMessage(data) {
+  // 比赛服下发 raw protobuf frame，先解码，再根据消息类型决定是否 ACK。
+  let message;
+  try {
+    message = decodeServerMessage(data);
+  } catch (err) {
+    console.log("[match-ws] decode failed", err, data);
+    return;
+  }
+
+  const decodedMatchId = normalizeId(pickField(message, "matchId", "match_id"));
+  if (decodedMatchId && currentContext) {
+    currentContext.matchId = decodedMatchId;
+  }
+
+  if (message.type === ServerMessageType.SERVER_MSG_HEARTBEAT) {
+    sendHeartbeatAck();
+    return;
+  }
+
+  const typeName = getServerMessageTypeName(message.type);
+  console.log("收到比赛服 WebSocket 消息", typeName, message);
+
+  const businessMessage = buildBusinessMessage(message);
+  if (businessMessage?.matchId && currentContext) {
+    currentContext.matchId = businessMessage.matchId;
+  }
+  queueAckAfterAudio(message, businessMessage);
+  emitBusinessMessage(businessMessage);
+}
+
+function sendLeave() {
+  // 主动关闭、比赛结束、页面离开时发 CLIENT_MSG_LEAVE。
+  if (!socket || !currentContext?.matchId) return;
+  const clientMessage = {
+    type: ClientMessageType.CLIENT_MSG_LEAVE,
+    match_id: currentContext.matchId,
+    user_id: currentContext.userId,
+  };
+  sendBuffer(
+    createLeaveMessage({
+      matchId: clientMessage.match_id,
+      userId: clientMessage.user_id,
+    }),
+    "CLIENT_MSG_LEAVE",
+    clientMessage
+  );
+}
+
+export function connectMatchWebSocket(options = {}) {
+  // 入口参数来自原 websocket 的比赛服地址通知，不影响原有 websocket 连接。
+  const {
+    serverAddr,
+    matchId,
+    userId,
+    token,
+    mode,
+    force = false,
+    reconnecting = false,
+    reconnectReason = "",
+  } = options;
+  const normalizedMatchId = normalizeId(matchId);
+  const normalizedUserId = normalizeId(userId);
+  const normalizedMode = Number(mode);
+  const incomingUrl = normalizeServerUrl(serverAddr, token);
+  const currentUrlToken = getUrlToken(currentContext?.url);
+  const shouldKeepAuthenticatedUrl = !!(
+    currentContext &&
+    currentContext.matchId === normalizedMatchId &&
+    getServerEndpoint(currentContext.url) === getServerEndpoint(incomingUrl) &&
+    currentUrlToken &&
+    !getUrlToken(incomingUrl)
+  );
+  const url = shouldKeepAuthenticatedUrl ? currentContext.url : incomingUrl;
+  const resolvedServerAddr = shouldKeepAuthenticatedUrl
+    ? currentContext.serverAddr
+    : serverAddr;
+  const resolvedToken = shouldKeepAuthenticatedUrl
+    ? currentContext.token || currentUrlToken
+    : token;
+
+  if (shouldKeepAuthenticatedUrl) {
+    console.log("[match-ws] keep authenticated url for same match", {
+      matchId: normalizedMatchId,
+      endpoint: getServerEndpoint(url),
+    });
+  }
+
+  if (!url || !normalizedMatchId) {
+    console.log("[match-ws] missing serverAddr or matchId", options);
+    return;
+  }
+
+  const isSameContext =
+    currentContext?.url === url &&
+    currentContext?.matchId === normalizedMatchId;
+  if (!force && socket && isSameContext) {
+    // 同一场比赛同一地址重复通知时不重复建连。
+    console.log("[match-ws] already connected or connecting", {
+      matchId: normalizedMatchId,
+      url,
+    });
+    return;
+  }
+
+  if (force && isSameContext) {
+    // 网络切换或假死重连时只销毁旧链路，保留比赛上下文且不发送 LEAVE。
+    detachCurrentSocket(reconnectReason || "force-reconnect");
+  } else if (!isSameContext) {
+    // 切换比赛服地址时先关闭旧连接，不发送 LEAVE，避免误通知旧比赛离场。
+    closeMatchWebSocket({ sendLeave: false, reason: "switch" });
+  }
+
+  clearReconnectTimer();
+  manualClose = false;
+  isConnecting = true;
+  if (!isSameContext) reconnectAttempt = 0;
+  const connectedOnce = isSameContext && currentContext?.connectedOnce === true;
+  currentContext = {
+    serverAddr: resolvedServerAddr,
+    matchId: normalizedMatchId,
+    userId: normalizedUserId,
+    token: resolvedToken,
+    url,
+    mode: Number.isFinite(normalizedMode) ? normalizedMode : undefined,
+    isMelee:
+      Number.isFinite(normalizedMode) ? normalizedMode > 3 : undefined,
+    meleeHalfRest: isSameContext
+      ? currentContext?.meleeHalfRest === true
+      : false,
+    connectedOnce,
+  };
+  ensureAudioAckListener();
+  emitMatchSocketState(reconnecting ? "reconnecting" : "connecting", {
+    reason: reconnectReason,
+    attempt: reconnectAttempt,
+  });
+
+  const socketTask = uni.connectSocket({
+    url,
+    success: () => {
+      console.log("[match-ws] connect requested", {
+        matchId: normalizedMatchId,
+        url,
+      });
+    },
+    fail: (err) => {
+      if (socket !== socketTask) return;
+      socket = null;
+      isConnecting = false;
+      console.log("[match-ws] connect failed", err);
+      clearSocketHealthTimers();
+      emitMatchSocketState(networkConnected ? "disconnected" : "offline", {
+        reason: "connect-failed",
+      });
+      scheduleReconnect("connect-failed");
+    },
+  });
+
+  socket = socketTask;
+  startConnectTimeout(socketTask);
+
+  socketTask.onOpen(() => {
+    if (socket !== socketTask) return;
+    clearConnectTimeout();
+    isConnecting = false;
+    const wasReconnected =
+      currentContext?.connectedOnce === true || reconnecting || reconnectAttempt > 0;
+    if (currentContext) currentContext.connectedOnce = true;
+    reconnectAttempt = 0;
+    resetLivenessTimer(socketTask);
+    console.log("[match-ws] connected", {
+      matchId: normalizedMatchId,
+      url,
+      reconnected: wasReconnected,
+    });
+    emitMatchSocketState("open", {
+      reason: reconnectReason,
+      reconnected: wasReconnected,
+    });
+  });
+
+  socketTask.onMessage((res) => {
+    if (socket !== socketTask) return;
+    resetLivenessTimer(socketTask);
+    handleMessage(res.data);
+  });
+
+  socketTask.onError((err) => {
+    if (socket !== socketTask) return;
+    console.log("[match-ws] socket error", err);
+    handleUnexpectedDisconnect(socketTask, "socket-error", err);
+  });
+
+  socketTask.onClose((result) => {
+    if (socket !== socketTask) return;
+    console.log("[match-ws] closed", {
+      manualClose,
+      result,
+      context: currentContext,
+    });
+    if (manualClose) return;
+    handleUnexpectedDisconnect(socketTask, "socket-close", result, {
+      closeTask: false,
+    });
+  });
+}
+
+export function connectMatchWebSocketFromNotice(notice, fallbackUserId) {
+  // 原 websocket 下发的比赛服通知统一从这里转成连接参数。
+  if (!notice) return;
+  connectMatchWebSocket({
+    serverAddr: pickField(notice, "serverAddr", "server_addr"),
+    matchId: pickField(notice, "matchId", "match_id"),
+    userId: pickField(notice, "userId", "user_id") || fallbackUserId,
+    mode: pickField(notice, "mode"),
+    token: notice.token || notice.wsToken || notice.ws_token,
+  });
+}
+
+export function closeMatchWebSocket(options = {}) {
+  // 默认关闭时会发送 LEAVE；内部切换连接可通过 sendLeave:false 跳过。
+  const { sendLeave: shouldSendLeave = true, reason = "manual" } = options;
+
+  manualClose = true;
+  clearReconnectTimer();
+  clearSocketHealthTimers();
+  reconnectAttempt = 0;
+  pendingAcks.forEach((task) => {
+    if (task?.timer) clearTimeout(task.timer);
+  });
+  pendingAcks.length = 0;
+
+  if (socket) {
+    const currentSocket = socket;
+    if (shouldSendLeave) sendLeave();
+    socket = null;
+    try {
+      currentSocket.close({ reason });
+    } catch (err) {
+      console.log("[match-ws] close failed", err);
+    }
+  }
+
+  isConnecting = false;
+  removeAudioAckListener();
+  console.log("[match-ws] close requested", { reason, currentContext });
+  currentContext = null;
+}
+
+export default {
+  ClientMessageType,
+  ServerMessageType,
+  connectMatchWebSocket,
+  connectMatchWebSocketFromNotice,
+  closeMatchWebSocket,
+  forceReconnectMatchWebSocket,
+  handleMatchNetworkStatusChange,
+};
@@ -30,12 +30,9 @@
        "navigationBarTitleText": ""
      }
    },
-    {
-      "path": "pages/team-battle/index"
-    },
-    {
-      "path": "pages/melee-battle"
-    },
+    {
+      "path": "pages/melee-battle"
+    },
    {
      "path": "pages/battle-result"
    },
@@ -69,21 +66,6 @@
    {
      "path": "pages/user"
    },
-    {
-      "path": "pages/member/orders"
-    },
-    {
-      "path": "pages/member/order-detail"
-    },
-    {
-      "path": "pages/member/be-vip"
-    },
-    {
-      "path": "pages/member/vip-intro"
-    },
-    {
-      "path": "pages/member/agreement"
-    },
    {
      "path": "pages/grade-intro"
    },
@@ -118,11 +100,8 @@
      "path": "pages/match-detail"
    },
    {
-      "path": "pages/team-battle/team-bow-data"
+      "path": "pages/melee-bow-data"
    },
-    {
-      "path": "pages/melee-bow-data"
-    },
    {
      "path": "pages/mine-bow-data"
    },
@@ -150,5 +129,37 @@
      "^uni-(.*)": "@dcloudio/uni-ui/lib/uni-$1/uni-$1.vue"
    }
  },
-  "subPackages": []
-}
+  "subPackages": [
+    {
+      "root": "pages/member",
+      "pages": [
+        {
+          "path": "orders"
+        },
+        {
+          "path": "order-detail"
+        },
+        {
+          "path": "be-vip"
+        },
+        {
+          "path": "vip-intro"
+        },
+        {
+          "path": "agreement"
+        }
+      ]
+    },
+    {
+      "root": "pages/team-battle",
+      "pages": [
+        {
+          "path": "index"
+        },
+        {
+          "path": "team-bow-data"
+        }
+      ]
+    }
+  ]
+}
@@ -82,7 +82,7 @@ const checkBowData = () => {
  <view class="container">
    <block v-if="data.mode <= 3">
      <view class="header-team" :style="{ marginTop: '25%' }">
-        <image src="../static/battle-result.png" mode="widthFix" />
+        <image src="https://static.shelingxingqiu.com/shootmini/static/battle-result.png" mode="widthFix" />
        <view class="header-solo" v-if="data.mode === 1">
          <text
            :style="{
@@ -107,7 +107,7 @@ const checkBowData = () => {
      </view>
      <view class="header-mvp" v-if="data.mode === 2 || data.mode === 3">
        <image
-          :src="`../static/${data.winTeam === 1 ? 'blue' : 'red'}-team-win.png`"
+          :src="`https://static.shelingxingqiu.com/shootmini/static/${data.winTeam === 1 ? 'blue' : 'red'}-team-win.png`"
          mode="widthFix"
        />
        <view
@@ -117,8 +117,8 @@ const checkBowData = () => {
            }deg)`,
          }"
        >
-          <view v-if="data.mvp && data.mvp.totalRings">
-            <image src="../static/title-mvp.png" mode="widthFix" />
+          <view v-if="data.mvp && data.mvp.player_match_result.total_ring">
+            <image src="https://static.shelingxingqiu.com/shootmini/static/title-mvp.png" mode="widthFix" />
            <text
              >斩获<text
                :style="{
@@ -127,7 +127,7 @@ const checkBowData = () => {
                  margin: '0 3px',
                  fontWeight: '600',
                }"
-                >{{ data.mvp.totalRings }}</text
+                >{{ data.mvp.player_match_result.total_ring }}</text
              >环</text
            >
          </view>
@@ -153,7 +153,7 @@ const checkBowData = () => {
        </view>
      </view>
      <view class="battle-winner">
-        <image src="../static/shining-bg.png" mode="widthFix" />
+        <image src="https://static.shelingxingqiu.com/shootmini/static/shining-bg.png" mode="widthFix" />
        <image
          :src="ifWin ? '../static/you-win.png' : '../static/you-lost.png'"
          mode="widthFix"
@@ -173,7 +173,7 @@ const checkBowData = () => {
    <block v-else>
      <view class="header-melee">
        <view />
-        <image src="../static/battle-result.png" mode="widthFix" />
+        <image src="https://static.shelingxingqiu.com/shootmini/static/battle-result.png" mode="widthFix" />
        <view />
      </view>
      <view
@@ -248,7 +248,7 @@ const checkBowData = () => {
      class="battle-e"
      :style="{ marginTop: data.mode > 3 ? '20px' : '20vw' }"
    >
-      <image src="../static/row-yellow-bg.png" mode="widthFix" />
+      <image src="https://static.shelingxingqiu.com/shootmini/static/row-yellow-bg.png" mode="widthFix" />
      <view class="team-avatar">
        <Avatar
          :src="user.avatar"
@@ -15,7 +15,7 @@ import {
  getReadyAPI,
  kickPlayerAPI,
 } from "@/apis";
-import { isLimitError } from "@/util";
+import { debounce, isLimitError } from "@/util";
 import { MESSAGETYPES, MESSAGETYPESV2 } from "@/constants";
 import useStore from "@/store";
 import { storeToRefs } from "pinia";
@@ -31,6 +31,20 @@ const players = ref([]);
 const blueTeam = ref([]);
 const redTeam = ref([]);

+const isMember = (player = {}) => player.vip === true || player.sVip === true;
+
+const getMemberNicknameClass = (player = {}) => [
+  "member-nickname",
+  player.vip === true && player.sVip !== true ? "member-nickname--vip" : "",
+  player.sVip === true ? "member-nickname--svip" : "",
+];
+
+const normalizeRoomPlayer = (member = {}) => ({
+  ...(member.userInfo || {}),
+  vip: member.vip ?? member.userInfo?.vip,
+  sVip: member.sVip ?? member.userInfo?.sVip,
+});
+
 /**
 * 根据对战类型和房间人数动态生成页面标题
 * battleType=1: 组队对战；count 2/4/6 分别对应 1v1/2v2/3v3
@@ -59,6 +73,7 @@ const allReady = ref(false);
 const timer = ref(null);
 const goBattle = ref(false);
 const showLimitModal = ref(false);
+const readySubmitting = ref(false);
 /** 从结算页返回时为 true，跳过进场靶纸语音 */
 const skipTargetAudio = ref(false);

@@ -94,13 +109,16 @@ async function refreshRoomData() {
    return false;
  });
  members.some((m) => {
-    if (m.userInfo.id === result.creator) {
+    const player = normalizeRoomPlayer(m);
+    if (player.id === result.creator) {
      owner.value = {
-        id: m.userInfo.id,
-        name: m.userInfo.name,
-        avatar: m.userInfo.avatar,
-        rankLvl: m.userInfo.rankLvl,
-        ready: !!m.userInfo.state,
+        id: player.id,
+        name: player.name,
+        avatar: player.avatar,
+        rankLvl: player.rankLvl,
+        vip: player.vip,
+        sVip: player.sVip,
+        ready: !!player.state,
      };
      return true;
    }
@@ -108,13 +126,16 @@ async function refreshRoomData() {
  });
  if (result.battleType === 1 && result.count === 2) {
    result.members.forEach((m) => {
-      if (m.userInfo.id !== owner.value.id) {
+      const player = normalizeRoomPlayer(m);
+      if (player.id !== owner.value.id) {
        opponent.value = {
-          id: m.userInfo.id,
-          name: m.userInfo.name,
-          avatar: m.userInfo.avatar,
-          rankLvl: m.userInfo.rankLvl,
-          ready: !!m.userInfo.state,
+          id: player.id,
+          name: player.name,
+          avatar: player.avatar,
+          rankLvl: player.rankLvl,
+          vip: player.vip,
+          sVip: player.sVip,
+          ready: !!player.state,
        };
      }
    });
@@ -124,12 +145,12 @@ async function refreshRoomData() {
      (m) => m.userInfo.id === result.creator
    );
    if (ownerIndex !== -1) {
-      players.value.push(result.members[ownerIndex].userInfo);
+      players.value.push(normalizeRoomPlayer(result.members[ownerIndex]));
    } else {
      players.value.push({});
    }
    result.members.forEach((m, index) => {
-      if (ownerIndex !== index) players.value.push(m.userInfo);
+      if (ownerIndex !== index) players.value.push(normalizeRoomPlayer(m));
    });
  } else {
    players.value = new Array(result.count).fill({});
@@ -139,17 +160,22 @@ async function refreshRoomData() {
  // timer.value = setTimeout(refreshRoomData, 2000);
 }

-const getReady = async () => {
+const getReady = debounce(async () => {
+  if (readySubmitting.value) return;
+  readySubmitting.value = true;
  try {
    await getReadyAPI(roomNumber.value);
+    ready.value = true;
  } catch (error) {
    if (isLimitError(error)) {
      showLimitModal.value = true;
      return;
    }
    console.log("room ready error", error);
+  } finally {
+    readySubmitting.value = false;
  }
-};
+});

 const closeLimitModal = () => {
  showLimitModal.value = false;
@@ -166,11 +192,12 @@ const refreshMembers = (members = []) => {
  blueTeam.value = [];
  redTeam.value = [];
  members.forEach((m, index) => {
-    players.value[index] = { ...m.userInfo, groupType: m.groupType };
+    const player = { ...normalizeRoomPlayer(m), groupType: m.groupType };
+    players.value[index] = player;
    if (m.groupType === 1) {
-      blueTeam.value.push({ ...m.userInfo, groupType: 1 });
+      blueTeam.value.push({ ...player, groupType: 1 });
    } else if (m.groupType === 2) {
-      redTeam.value.push({ ...m.userInfo, groupType: 2 });
+      redTeam.value.push({ ...player, groupType: 2 });
    }
  });
  for (let i = 0; i < room.value.count / 2; i++) {
@@ -389,18 +416,36 @@ onBeforeUnmount(() => {
          <view v-if="owner.id" class="player" :style="{ transform: 'translateY(-60px)' }">
            <Avatar :src="owner.avatar" :size="60" />
            <text>管理员</text>
-            <text>{{ owner.name }}</text>
+            <view
+              v-if="isMember(owner)"
+              :class="['room-player-name', ...getMemberNicknameClass(owner)]"
+            >
+              <text class="member-nickname__text">{{ owner.name }}</text>
+              <text v-if="owner.sVip === true" class="member-nickname__shine">
+                {{ owner.name }}
+              </text>
+            </view>
+            <text v-else class="room-player-name">{{ owner.name }}</text>
          </view>
          <view v-else class="no-player" :style="{ transform: 'translateY(-60px)' }">
            <image src="../static/question-mark.png" mode="widthFix" />
          </view>
-          <image src="../static/versus.png" mode="widthFix" />
+          <image src="https://static.shelingxingqiu.com/shootmini/static/versus.png" mode="widthFix" />
          <view v-if="opponent.id" class="player" :style="{ transform: 'translateY(60px)' }">
            <Avatar :src="opponent.avatar" :size="60" />
            <text class="ready" :style="{ opacity: opponent.ready ? 1 : 0 }">
              已准备
            </text>
-            <text>{{ opponent.name }}</text>
+            <view
+              v-if="isMember(opponent)"
+              :class="['room-player-name', ...getMemberNicknameClass(opponent)]"
+            >
+              <text class="member-nickname__text">{{ opponent.name }}</text>
+              <text v-if="opponent.sVip === true" class="member-nickname__shine">
+                {{ opponent.name }}
+              </text>
+            </view>
+            <text v-else class="room-player-name">{{ opponent.name }}</text>
            <button v-if="owner.id === user.id" hover-class="none" class="remove-player"
              @click="() => removePlayer(opponent)">
              <image src="../static/close-white.png" mode="widthFix" />
@@ -414,8 +459,8 @@ onBeforeUnmount(() => {
      <block v-if="room.battleType === 1 && room.count >= 4">
        <view class="all-players">
          <image src="https://static.shelingxingqiu.com/attachment/2025-08-13/dc0x1p59iab6cvbhqc.png" mode="widthFix" />
-          <image v-if="room.count === 4" src="../static/title-2v2.png" mode="widthFix" />
-          <image v-if="room.count === 6" src="../static/title-3v3.png" mode="widthFix" />
+          <image v-if="room.count === 4" src="https://static.shelingxingqiu.com/shootmini/static/title-2v2.png" mode="widthFix" />
+          <image v-if="room.count === 6" src="https://static.shelingxingqiu.com/shootmini/static/title-3v3.png" mode="widthFix" />
          <view>
            <view v-for="(item, index) in players" :key="index">
              <Avatar v-if="item.id" :src="item.avatar" :size="36" />
@@ -434,8 +479,17 @@ onBeforeUnmount(() => {
              <button hover-class="none" v-if="item.id === user.id" @click="chooseTeam(0)">
                <image src="../static/close-grey.png" mode="widthFix" />
              </button>
-              <text class="truncate">{{ item.name || "我要加入" }}</text>
-              <view v-if="item.id">
+              <view
+                v-if="item.id && isMember(item)"
+                :class="['team-player-name', 'truncate', ...getMemberNicknameClass(item)]"
+              >
+                <text class="member-nickname__text">{{ item.name }}</text>
+                <text v-if="item.sVip === true" class="member-nickname__shine">
+                  {{ item.name }}
+                </text>
+              </view>
+              <text v-else class="truncate">{{ item.name || "我要加入" }}</text>
+              <view v-if="item.id" class="team-player-avatar">
                <Avatar :src="item.avatar" :size="36" />
                <text :style="{ opacity: !!item.state ? 1 : 0 }">已准备</text>
              </view>
@@ -446,14 +500,23 @@ onBeforeUnmount(() => {
          </view>
          <view>
            <view v-for="(item, index) in blueTeam" :key="index" class="choose-side-right-item">
-              <view v-if="item.id">
+              <view v-if="item.id" class="team-player-avatar">
                <Avatar :src="item.avatar" :size="36" />
                <text :style="{ opacity: !!item.state ? 1 : 0 }">已准备</text>
              </view>
              <button v-else hover-class="none" @click="chooseTeam(1)">
                <image src="../static/add-grey.png" mode="widthFix" />
              </button>
-              <text class="truncate">{{ item.name || "我要加入" }}</text>
+              <view
+                v-if="item.id && isMember(item)"
+                :class="['team-player-name', 'truncate', ...getMemberNicknameClass(item)]"
+              >
+                <text class="member-nickname__text">{{ item.name }}</text>
+                <text v-if="item.sVip === true" class="member-nickname__shine">
+                  {{ item.name }}
+                </text>
+              </view>
+              <text v-else class="truncate">{{ item.name || "我要加入" }}</text>
              <button hover-class="none" v-if="item.id === user.id" @click="chooseTeam(0)">
                <image src="../static/close-grey.png" mode="widthFix" />
              </button>
@@ -465,7 +528,10 @@ onBeforeUnmount(() => {
      <PlayerSeats v-if="room.battleType === 2" :total="room.count || 10" :players="players"
        :removePlayer="removePlayer" :isOwner="owner.id === user.id" />
      <view>
-        <SButton :disabled="!canClick" :onClick="() => $clickSound(getReady)">
+        <SButton
+          :disabled="!canClick || readySubmitting"
+          :onClick="() => { $clickSound(); return getReady(); }"
+        >
          {{
            allReady.value
              ? "即将进入对局..."
@@ -584,11 +650,12 @@ onBeforeUnmount(() => {
  position: relative;
 }

-.player>text:nth-child(3) {
+.room-player-name {
  margin-top: 6rpx;
 }

-.player>text {
+.player>text,
+.room-player-name {
  max-width: 100px;
  white-space: nowrap;
  overflow: hidden;
@@ -596,6 +663,12 @@ onBeforeUnmount(() => {
  text-align: center;
 }

+.room-player-name .member-nickname__text,
+.room-player-name .member-nickname__shine {
+  font-size: 14px;
+  text-align: center;
+}
+
 .player .ready {
  background-color: #2c261fb3 !important;
  border: 1rpx solid #a3793f66 !important;
@@ -843,12 +916,18 @@ onBeforeUnmount(() => {
 }

 .choose-side-left-item>text,
-.choose-side-right-item>text {
+.choose-side-right-item>text,
+.team-player-name {
  margin: 10px;
  max-width: 100px;
  font-size: 14px;
 }

+.team-player-name .member-nickname__text,
+.team-player-name .member-nickname__shine {
+  font-size: 14px;
+}
+
 .choose-side-left-item>button:first-child,
 .choose-side-right-item>button:last-child {
  position: absolute;
@@ -885,15 +964,13 @@ onBeforeUnmount(() => {
  width: 18px;
 }

-.choose-side-left-item>view,
-.choose-side-right-item>view {
+.team-player-avatar {
  display: flex;
  flex-direction: column;
  align-items: center;
 }

-.choose-side-left-item>view>text,
-.choose-side-right-item>view>text {
+.team-player-avatar>text {
  font-size: 16rpx;
  border-radius: 20rpx;
  line-height: 26rpx;
@@ -15,19 +15,19 @@ import BubbleTip from "@/components/BubbleTip.vue";
 import audioManager from "@/audioManager";
 import {
  createPractiseAPI,
-  startPractiseAPI,
-  endPractiseAPI,
  getPractiseAPI,
+  startPractiseAPI,
  laserAimAPI,
  laserCloseAPI,
 } from "@/apis";
+import { connectMatchWebSocket, closeMatchWebSocket } from "@/matchWebsocket";
 import { sharePractiseData } from "@/canvas";
 import { wxShare, debounce } from "@/util";
 import { MESSAGETYPESV2 } from "@/constants";
 import useStore from "@/store";
 import { storeToRefs } from "pinia";
 const store = useStore();
-const { user } = storeToRefs(store);
+const { user, device } = storeToRefs(store);
 const scores = ref([]);
 const isSvip = ref(false);
 const step = ref(0);
@@ -50,6 +50,7 @@ const showGuide = ref(false);
 const laserActive = ref(false);
 const guideSwiperIndex = ref(0);
 const sharing = ref(false);
+const RESULT_TIP_CDN = "https://static.shelingxingqiu.com/shootmini/static";

 const guideImages = [
  "https://static.shelingxingqiu.com/shootmini/static/target.png",
@@ -104,21 +105,54 @@ const closeCalibrationLaser = async () => {
 };

 const createPractise = async (arrows) => {
-  const result = await createPractiseAPI(arrows, 1);
+  closeMatchWebSocket({ reason: "practice-recreate" });
+  const result = await createPractiseAPI(
+    arrows,
+    120,
+    1,
+    device.value.deviceId
+  );
  if (result) practiseId.value = result.id;
+  if (!result?.serverAddr) {
+    uni.showToast({
+      title: "练习连接信息异常，请重试",
+      icon: "none",
+    });
+    return null;
+  }
+  connectMatchWebSocket({
+    serverAddr: result.serverAddr,
+    matchId: result.id,
+    userId: user.value.id,
+  });
+  return result;
 };

-const onOver = async () => {
-  practiseResult.value = await getPractiseAPI(practiseId.value);
+const onOver = async (message) => {
+  practiseResult.value = Array.isArray(message?.details)
+    ? message
+    : await getPractiseAPI(practiseId.value);
  start.value = false;
 };

+const beginPractise = async () => {
+  if (!practiseId.value) {
+    uni.showToast({
+      title: "练习未创建，请重试",
+      icon: "none",
+    });
+    return false;
+  }
+  await startPractiseAPI(practiseId.value);
+  return true;
+};
+
 async function onReceiveMessage(msg) {
  if (msg.type === MESSAGETYPESV2.ShootResult) {
    isSvip.value = msg.sVip === true;
-    scores.value = msg.details;
+    scores.value = Array.isArray(msg.details) ? msg.details : scores.value;
  } else if (msg.type === MESSAGETYPESV2.BattleEnd) {
-    setTimeout(onOver, 1500);
+    setTimeout(() => onOver(msg), 1500);
  } else if (msg.type === MESSAGETYPESV2.TestDistance && step.value === 3) {
    if (msg.shootData.distance / 100 >= 5) {
      audioManager.play("距离合格");
@@ -158,6 +192,7 @@ const onClickShare = debounce(async () => {
 });

 onMounted(() => {
+  void audioManager.warmAll();
  uni.setKeepScreenOn({
    keepScreenOn: true,
  });
@@ -173,7 +208,7 @@ onBeforeUnmount(async () => {
  uni.$off("share-image", onClickShare);
  await closeCalibrationLaser();
  audioManager.stopAll();
-  endPractiseAPI();
+  closeMatchWebSocket({ reason: "practice-leave" });
 });

 const nextStep = async () => {
@@ -196,15 +231,20 @@ const nextStep = async () => {
    btnDisabled.value = true;
    step.value = 3;
    title.value = "-感知距离";
-    const result = await createPractiseAPI(total, 120);
-    if (result) practiseId.value = result.id;
+    const result = await createPractise(total);
+    if (!result) {
+      btnDisabled.value = false;
+      step.value = 2;
+      return;
+    }
  } else if (step.value === 3) {
    showGuide.value = false;
    step.value = 4;
    title.value = "-小试牛刀";
  } else if (step.value === 4) {
    title.value = "小试牛刀";
-    await startPractiseAPI();
+    const result = await beginPractise();
+    if (!result) return;
    scores.value = [];
    isSvip.value = false;
    step.value = 5;
@@ -235,10 +275,16 @@ const onClose = async () => {
    scores.value = [];
    isSvip.value = false;
    step.value = 4;
-    const result = await createPractiseAPI(total, 120);
-    if (result) practiseId.value = result.id;
+    await createPractise(total);
  }
 };
+
+const getResultTipSrc = (result = {}) => {
+  const validCount = (result.details || []).filter(
+    (arrow) => arrow.x !== -30 && arrow.y !== -30
+  ).length;
+  return `${RESULT_TIP_CDN}/${validCount < total ? "un" : ""}finish-tip.png`;
+};
 </script>

 <template>
@@ -361,13 +407,7 @@ const onClose = async () => {
        :total="total"
        :onClose="onClose"
        :result="practiseResult"
-        :tipSrc="`../static/${
-          practiseResult.details.filter(
-            (arrow) => arrow.x !== -30 && arrow.y !== -30
-          ).length < total
-            ? 'un'
-            : ''
-        }finish-tip.png`"
+        :tipSrc="getResultTipSrc(practiseResult)"
      />
      <canvas class="share-canvas" id="shareCanvas" type="2d"></canvas>
    </view>
@@ -404,12 +404,12 @@ function goBack() {
        <!-- 背景图：蓝队用 mvp-blue.png，红队用 mvp-red.png（平行四边形渐变切图） -->
        <image
          class="mvp-bg"
-          :src="mvpTeam === 1 ? '../static/mvp-blue.png' : '../static/mvp-red.png'"
+          :src="mvpTeam === 1 ? 'https://static.shelingxingqiu.com/shootmini/static/mvp-blue.png' : 'https://static.shelingxingqiu.com/shootmini/static/mvp-red.png'"
          mode="scaleToFill"
        />
        <!-- 左：MVP 标题图 + 斩获环数 -->
        <view class="mvp-info">
-          <image class="mvp-badge" src="../static/mvp-tip.png" mode="widthFix" />
+          <image class="mvp-badge" src="https://static.shelingxingqiu.com/shootmini/static/mvp-tip.png" mode="widthFix" />
          <view class="mvp-rings">
            斩获<text class="mvp-rings-num">{{ mvpPlayer.totalRing }}</text>环
          </view>
@@ -439,7 +439,7 @@ function goBack() {
        <!-- 本场战绩标题：装饰横线 + 标题图 + 装饰横线 -->
        <view class="melee-title">
          <view class="melee-title-line" />
-          <image class="melee-title-img" src="../static/battle-result.png" mode="scaleToFill" />
+          <image class="melee-title-img" src="https://static.shelingxingqiu.com/shootmini/static/battle-result.png" mode="scaleToFill" />
          <view class="melee-title-line" />
        </view>

@@ -27,6 +27,7 @@ const data = ref({});
 const roomID = ref("");
 const loading = ref(false);
 const showLimitModal = ref(false);
+const createRoomLoading = ref(false);
 const isSVip = computed(() => user.value.sVip === true);
 const isVip = computed(() => user.value.vip === true && !isSVip.value);
 const challengeLimitText = computed(() =>
@@ -45,6 +46,8 @@ const enterRoom = debounce(async (number) => {
    showModal.value = true;
    return;
  }
+  loading.value = true;
+  let keepLoading = false;
  try {
    const room = await getRoomAPI(number);
    if (!room.number) {
@@ -63,24 +66,33 @@ const enterRoom = debounce(async (number) => {
        return;
      }
    }
-    loading.value = true;
+    keepLoading = true;
    uni.navigateTo({
      url: "/pages/battle-room?roomNumber=" + number,
+      fail: () => {
+        loading.value = false;
+      },
    });
  } finally {
-    loading.value = false;
+    if (!keepLoading) loading.value = false;
  }
 });
-const onCreateRoom = async () => {
+const onCreateRoom = debounce(async () => {
+  if (createRoomLoading.value) return;
  if (!canEenter(user.value, device.value, online.value)) return;
-  const countData = await loadDailyCount();
-  if (isLimitReached(countData.challenge)) {
-    showLimitModal.value = true;
-    return;
+  createRoomLoading.value = true;
+  try {
+    const countData = await loadDailyCount();
+    if (isLimitReached(countData.challenge)) {
+      showLimitModal.value = true;
+      return;
+    }
+    warnning.value = "";
+    showModal.value = true;
+  } finally {
+    createRoomLoading.value = false;
  }
-  warnning.value = "";
-  showModal.value = true;
-};
+});

 const closeLimitModal = () => {
  showLimitModal.value = false;
@@ -116,6 +128,7 @@ const goMyRecord = () => {
  });
 };
 onShow(async () => {
+  loading.value = false;
  if (user.value.id) {
    const [result] = await Promise.all([
      getBattleDataAPI(),
@@ -196,10 +209,10 @@ onLoad(async (options) => {
      </view>
      <view class="create-room">
        <image src="https://static.shelingxingqiu.com/attachment/2025-07-15/dbcejys872iyun92h6.png" mode="widthFix" />
-        <image src="../static/room-notfound-title.png" mode="widthFix" />
+        <image src="https://static.shelingxingqiu.com/shootmini/static/room-notfound-title.png" mode="widthFix" />
        <view>
          <image :src="user.avatar" mode="widthFix" />
-          <image src="../static/versus.png" mode="widthFix" />
+          <image src="https://static.shelingxingqiu.com/shootmini/static/versus.png" mode="widthFix" />
          <view>
            <image src="../static/question-mark.png" mode="widthFix" />
          </view>
@@ -208,7 +221,12 @@ onLoad(async (options) => {
          <view v-if="challengeLimitText" class="pp-text">
            {{ challengeLimitText }}
          </view>
-          <SButton width="80%" :rounded="30" :onClick="() => $clickSound(onCreateRoom)">
+          <SButton
+            width="80%"
+            :rounded="30"
+            :disabled="createRoomLoading"
+            :onClick="() => { $clickSound(); return onCreateRoom(); }"
+          >
            创建约战房
          </SButton>
        </view>
@@ -256,11 +256,6 @@ const toPage = async (path) => {
    showModal.value = true;
    return;
  }
-  // if (path === "/pages/first-try") {
-  // if (canEenter(user.value, device.value, online.value, path)) {
-  //   await uni.$checkAudio();
-  // }
-  // }
  uni.navigateTo({url: path});
 };

@@ -423,7 +418,7 @@ onShareTimeline(() => {
              <text v-else-if="online">设备在线</text>
            </block>
            <image
-                src="../static/first-try.png"
+                src="https://static.shelingxingqiu.com/shootmini/static/first-try.png"
                mode="widthFix"
                @click="() => toPage('/pages/first-try')"
            />
@@ -434,10 +429,10 @@ onShareTimeline(() => {
          </view>
          <view class="play-card">
            <view @click="$clickSound(() => toPage('/pages/practise'))">
-              <image src="../static/my-practise.png" mode="widthFix"/>
+              <image src="https://static.shelingxingqiu.com/shootmini/static/my-practise.png" mode="widthFix"/>
            </view>
            <view @click="$clickSound(() => toPage('/pages/friend-battle'))">
-              <image src="../static/friend-battle.png" mode="widthFix"/>
+              <image src="https://static.shelingxingqiu.com/shootmini/static/friend-battle.png" mode="widthFix"/>
            </view>
          </view>
        </view>
@@ -452,7 +447,7 @@ onShareTimeline(() => {
              hover-class="none"
          ></button>
          <view class="ranking-players" @click="toRankListPage">
-            <img src="../static/juezhanbang.png" mode="widthFix"/>
+            <img src="https://static.shelingxingqiu.com/shootmini/static/juezhanbang.png" mode="widthFix"/>
            <view class="divide-line"></view>
            <view class="player-avatars">
              <view
@@ -486,7 +481,7 @@ onShareTimeline(() => {
          </view>
          <view class="my-data">
            <view @click="() => toPage('/pages/my-growth')">
-              <image src="../static/my-growth.png" mode="widthFix"/>
+              <image src="https://static.shelingxingqiu.com/shootmini/static/my-growth.png" mode="widthFix"/>
            </view>
            <view @click="() => toPage('/pages/ranking')">
              <view>
@@ -4,6 +4,7 @@ import { onLoad, onShow, onHide } from "@dcloudio/uni-app";
 import Container from "@/components/Container.vue";
 import Matching from "@/components/Matching.vue";
 import ModalDialog from "@/components/ModalDialog.vue";
+import audioManager from "@/audioManager";
 import { matchGameAPI, getBattleAPI } from "@/apis";
 import { MESSAGETYPESV2 } from "@/constants";
 import { isLimitError } from "@/util";
@@ -12,6 +13,7 @@ const gameType = ref(0);
 const teamSize = ref(0);
 const onComplete = ref(null);
 const showLimitModal = ref(false);
+const MATCH_READY_SNAPSHOT_PREFIX = "match-ready-snapshot:";

 /** 匹配超时计时器，用于检测 WS 消息丢失或真正超时 */
 const matchTimeoutTimer = ref(null);
@@ -27,6 +29,17 @@ const clearMatchTimeout = () => {
  }
 };

+const cacheReadyBattle = (battle) => {
+  const matchId = String(battle?.matchId || "");
+  if (!matchId) return;
+
+  uni.setStorageSync(`${MATCH_READY_SNAPSHOT_PREFIX}${matchId}`, {
+    ...battle,
+    status: battle.status == null ? 0 : Number(battle.status),
+    savedAt: Date.now(),
+  });
+};
+
 /**
 * 超时处理：查询后端是否已分配对局
 * - 有对局 → WS 消息丢失场景，自动跳入
@@ -36,6 +49,7 @@ const handleMatchTimeout = async () => {
  try {
    const battle = await getBattleAPI();
    if (battle && battle.matchId) {
+      cacheReadyBattle(battle);
      uni.showToast({ title: "匹配成功，正在进入...", icon: "none" });
      if (battle.mode <= 3) {
        uni.redirectTo({ url: `/pages/team-battle/index?battleId=${battle.matchId}` });
@@ -133,6 +147,7 @@ onLoad(async (options) => {
 });

 onMounted(() => {
+  void audioManager.warmAll();
  uni.setKeepScreenOn({
    keepScreenOn: true,
  });
@@ -13,7 +13,14 @@ import TestDistance from "@/components/TestDistance.vue";
 import SModal from "@/components/SModal.vue";
 import audioManager from "@/audioManager";
 import { getBattleAPI, laserCloseAPI } from "@/apis";
+import {
+  closeMatchWebSocket,
+  connectMatchWebSocket,
+  MATCH_WS_AUDIO_ACK_EVENT,
+  MATCH_WS_STATE_EVENT,
+} from "@/matchWebsocket";
 import { MESSAGETYPESV2 } from "@/constants";
+import { takeMatchReturnSnapshot } from "@/utils/matchReturn";
 import useStore from "@/store";
 import { storeToRefs } from "pinia";
 const store = useStore();
@@ -30,13 +37,26 @@ const playersSorted = ref([]);
 const playersScores = ref([]);
 const halfTimeTip = ref(false);
 const halfRest = ref(false);
+const DEFAULT_READY_TIME = 15;
 const HALF_REST_SECONDS = 20;
+const MATCH_READY_SNAPSHOT_PREFIX = "match-ready-snapshot:";
+const MATCH_STATUS_BY_TEXT = {
+  MATCH_STATUS_READY: 0,
+  MATCH_STATUS_STARTED: 1,
+  MATCH_STATUS_END: 2,
+  MATCH_STATUS_TIMEOUT: 3,
+  MATCH_STATUS_UNEXPECTEDLY: 4,
+};
 const halfRestRemain = ref(HALF_REST_SECONDS);
+const readyTime = ref(DEFAULT_READY_TIME);
 let halfRestTimer = null;
 /** 控制设备离线提示弹窗的显示状态 */
 const showOfflineModal = ref(false);
 /** 记录每位玩家当前半场连续 10 环及以上次数，key 为 playerId，用于触发 tententen 音效 */
 const xRingStreaks = ref({});
+let battleEnded = false;
+let skipNextRestoreOnShow = false;
+let restoreGeneration = 0;

 function clearHalfRestCountdown() {
  if (halfRestTimer) {
@@ -45,6 +65,12 @@ function clearHalfRestCountdown() {
  }
 }

+function leaveHalfRest() {
+  clearHalfRestCountdown();
+  halfTimeTip.value = false;
+  halfRest.value = false;
+}
+
 function getHalfRestSeconds(battleInfo) {
  const remainCandidates = [
    battleInfo?.halfRestRemain,
@@ -60,13 +86,24 @@ function getHalfRestSeconds(battleInfo) {
    }
  }

-  const endTime = Number(battleInfo?.halfRestEndTime ?? battleInfo?.restEndTime);
-  if (!Number.isFinite(endTime) || endTime <= 0) return HALF_REST_SECONDS;
+  const timeoutTime = normalizeTimestamp(battleInfo?.timeoutTime);
+  if (timeoutTime) {
+    const elapsedSeconds = Math.max(0, (Date.now() - timeoutTime) / 1000);
+    return Math.max(
+      0,
+      Math.min(HALF_REST_SECONDS, Math.ceil(HALF_REST_SECONDS - elapsedSeconds))
+    );
+  }

-  const timestamp = endTime < 1e12 ? endTime * 1000 : endTime;
-  const diffSeconds = (timestamp - Date.now()) / 1000;
-  if (diffSeconds > 0 && diffSeconds <= HALF_REST_SECONDS) {
-    return Math.ceil(diffSeconds);
+  const endTime = normalizeTimestamp(
+    battleInfo?.halfRestEndTime ?? battleInfo?.restEndTime
+  );
+  if (endTime) {
+    const diffSeconds = (endTime - Date.now()) / 1000;
+    return Math.max(
+      0,
+      Math.min(HALF_REST_SECONDS, Math.ceil(diffSeconds))
+    );
  }

  return HALF_REST_SECONDS;
@@ -74,7 +111,14 @@ function getHalfRestSeconds(battleInfo) {

 function startHalfRestCountdown(seconds = HALF_REST_SECONDS) {
  clearHalfRestCountdown();
-  halfRestRemain.value = Math.max(0, Math.ceil(Number(seconds) || HALF_REST_SECONDS));
+  const secondsValue = Number(seconds);
+  const normalizedSeconds = Number.isFinite(secondsValue)
+    ? secondsValue
+    : HALF_REST_SECONDS;
+  halfRestRemain.value = Math.max(
+    0,
+    Math.min(HALF_REST_SECONDS, Math.ceil(normalizedSeconds))
+  );

  if (halfRestRemain.value <= 0) return;

@@ -93,6 +137,112 @@ const currentPlayer = computed(() =>
 );
 const isCurrentUserSvip = computed(() => currentPlayer.value?.sVip === true);

+function getReadySnapshotKey(matchId) {
+  return `${MATCH_READY_SNAPSHOT_PREFIX}${String(matchId || "")}`;
+}
+
+function normalizeBattleInfo(battleInfo) {
+  if (!battleInfo || typeof battleInfo !== "object") return battleInfo;
+
+  const statusText = battleInfo.statusText || battleInfo.status_text;
+  if (
+    (battleInfo.status === undefined ||
+      battleInfo.status === null ||
+      battleInfo.status === "") &&
+    MATCH_STATUS_BY_TEXT[statusText] !== undefined
+  ) {
+    return {
+      ...battleInfo,
+      status: MATCH_STATUS_BY_TEXT[statusText],
+    };
+  }
+
+  return battleInfo;
+}
+
+function normalizeTimestamp(value) {
+  const numberValue = Number(value || 0);
+  if (!numberValue) return 0;
+  return numberValue < 1000000000000 ? numberValue * 1000 : numberValue;
+}
+
+function getReadyTime(battleInfo) {
+  const value = Number(battleInfo?.readyTime);
+  return Number.isFinite(value) && value > 0 ? value : DEFAULT_READY_TIME;
+}
+
+function getReadyRemainingSeconds(battleInfo) {
+  const total = getReadyTime(battleInfo);
+  const countdownStartTime = normalizeTimestamp(battleInfo?.countdownStartTime);
+  if (!countdownStartTime) return total;
+
+  const elapsed = Math.max(0, (Date.now() - countdownStartTime) / 1000);
+  console.log('11111111111111111111111111111',  total, countdownStartTime,  Math.max(0, (Date.now() - countdownStartTime) / 1000))
+  return Math.max(0, total - elapsed);
+}
+
+function hasKnownStatus(battleInfo) {
+  return !(
+    battleInfo?.status === undefined ||
+    battleInfo?.status === null ||
+    battleInfo?.status === ""
+  );
+}
+
+function hasStartedSnapshot(battleInfo) {
+  if (hasKnownStatus(battleInfo)) return Number(battleInfo.status) !== 0;
+
+  const current = battleInfo?.current || {};
+  return !!(
+    current.playerId ||
+    current.startTime ||
+    current.round ||
+    (Array.isArray(battleInfo?.rounds) && battleInfo.rounds.length)
+  );
+}
+
+function takeReadySnapshot(matchId) {
+  const key = getReadySnapshotKey(matchId);
+  const snapshot = uni.getStorageSync(key);
+  if (snapshot) uni.removeStorageSync(key);
+  return normalizeBattleInfo(snapshot);
+}
+
+function reconnectMatchServer(battleInfo) {
+  const status = Number(battleInfo?.status);
+  if ([2, 4].includes(status)) return;
+  if (!battleInfo?.serverAddr) return;
+
+  connectMatchWebSocket({
+    serverAddr: battleInfo.serverAddr,
+    matchId: battleInfo.matchId || battleId.value,
+    userId: user.value.id,
+    mode: battleInfo.mode,
+  });
+}
+
+function closeBattleServer(reason) {
+  if (battleEnded) return;
+  closeMatchWebSocket({ reason });
+}
+
+function notifyMatchAudioAck(message) {
+  if (
+    message?.sequence === undefined ||
+    message?.sequence === null ||
+    message?.sequence === ""
+  ) {
+    return;
+  }
+
+  uni.$emit(MATCH_WS_AUDIO_ACK_EVENT, {
+    matchId: message.matchId || battleId.value,
+    sequence: message.sequence,
+    matchWsType: message.matchWsType,
+    matchWsTypeName: message.matchWsTypeName,
+  });
+}
+
 /**
 * 监听设备在线状态，大乱斗比赛进行中设备离线时弹窗提示用户
 */
@@ -103,7 +253,11 @@ watch(online, (newVal, oldVal) => {
 });

 function recoverData(battleInfo, { force = false } = {}) {
+  battleInfo = normalizeBattleInfo(battleInfo);
  if (!battleInfo) return;
+  if (battleInfo.status !== undefined) {
+    battleEnded = [2, 4].includes(Number(battleInfo.status));
+  }
  try {
    if (battleInfo.way === 1) title.value = "好友约战 - 大乱斗";
    if (battleInfo.way === 2) title.value = "排位赛 - 大乱斗";
@@ -121,19 +275,27 @@ function recoverData(battleInfo, { force = false } = {}) {
      players.value = []; 
    }
    
-    start.value = battleInfo.status !== 0;
+    if (hasKnownStatus(battleInfo)) {
+      start.value = battleInfo.status !== 0;
+    } else if (!hasStartedSnapshot(battleInfo)) {
+      if (start.value !== true) start.value = false;
+      return;
+    } else {
+      start.value = true;
+    }

    if (battleInfo.status === 0) {
-      const readyRemain = (Date.now() - (battleInfo.createTime || Date.now())) / 1000;
-      if (readyRemain > 0 && readyRemain < 15) {
-        setTimeout(() => uni.$emit("update-timer", 15 - readyRemain - 0.2), 200);
-      }
+      readyTime.value = getReadyTime(battleInfo);
+      setTimeout(() => {
+        uni.$emit("update-timer", getReadyRemainingSeconds(battleInfo));
+      }, 200);
      return;
    }

+    const rounds = Array.isArray(battleInfo.rounds) ? battleInfo.rounds : [];
    tips.value =
-      (battleInfo.rounds.length !== 2 ? "上" : "下") + "半场：请先射6箭";
-    playersScores.value = battleInfo.rounds.map((r) => ({ ...r.shoots }));
+      (rounds.length !== 2 ? "上" : "下") + "半场：请先射6箭";
+    playersScores.value = rounds.map((r) => ({ ...r.shoots }));
    const totals = {};
    players.value.forEach((p) => {
      const total = playersScores.value.reduce((acc, round) => {
@@ -155,6 +317,7 @@ function recoverData(battleInfo, { force = false } = {}) {
      }, 200);
      return;
    }
+    leaveHalfRest();
    if (force) {
      const remain = (Date.now() - (battleInfo.current?.startTime || Date.now())) / 1000;
      console.log(`当前轮已进行${remain}秒`);
@@ -169,8 +332,64 @@ function recoverData(battleInfo, { force = false } = {}) {
  }
 }

+async function restoreLatestBattle() {
+  if (!battleId.value) return;
+
+  const currentRestoreId = ++restoreGeneration;
+  let result = null;
+  try {
+    result = normalizeBattleInfo(await getBattleAPI(battleId.value));
+  } catch (err) {
+    console.log("restore latest melee battle failed:", err);
+    return;
+  }
+  if (currentRestoreId !== restoreGeneration || !result) return;
+
+  if (result.status === 2) {
+    battleEnded = true;
+    uni.showToast({
+      title: "比赛已结束",
+      icon: "none",
+    });
+    uni.navigateBack({
+      delta: 2,
+    });
+    return;
+  }
+
+  reconnectMatchServer(result);
+  recoverData(result, { force: true });
+}
+
+function onMatchSocketState(event) {
+  if (event?.state !== "open" || event?.reconnected !== true) return;
+  if (
+    event.matchId &&
+    battleId.value &&
+    String(event.matchId) !== String(battleId.value)
+  ) {
+    return;
+  }
+  restoreLatestBattle();
+}
+
 onLoad(async (options) => {
-  if (options.battleId) battleId.value = options.battleId;
+  const returnSnapshot = options.fromReturn ? takeMatchReturnSnapshot() : null;
+  skipNextRestoreOnShow = false;
+  if (returnSnapshot?.matchId) battleId.value = returnSnapshot.matchId;
+  else if (options.battleId) battleId.value = options.battleId;
+  if (returnSnapshot) {
+    skipNextRestoreOnShow = true;
+    reconnectMatchServer(returnSnapshot);
+    recoverData(returnSnapshot, { force: true });
+    return;
+  }
+  const readySnapshot = takeReadySnapshot(battleId.value);
+  if (readySnapshot?.status === 0) {
+    skipNextRestoreOnShow = true;
+    reconnectMatchServer(readySnapshot);
+    recoverData(readySnapshot);
+  }
  // uni.enableAlertBeforeUnload({
  //   message: "离开比赛可能导致比赛失败，是否继续？",
  //   success: (res) => {
@@ -207,10 +426,10 @@ function checkAndPlayTententen(playerId, isTenPlusRingShot) {

 async function onReceiveMessage(msg) {
  if (Array.isArray(msg)) return;
-  if (msg.type === MESSAGETYPESV2.BattleStart) {
-    clearHalfRestCountdown();
-    halfTimeTip.value = false;
-    halfRest.value = false;
+  if (msg.type === MESSAGETYPESV2.AboutToStart) {
+    recoverData(msg);
+  } else if (msg.type === MESSAGETYPESV2.BattleStart) {
+    leaveHalfRest();
    recoverData(msg);
  } else if (msg.type === MESSAGETYPESV2.ShootResult) {
    // 更新前快照各玩家本轮已射箭数，用于事后识别本次射手
@@ -239,8 +458,10 @@ async function onReceiveMessage(msg) {
    halfTimeTip.value = true;
    halfRest.value = true;
    tips.value = "准备下半场";
-    startHalfRestCountdown();
+    startHalfRestCountdown(getHalfRestSeconds(msg));
  } else if (msg.type === MESSAGETYPESV2.BattleEnd) {
+    battleEnded = true;
+    notifyMatchAudioAck(msg);
    setTimeout(() => {
      // 全部跳转到新结算页
      uni.redirectTo({
@@ -254,33 +475,31 @@ onMounted(async () => {
    keepScreenOn: true,
  });
  uni.$on("socket-inbox", onReceiveMessage);
+  uni.$on(MATCH_WS_STATE_EVENT, onMatchSocketState);
  await laserCloseAPI();
 });
 onBeforeUnmount(() => {
  uni.setKeepScreenOn({
    keepScreenOn: false,
  });
+  restoreGeneration += 1;
  clearHalfRestCountdown();
  uni.$off("socket-inbox", onReceiveMessage);
+  uni.$off(MATCH_WS_STATE_EVENT, onMatchSocketState);
+  closeBattleServer("melee-battle-unmount");
  audioManager.stopAll();
 });

-onShow(async () => {
-  if (battleId.value) {
-    const result = await getBattleAPI(battleId.value);
-    if (!result) return;
-    if (result.status === 2) {
-      uni.showToast({
-        title: "比赛已结束",
-        icon: "none",
-      });
-      uni.navigateBack({
-        delta: 2,
-      });
-    } else {
-      recoverData(result, { force: true });
-    }
+onHide(() => {
+  closeBattleServer("melee-battle-hide");
+});
+
+onShow(() => {
+  if (skipNextRestoreOnShow) {
+    skipNextRestoreOnShow = false;
+    return;
  }
+  restoreLatestBattle();
 });
 </script>

@@ -288,7 +507,12 @@ onShow(async () => {
  <Container :title="title" :bgType="1">
    <view class="container">
      <BattleHeader v-if="!start" :players="players" />
-      <TestDistance v-if="start === false" :guide="false" :isBattle="true" />
+      <TestDistance
+        v-if="start === false"
+        :guide="false"
+        :isBattle="true"
+        :count="readyTime"
+      />
      <ShootProgress
        :show="start"
        :start="start && !halfRest"
@@ -310,6 +534,7 @@ onShow(async () => {
        :totalRound="12"
        :scores="playersScores.map((r) => r[user.id]).flat()"
        :isSvip="isCurrentUserSvip"
+        :missAsZero="true"
        :stop="halfRest"
      />
      <view :style="{ paddingBottom: '20px' }">
@@ -65,7 +65,7 @@ onLoad(async (options) => {
  <Container title="靶纸">
    <view class="container">
      <image
-        src="../static/battle-header-melee.png"
+        src="https://static.shelingxingqiu.com/shootmini/static/battle-header-melee.png"
        mode="widthFix"
        :style="{ top: '-50rpx' }"
      />
@@ -161,7 +161,7 @@ onShow(async () => {
  <Container title="弓箭绑定">
    <view v-if="!device.deviceId" class="scan-code">
      <button hover-class="none" @click="$clickSound(handleScan)">
-        <image src="../static/scan.png" mode="widthFix" />
+        <image src="https://static.shelingxingqiu.com/shootmini/static/scan.png" mode="widthFix" />
      </button>
      <button hover-class="none" @click="showTip = true">
        <text>扫</text>
@@ -172,7 +172,7 @@ onShow(async () => {
      <text>射灵智能弓箭，三模传感系统与独创靶环算法，</text>
      <text>毫秒级在线实时对战，让你拥有全球约战的乐趣！</text>
      <button hover-class="none" @click="toDeviceIntroPage">
-        <image src="../static/have-no-device.png" mode="widthFix" />
+        <image src="https://static.shelingxingqiu.com/shootmini/static/have-no-device.png" mode="widthFix" />
      </button>
      <ScreenHint
        mode="square"
@@ -219,7 +219,7 @@ onShow(async () => {
        :style="{ marginBottom: calibration ? '250rpx' : '100rpx' }"
      >
        <view>
-          <image src="../static/device-icon.png" mode="widthFix" />
+          <image src="https://static.shelingxingqiu.com/shootmini/static/device-icon.png" mode="widthFix" />
          <text>{{ device.deviceName }}</text>
          <view class="calibration" v-if="calibration">
            <button hover-class="none" @click="goCalibration">
@@ -286,7 +286,7 @@ onShow(async () => {
    <view v-if="device.deviceId && !justBind" class="has-device">
      <view class="device-binded">
        <view>
-          <image src="../static/device-icon.png" mode="widthFix" />
+          <image src="https://static.shelingxingqiu.com/shootmini/static/device-icon.png" mode="widthFix" />
          <text>{{ device.deviceName }}</text>
          <view class="calibration">
            <button hover-class="none" @click="goCalibration">
@@ -44,7 +44,7 @@ onMounted(async () => {
  <Container :bgType="5" bgColor="#F5F5F5" :whiteBackArrow="false">
    <view class="top-part">
      <view>
-        <image src="../static/point-champion.png" mode="widthFix" />
+        <image src="https://static.shelingxingqiu.com/shootmini/static/point-champion.png" mode="widthFix" />
        <image
          :src="list[0] && list[0].avatar ? list[0].avatar : ''"
          mode="widthFix"
@@ -348,7 +348,7 @@ onShareTimeline(() => {
      />
      <view class="heat-map">
        <image
-          :src="bowTargetSrc || '../static/bow-target.png'"
+          :src="bowTargetSrc || 'https://static.shelingxingqiu.com/shootmini/static/bow-target.png'"
          mode="widthFix"
        />
        <image
@@ -374,7 +374,7 @@ onShareTimeline(() => {
      </view>
      <view class="reward" v-if="data.totalArrow">
        <button hover-class="none" @click="showTip = true">
-          <image src="../static/reward-us.png" mode="widthFix" />
+          <image src="https://static.shelingxingqiu.com/shootmini/static/reward-us.png" mode="widthFix" />
        </button>
      </view>
      <RingBarChart :data="data.ringRate" v-if="user.id" />
@@ -15,10 +15,11 @@ import audioManager from "@/audioManager";

 import {
  createPractiseAPI,
-  startPractiseAPI,
  endPractiseAPI,
  getPractiseAPI,
+  startPractiseAPI,
 } from "@/apis";
+import { connectMatchWebSocket, closeMatchWebSocket } from "@/matchWebsocket";
 import { sharePractiseData } from "@/canvas";
 import { wxShare, debounce } from "@/util";
 import { MESSAGETYPESV2, roundsName } from "@/constants";
@@ -26,7 +27,7 @@ import { MESSAGETYPESV2, roundsName } from "@/constants";
 import useStore from "@/store";
 import { storeToRefs } from "pinia";
 const store = useStore();
-const { user } = storeToRefs(store);
+const { user, device } = storeToRefs(store);

 const start = ref(false);
 const scores = ref([]);
@@ -40,6 +41,8 @@ const showGuide = ref(false);
 const tips = ref("");
 const targetType = ref(1);
 const sharing = ref(false);
+const exiting = ref(false);
+const RESULT_TIP_CDN = "https://static.shelingxingqiu.com/shootmini/static";

 onLoad((options) => {
  if (options.target) {
@@ -47,8 +50,45 @@ onLoad((options) => {
  }
 });

+const createPractise = async () => {
+  closeMatchWebSocket({ reason: "practice-recreate" });
+  const result = await createPractiseAPI(
+    total,
+    120,
+    targetType.value,
+    device.value.deviceId
+  );
+  if (result?.id) practiseId.value = result.id;
+  if (!result?.serverAddr) {
+    uni.showToast({
+      title: "练习连接信息异常，请重试",
+      icon: "none",
+    });
+    return null;
+  }
+  connectMatchWebSocket({
+    serverAddr: result.serverAddr,
+    matchId: result.id,
+    userId: user.value.id,
+  });
+  return result;
+};
+
+const beginPractise = async () => {
+  if (!practiseId.value) {
+    uni.showToast({
+      title: "练习未创建，请重试",
+      icon: "none",
+    });
+    return false;
+  }
+  await startPractiseAPI(practiseId.value);
+  return true;
+};
+
 const onReady = async () => {
-  await startPractiseAPI();
+  const result = await beginPractise();
+  if (!result) return;
  scores.value = [];
  isSvip.value = false;
  xRingStreak.value = 0; // 新一局开始，重置 X 环连续计数
@@ -56,8 +96,10 @@ const onReady = async () => {
  audioManager.play("练习开始");
 };

-const onOver = async () => {
-  practiseResult.value = await getPractiseAPI(practiseId.value);
+const onOver = async (message) => {
+  practiseResult.value = Array.isArray(message?.details)
+    ? message
+    : await getPractiseAPI(practiseId.value);
  start.value = false;
 };

@@ -87,14 +129,14 @@ async function onReceiveMessage(msg) {
  if (msg.type === MESSAGETYPESV2.ShootResult) {
    const prevLen = scores.value.length;
    isSvip.value = msg.sVip === true;
-    scores.value = msg.details;
+    scores.value = Array.isArray(msg.details) ? msg.details : scores.value;
    // 有新箭时取最后一箭判断是否 10 环及以上并检测连续计数
    if (scores.value.length > prevLen) {
      const latestArrow = scores.value[scores.value.length - 1];
      checkAndPlayTententen(isTenPlusRing(latestArrow));
    }
  } else if (msg.type === MESSAGETYPESV2.BattleEnd) {
-    // setTimeout(onOver, 1500);
+    setTimeout(() => onOver(msg), 1500);
  }
 }

@@ -111,11 +153,32 @@ async function onComplete() {
    scores.value = [];
    isSvip.value = false;
    xRingStreak.value = 0; // 重新开始练习，重置 X 环连续计数
-    const result = await createPractiseAPI(total, 120);
-    if (result) practiseId.value = result.id;
+    await createPractise();
  }
 }

+async function exitPractise() {
+  if (exiting.value) return;
+  exiting.value = true;
+
+  try {
+    if (practiseId.value && !practiseResult.value?.details) {
+      await endPractiseAPI(practiseId.value);
+    }
+  } catch (error) {
+    console.error("Failed to stop practice", error);
+  } finally {
+    uni.navigateBack();
+  }
+}
+
+const getResultTipSrc = (result = {}) => {
+  const validCount = (result.details || []).filter(
+    (arrow) => arrow.x !== -30 && arrow.y !== -30
+  ).length;
+  return `${RESULT_TIP_CDN}/${validCount < total ? "un" : ""}finish-tip.png`;
+};
+
 const onClickShare = debounce(async () => {
  if (sharing.value) return;
  sharing.value = true;
@@ -132,22 +195,15 @@ const onClickShare = debounce(async () => {
  }
 });

-function onAudioEnded(s) {
-  if (s.indexOf("比赛结束") >= 0) {
-    onOver()
-  }
-}
-
 onMounted(async () => {
+  void audioManager.warmAll();
  // audioManager.play("第一轮");
  uni.setKeepScreenOn({
    keepScreenOn: true,
  });
  uni.$on("socket-inbox", onReceiveMessage);
  uni.$on("share-image", onClickShare);
-  uni.$on("audioEnded", onAudioEnded);
-  const result = await createPractiseAPI(total, 120, targetType.value);
-  if (result) practiseId.value = result.id;
+  await createPractise();
 });

 onBeforeUnmount(() => {
@@ -156,9 +212,8 @@ onBeforeUnmount(() => {
  });
  uni.$off("socket-inbox", onReceiveMessage);
  uni.$off("share-image", onClickShare);
-  uni.$off("audioEnded", onAudioEnded);
  audioManager.stopAll();
-  endPractiseAPI();
+  closeMatchWebSocket({ reason: "practice-leave" });
 });
 </script>

@@ -167,6 +222,7 @@ onBeforeUnmount(() => {
    :bgType="1"
    title="个人单组练习"
    :showBottom="!start && !scores.length"
+    :onBack="exitPractise"
  >
    <view>
      <TestDistance v-if="!start && !practiseResult.id" />
@@ -203,13 +259,7 @@ onBeforeUnmount(() => {
          :total="total"
          :onClose="onComplete"
          :result="practiseResult"
-          :tipSrc="`../static/${
-            practiseResult.details.filter(
-              (arrow) => arrow.x !== -30 && arrow.y !== -30
-            ).length < total
-              ? 'un'
-              : ''
-          }finish-tip.png`"
+          :tipSrc="getResultTipSrc(practiseResult)"
        />
        <canvas class="share-canvas" id="shareCanvas" type="2d"></canvas>
      </block>
@@ -14,10 +14,11 @@ import audioManager from "@/audioManager";

 import {
  createPractiseAPI,
-  startPractiseAPI,
  endPractiseAPI,
  getPractiseAPI,
+  startPractiseAPI,
 } from "@/apis";
+import { connectMatchWebSocket, closeMatchWebSocket } from "@/matchWebsocket";
 import { sharePractiseData } from "@/canvas";
 import { wxShare, debounce } from "@/util";
 import { MESSAGETYPESV2 } from "@/constants";
@@ -26,7 +27,7 @@ import useStore from "@/store";
 import { storeToRefs } from "pinia";
 import {onLoad} from "@dcloudio/uni-app";
 const store = useStore();
-const { user } = storeToRefs(store);
+const { user, device } = storeToRefs(store);

 const start = ref(false);
 const scores = ref([]);
@@ -39,6 +40,8 @@ const practiseId = ref("");
 const showGuide = ref(false);
 const targetType = ref(1);
 const sharing = ref(false);
+const exiting = ref(false);
+const RESULT_TIP_CDN = "https://static.shelingxingqiu.com/shootmini/static";

 onLoad((options) => {
  if (options.target) {
@@ -46,8 +49,45 @@ onLoad((options) => {
  }
 });

+const createPractise = async () => {
+  closeMatchWebSocket({ reason: "practice-recreate" });
+  const result = await createPractiseAPI(
+    total,
+    3600,
+    targetType.value,
+    device.value.deviceId
+  );
+  if (result?.id) practiseId.value = result.id;
+  if (!result?.serverAddr) {
+    uni.showToast({
+      title: "练习连接信息异常，请重试",
+      icon: "none",
+    });
+    return null;
+  }
+  connectMatchWebSocket({
+    serverAddr: result.serverAddr,
+    matchId: result.id,
+    userId: user.value.id,
+  });
+  return result;
+};
+
+const beginPractise = async () => {
+  if (!practiseId.value) {
+    uni.showToast({
+      title: "练习未创建，请重试",
+      icon: "none",
+    });
+    return false;
+  }
+  await startPractiseAPI(practiseId.value);
+  return true;
+};
+
 const onReady = async () => {
-  await startPractiseAPI();
+  const result = await beginPractise();
+  if (!result) return;
  scores.value = [];
  isSvip.value = false;
  xRingStreak.value = 0; // 新一局开始，重置 X 环连续计数
@@ -55,8 +95,10 @@ const onReady = async () => {
  audioManager.play("练习开始");
 };

-const onOver = async () => {
-  practiseResult.value = await getPractiseAPI(practiseId.value);
+const onOver = async (message) => {
+  practiseResult.value = Array.isArray(message?.details)
+    ? message
+    : await getPractiseAPI(practiseId.value);
  start.value = false;
 };

@@ -86,14 +128,14 @@ async function onReceiveMessage(msg) {
  if (msg.type === MESSAGETYPESV2.ShootResult) {
    const prevLen = scores.value.length;
    isSvip.value = msg.sVip === true;
-    scores.value = msg.details;
+    scores.value = Array.isArray(msg.details) ? msg.details : scores.value;
    // 有新箭时取最后一箭判断是否 10 环及以上并检测连续计数
    if (scores.value.length > prevLen) {
      const latestArrow = scores.value[scores.value.length - 1];
      checkAndPlayTententen(isTenPlusRing(latestArrow));
    }
  } else if (msg.type === MESSAGETYPESV2.BattleEnd) {
-    setTimeout(onOver, 1500);
+    setTimeout(() => onOver(msg), 1500);
  }
  // messages.forEach((msg) => {
  //   if (msg.constructor === MESSAGETYPES.ShootSyncMeArrowID) {
@@ -126,11 +168,32 @@ async function onComplete() {
    scores.value = [];
    isSvip.value = false;
    xRingStreak.value = 0; // 重新开始练习，重置 X 环连续计数
-    const result = await createPractiseAPI(total, 3600);
-    if (result) practiseId.value = result.id;
+    await createPractise();
  }
 }

+async function exitPractise() {
+  if (exiting.value) return;
+  exiting.value = true;
+
+  try {
+    if (practiseId.value && !practiseResult.value?.details) {
+      await endPractiseAPI(practiseId.value);
+    }
+  } catch (error) {
+    console.error("Failed to stop practice", error);
+  } finally {
+    uni.navigateBack();
+  }
+}
+
+const getResultTipSrc = (result = {}) => {
+  const validCount = (result.details || []).filter(
+    (arrow) => arrow.x !== -30 && arrow.y !== -30
+  ).length;
+  return `${RESULT_TIP_CDN}/${validCount < total ? "2un" : ""}finish-tip.png`;
+};
+
 const onClickShare = debounce(async () => {
  if (sharing.value) return;
  sharing.value = true;
@@ -148,13 +211,13 @@ const onClickShare = debounce(async () => {
 });

 onMounted(async () => {
+  void audioManager.warmAll();
  uni.setKeepScreenOn({
    keepScreenOn: true,
  });
  uni.$on("socket-inbox", onReceiveMessage);
  uni.$on("share-image", onClickShare);
-  const result = await createPractiseAPI(total, 3600, targetType.value);
-  if (result) practiseId.value = result.id;
+  await createPractise();
 });

 onBeforeUnmount(() => {
@@ -164,7 +227,7 @@ onBeforeUnmount(() => {
  uni.$off("socket-inbox", onReceiveMessage);
  uni.$off("share-image", onClickShare);
  audioManager.stopAll();
-  endPractiseAPI();
+  closeMatchWebSocket({ reason: "practice-leave" });
 });
 </script>

@@ -173,6 +236,7 @@ onBeforeUnmount(() => {
    :bgType="1"
    title="日常耐力挑战"
    :showBottom="!start && !scores.length"
+    :onBack="exitPractise"
  >
    <view>
      <TestDistance v-if="!start && !practiseResult.id" />
@@ -211,13 +275,7 @@ onBeforeUnmount(() => {
          :rowCount="9"
          :onClose="onComplete"
          :result="practiseResult"
-          :tipSrc="`../static/${
-            practiseResult.details.filter(
-              (arrow) => arrow.x !== -30 && arrow.y !== -30
-            ).length < total
-              ? '2un'
-              : ''
-          }finish-tip.png`"
+          :tipSrc="getResultTipSrc(practiseResult)"
        />
        <canvas class="share-canvas" id="shareCanvas" type="2d"></canvas>
      </block>
@@ -63,39 +63,39 @@ import Container from "@/components/Container.vue";
            <view class="table-row">
              <text>倔强青铜</text>
              <view>
-                <text>青铜1*</text>
-                <text>青铜2*</text>
-                <text>青铜3*</text>
+                <text>青铜1</text>
+                <text>青铜2</text>
+                <text>青铜3</text>
              </view>
              <text>每个小段位需要满 3星才能晋升到下一个段位，共9颗星。</text>
            </view>
            <view class="table-row">
              <text>秩序白银</text>
              <view>
-                <text>白铜1*</text>
-                <text>白铜2*</text>
-                <text>白铜3*</text>
+                <text>白铜1</text>
+                <text>白铜2</text>
+                <text>白铜3</text>
              </view>
              <text>每个小段位需要满 3颗星才能晋升到下一个段位，共9颗星。</text>
            </view>
            <view class="table-row">
              <text>荣耀黄金</text>
              <view>
-                <text>黄金1*</text>
-                <text>黄金2*</text>
-                <text>黄金3*</text>
-                <text>黄金4*</text>
+                <text>黄金1</text>
+                <text>黄金2</text>
+                <text>黄金3</text>
+                <text>黄金4</text>
              </view>
              <text>每个小段位需要满4颗星才能晋升到下一个段位，共16颗星。</text>
            </view>
            <view class="table-row">
              <text>永恒钻石</text>
              <view>
-                <text>钻石1*</text>
-                <text>钻石2*</text>
-                <text>钻石3*</text>
-                <text>钻石4*</text>
-                <text>钻石5*</text>
+                <text>钻石1</text>
+                <text>钻石2</text>
+                <text>钻石3</text>
+                <text>钻石4</text>
+                <text>钻石5</text>
              </view>
              <text>每个小段位需要满5颗星才能晋升到下一个段位，共25颗星。</text>
            </view>
@@ -126,7 +126,6 @@ const toMatchPage = async (gameType, teamSize) => {
    showLimitModal.value = true;
    return;
  }
-  await uni.$checkAudio();
  uni.navigateTo({
    url: `/pages/match-page?gameType=${gameType}&teamSize=${teamSize}`,
  });
@@ -328,8 +327,8 @@ onShow(async () => {
    <view class="battle-types-box">
      <view class="battle-types">
        <view class="first">
-          <image src="../static/rank/battle-choose.png" mode="widthFix" />
-          <image class="star" src="../static/rank/star.png" mode="widthFix" />
+          <image src="https://static.shelingxingqiu.com/shootmini/static/rank/battle-choose.png" mode="widthFix" />
+          <image class="star" src="https://static.shelingxingqiu.com/shootmini/static/rank/star.png" mode="widthFix" />
        </view>
        <image
          src="../static/rank/battle1v1.svg"
@@ -86,7 +86,7 @@ const recoverData = (battleInfo, {force = false, arrowOnly = false} = {}) => {
    start.value = battleInfo.status !== 0;

    if (battleInfo.status === 0) {
-      const readyRemain = (Date.now() - (battleInfo.createTime || Date.now())) / 1000;
+      const readyRemain = (Date.now() - (battleInfo.serverTime || Date.now())) / 1000;
      if (readyRemain > 0 && readyRemain < 15) {
        setTimeout(() => {
          uni.$emit("update-timer", 15 - readyRemain - 0.2);
@@ -4,6 +4,7 @@ import { onShow } from "@dcloudio/uni-app";

 import { getBattleAPI, getUserGameState } from "@/apis";
 import { debounce } from "@/util";
+import { returnToBattle } from "@/utils/matchReturn";

 import useStore from "@/store";
 import { storeToRefs } from "pinia";
@@ -66,12 +67,7 @@ const onClick = debounce(async () => {
    loading.value = true;
    const result = await getBattleAPI();
    if (result && result.matchId) {
-      await uni.$checkAudio();
-      if (result.mode <= 3) {
-        await navigateOnce(`/pages/team-battle/index?battleId=${result.matchId}`);
-      } else {
-        await navigateOnce(`/pages/melee-battle?battleId=${result.matchId}`);
-      }
+      await returnToBattle(result, navigateOnce);
      return;
    }
    if (game.value.roomID) {
@@ -100,9 +96,9 @@ onBeforeUnmount(() => {
    class="back-to-game"
    @click="onClick"
  >
-    <image src="../../../static/back-to-game-bg.png" mode="widthFix" />
+    <image src="https://static.shelingxingqiu.com/shootmini/static/back-to-game-bg.png" mode="widthFix" />
    <block v-if="game.inBattle">
-      <image src="../../../static/pk-icon.png" mode="widthFix" />
+      <image src="https://static.shelingxingqiu.com/shootmini/static/pk-icon.png" mode="widthFix" />
      <text>返回进行中的对局</text>
    </block>
    <block v-else-if="game.roomID">
@@ -31,7 +31,7 @@ const normalRounds = computed(() => {
 <template>
  <view class="container">
    <view class="guide-row">
-      <image src="../../../static/shooter.png" mode="widthFix" />
+      <image src="https://static.shelingxingqiu.com/shootmini/static/shooter.png" mode="widthFix" />
      <view
        :style="{
          marginBottom: '10px',
@@ -42,7 +42,7 @@ const normalRounds = computed(() => {
      </view>
    </view>
    <view>
-      <image src="../../../static/battle-header-melee.png" mode="widthFix" />
+      <image src="https://static.shelingxingqiu.com/shootmini/static/battle-header-melee.png" mode="widthFix" />
      <text>蓝队({{ bluePoints }})</text>
      <text>红队({{ redPoints }})</text>
    </view>
@@ -41,7 +41,7 @@ const isMember = (player = {}) => player.vip === true || player.sVip === true;
  <view class="container" :style="{ paddingTop: showHeader ? '5px' : '0' }">
    <image
      v-if="showHeader"
-      :src="`../../../static/battle-header${players.length ? '-melee' : ''}.png`"
+      :src="`https://static.shelingxingqiu.com/shootmini/static/battle-header${players.length ? '-melee' : ''}.png`"
      mode="widthFix"
    />
    <view
@@ -531,7 +531,7 @@ onBeforeUnmount(() => {
        @impact="shakeTarget"
        @complete="completeShotEffect"
      />
-      <image src="../../../static/bow-target.png" mode="widthFix" />
+      <image src="https://static.shelingxingqiu.com/shootmini/static/bow-target.png" mode="widthFix" />
    </view>
    <view class="footer">
      <PointSwitcher
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, computed, onMounted, onBeforeUnmount } from "vue";
+import { ref } from "vue";
 import { onShow } from "@dcloudio/uni-app";
 import AppBackground from "./AppBackground.vue";
 import Header from "./Header.vue";
@@ -7,7 +7,7 @@ import ScreenHint from "./ScreenHint.vue";
 import BackToGame from "./BackToGame.vue";
 import {laserAimAPI, getBattleAPI, matchGameAPI} from "@/apis";
 import { capsuleHeight, debounce } from "@/util";
-import AudioManager from "@/audioManager";
+import { returnToBattle } from "@/utils/matchReturn";
 const props = defineProps({
  title: {
    type: String,
@@ -58,9 +58,6 @@ const isIOS = uni.getDeviceInfo().osName === "ios";
 const showHint = ref(false);
 const hintType = ref(0);
 const isLoading = ref(false);
-const audioInitProgress = ref(1);
-const audioProgress = ref(0);
-const audioTimer = ref(null);

 const showGlobalHint = (type) => {
  hintType.value = type;
@@ -71,55 +68,21 @@ const hideGlobalHint = () => {
  showHint.value = false;
 };

-const restart = () => {
-  uni.restartMiniProgram({
-    path: "/pages/index",
-  });
-};
-
-const checkAudioProgress = async () => {
-  return new Promise((resolve, reject) => {
-    try {
-      audioInitProgress.value = AudioManager.getLoadProgress();
-      if (audioInitProgress.value === 1) return resolve();
-      audioTimer.value = setInterval(() => {
-        audioProgress.value = AudioManager.getLoadProgress();
-        if (audioProgress.value === 1) {
-          setTimeout(() => {
-            audioInitProgress.value = 1;
-          }, 200);
-          clearInterval(audioTimer.value);
-          resolve();
-        }
-      }, 200);
-    } catch (err) {
-      reject(err);
-    }
-  });
-};
-
-const audioFinalProgress = computed(() => {
-  const left = 1 - audioInitProgress.value;
-  if (left <= 0) return 0;
-  return Math.max(0, (audioProgress.value - audioInitProgress.value) / left);
-});
-
-const loadingProgress = computed(() => {
-  if (props.loading && audioInitProgress.value >= 1) return 1;
-  return audioFinalProgress.value;
-});
-
-onBeforeUnmount(() => {
-  if (audioTimer.value) clearInterval(audioTimer.value);
-});
-
 onShow(() => {
  uni.$showHint = showGlobalHint;
  uni.$hideHint = hideGlobalHint;
-  uni.$checkAudio = checkAudioProgress;
  showHint.value = false;
 });

+const navigateTo = (url) =>
+  new Promise((resolve, reject) => {
+    uni.navigateTo({
+      url,
+      success: resolve,
+      fail: reject,
+    });
+  });
+
 const backToGame = debounce(async () => {
  if (isLoading.value) return; // 防止重复点击

@@ -127,16 +90,7 @@ const backToGame = debounce(async () => {
    isLoading.value = true;
    const result = await getBattleAPI();
    if (result && result.matchId) {
-      await checkAudioProgress();
-      if (result.mode <= 3) {
-        uni.navigateTo({
-          url: `/pages/team-battle/index?battleId=${result.matchId}`,
-        });
-      } else {
-        uni.navigateTo({
-          url: `/pages/melee-battle?battleId=${result.matchId}`,
-        });
-      }
+      await returnToBattle(result, navigateTo);
    }
  } catch (error) {
    console.error("获取当前游戏失败:", error);
@@ -233,13 +187,13 @@ const goCalibration = async () => {
        </view>
      </view>
    </ScreenHint>
-    <view v-if="loading || audioInitProgress < 1" class="audio-progress">
+    <view v-if="loading" class="audio-progress">
      <image
        src="https://static.shelingxingqiu.com/attachment/2025-11-26/deihtj15xjwcz3c1tx.png"
        mode="widthFix"
      />
      <view>
-        <view :style="{ width: `${loadingProgress * 100}%` }">
+        <view :style="{ width: '100%' }">
          <!-- <image
            src="https://static.shelingxingqiu.com/attachment/2025-11-24/degu91a7si77sg9jqv.png"
            mode="widthFix"
@@ -247,8 +201,7 @@ const goCalibration = async () => {
        </view>
      </view>
      <view>
-        <text>{{ loading ? loadingText || "加载中..." : "若加载时间过长，请" }}</text>
-        <button v-if="!loading" hover-class="none" @click="restart">点击这里重启</button>
+        <text>{{ loadingText || "加载中..." }}</text>
      </view>
    </view>
  </view>
@@ -12,13 +12,13 @@ defineProps({
 const bubbleTypes = [
  "../../../static/long-bubble.png",
  "../../../static/long-bubble-middle.png",
-  "../../../static/long-bubble-tall.png",
+  "https://static.shelingxingqiu.com/shootmini/static/long-bubble-tall.png",
 ];
 </script>

 <template>
  <view class="container">
-    <image src="../../../static/shooter.png" mode="widthFix" />
+    <image src="https://static.shelingxingqiu.com/shootmini/static/shooter.png" mode="widthFix" />
    <view>
      <image
        v-if="!noBg"
@@ -27,22 +27,22 @@ const getContentHeight = () => {
    <view class="scale-in" :style="{ height: getContentHeight() }">
      <image
        v-if="mode === 'normal'"
-        src="../../../static/screen-hint-bg.png"
+        src="https://static.shelingxingqiu.com/shootmini/static/screen-hint-bg.png"
        mode="widthFix"
      />
      <image
        v-if="mode === 'tall'"
-        src="../../../static/coach-comment.png"
+        src="https://static.shelingxingqiu.com/shootmini/static/coach-comment.png"
        mode="widthFix"
      />
      <image
        v-if="mode === 'square'"
-        src="../../../static/prompt-bg-square.png"
+        src="https://static.shelingxingqiu.com/shootmini/static/prompt-bg-square.png"
        mode="widthFix"
      />
      <image
        v-if="mode === 'small'"
-        src="../../../static/finish-frame.png"
+        src="https://static.shelingxingqiu.com/shootmini/static/finish-frame.png"
        mode="widthFix"
      />
      <slot />
@@ -111,7 +111,7 @@ onBeforeUnmount(() => {
      </view>
    </view>
    <view v-if="isBattle" class="ready-timer">
-      <image src="../../../static/test-tip.png" mode="widthFix" />
+      <image src="https://static.shelingxingqiu.com/shootmini/static/test-tip.png" mode="widthFix" />
      <view v-if="count >= 0">
        <text>具体正式比赛还有</text>
        <text>{{ count }}</text>
@@ -13,8 +13,15 @@ import TeamAvatars from "./components/TeamAvatars.vue";
 import ShootProgress2 from "./components/ShootProgress2.vue";
 import SModal from "./components/SModal.vue";
 import { laserCloseAPI, getBattleAPI } from "@/apis";
+import {
+  closeMatchWebSocket,
+  connectMatchWebSocket,
+  MATCH_WS_AUDIO_ACK_EVENT,
+  MATCH_WS_STATE_EVENT,
+} from "@/matchWebsocket";
 import { MESSAGETYPESV2 } from "@/constants";
 import { getDirectionText } from "@/util";
+import { takeMatchReturnSnapshot } from "@/utils/matchReturn";
 import audioManager, {
  AUDIO_INTERRUPTION_BEGIN_EVENT,
  AUDIO_INTERRUPTION_END_EVENT,
@@ -26,7 +33,7 @@ const store = useStore();
 const { user, online } = storeToRefs(store);

 const DEFAULT_SHOOT_TIME = 15;
-const READY_SECONDS = 15;
+const DEFAULT_READY_TIME = 15;
 const READY_TIMER_EMIT_DELAY = 200;
 const RESTORE_DELAY = 300;
 const RESTORE_EMPTY_ID_RETRY_DELAY = 50;
@@ -42,6 +49,14 @@ const AUDIO_TIMEOUT_MAX = 12000;
 const BATTLE_CANCEL_RETURN_DELAY = 2000;
 const ROUND_AUDIO_NAMES = ["一", "二", "三", "四", "五"];
 const X_RING_STREAKS_KEY = "team-battle-x-ring-streaks";
+const MATCH_READY_SNAPSHOT_PREFIX = "match-ready-snapshot:";
+const MATCH_STATUS_BY_TEXT = {
+  MATCH_STATUS_READY: 0,
+  MATCH_STATUS_STARTED: 1,
+  MATCH_STATUS_END: 2,
+  MATCH_STATUS_TIMEOUT: 3,
+  MATCH_STATUS_UNEXPECTEDLY: 4,
+};
 const PROGRESS_ZERO_EVENT = "team-battle-progress-zero";
 const COUNTDOWN_READY_EVENT = "team-battle-countdown-ready";

@@ -67,6 +82,7 @@ const showRoundTip = ref(false);
 const isFinalShoot = ref(false);
 const matchStatus = ref(undefined);
 const shootTimeTotal = ref(DEFAULT_SHOOT_TIME);
+const readyTime = ref(DEFAULT_READY_TIME);
 const showOfflineModal = ref(false);
 const restoreLoading = ref(false);
 const xRingStreaks = ref({});
@@ -89,6 +105,8 @@ let restoreLoadingTimer = null;
 let pendingRoundAudio = false;
 // 一旦收到 BattleEnd，后续普通消息就不再进入队列。
 let battleEnded = false;
+let skipNextRestoreOnShow = false;
+let pendingReturnSnapshot = null;
 const handledMessageKeys = new Set();
 const handledMessageKeyOrder = [];
 const queuedMessageKeys = new Set();
@@ -129,6 +147,82 @@ function normalizeTimestamp(value) {
  return numberValue < 1000000000000 ? numberValue * 1000 : numberValue;
 }

+function getReadyTime(battleInfo) {
+  const value = Number(battleInfo?.readyTime);
+  return Number.isFinite(value) && value > 0 ? value : DEFAULT_READY_TIME;
+}
+
+function getReadyRemainingSeconds(battleInfo) {
+  const total = getReadyTime(battleInfo);
+  const countdownStartTime = normalizeTimestamp(battleInfo?.countdownStartTime);
+  if (!countdownStartTime) return total;
+
+  const elapsed = Math.max(0, (Date.now() - countdownStartTime) / 1000);
+  return Math.max(0, total - elapsed);
+}
+
+function getReadySnapshotKey(matchId) {
+  return `${MATCH_READY_SNAPSHOT_PREFIX}${String(matchId || "")}`;
+}
+
+function normalizeBattleInfo(battleInfo) {
+  if (!battleInfo || typeof battleInfo !== "object") return battleInfo;
+
+  const statusText = battleInfo.statusText || battleInfo.status_text;
+  if (
+    (battleInfo.status === undefined ||
+      battleInfo.status === null ||
+      battleInfo.status === "") &&
+    MATCH_STATUS_BY_TEXT[statusText] !== undefined
+  ) {
+    return {
+      ...battleInfo,
+      status: MATCH_STATUS_BY_TEXT[statusText],
+    };
+  }
+
+  return battleInfo;
+}
+
+function hasKnownStatus(battleInfo) {
+  return !(
+    battleInfo?.status === undefined ||
+    battleInfo?.status === null ||
+    battleInfo?.status === ""
+  );
+}
+
+function hasStartedSnapshot(battleInfo) {
+  if (hasKnownStatus(battleInfo)) return Number(battleInfo.status) !== 0;
+
+  const current = battleInfo?.current || {};
+  return !!(
+    current.playerId ||
+    current.startTime ||
+    current.round ||
+    (Array.isArray(battleInfo?.rounds) && battleInfo.rounds.length)
+  );
+}
+
+function takeReadySnapshot(matchId) {
+  const key = getReadySnapshotKey(matchId);
+  const snapshot = uni.getStorageSync(key);
+  if (snapshot) uni.removeStorageSync(key);
+  return normalizeBattleInfo(snapshot);
+}
+
+function reconnectMatchServer(battleInfo) {
+  const status = Number(battleInfo?.status);
+  if ([2, 3, 4].includes(status)) return;
+  if (!battleInfo?.serverAddr) return;
+
+  connectMatchWebSocket({
+    serverAddr: battleInfo.serverAddr,
+    matchId: battleInfo.matchId || battleId.value,
+    userId: user.value.id,
+  });
+}
+
 // 从不同消息结构中提取服务端时间，作为恢复和去重的时间基准。
 function getServerTime(message) {
  return normalizeTimestamp(
@@ -289,6 +383,10 @@ function hideRestoreLoading() {
 }

 function showRestoreLoading() {
+  if (start.value === false) {
+    hideRestoreLoading();
+    return;
+  }
  clearRestoreLoadingTimer();
  restoreLoading.value = true;
  restoreLoadingTimer = setTimeout(() => {
@@ -391,7 +489,9 @@ async function executeBattleTask(task, runId) {
  if (!task || !isQueueAlive(runId)) return;
  const type = task.type;

-  if (type === MESSAGETYPESV2.BattleStart) {
+  if (type === MESSAGETYPESV2.AboutToStart) {
+    applyBattleSnapshot(task.message, { restore: true });
+  } else if (type === MESSAGETYPESV2.BattleStart) {
    await runBattleStartTask(task, runId);
  } else if (type === MESSAGETYPESV2.ToSomeoneShoot) {
    await runToSomeoneShootTask(task, runId);
@@ -402,7 +502,7 @@ async function executeBattleTask(task, runId) {
  } else if (type === MESSAGETYPESV2.BattleEnd) {
    await runBattleEndTask(task, runId);
  } else if (type === MESSAGETYPESV2.InvalidShot) {
-    await runInvalidShotTask(runId);
+    await runInvalidShotTask(task, runId);
  }
 }

@@ -448,6 +548,24 @@ function onAudioEnded(key) {
  });
 }

+function notifyMatchAudioAck(task) {
+  const message = task?.message;
+  if (
+    message?.sequence === undefined ||
+    message?.sequence === null ||
+    message?.sequence === ""
+  ) {
+    return;
+  }
+
+  uni.$emit(MATCH_WS_AUDIO_ACK_EVENT, {
+    matchId: message.matchId || battleId.value,
+    sequence: message.sequence,
+    matchWsType: message.matchWsType,
+    matchWsTypeName: message.matchWsTypeName,
+  });
+}
+
 function handleBattleCovered() {
  if (pendingRestoreTimer) {
    clearTimeout(pendingRestoreTimer);
@@ -462,6 +580,11 @@ function handleBattleRecovered() {
  scheduleRestoreLatestBattle();
 }

+function closeBattleServer(reason) {
+  if (battleEnded) return;
+  closeMatchWebSocket({ reason });
+}
+
 // 队伍信息优先用接口返回值；接口缺失时使用本地缓存，避免重进页面时头像为空。
 function loadTeamPlayers(teamInfo, storageKey) {
  if (Array.isArray(teamInfo?.players)) return [...teamInfo.players];
@@ -526,6 +649,7 @@ function applyRestoreNewRoundSnapshot(battleInfo) {

 // 回填比赛基础信息：队伍、比分、轮次、金箭状态等公共字段都在这里统一处理。
 function applyBattleBase(battleInfo) {
+  battleInfo = normalizeBattleInfo(battleInfo);
  if (!battleInfo) return;
  if (battleInfo.matchId) battleId.value = battleInfo.matchId;
  if (battleInfo.status !== undefined) {
@@ -723,6 +847,7 @@ function stopProgressAfterMount() {
 // 待开局状态：清理比赛态展示，并恢复准备倒计时。
 function applyReadyState(battleInfo) {
  hideRestoreLoading();
+  readyTime.value = getReadyTime(battleInfo);
  start.value = false;
  showRoundTip.value = false;
  currentShooterId.value = 0;
@@ -734,17 +859,15 @@ function applyReadyState(battleInfo) {
  clearProgressZeroWaiters();
  cancelRoundTipDisplay();

-  const createTime = normalizeTimestamp(battleInfo?.createTime || Date.now());
-  const readyElapsed = (Date.now() - createTime) / 1000;
-  if (readyElapsed > 0 && readyElapsed < READY_SECONDS) {
-    setTimeout(() => {
-      uni.$emit("update-timer", READY_SECONDS - readyElapsed - 0.2);
-    }, READY_TIMER_EMIT_DELAY);
-  }
+  setTimeout(() => {
+    uni.$emit("update-timer", getReadyRemainingSeconds(battleInfo));
+  }, READY_TIMER_EMIT_DELAY);
 }

 // 快照恢复入口：只把页面拉到服务端最新状态，不重放已经发生过的语音。
 function applyBattleSnapshot(battleInfo, { restore = false, restoreEventType = 0 } = {}) {
+  battleInfo = normalizeBattleInfo(battleInfo);
+  if (!battleInfo) return;
  // 快照恢复只负责“把页面拉回最新状态”，不重放历史语音。
  applyBattleBase(battleInfo);
  if (battleInfo.status === 0) {
@@ -752,6 +875,12 @@ function applyBattleSnapshot(battleInfo, { restore = false, restoreEventType = 0
    return;
  }

+  if (!hasStartedSnapshot(battleInfo)) {
+    hideRestoreLoading();
+    if (start.value === false) applyReadyState(battleInfo);
+    return;
+  }
+
  start.value = true;
  showRoundTip.value = false;

@@ -793,6 +922,7 @@ async function runBattleStartTask(task, runId) {
  pendingRoundAudio = true;
  updateShotInfo(task.message);
  await playAudioKeys("比赛开始", { interrupt: false });
+  notifyMatchAudioAck(task);
  if (!isQueueAlive(runId)) return;
 }

@@ -846,11 +976,12 @@ async function runToSomeoneShootTask(task, runId) {
  });

  await audioPromise;
+  notifyMatchAudioAck(task);
  if (!isQueueAlive(runId)) return;

-  const remainingSeconds = getRemainingSeconds(battleInfo, task, {
-    fullDurationIfNoBackendRemain: isRoundFirstShoot,
-  });
+  // 实时换人消息的倒计时由本条语音 ACK 驱动：后端收到 ACK 后才开始计时，
+  // 因此前端也应从完整 shootTime 启动，不能扣除消息排队及 tententen/提示语音耗时。
+  const remainingSeconds = getShootTimeSeconds(battleInfo);
  const countdown = getCountdownPayload(remainingSeconds, shootTimeTotal.value);
  markProgressDeadline(countdown);
  uni.$emit("update-remain", {
@@ -918,6 +1049,7 @@ async function runShootResultTask(task) {
  const audioKeys = buildShootResultAudioKeys(battleInfo.shootData);
  if (isTententen) audioKeys.push("tententen");
  await playAudioKeys(audioKeys, { interrupt: false });
+  notifyMatchAudioAck(task);
 }

 // 新回合任务：展示上一回合结算弹窗，弹窗关闭后再允许下一轮继续。
@@ -977,6 +1109,7 @@ async function runBattleEndTask(task, runId) {

  // 终局语音必须完整播完，再决定跳转或返回。
  await playAudioKeys("比赛结束", { interrupt: false, timeout: AUDIO_TIMEOUT_MAX });
+  notifyMatchAudioAck(task);
  if (!isQueueAlive(runId)) return;

  if (matchStatus.value === 2) {
@@ -984,20 +1117,28 @@ async function runBattleEndTask(task, runId) {
      url: `/pages/friend-battle-result?battleId=${battleId.value}`,
    });
  } else if (matchStatus.value === 4) {
+    const roomNumber = battleInfo.roomId || store.game.roomNumber || store.game.roomID;
    setTimeout(() => {
-      uni.navigateBack();
+      if (roomNumber) {
+        uni.redirectTo({
+          url: `/pages/battle-room?roomNumber=${encodeURIComponent(roomNumber)}&fromResult=1`,
+        });
+      } else {
+        uni.navigateBack();
+      }
    }, BATTLE_CANCEL_RETURN_DELAY);
  }
 }

 // 无效射击任务：弹 toast 并播报无效射击，不修改比赛主状态。
-async function runInvalidShotTask(runId) {
+async function runInvalidShotTask(task, runId) {
  if (!isQueueAlive(runId)) return;
  uni.showToast({
    title: "距离不足，无效",
    icon: "none",
  });
  await playAudioKeys("射击无效", { interrupt: false });
+  notifyMatchAudioAck(task);
 }

 // 回前台恢复入口：拉取服务端快照，处理结束态，然后继续消费增量队列。
@@ -1016,6 +1157,7 @@ async function restoreLatestBattle() {
    console.log("restore latest battle failed:", err);
  }
  if (currentRestoreId !== restoreGeneration) return;
+  result = normalizeBattleInfo(result);
  if (!result) {
    hideRestoreLoading();
    runBattleQueue();
@@ -1041,6 +1183,7 @@ async function restoreLatestBattle() {
  if (result.status === 4) {
    clearXRingStreaks();
  }
+  reconnectMatchServer(result);

  if (restoreEventType === MESSAGETYPESV2.NewRound) {
    const prevRound = getRestorePrevRound(result);
@@ -1086,6 +1229,18 @@ function scheduleRestoreLatestBattle() {
  }, RESTORE_EMPTY_ID_RETRY_DELAY);
 }

+function onMatchSocketState(event) {
+  if (event?.state !== "open" || event?.reconnected !== true) return;
+  if (
+    event.matchId &&
+    battleId.value &&
+    String(event.matchId) !== String(battleId.value)
+  ) {
+    return;
+  }
+  scheduleRestoreLatestBattle();
+}
+
 // 页面统一的 socket 回调，只负责把消息送进战况队列。
 function onReceiveMessage(message) {
  enqueueBattleMessage(message);
@@ -1094,10 +1249,13 @@ function onReceiveMessage(message) {
 // 新对局入口：彻底清空上一局残留的状态、队列和缓存。
 onLoad((options) => {
  console.log('重新进入了')
+  const returnSnapshot = options.fromReturn ? takeMatchReturnSnapshot() : null;
+  pendingReturnSnapshot = returnSnapshot;
+  skipNextRestoreOnShow = false;
  // 新对局入口：把所有会串场的状态、队列、时间戳和缓存一次性清空。
  start.value = null;
  tips.value = "";
-  battleId.value = options.battleId || "";
+  battleId.value = returnSnapshot?.matchId || options.battleId || "";
  currentRound.value = 0;
  roundTipRound.value = 0;
  goldenRound.value = 0;
@@ -1135,6 +1293,15 @@ onLoad((options) => {
  store.updateShotInfo(0, 0);
  store.updateTips("");
  latestShotFlash.value = null;
+  if (returnSnapshot) {
+    skipNextRestoreOnShow = true;
+    showRestoreLoading();
+    return;
+  }
+  const readySnapshot = takeReadySnapshot(battleId.value);
+  if (readySnapshot?.status === 0) {
+    applyBattleSnapshot(readySnapshot, { restore: true });
+  }
  scheduleRestoreLatestBattle();
 });

@@ -1149,6 +1316,13 @@ onMounted(async () => {
  uni.$on(AUDIO_INTERRUPTION_END_EVENT, handleBattleRecovered);
  uni.$on(PROGRESS_ZERO_EVENT, onProgressZero);
  uni.$on(COUNTDOWN_READY_EVENT, hideRestoreLoading);
+  uni.$on(MATCH_WS_STATE_EVENT, onMatchSocketState);
+  if (pendingReturnSnapshot) {
+    const returnSnapshot = pendingReturnSnapshot;
+    pendingReturnSnapshot = null;
+    reconnectMatchServer(returnSnapshot);
+    scheduleRestoreLatestBattle();
+  }
  await laserCloseAPI();
 });

@@ -1161,12 +1335,15 @@ onBeforeUnmount(() => {
  uni.$off("audioEnded", onAudioEnded);
  uni.$off(PROGRESS_ZERO_EVENT, onProgressZero);
  uni.$off(COUNTDOWN_READY_EVENT, hideRestoreLoading);
+  uni.$off(MATCH_WS_STATE_EVENT, onMatchSocketState);
  if (pendingRestoreTimer) {
    clearTimeout(pendingRestoreTimer);
    pendingRestoreTimer = null;
  }
+  pendingReturnSnapshot = null;
  hideRestoreLoading();
  invalidateBattleQueue({ stopAudio: true, stopProgress: true });
+  closeBattleServer("team-battle-unmount");
  console.log('onBeforeUnmount', '页面卸载前')
  audioManager.stopAll();
  uni.$off(AUDIO_INTERRUPTION_BEGIN_EVENT, handleBattleCovered);
@@ -1176,11 +1353,16 @@ onBeforeUnmount(() => {
 onHide(()=>{
  console.log('onHide', '页面大退')
  handleBattleCovered();
+  closeBattleServer("team-battle-hide");
 })

 // 每次回到前台都重新拉最新比赛快照，确保画面与后端一致。
 onShow(() => {
  console.log('onshow')
+  if (skipNextRestoreOnShow) {
+    skipNextRestoreOnShow = false;
+    return;
+  }
  scheduleRestoreLatestBattle();
 });
 </script>
@@ -1199,7 +1381,12 @@ onShow(() => {
          :blueTeam="blueTeam"
          :winner="0"
      />
-      <TestDistance v-if="start === false" :guide="false" :isBattle="true"/>
+      <TestDistance
+          v-if="start === false"
+          :guide="false"
+          :isBattle="true"
+          :count="readyTime"
+      />
      <!-- 比赛进行中显示：左右队伍、进度条、靶面和底部比分。 -->
      <view v-if="start" class="players-row">
        <TeamAvatars
@@ -19,7 +19,6 @@ const toOrderPage = () => {

 const toFristTryPage = async () => {
  if (canEenter(user.value, device.value, online.value, "/pages/first-try")) {
-    await uni.$checkAudio();
    uni.navigateTo({
      url: "/pages/first-try",
    });
@@ -136,7 +135,7 @@ const buildVersion = typeof __BUILD_TIME__ !== 'undefined' ? __BUILD_TIME__ : ''
          <text>点</text>
        </UserItem>
        <view class="my-grow" @click="toMyGrowthPage">
-          <image src="../static/my-grow.png" mode="widthFix" />
+          <image src="https://static.shelingxingqiu.com/shootmini/static/my-grow.png" mode="widthFix" />
        </view>
        <UserItem title="关于我们" :onClick="toAboutUsPage" />
        <UserItem
@@ -0,0 +1,4 @@
+/* eslint-disable */
+import * as $protobuf from "protobufjs";
+const $root=$protobuf.Root.create({nested:{rpc:{ServerMessageType:{SERVER_MSG_UNKNOWN:0,SERVER_MSG_MATCH_READY:1,SERVER_MSG_MATCH_START:2,SERVER_MSG_NOW_YOU:3,SERVER_MSG_SHOT:4,SERVER_MSG_NEW_ROUND:5,SERVER_MSG_MATCH_END:6,SERVER_MSG_TIMEOUT:7,SERVER_MSG_CHECK:8,SERVER_MSG_RAND:9,SERVER_MSG_NOT_ENOUGH_DISTANCE:10,SERVER_MSG_PLAYER_LEFT:11,SERVER_MSG_HEARTBEAT:12,SERVER_MSG_PRACTICE_END:13},ClientMessageType:{CLIENT_MSG_UNKNOWN:0,CLIENT_MSG_HEARTBEAT_ACK:1,CLIENT_MSG_SHOOT_DATA:2,CLIENT_MSG_ACK:3,CLIENT_MSG_LEAVE:4},MatchStatus:{MATCH_STATUS_READY:0,MATCH_STATUS_STARTED:1,MATCH_STATUS_END:2,MATCH_STATUS_TIMEOUT:3,MATCH_STATUS_UNEXPECTEDLY:4},MatchPlayerStatus:{MATCH_PLAYER_STATUS_READY:0,MATCH_PLAYER_STATUS_STARTED:1,MATCH_PLAYER_STATUS_END:2},MatchShoot:{fields:{player_id:{type:"int64",id:1},status:{type:"int32",id:2},x:{type:"float",id:3},y:{type:"float",id:4},ring:{type:"int32",id:5},ring_x:{type:"bool",id:6},angle:{type:"float",id:7},distance:{type:"float",id:8}}},MatchShootList:{fields:{items:{rule:"repeated",type:"MatchShoot",id:1}}},RoundScore:{fields:{total_ring:{type:"int32",id:1},score:{type:"int32",id:2},if_win:{type:"bool",id:3}}},MatchRound:{fields:{shoots:{rule:"map",type:"MatchShootList",id:1,keytype:"int64"},scores:{rule:"map",type:"RoundScore",id:2,keytype:"int32"},round:{type:"int32",id:3},if_gold:{type:"bool",id:4},status:{type:"int32",id:5},gold_round:{type:"int32",id:6}}},PlayerMatchResult:{fields:{total_ring:{type:"int32",id:1},user_id:{type:"int64",id:2},ten_ring_count:{type:"int32",id:3},average_ring:{type:"float",id:4}}},PlayerFull:{fields:{id:{type:"int64",id:1},name:{type:"string",id:2},avatar:{type:"string",id:3},exp:{type:"int32",id:4},score:{type:"int32",id:5},level:{type:"int32",id:6},before_level:{type:"int32",id:7},before_exp:{type:"int32",id:8},current_exp:{type:"int32",id:9},upgrade_exp:{type:"int32",id:10},active:{type:"int32",id:11},device_id:{type:"string",id:12},s_vip:{type:"bool",id:13},vip:{type:"bool",id:14},player_match_result:{type:"PlayerMatchResult",id:15}}},TeamInfo:{fields:{players:{rule:"repeated",type:"PlayerFull",id:1},id:{type:"int32",id:2},name:{type:"string",id:3},score:{type:"int32",id:4}}},CurrentShoot:{fields:{round:{type:"int32",id:1},round_id:{type:"int64",id:2},index:{type:"int32",id:3},start_time:{type:"int64",id:4},player_id:{type:"int64",id:5},gold_round:{type:"bool",id:6},start_time_text:{type:"string",id:7},my_index:{type:"int32",id:8},index_map:{rule:"map",type:"int32",id:9,keytype:"int64"}}},ShootData:{fields:{x:{type:"float",id:1},y:{type:"float",id:2},r:{type:"float",id:3},dst:{type:"float",id:4},m:{type:"string",id:5},adc:{type:"float",id:6},device_id:{type:"string",id:7},shoot_id:{type:"string",id:8}}},PracticeInfo:{fields:{id:{type:"int64",id:1},user_id:{type:"int64",id:2},status:{type:"int32",id:3},status_text:{type:"string",id:4},start_time:{type:"int64",id:5},target_type:{type:"int32",id:6},vip:{type:"bool",id:7},s_vip:{type:"bool",id:8},device_id:{type:"string",id:9},shoot_data:{type:"MatchShoot",id:10},details:{rule:"repeated",type:"MatchShoot",id:11}}},MatchInfo:{fields:{match_id:{type:"string",id:1},create_time:{type:"int64",id:2},start_time:{type:"int64",id:3},server_time:{type:"int64",id:4},shoot_time:{type:"int32",id:5},shoot_number:{type:"int32",id:6},ready_time:{type:"int32",id:7},way:{type:"int32",id:8},mode:{type:"int32",id:9},status:{type:"MatchStatus",id:10},status_text:{type:"string",id:11},rounds:{rule:"repeated",type:"MatchRound",id:12},teams:{rule:"map",type:"TeamInfo",id:13,keytype:"int32"},current:{type:"CurrentShoot",id:14},next:{type:"CurrentShoot",id:15},shoot_data:{type:"MatchShoot",id:16},win_team:{type:"int32",id:17},mvp:{type:"PlayerFull",id:18},room_id:{type:"string",id:19},result_list:{rule:"repeated",type:"PlayerMatchResult",id:20},timeout_time:{type:"int64",id:21},target_type:{type:"int32",id:22},event_type:{type:"int32",id:23},timeout:{type:"int32",id:24},server_addr:{type:"string",id:25},countdown_start_time:{type:"int64",id:26}}},ServerMessage:{fields:{type:{type:"ServerMessageType",id:1},match_id:{type:"string",id:2},timestamp:{type:"int64",id:3},match_info:{type:"MatchInfo",id:4,oneof:"payload"},shoot_data:{type:"ShootData",id:5,oneof:"payload"},practice_info:{type:"PracticeInfo",id:6,oneof:"payload"},sequence:{type:"int64",id:7}}},ClientMessage:{fields:{type:{type:"ClientMessageType",id:1},match_id:{type:"string",id:2},user_id:{type:"int64",id:3},sequence:{type:"int64",id:4},data:{type:"bytes",id:5}}}}}});
+export default $root;
@@ -0,0 +1,121 @@
+// 比赛数据适配器：统一接口返回和比赛服 websocket 的字段结构。
+// 页面继续使用原来的 camelCase 数据，后端可以返回 snake_case 或新的 matchInfo 包装结构。
+export const MATCH_STATUS_BY_TEXT = {
+  MATCH_STATUS_READY: 0,
+  MATCH_STATUS_STARTED: 1,
+  MATCH_STATUS_END: 2,
+  MATCH_STATUS_TIMEOUT: 3,
+  MATCH_STATUS_UNEXPECTEDLY: 4,
+};
+
+export function pickField(source, camelKey, snakeKey) {
+  return source?.[camelKey] ?? source?.[snakeKey];
+}
+
+export function normalizeId(value) {
+  if (value === undefined || value === null || value === "") return "";
+  return String(value);
+}
+
+function toCamelKey(key) {
+  return key.replace(/_([a-z])/g, (_, letter) => letter.toUpperCase());
+}
+
+export function normalizePlainObject(value) {
+  if (Array.isArray(value)) return value.map(normalizePlainObject);
+  if (!value || typeof value !== "object") return value;
+
+  return Object.keys(value).reduce((result, key) => {
+    result[toCamelKey(key)] = normalizePlainObject(value[key]);
+    return result;
+  }, {});
+}
+
+function normalizeMapValues(map = {}) {
+  return Object.keys(map || {}).reduce((result, key) => {
+    result[key] = normalizePlainObject(map[key]);
+    return result;
+  }, {});
+}
+
+function normalizeShootListMap(map = {}) {
+  return Object.keys(map || {}).reduce((result, key) => {
+    const value = map[key];
+    const items = Array.isArray(value)
+      ? value
+      : Array.isArray(value?.items)
+      ? value.items
+      : [];
+    result[key] = items.map(normalizePlainObject);
+    return result;
+  }, {});
+}
+
+function normalizeRound(round = {}) {
+  const normalized = normalizePlainObject(round);
+  normalized.shoots = normalizeShootListMap(round.shoots || normalized.shoots);
+  normalized.scores = normalizeMapValues(round.scores || normalized.scores);
+  return normalized;
+}
+
+export function normalizeMatchInfo(matchInfo = {}) {
+  if (!matchInfo || typeof matchInfo !== "object") return matchInfo;
+
+  const normalized = normalizePlainObject(matchInfo);
+  const statusText = normalized.statusText || matchInfo.status_text;
+
+  if (
+    (normalized.status === undefined ||
+      normalized.status === null ||
+      normalized.status === "") &&
+    MATCH_STATUS_BY_TEXT[statusText] !== undefined
+  ) {
+    normalized.status = MATCH_STATUS_BY_TEXT[statusText];
+  }
+
+  if (matchInfo.teams || normalized.teams) {
+    normalized.teams = normalizeMapValues(matchInfo.teams || normalized.teams);
+  }
+  if (Array.isArray(matchInfo.rounds || normalized.rounds)) {
+    normalized.rounds = (matchInfo.rounds || normalized.rounds).map(normalizeRound);
+  }
+  if (matchInfo.current || normalized.current) {
+    normalized.current = normalizePlainObject(matchInfo.current || normalized.current);
+  }
+  if (matchInfo.next || normalized.next) {
+    normalized.next = normalizePlainObject(matchInfo.next || normalized.next);
+  }
+  if (matchInfo.shoot_data || normalized.shootData) {
+    normalized.shootData = normalizePlainObject(matchInfo.shoot_data || normalized.shootData);
+  }
+  if (Array.isArray(matchInfo.result_list || normalized.resultList)) {
+    normalized.resultList = (matchInfo.result_list || normalized.resultList).map(
+      normalizePlainObject
+    );
+  }
+
+  return normalized;
+}
+
+export function normalizeBattleApiResult(result) {
+  if (!result || typeof result !== "object") return result;
+
+  // request 通常已经解出顶层 data；这里额外兼容未解包和旧版扁平结构。
+  const resultData = result.data && typeof result.data === "object" ? result.data : null;
+  const payload =
+    resultData && (resultData.matchInfo || resultData.match_info)
+      ? resultData
+      : result;
+  const matchInfo = payload.matchInfo || payload.match_info || payload;
+  const normalized = normalizeMatchInfo(matchInfo);
+  const serverAddr =
+    payload.serverAddr ||
+    payload.server_addr ||
+    matchInfo.serverAddr ||
+    matchInfo.server_addr ||
+    normalized.serverAddr;
+
+  if (serverAddr) normalized.serverAddr = serverAddr;
+
+  return normalized;
+}
@@ -0,0 +1,371 @@
+import protobuf from "protobufjs/minimal.js";
+
+const { Reader, Writer } = protobuf;
+
+// 比赛服 protobuf 协议适配层：
+// 小程序环境不支持 protobufjs 反射模式里的动态 Function codegen，
+// 所以这里使用 minimal Reader/Writer 做静态字段解码和客户端消息编码。
+export const ServerMessageType = {
+  SERVER_MSG_UNKNOWN: 0,
+  SERVER_MSG_MATCH_READY: 1,
+  SERVER_MSG_MATCH_START: 2,
+  SERVER_MSG_NOW_YOU: 3,
+  SERVER_MSG_SHOT: 4,
+  SERVER_MSG_NEW_ROUND: 5,
+  SERVER_MSG_MATCH_END: 6,
+  SERVER_MSG_TIMEOUT: 7,
+  SERVER_MSG_CHECK: 8,
+  SERVER_MSG_RAND: 9,
+  SERVER_MSG_NOT_ENOUGH_DISTANCE: 10,
+  SERVER_MSG_PLAYER_LEFT: 11,
+  SERVER_MSG_HEARTBEAT: 12,
+  SERVER_MSG_PRACTICE_END: 13,
+};
+
+export const ClientMessageType = {
+  CLIENT_MSG_UNKNOWN: 0,
+  CLIENT_MSG_HEARTBEAT_ACK: 1,
+  CLIENT_MSG_SHOOT_DATA: 2,
+  CLIENT_MSG_ACK: 3,
+  CLIENT_MSG_LEAVE: 4,
+};
+
+// protobufjs 的 enum 默认是 name -> value，这里反转成 value -> name 用于日志打印。
+const ServerMessageTypeNameByValue = Object.keys(ServerMessageType).reduce(
+  (result, name) => {
+    result[ServerMessageType[name]] = name;
+    return result;
+  },
+  {}
+);
+
+// 当前只需要解码比赛服下发的字段并打印，字段表按后端 proto 定义维护。
+const SCHEMAS = {
+  MatchShoot: {
+    1: { name: "player_id", kind: "int64" },
+    2: { name: "status", kind: "int32" },
+    3: { name: "x", kind: "float" },
+    4: { name: "y", kind: "float" },
+    5: { name: "ring", kind: "int32" },
+    6: { name: "ring_x", kind: "bool" },
+    7: { name: "angle", kind: "float" },
+    8: { name: "distance", kind: "float" },
+  },
+  MatchShootList: {
+    1: { name: "items", kind: "message", type: "MatchShoot", repeated: true },
+  },
+  RoundScore: {
+    1: { name: "total_ring", kind: "int32" },
+    2: { name: "score", kind: "int32" },
+    3: { name: "if_win", kind: "bool" },
+  },
+  MatchRound: {
+    1: {
+      name: "shoots",
+      kind: "map",
+      keyKind: "int64",
+      valueKind: "message",
+      valueType: "MatchShootList",
+    },
+    2: {
+      name: "scores",
+      kind: "map",
+      keyKind: "int32",
+      valueKind: "message",
+      valueType: "RoundScore",
+    },
+    3: { name: "round", kind: "int32" },
+    4: { name: "if_gold", kind: "bool" },
+    5: { name: "status", kind: "int32" },
+    6: { name: "gold_round", kind: "int32" },
+  },
+  PlayerMatchResult: {
+    1: { name: "total_ring", kind: "int32" },
+    2: { name: "user_id", kind: "int64" },
+    3: { name: "ten_ring_count", kind: "int32" },
+    4: { name: "average_ring", kind: "float" },
+  },
+  PlayerFull: {
+    1: { name: "id", kind: "int64" },
+    2: { name: "name", kind: "string" },
+    3: { name: "avatar", kind: "string" },
+    4: { name: "exp", kind: "int32" },
+    5: { name: "score", kind: "int32" },
+    6: { name: "level", kind: "int32" },
+    7: { name: "before_level", kind: "int32" },
+    8: { name: "before_exp", kind: "int32" },
+    9: { name: "current_exp", kind: "int32" },
+    10: { name: "upgrade_exp", kind: "int32" },
+    11: { name: "active", kind: "int32" },
+    12: { name: "device_id", kind: "string" },
+    13: { name: "s_vip", kind: "bool" },
+    14: { name: "vip", kind: "bool" },
+    15: { name: "player_match_result", kind: "message", type: "PlayerMatchResult" },
+  },
+  TeamInfo: {
+    1: { name: "players", kind: "message", type: "PlayerFull", repeated: true },
+    2: { name: "id", kind: "int32" },
+    3: { name: "name", kind: "string" },
+    4: { name: "score", kind: "int32" },
+  },
+  CurrentShoot: {
+    1: { name: "round", kind: "int32" },
+    2: { name: "round_id", kind: "int64" },
+    3: { name: "index", kind: "int32" },
+    4: { name: "start_time", kind: "int64" },
+    5: { name: "player_id", kind: "int64" },
+    6: { name: "gold_round", kind: "bool" },
+    7: { name: "start_time_text", kind: "string" },
+    8: { name: "my_index", kind: "int32" },
+    9: {
+      name: "index_map",
+      kind: "map",
+      keyKind: "int64",
+      valueKind: "int32",
+    },
+  },
+  ShootData: {
+    1: { name: "x", kind: "float" },
+    2: { name: "y", kind: "float" },
+    3: { name: "r", kind: "float" },
+    4: { name: "dst", kind: "float" },
+    5: { name: "m", kind: "string" },
+    6: { name: "adc", kind: "float" },
+    7: { name: "device_id", kind: "string" },
+    8: { name: "shoot_id", kind: "string" },
+  },
+  PracticeInfo: {
+    1: { name: "id", kind: "int64" },
+    2: { name: "user_id", kind: "int64" },
+    3: { name: "status", kind: "int32" },
+    4: { name: "status_text", kind: "string" },
+    5: { name: "start_time", kind: "int64" },
+    6: { name: "target_type", kind: "int32" },
+    7: { name: "vip", kind: "bool" },
+    8: { name: "s_vip", kind: "bool" },
+    9: { name: "device_id", kind: "string" },
+    10: { name: "shoot_data", kind: "message", type: "MatchShoot" },
+    11: { name: "details", kind: "message", type: "MatchShoot", repeated: true },
+  },
+  MatchInfo: {
+    1: { name: "match_id", kind: "string" },
+    2: { name: "create_time", kind: "int64" },
+    3: { name: "start_time", kind: "int64" },
+    4: { name: "server_time", kind: "int64" },
+    5: { name: "shoot_time", kind: "int32" },
+    6: { name: "shoot_number", kind: "int32" },
+    7: { name: "ready_time", kind: "int32" },
+    8: { name: "way", kind: "int32" },
+    9: { name: "mode", kind: "int32" },
+    10: { name: "status", kind: "int32" },
+    11: { name: "status_text", kind: "string" },
+    12: { name: "rounds", kind: "message", type: "MatchRound", repeated: true },
+    13: {
+      name: "teams",
+      kind: "map",
+      keyKind: "int32",
+      valueKind: "message",
+      valueType: "TeamInfo",
+    },
+    14: { name: "current", kind: "message", type: "CurrentShoot" },
+    15: { name: "next", kind: "message", type: "CurrentShoot" },
+    16: { name: "shoot_data", kind: "message", type: "MatchShoot" },
+    17: { name: "win_team", kind: "int32" },
+    18: { name: "mvp", kind: "message", type: "PlayerFull" },
+    19: { name: "room_id", kind: "string" },
+    20: {
+      name: "result_list",
+      kind: "message",
+      type: "PlayerMatchResult",
+      repeated: true,
+    },
+    21: { name: "timeout_time", kind: "int64" },
+    22: { name: "target_type", kind: "int32" },
+    23: { name: "event_type", kind: "int32" },
+    24: { name: "timeout", kind: "int32" },
+    25: { name: "server_addr", kind: "string" },
+    26: { name: "countdown_start_time", kind: "int64" },
+  },
+  ServerMessage: {
+    1: { name: "type", kind: "int32" },
+    2: { name: "match_id", kind: "string" },
+    3: { name: "timestamp", kind: "int64" },
+    4: { name: "match_info", kind: "message", type: "MatchInfo", oneof: "payload" },
+    5: { name: "shoot_data", kind: "message", type: "ShootData", oneof: "payload" },
+    6: { name: "practice_info", kind: "message", type: "PracticeInfo", oneof: "payload" },
+    7: { name: "sequence", kind: "int64" },
+  },
+};
+
+// 小程序 websocket 收到的 data 可能是 ArrayBuffer、TypedArray 或字符串，这里统一成 Uint8Array。
+function toUint8Array(data) {
+  if (data instanceof Uint8Array) return data;
+  if (data instanceof ArrayBuffer) return new Uint8Array(data);
+  if (ArrayBuffer.isView(data)) {
+    return new Uint8Array(data.buffer, data.byteOffset, data.byteLength);
+  }
+  if (typeof data === "string") {
+    const bytes = new Uint8Array(data.length);
+    for (let i = 0; i < data.length; i += 1) {
+      bytes[i] = data.charCodeAt(i) & 0xff;
+    }
+    return bytes;
+  }
+  throw new TypeError("Unsupported match websocket message payload");
+}
+
+// uni.sendSocketMessage 发送二进制时使用 ArrayBuffer。
+function toArrayBuffer(bytes) {
+  const output = new Uint8Array(bytes.length);
+  output.set(bytes);
+  return output.buffer;
+}
+
+function readScalar(reader, kind) {
+  switch (kind) {
+    case "int32":
+      return reader.int32();
+    case "int64":
+      // 统一把 int64 转成字符串，避免小程序环境下大整数精度丢失。
+      return reader.int64().toString();
+    case "float":
+      return reader.float();
+    case "bool":
+      return reader.bool();
+    case "string":
+      return reader.string();
+    case "bytes":
+      return Array.from(reader.bytes());
+    default:
+      throw new Error(`Unsupported protobuf scalar kind: ${kind}`);
+  }
+}
+
+function readMapEntry(reader, field) {
+  const end = reader.uint32() + reader.pos;
+  let key = "";
+  let value;
+
+  while (reader.pos < end) {
+    const tag = reader.uint32();
+    switch (tag >>> 3) {
+      case 1:
+        key = readScalar(reader, field.keyKind);
+        break;
+      case 2:
+        value =
+          field.valueKind === "message"
+            ? decodeMessage(field.valueType, reader, reader.uint32())
+            : readScalar(reader, field.valueKind);
+        break;
+      default:
+        reader.skipType(tag & 7);
+        break;
+    }
+  }
+
+  return { key: String(key), value };
+}
+
+function readValue(reader, field) {
+  if (field.kind === "message") {
+    return decodeMessage(field.type, reader, reader.uint32());
+  }
+  return readScalar(reader, field.kind);
+}
+
+function decodeMessage(schemaName, readerOrData, length) {
+  const schema = SCHEMAS[schemaName];
+  const reader =
+    readerOrData instanceof Reader ? readerOrData : Reader.create(readerOrData);
+  const end = length === undefined ? reader.len : reader.pos + length;
+  const message = {};
+
+  while (reader.pos < end) {
+    const tag = reader.uint32();
+    const field = schema[tag >>> 3];
+
+    if (!field) {
+      reader.skipType(tag & 7);
+      continue;
+    }
+
+    if (field.kind === "map") {
+      const entry = readMapEntry(reader, field);
+      const map = message[field.name] || {};
+      map[entry.key] = entry.value;
+      message[field.name] = map;
+      continue;
+    }
+
+    const value = readValue(reader, field);
+
+    if (field.repeated) {
+      if (!message[field.name]) message[field.name] = [];
+      message[field.name].push(value);
+    } else {
+      message[field.name] = value;
+    }
+
+    if (field.oneof) {
+      message[field.oneof] = field.name;
+    }
+  }
+
+  return message;
+}
+
+export function decodeServerMessage(data) {
+  // 后端已确认比赛服 websocket 下发的是原始 protobuf frame，直接解 ServerMessage。
+  return decodeMessage("ServerMessage", toUint8Array(data));
+}
+
+export function encodeClientMessage(payload) {
+  // ClientMessage 字段名按 proto 定义写入，例如 match_id、user_id。
+  const writer = Writer.create();
+  const matchId = payload.match_id ?? payload.matchId;
+  const userId = payload.user_id ?? payload.userId;
+
+  if (payload.type !== undefined) writer.uint32(8).int32(payload.type);
+  if (matchId !== undefined && matchId !== null) {
+    writer.uint32(18).string(String(matchId));
+  }
+  if (userId !== undefined && userId !== null) writer.uint32(24).int64(userId);
+  if (payload.sequence !== undefined && payload.sequence !== null) {
+    writer.uint32(32).int64(payload.sequence);
+  }
+  if (payload.data !== undefined && payload.data !== null) {
+    writer.uint32(42).bytes(toUint8Array(payload.data));
+  }
+
+  return toArrayBuffer(writer.finish());
+}
+
+export function getServerMessageTypeName(type) {
+  return ServerMessageTypeNameByValue[type] || String(type);
+}
+
+export function createHeartbeatAckMessage() {
+  // 心跳 ACK 按文档立即回，不等待语音播报。
+  return encodeClientMessage({
+    type: ClientMessageType.CLIENT_MSG_HEARTBEAT_ACK,
+  });
+}
+
+export function createAckMessage({ matchId, sequence }) {
+  // 普通消息 ACK 仍携带 sequence，但前端不做 sequence 补发或排序。
+  return encodeClientMessage({
+    type: ClientMessageType.CLIENT_MSG_ACK,
+    match_id: matchId,
+    sequence,
+  });
+}
+
+export function createLeaveMessage({ matchId, userId }) {
+  // 比赛结束或页面离开时通知比赛服释放当前玩家连接。
+  return encodeClientMessage({
+    type: ClientMessageType.CLIENT_MSG_LEAVE,
+    match_id: matchId,
+    user_id: userId,
+  });
+}
@@ -0,0 +1,32 @@
+export const MATCH_RETURN_SNAPSHOT_KEY = "match-return-snapshot";
+
+function getMatchId(battleInfo) {
+  return battleInfo?.matchId || battleInfo?.id || "";
+}
+
+function getBattlePageUrl(battleInfo) {
+  return Number(battleInfo?.mode) <= 3
+    ? "/pages/team-battle/index?fromReturn=1"
+    : "/pages/melee-battle?fromReturn=1";
+}
+
+export function takeMatchReturnSnapshot() {
+  const snapshot = uni.getStorageSync(MATCH_RETURN_SNAPSHOT_KEY);
+  if (snapshot) uni.removeStorageSync(MATCH_RETURN_SNAPSHOT_KEY);
+  return snapshot && typeof snapshot === "object" ? snapshot : null;
+}
+
+export async function returnToBattle(battleInfo, navigate) {
+  const matchId = getMatchId(battleInfo);
+  if (!battleInfo || !matchId || !battleInfo.serverAddr) {
+    uni.showToast({
+      title: "比赛连接信息异常",
+      icon: "none",
+    });
+    return false;
+  }
+
+  uni.setStorageSync(MATCH_RETURN_SNAPSHOT_KEY, battleInfo);
+  await navigate(getBattlePageUrl(battleInfo));
+  return true;
+}
@@ -0,0 +1,131 @@
+"use strict";
+
+var utf8 = exports;
+var replacementChar = "\ufffd";
+
+function utf8Read(buffer, start, end, fatal) {
+    var str = "";
+    for (var i = start; i < end;) {
+        var first = buffer[i++];
+        if (first <= 0x7F) {
+            str += String.fromCharCode(first);
+            continue;
+        }
+
+        var needed = 0;
+        var codePoint = 0;
+        var minCodePoint = 0;
+
+        if (first >= 0xC2 && first <= 0xDF) {
+            needed = 1;
+            codePoint = first & 0x1F;
+            minCodePoint = 0x80;
+        } else if (first >= 0xE0 && first <= 0xEF) {
+            needed = 2;
+            codePoint = first & 0x0F;
+            minCodePoint = 0x800;
+        } else if (first >= 0xF0 && first <= 0xF4) {
+            needed = 3;
+            codePoint = first & 0x07;
+            minCodePoint = 0x10000;
+        } else {
+            if (fatal) throw Error("invalid UTF-8 encoding");
+            str += replacementChar;
+            continue;
+        }
+
+        if (i + needed > end) {
+            if (fatal) throw Error("invalid UTF-8 encoding");
+            str += replacementChar;
+            break;
+        }
+
+        var valid = true;
+        for (var j = 0; j < needed; ++j) {
+            var next = buffer[i + j];
+            if ((next & 0xC0) !== 0x80) {
+                valid = false;
+                break;
+            }
+            codePoint = codePoint << 6 | next & 0x3F;
+        }
+
+        if (
+            !valid ||
+            codePoint < minCodePoint ||
+            codePoint > 0x10FFFF ||
+            codePoint >= 0xD800 && codePoint <= 0xDFFF
+        ) {
+            if (fatal) throw Error("invalid UTF-8 encoding");
+            str += replacementChar;
+            continue;
+        }
+
+        i += needed;
+        if (codePoint <= 0xFFFF) {
+            str += String.fromCharCode(codePoint);
+        } else {
+            codePoint -= 0x10000;
+            str += String.fromCharCode(0xD800 + (codePoint >> 10));
+            str += String.fromCharCode(0xDC00 + (codePoint & 0x3FF));
+        }
+    }
+    return str;
+}
+
+utf8.length = function utf8_length(string) {
+    var len = 0,
+        c = 0;
+    for (var i = 0; i < string.length; ++i) {
+        c = string.charCodeAt(i);
+        if (c < 128)
+            len += 1;
+        else if (c < 2048)
+            len += 2;
+        else if ((c & 0xFC00) === 0xD800 && (string.charCodeAt(i + 1) & 0xFC00) === 0xDC00) {
+            ++i;
+            len += 4;
+        } else
+            len += 3;
+    }
+    return len;
+};
+
+utf8.read = function utf8_read(buffer, start, end) {
+    if (end - start < 1)
+        return "";
+    return utf8Read(buffer, start, end, false);
+};
+
+utf8.readStrict = function utf8_read_strict(buffer, start, end) {
+    if (end - start < 1)
+        return "";
+    return utf8Read(buffer, start, end, true);
+};
+
+utf8.write = function utf8_write(string, buffer, offset) {
+    var start = offset,
+        c1,
+        c2;
+    for (var i = 0; i < string.length; ++i) {
+        c1 = string.charCodeAt(i);
+        if (c1 < 128) {
+            buffer[offset++] = c1;
+        } else if (c1 < 2048) {
+            buffer[offset++] = c1 >> 6 | 192;
+            buffer[offset++] = c1 & 63 | 128;
+        } else if ((c1 & 0xFC00) === 0xD800 && ((c2 = string.charCodeAt(i + 1)) & 0xFC00) === 0xDC00) {
+            c1 = 0x10000 + ((c1 & 0x03FF) << 10) + (c2 & 0x03FF);
+            ++i;
+            buffer[offset++] = c1 >> 18 | 240;
+            buffer[offset++] = c1 >> 12 & 63 | 128;
+            buffer[offset++] = c1 >> 6 & 63 | 128;
+            buffer[offset++] = c1 & 63 | 128;
+        } else {
+            buffer[offset++] = c1 >> 12 | 224;
+            buffer[offset++] = c1 >> 6 & 63 | 128;
+            buffer[offset++] = c1 & 63 | 128;
+        }
+    }
+    return offset - start;
+};
@@ -24,7 +24,7 @@ function createWebSocket(token, onMessage) {

    switch (envVersion) {
      case "develop": // 开发版
-        // url = "ws://192.168.1.30:8000/socket";
+        // url = "ws://192.168.1.2:8000/socket";
        url = "wss://apitest.shelingxingqiu.com/socket";
        break;
      case "trial": // 体验版
@@ -1,8 +1,23 @@
 import { fileURLToPath, URL } from 'node:url'
+import { readFileSync } from 'node:fs'

 import { defineConfig } from 'vite'
 import uni from '@dcloudio/vite-plugin-uni'

+const protobufUtf8CompatPath = fileURLToPath(new URL('./src/utils/protobufUtf8Compat.js', import.meta.url))
+
+function protobufUtf8CompatPlugin() {
+  return {
+    name: 'protobufjs-utf8-miniprogram-compat',
+    load(id) {
+      const normalizedId = id.replace(/\\/g, '/')
+      if (normalizedId.endsWith('/node_modules/protobufjs/src/util/utf8.js')) {
+        return readFileSync(protobufUtf8CompatPath, 'utf8')
+      }
+    }
+  }
+}
+
 export default defineConfig({
  resolve: {
    alias: {
@@ -10,6 +25,7 @@ export default defineConfig({
    }
  },
  plugins: [
+    protobufUtf8CompatPlugin(),
    uni(),
  ],
  /** 构建时常量注入：__BUILD_TIME__ 在源码中展开为精确的打包时刻字符串 */
Author	SHA1	Message	Date
zhangyi	b8c5f3dd91	Merge branch 'test'	2026-07-15 15:23:57 +08:00
zhangyi	af7f70ba80	update:修改mvp字段	2026-07-15 15:22:31 +08:00
zhangyi	6d1a910051	Merge branch 'test'	2026-07-15 09:55:37 +08:00
zhangyi	1c7cf74eb9	update:优化段位介绍	2026-07-15 09:55:01 +08:00
zhangyi	e9023ecc9f	update:新增dist排除代码	2026-07-14 17:59:52 +08:00
zhangyi	080af14be8	update:语音加载优化，修复大乱斗未重连比赛服问题	2026-07-13 14:50:21 +08:00
zhangyi	1796d4aa40	update:房间新增vip特效	2026-07-10 18:13:41 +08:00
zhangyi	4b39107453	update：优化大乱斗断连	2026-07-10 17:49:42 +08:00
zhangyi	3e090e5b33	update:修复大乱斗	2026-07-10 16:45:03 +08:00
zhangyi	98ca638b63	update:新增比赛服断线重连机制	2026-07-10 15:11:45 +08:00
zhangyi	b5373bee31	update:新版本websocket	2026-07-10 13:57:09 +08:00
zhangyi	58a7bb2017	update:优化个人练习	2026-07-09 18:29:04 +08:00
zhangyi	82eedc3ab8	update:分包、对接个人练习	2026-07-09 17:53:29 +08:00
zhangyi	ac4d8dfb38	Merge branch 'test' into feat-websoc	2026-07-09 16:26:31 +08:00
zhangyi	725a3ddcb9	update:优化比赛	2026-07-09 16:15:27 +08:00
zhangyi	33187e0cc3	update；优化比赛服	2026-07-09 15:48:28 +08:00
zhangyi	bf6b87b59c	update:优化跳转	2026-07-09 14:43:25 +08:00
zhangyi	12729a1cef	update:修复日志和防抖	2026-07-09 14:35:48 +08:00
zhangyi	f8efe4c4a4	update：优化比赛	2026-07-09 11:43:06 +08:00
zhangyi	af07d09ab6	update:优化比赛队列	2026-07-08 18:18:27 +08:00
zhangyi	e0d976fcce	update:更新比赛服逻辑	2026-07-08 16:03:34 +08:00
zhangyi	01ac4f9c03	update:新增比赛服链接	2026-07-08 14:51:35 +08:00
zhangyi	095884d7fc	Merge branch 'fix-vip'	2026-07-06 11:16:52 +08:00
zhangyi	a7897af861	Merge branch 'fix-vip'	2026-07-06 09:38:15 +08:00
zhangyi	fd7c4b4bbf	update:优化图片	2026-07-03 17:50:55 +08:00
zhangyi	efb186d242	Merge branch 'test'	2026-07-03 17:49:40 +08:00
zhangyi	4ce2e6a7c4	Merge branch 'fix-bug'	2026-06-15 09:31:27 +08:00
zhangyi	52c5b9504a	update:更新靶纸	2026-06-11 18:13:46 +08:00