Merge branch 'new-race-mode' into test

fix：结算页面经验进度条后端对接完成
fix：房间号模块跟胶囊margin距离根据机型动态写入
2026-05-09 17:41:54 +08:00 · 2026-05-09 17:41:41 +08:00 · 2026-05-09 16:41:06 +08:00 · 2026-05-09 16:01:21 +08:00 · 2026-05-09 15:58:55 +08:00 · 2026-05-09 15:51:51 +08:00
56 changed files with 3131 additions and 480 deletions
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -0,0 +1,269 @@
+# AI Agent 企业级行为策略（Ultimate Edition）
+
+## 核心目标
+
+AI 应：
+
+* 像高级工程师一样思考
+* 保持智能
+* 保持上下文理解能力
+* 保持组件联动能力
+* 同时避免无意义 token 消耗
+
+目标不是限制 AI。
+
+目标是：
+
+* 智能
+* 克制
+* 稳定
+* 高效
+
+---
+
+# AI 工作模式
+
+默认采用：
+
+Think First
+Explore Second
+Modify Last
+
+即：
+
+1. 先理解需求
+2. 再推理可能相关文件
+3. 再最小化读取
+4. 最后修改代码
+
+禁止：
+
+* 无脑全项目扫描
+* 不经思考直接 grep
+* 无限递归读取
+
+---
+
+# 智能按需扫描（核心规则）
+
+允许 AI 自动：
+
+* 分析当前任务
+* 分析 import
+* 分析组件依赖
+* 分析 store 依赖
+* 分析 api 依赖
+* 分析 types 依赖
+* 分析 utils 依赖
+
+允许：
+
+* 自动读取直接依赖文件
+* 自动修复 import
+* 自动修复类型引用
+* 自动分析运行链路
+
+但必须：
+
+* 最小化扫描范围
+* 最小化 token 消耗
+* 禁止无限递归探索
+
+---
+
+# 扫描深度限制
+
+默认最大依赖深度：
+
+2 层
+
+例如：
+
+index.vue
+-> ProductCard.vue
+-> product.ts
+
+允许读取：
+
+* ProductCard.vue
+* product.ts
+
+禁止继续无限扫描。
+
+如果任务复杂：
+
+必须先输出分析计划，
+等待确认后再扩大扫描范围。
+
+---
+
+# AI 自由发挥边界
+
+允许：
+
+* 合理重构
+* 合理组件化
+* 合理优化结构
+* 合理优化样式
+* 合理优化复用
+* 合理修复低级问题
+* 合理修复 import
+* 合理修复类型错误
+
+禁止：
+
+* 为了炫技重构项目
+* 无意义抽象
+* 过度设计
+* 无意义拆分
+* 无意义新增依赖
+* 自动升级依赖
+
+---
+
+# Token 经济策略
+
+Token 应优先用于：
+
+* 推理
+* 架构理解
+* 业务逻辑
+* UI 结构优化
+* 类型安全
+* 组件联动
+
+禁止浪费在：
+
+* 全项目 grep
+* 重复读取
+* 重复输出
+* 重复解释
+* 输出完整项目
+* 输出未修改代码
+
+---
+
+# 页面生成规则（Figma / uni-app）
+
+允许：
+
+* 自动组件化
+* 自动布局优化
+* 自动结构优化
+* 自动提取公共组件
+
+优先：
+
+* flex 布局
+* 可维护性
+* uni-app 最佳实践
+* 低嵌套结构
+* 高复用结构
+
+禁止：
+
+* div 套 div
+* 全 absolute 页面
+* 垃圾 HTML
+* 无意义嵌套
+* 内联 style 泛滥
+
+---
+
+# uni-app 规则
+
+必须：
+
+* 使用 view/text/image
+* px 转 rpx
+* 使用 script setup
+* scoped scss
+* 兼容：
+
+  * H5
+  * 微信小程序
+  * App
+
+---
+
+# 大任务策略
+
+复杂任务：
+
+必须：
+
+1. 先分析
+2. 先规划
+3. 先输出方案
+4. 等待确认
+
+再：
+
+5. 编码
+
+禁止直接进入大规模代码生成。
+
+---
+
+# 修改策略
+
+优先：
+
+* diff 修改
+* 小范围 patch
+* 保持现有架构
+* 保持现有组件体系
+* 保持现有 API 结构
+
+允许：
+
+* 小范围智能优化
+
+禁止：
+
+* 全项目重构
+* 无关文件修改
+
+---
+
+# 高级工程师行为模式
+
+AI 应像高级工程师：
+
+* 先思考
+* 再探索
+* 再修改
+
+而不是：
+
+* 无脑扫描器
+* Token 消耗机器
+* 低级代码生成器
+
+AI 应主动：
+
+* 控制扫描范围
+* 控制输出长度
+* 控制修改范围
+* 控制复杂度
+
+同时保持：
+
+* 智能
+* 联动能力
+* 架构理解能力
+
+---
+
+# 默认输出规则
+
+默认：
+
+* 仅输出修改部分
+* 不重复未修改代码
+* 少解释
+* 优先 patch
+* 优先 diff
+
+除非用户明确要求：
+否则不要输出完整项目。
--- a/doc.md
+++ b/doc.md
@@ -0,0 +1,116 @@
+# 微信小程序多人协作分支管理规范
+
+## 一、分支结构
+
+```
+main (主分支/生产环境)
+  └── test (测试分支)
+        └── feature/xxx (个人开发分支)
+```
+
+| 分支 | 用途 | 稳定性 |
+|------|------|--------|
+| main | 生产环境代码 | 最高，仅接受测试通过的代码合并 |
+| test | 测试环境，用于体验版发布 | 中，需验证后合并到 main |
+| feature/xxx | 个人开发分支 | 低，按需命名，如 `feature/user-center` |
+
+---
+
+## 二、开发流程
+
+### 1. 开始开发
+
+```bash
+# 确保本地 main 最新
+git checkout main
+git pull origin main
+
+# 从 main 创建自己的开发分支
+git checkout -b feature/your-name-work
+```
+
+### 2. 开发阶段
+
+- 在个人分支上开发功能
+- 频繁提交，保持原子性提交
+- 定期 `git pull origin main` 同步主线变更，避免合并冲突累积
+
+```bash
+git add .
+git commit -m "feat: 完成xxx功能"
+```
+
+### 3. 合并到 test 分支
+
+```bash
+# 切换到 test
+git checkout test
+git pull origin test
+
+# 合并个人分支
+git merge feature/your-name-work
+
+# 推送 test 分支
+git push origin test
+```
+
+### 4. 打包上传体验版
+
+```bash
+# 执行打包
+npm run build
+```
+
+打包完成后：
+
+1. 打开 **微信开发者工具**
+2. 导入项目，选择 `dist/build/mp-weixin` 目录
+3. 在开发者工具中点击 **上传**
+4. 登录 [微信公众平台](https://mp.weixin.qq.com)
+5. 进入 **管理->版本管理**
+6. 找到刚上传的版本，点击 **选为体验版**
+
+---
+
+## 三、合并到 main 分支
+
+当 test 分支验证通过后，将其合并到 main：
+
+```bash
+git checkout main
+git pull origin main
+
+git merge origin/test
+
+git push origin main
+```
+
+---
+
+## 四、冲突处理
+
+合并时如有冲突，在个人分支解决后再合并：
+
+```bash
+git checkout feature/your-name-work
+git merge main
+# 解决冲突后
+git add .
+git commit -m "merge: 解决与main的冲突"
+git push origin feature/your-name-work
+
+# 重新合并到 test
+git checkout test
+git merge feature/your-name-work
+git push origin test
+```
+
+---
+
+## 五、注意事项
+
+1. **禁止直接向 main 和 test 分支提交代码**，必须通过合并
+2. **每次合并前先拉取最新代码**，避免覆盖他人改动
+3. **体验版发布前确认代码已提交**，避免遗漏
+4. **开发分支命名建议**：`feature/姓名-功能名`，如 `feature/zhangsan-login`
+5. **删除已合并的开发分支**：`git branch -d feature/your-name-work`
--- a/src/apis.js
+++ b/src/apis.js
@@ -6,8 +6,8 @@ try {

    switch (envVersion) {
        case "develop": // 开发版
-            BASE_URL = "http://localhost:8000/api/shoot";
-            // BASE_URL = "https://apitest.shelingxingqiu.com/api/shoot";
+            // BASE_URL = "http://localhost:8000/api/shoot";
+            BASE_URL = "https://apitest.shelingxingqiu.com/api/shoot";
            break;
        case "trial": // 体验版
            BASE_URL = "https://apitest.shelingxingqiu.com/api/shoot";
@@ -496,3 +496,63 @@ export const kickPlayerAPI = (number, userId) => {
        userId,
    });
 };
+
+// 获取赛季列表
+export const getSeasonList = () => {
+    return request("GET", "/index/season/list");
+};
+
+// 获取赛季统计
+export const getSeasonStats = (seasonId) => {
+    const data = {};
+    if (seasonId !== undefined && seasonId !== null) data.seasonId = seasonId;
+    return request("GET", "/index/season/stats", data);
+};
+
+//获取积分榜
+export const getScoreRankList = (seasonId, page, perPage) => {
+    return request("GET", "/index/score/rank/list", {
+		seasonId,
+		page,
+		perPage
+	});
+};
+
+// 获取10环排行榜
+export const getTenRingRankList = (seasonId, page, perPage) => {
+    return request("GET", "/index/tenRing/rank/list", {
+		seasonId,
+		page,
+		perPage
+	});
+};
+
+// 获取MVP排行榜
+export const getMvpRankList = (seasonId, page, perPage) => {
+    return request("GET", "/index/mvp/rank/list", {
+		seasonId,
+		page,
+		perPage
+	});
+};
+
+// 获取我的积分排名
+export const getMyScoreRank = (seasonId) => {
+    const data = {};
+    if (seasonId !== undefined && seasonId !== null) data.seasonId = seasonId;
+    return request("GET", "/index/myScoreRank", data);
+};
+
+// 获取我的MVP排名
+export const getMyMvpRank = (seasonId) => {
+    const data = {};
+    if (seasonId !== undefined && seasonId !== null) data.seasonId = seasonId;
+    return request("GET", "/index/myMvpRank", data);
+};
+
+// 获取我的10环排名
+export const getMyTenRingRank = (seasonId) => {
+    const data = {};
+    if (seasonId !== undefined && seasonId !== null) data.seasonId = seasonId;
+    return request("GET", "/index/myTenRingRank", data);
+};
--- a/src/audioManager.js
+++ b/src/audioManager.js
@@ -362,6 +362,7 @@ class AudioManager {
        }
        this.allowPlayMap.set(key, false);
        this.onAudioEnded(key);
+        uni.$emit('audioEnded', key);
      });

      audio.onStop(() => {
--- a/src/components/AppBackground.vue
+++ b/src/components/AppBackground.vue
@@ -18,31 +18,31 @@ const props = defineProps({
    <image
      class="bg-image"
      v-if="type === 0"
-      src="../static/app-bg.png"
+      src="https://static.shelingxingqiu.com/shootmini/static/app-bg.png"
      mode="widthFix"
    />
    <image
      class="bg-image"
      v-if="type === 1"
-      src="../static/app-bg2.png"
+      src="https://static.shelingxingqiu.com/shootmini/static/app-bg2.png"
      mode="widthFix"
    />
    <image
      class="bg-image"
      v-if="type === 2"
-      src="../static/app-bg3.png"
+      src="https://static.shelingxingqiu.com/shootmini/static/app-bg3.png"
      :style="{ height: capsuleHeight + 50 + 'px' }"
    />
    <image
      class="bg-image"
      v-if="type === 3"
-      src="../static/app-bg4.png"
+      src="https://static.shelingxingqiu.com/shootmini/static/app-bg4.png"
      mode="widthFix"
    />
    <image
      class="bg-image"
      v-if="type === 4"
-      src="../static/app-bg5.png"
+      src="https://static.shelingxingqiu.com/shootmini/static/app-bg5.png"
      mode="widthFix"
    />
    <image
@@ -51,6 +51,12 @@ const props = defineProps({
      src="https://static.shelingxingqiu.com/attachment/2026-01-05/dfgf3b5kp459tfyn0f.png"
      mode="widthFix"
    />
+	<image
+	  class="bg-image"
+	  v-if="type === 6"
+	  src="https://static.shelingxingqiu.com/shootmini/static/rank/rank-bg.png"
+	  mode="widthFix"
+	/>
    <view class="bg-overlay" v-if="type === 0"></view>
  </view>
 </template>
@@ -67,7 +73,7 @@ const props = defineProps({

 .bg-image {
  width: 100%;
-  height: 100%;
+  /* height: 100%; */
 }

 .bg-overlay {
--- a/src/components/GuideTwo.vue
+++ b/src/components/GuideTwo.vue
@@ -9,12 +9,12 @@ defineProps({

 <template>
  <view class="container">
-    <image class="shooter2" src="../static/shooter2.png" mode="widthFix" />
+    <image class="shooter2" src="https://static.shelingxingqiu.com/shootmini/static/shooter2.png" mode="widthFix" />
    <view class="bg-box">
      <image
        class="bg"
        v-if="!noBg"
-        src="../static/long-bubble-border.png"
+        src="https://static.shelingxingqiu.com/shootmini/static/long-bubble-border.png"
        mode="widthFix"
      />
      <slot />
@@ -26,20 +26,21 @@ defineProps({
 .container {
  display: flex;
  align-items: center;
-  padding: 0 15px;
-  margin-bottom: 14px;
-  width: clac(100% - 30px);
+  padding: 0 26rpx 0 28rpx;
+  margin-bottom: 14rpx;
+  width: clac(100% - 54rpx);
 }
 .container .shooter2 {
-  width: 150rpx;
-  height: 162rpx;
+  display: block;
+  width: 133rpx;
+  height: 144rpx;
 }
 .container .bg-box {
  color: #fff;
  font-size: 28rpx;
  position: relative;
  flex: 1;
-  min-height: 55px;
+  height: 128rpx;
  display: flex;
  align-items: center;
  justify-content: center;
--- a/src/components/Header.vue
+++ b/src/components/Header.vue
@@ -6,7 +6,7 @@ import Avatar from "@/components/Avatar.vue";
 import useStore from "@/store";
 import { storeToRefs } from "pinia";
 const store = useStore();
-const { user } = storeToRefs(store);
+const { user, game } = storeToRefs(store);

 const currentPage = computed(() => {
  const pages = getCurrentPages();
@@ -59,6 +59,9 @@ const loading = ref(false);
 const pointBook = ref(null);
 const showProgress = ref(false);
 const heat = ref(0);
+/** 房间号按钮动态定位样式（position: fixed，根据胶囊真实位置计算，脱离 flex 流避免挤压标题） */
+const battleRoomBtnStyle = ref({});
+
 const updateLoading = (value) => {
  loading.value = value;
 };
@@ -82,6 +85,23 @@ onMounted(() => {
  if (currentPage.route === "pages/team-battle") {
    showProgress.value = true;
  }
+  // 仅在对战房间页获取胶囊位置，按钮用 fixed 定位精确贴靠胶囊左侧（脱离 flex 流，不挤压标题）
+  if (currentPage.route === "pages/battle-room") {
+    try {
+      const menuButtonRect = uni.getMenuButtonBoundingClientRect();
+      const { windowWidth } = uni.getSystemInfoSync();
+      battleRoomBtnStyle.value = {
+        // 按钮右边缘距视口右侧 = 屏幕宽 - 胶囊左边缘 + 4px 安全间隙
+        right: (windowWidth - menuButtonRect.left + 4) + "px",
+        // 垂直位置与胶囊顶部对齐
+        top: menuButtonRect.top + "px",
+        // 高度与胶囊一致，视觉融合
+        height: menuButtonRect.height + "px",
+      };
+    } catch (e) {
+      // 获取失败时使用 CSS 兜底定位（28vw + 4px 作为 right，8px 作为 top）
+    }
+  }
  uni.$on("update-hot", updateHot);
 });
 onBeforeUnmount(() => {
@@ -172,6 +192,17 @@ onBeforeUnmount(() => {
    <view v-if="showProgress" class="battle-progress">
      <HeaderProgress />
    </view>
+    <!-- 对战房间：整个胶囊为分享按钮，房号从 Store 读取；fixed 定位紧靠系统胶囊左侧 -->
+    <button
+      v-if="currentPage === 'pages/battle-room' && game.roomNumber"
+      open-type="share"
+      hover-class="none"
+      class="battle-room-number"
+      :style="battleRoomBtnStyle"
+    >
+      <text class="battle-room-number__text">房号: {{ game.roomNumber }}</text>
+      <image src="../static/share2.png" mode="widthFix" class="battle-room-number__icon" />
+    </button>
  </view>
 </template>

@@ -259,4 +290,37 @@ onBeforeUnmount(() => {
  margin: 0 20rpx;
  max-width: 300rpx;
 }
+/* 对战房间：整个胶囊作为分享按钮，fixed 定位脱离 flex 流，紧贴系统胶囊左侧 */
+.battle-room-number {
+  position: fixed;
+  /* 兜底定位（JS 获取胶囊位置失败时生效）：约 28vw 对应胶囊区域左边缘 */
+  right: calc(28vw + 4px);
+  top: 8px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 240rpx;
+  height: 64rpx;
+  background: rgba(0, 0, 0, 0.15);
+  border-radius: 96rpx;
+  border: 1rpx solid #5b5758;
+  padding: 0;
+}
+/* 重置 button 默认边框 */
+.battle-room-number::after {
+  border: none;
+}
+.battle-room-number__text {
+  width: 156rpx;
+  height: 28rpx;
+  font-weight: 400;
+  font-size: 20rpx;
+  color: #ffffff;
+  text-align: center;
+  line-height: 28rpx;
+}
+.battle-room-number__icon {
+  width: 25rpx;
+  height: 26rpx;
+}
 </style>
--- a/src/components/ShootProgress.vue
+++ b/src/components/ShootProgress.vue
@@ -139,7 +139,7 @@ async function onReceiveMessage(msg) {
    halfTime.value = false;
    audioManager.play("比赛开始");
  } else if (msg.type === MESSAGETYPESV2.BattleEnd) {
-    audioManager.play("比赛结束");
+    audioManager.play("比赛结束", false);
  } else if (msg.type === MESSAGETYPESV2.ShootResult) {
    let arrow = {};
    if (msg.details && Array.isArray(msg.details)) {
--- a/src/components/ShootProgress2.vue
+++ b/src/components/ShootProgress2.vue
@@ -1,6 +1,7 @@
 <script setup>
-import { ref, watch, onMounted, onBeforeUnmount } from "vue";
-import { RoundGoldImages } from "@/constants";
+import {ref, watch, onMounted, onBeforeUnmount} from "vue";
+import {RoundGoldImages} from "@/constants";
+
 const props = defineProps({
  tips: {
    type: String,
@@ -19,13 +20,26 @@ const props = defineProps({
 const barColor = ref("");
 const remain = ref(15);
 const timer = ref(null);
-const laoding = ref(false);
+const loading = ref(false);
 const transitionStyle = ref("all 1s linear");
+const currentTeam = ref(null);

 const updateRemain = (value) => {
-  if (timer.value) clearInterval(timer.value);
-  const newVal = Math.round(value);
-  
+  if (value.stop) {
+    if (timer.value) clearInterval(timer.value);
+    return
+  }
+  loading.value = false;
+  currentTeam.value = value.team
+  if (value.team === 'red')
+    barColor.value = "linear-gradient( 180deg, #FFA0A0 0%, #FF6060 100%)";
+  if (value.team === 'blue')
+    barColor.value = "linear-gradient( 180deg, #9AB3FF 0%, #4288FF 100%)";
+  if (value.reset) {
+    remain.value = value.value;
+    return;
+  }
+  const newVal = Math.round(value.value);
  // 如果剩余时间增加（如轮次切换重置），瞬间变化无动画；否则保持动画
  if (newVal >= remain.value) {
    transitionStyle.value = "none";
@@ -38,26 +52,19 @@ const updateRemain = (value) => {
  }

  timer.value = setInterval(() => {
-    laoding.value = remain.value === 0;
+    loading.value = remain.value === 0;
    if (remain.value > 0) remain.value--;
  }, 1000);
 };

 watch(
-  () => props.tips,
-  (newVal) => {
-    if (newVal.includes("红队"))
-      barColor.value = "linear-gradient( 180deg, #FFA0A0 0%, #FF6060 100%)";
-    if (newVal.includes("蓝队"))
-      barColor.value = "linear-gradient( 180deg, #9AB3FF 0%, #4288FF 100%)";
-    if (newVal.includes("重回")) return;
-    if (newVal.includes("红队") || newVal.includes("蓝队")) {
-      updateRemain(props.total);
+    () => props.tips,
+    (newVal) => {
+
+    },
+    {
+      immediate: true,
    }
-  },
-  {
-    immediate: true,
-  }
 );

 onMounted(() => {
@@ -72,21 +79,21 @@ onBeforeUnmount(() => {

 <template>
  <view class="container">
-    <image :src="RoundGoldImages[props.currentRound]" mode="widthFix" />
+    <image :src="RoundGoldImages[props.currentRound]" mode="widthFix"/>
    <view
-      :style="{
-        justifyContent: tips.includes('红队') ? 'flex-end' : 'flex-start',
+        :style="{
+        justifyContent: currentTeam==='red' ? 'flex-end' : 'flex-start',
      }"
    >
      <view
-        :style="{
+          :style="{
          width: `${(remain / total) * 100}%`,
          background: barColor,
-          right: tips.includes('红队') ? 0 : 'unset',
+          right: currentTeam==='red' ? 0 : 'unset',
          transition: transitionStyle,
        }"
      />
-      <text v-if="!laoding">剩余{{ remain }}秒</text>
+      <text v-if="!loading">剩余{{ remain }}秒</text>
      <text v-else>···</text>
    </view>
  </view>
@@ -99,11 +106,13 @@ onBeforeUnmount(() => {
  flex-direction: column;
  align-items: center;
 }
+
 .container > image {
  width: 380rpx;
  height: 80rpx;
  transform: translateY(18rpx);
 }
+
 .container > view:last-child {
  width: 100%;
  text-align: center;
@@ -115,10 +124,12 @@ onBeforeUnmount(() => {
  display: flex;
  align-items: center;
 }
+
 .container > view:last-child > view {
  height: 24rpx;
  border-radius: 15px;
 }
+
 .container > view:last-child > text {
  font-size: 18rpx;
  color: #fff;
--- a/src/pages.json
+++ b/src/pages.json
@@ -39,6 +39,9 @@
    {
      "path": "pages/battle-result"
    },
+    {
+      "path": "pages/friend-battle-result"
+    },
    {
      "path": "pages/point-book-edit"
    },
--- a/src/pages/battle-result.vue
+++ b/src/pages/battle-result.vue
@@ -117,7 +117,7 @@ const checkBowData = () => {
            }deg)`,
          }"
        >
-          <view v-if="data.mvp && data.mvp[0].totalRings">
+          <view v-if="data.mvp && data.mvp.totalRings">
            <image src="../static/title-mvp.png" mode="widthFix" />
            <text
              >斩获<text
@@ -127,7 +127,7 @@ const checkBowData = () => {
                  margin: '0 3px',
                  fontWeight: '600',
                }"
-                >{{ data.mvp[0].totalRings }}</text
+                >{{ data.mvp.totalRings }}</text
              >环</text
            >
          </view>
--- a/src/pages/battle-room.vue
+++ b/src/pages/battle-room.vue
@@ -6,6 +6,7 @@ import PlayerSeats from "@/components/PlayerSeats.vue";
 import GuideTwo from "@/components/GuideTwo.vue";
 import SButton from "@/components/SButton.vue";
 import Avatar from "@/components/Avatar.vue";
+import ScreenHint from "@/components/ScreenHint.vue";
 import {
  getRoomAPI,
  destroyRoomAPI,
@@ -29,16 +30,52 @@ const players = ref([]);
 const blueTeam = ref([]);
 const redTeam = ref([]);

+/**
+ * 根据对战类型和房间人数动态生成页面标题
+ * battleType=1: 组队对战；count 2/4/6 分别对应 1v1/2v2/3v3
+ * battleType=2: 多人乱斗
+ */
+const battleTitle = computed(() => {
+  if (!room.value.battleType) return "好友约战";
+  if (room.value.battleType === 2) return "多人乱斗";
+  const half = room.value.count / 2;
+  return `${half}v${half}对抗赛`;
+});
+
+/** 靶纸尺寸（cm），由 URL 参数或 API 返回的 targetType 字段填充 */
+const targetSize = ref(0);
+
+/**
+ * 根据 targetSize 动态生成靶纸尺寸文本，如"40cm"
+ * 数据未就绪时显示 "--"；数据来源：创建者取 URL 参数 target，加入者取 API 返回的 targetType
+ */
+const targetSizeLabel = computed(() =>
+  targetSize.value ? `${targetSize.value}cm` : '--'
+);
+
 const ready = ref(false);
 const allReady = ref(false);
 const timer = ref(null);
 const goBattle = ref(false);

+/**
+ * 从服务端刷新当前房间数据，更新成员列表、准备状态等信息
+ * 仅在 roomNumber 有效且房间未开始时执行
+ */
 async function refreshRoomData() {
  if (!roomNumber.value) return;
  const result = await getRoomAPI(roomNumber.value);
  if (result.started) return;
  room.value = result;
+  // 加入者通过 API 返回的 targetType 字段同步靶纸尺寸，并持久化到本地缓存
+  if (result.targetType) {
+    targetSize.value = result.targetType;
+    uni.setStorageSync(`targetSize_${roomNumber.value}`, result.targetType);
+  } else if (targetSize.value === 0) {
+    // API 无该字段时，从本地缓存兜底（如"返回房间"场景）
+    const stored = uni.getStorageSync(`targetSize_${roomNumber.value}`);
+    if (stored) targetSize.value = stored;
+  }
  owner.value = {};
  opponent.value = {};
  const members = result.members || [];
@@ -184,8 +221,32 @@ const exitRoom = async () => {
  uni.navigateBack();
 };

-const removePlayer = async (player) => {
-  await kickPlayerAPI(roomNumber.value, player.id);
+/** 待确认踢出的玩家信息 */
+const playerToKick = ref(null);
+/** 控制踢出确认弹窗的显示状态 */
+const showKickConfirm = ref(false);
+
+/**
+ * 点击踢出按钮，弹出二次确认弹窗
+ * @param {object} player - 被踢的玩家信息
+ */
+const removePlayer = (player) => {
+  playerToKick.value = player;
+  showKickConfirm.value = true;
+};
+
+/** 确认踢出：调用 API 并关闭弹窗 */
+const confirmKick = async () => {
+  if (!playerToKick.value) return;
+  await kickPlayerAPI(roomNumber.value, playerToKick.value.id);
+  showKickConfirm.value = false;
+  playerToKick.value = null;
+};
+
+/** 取消踢出：关闭弹窗 */
+const cancelKick = () => {
+  showKickConfirm.value = false;
+  playerToKick.value = null;
 };

 const canClick = computed(() => {
@@ -200,23 +261,64 @@ const canClick = computed(() => {
  return true;
 });

+/**
+ * 根据对战类型和人数动态生成分享文案
+ * 1v1 / 默认 → "星球论箭，来一决高下敢否?"
+ * 2v2 → "2v2对抗赛，是兄弟来助我一把!"
+ * 3v3 → "3v3对抗赛，来了马上发车!"
+ * 乱斗 → "热血乱斗赛，敢来争锋?"
+ */
+const shareTitle = computed(() => {
+  const { battleType, count } = room.value;
+  if (battleType === 2) return '热血乱斗赛，敢来争锋?';
+  if (battleType === 1 && count === 4) return '2v2对抗赛，是兄弟来助我一把!';
+  if (battleType === 1 && count === 6) return '3v3对抗赛，来了马上发车!';
+  return '星球论箭，来一决高下敢否?';
+});
+
 onShareAppMessage(() => {
  return {
-    title: "邀请您进入房间对战",
+    title: shareTitle.value,
    path: "/pages/friend-battle?roomID=" + roomNumber.value,
    imageUrl: "",
  };
 });

+/**
+ * onShow 生命周期：页面显示时刷新房间数据
+ * 注：uni-app 中 onShow 可能早于 onLoad 执行，此时 roomNumber 尚未赋值，
+ * refreshRoomData 会提前 return。
+ */
 onShow(() => {
  goBattle.value = false;
  refreshRoomData();
 });

+/**
+ * 页面加载时解析路由参数，初始化房间号
+ * - 存入本地 ref（供页面内部逻辑使用）
+ * - 同步到 Pinia Store（供 Header 组件展示房号胶囊）
+ */
 onLoad(async (options) => {
-  if (options.roomNumber) roomNumber.value = options.roomNumber;
+  if (options.roomNumber) {
+    roomNumber.value = options.roomNumber;
+    store.updateRoomNumber(options.roomNumber);
+  }
+  // 创建者通过 URL 参数 target（1→20cm，2→40cm）初始化靶纸尺寸，并持久化到本地缓存
+  if (options.target) {
+    targetSize.value = parseInt(options.target) * 20;
+    uni.setStorageSync(`targetSize_${roomNumber.value}`, targetSize.value);
+  } else if (roomNumber.value) {
+    // "返回房间"等无 target 参数的场景：从本地缓存恢复（待 refreshRoomData 进一步覆盖）
+    const stored = uni.getStorageSync(`targetSize_${roomNumber.value}`);
+    if (stored) targetSize.value = stored;
+  }
 });

+/**
+ * 组件挂载后：保持屏幕常亮、注册 WebSocket 消息监听
+ * 房间号已通过 onLoad 同步到 Store，Header 从 Store 直接读取，无需额外通知
+ */
 onMounted(() => {
  uni.setKeepScreenOn({
    keepScreenOn: true,
@@ -236,18 +338,14 @@ onBeforeUnmount(() => {
 </script>

 <template>
-  <Container :title="`好友约战 - ${roomNumber}`">
+  <Container :title="battleTitle">
    <view class="standby-phase">
      <GuideTwo>
        <view class="battle-guide">
          <view class="guide-tips">
-            <text>弓箭手们，人都到齐了吗?</text>
-            <text v-if="room.battleType === 1">{{
-              `${room.count / 2}v${room.count / 2}比赛即将开始!`
-            }}</text>
-            <text v-if="room.battleType === 2">大乱斗即将开始! </text>
+            <text class="guide-tips__target">请使用{{ targetSizeLabel }}全环靶</text>
+            <text class="guide-tips__warn">如果实际靶纸与选择靶纸不同，将导致射箭无效</text>
          </view>
-          <!-- <button hover-class="none" open-type="share">邀请</button> -->
        </view>
      </GuideTwo>
      <view v-if="room.battleType === 1 && room.count === 2" class="team-mode">
@@ -343,6 +441,20 @@ onBeforeUnmount(() => {
      </view>
    </view>
  </Container>
+  <!-- 踢出玩家二次确认弹窗（不传 onClose，屏蔽 X 关闭按钮） -->
+  <ScreenHint :show="showKickConfirm">
+    <view class="kick-confirm">
+      <!-- 弹窗标题，玩家名字高亮显示 -->
+      <text class="kick-confirm__title">
+        是否把「<text style="color: #F7D550">{{ playerToKick && playerToKick.name }}</text>」移出房间？
+      </text>
+      <!-- 按钮区：确认在左，取消在右 -->
+      <view class="kick-confirm__btns">
+        <button hover-class="none" class="kick-confirm__btn kick-confirm__btn--confirm" @click="confirmKick">确定</button>
+        <button hover-class="none" class="kick-confirm__btn kick-confirm__btn--cancel" @click="cancelKick">取消</button>
+      </view>
+    </view>
+  </ScreenHint>
 </template>

 <style scoped>
@@ -380,7 +492,7 @@ onBeforeUnmount(() => {
 .team-mode {
  width: calc(100vw - 30px);
  height: 125vw;
-  margin: 15px;
+  margin: 0 15px 15px 15px;
 }

 .team-mode>image:first-child {
@@ -445,6 +557,66 @@ onBeforeUnmount(() => {
  color: #fed847 !important;
 }

+/* 踢出确认弹窗内容 */
+.kick-confirm {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  padding: 20rpx 30rpx;
+  color: #fff;
+}
+.kick-confirm__title {
+  font-size: 30rpx;
+  font-weight: 500;
+  text-align: center;
+  line-height: 1.5;
+  /* 标题与按钮区间距 */
+  margin-bottom: 58rpx;
+}
+.kick-confirm__btns {
+  display: flex;
+  /* 两个按钮间距 */
+  gap: 16rpx;
+}
+/* 按钮公共基础样式：固定宽高与圆角 */
+.kick-confirm__btn {
+  font-size: 28rpx;
+  width: 232rpx;
+  height: 70rpx;
+  border-radius: 44rpx;
+  line-height: 70rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+/* 取消按钮：白色半透明背景（用 rgba 避免 opacity 平铺到文字） */
+.kick-confirm__btn--cancel {
+  background: rgba(255, 255, 255, 0.2);
+  border: none;
+  color: #FFFFFF;
+  font-weight: 500;
+  font-size: 28rpx;
+  text-align: center;
+  border-radius: 44rpx;
+}
+.kick-confirm__btn--cancel::after {
+  border: none;
+}
+/* 确认按钮：黄色实心背景 */
+.kick-confirm__btn--confirm {
+  background: #FED847;
+  border: none;
+  color: #000000;
+  font-weight: 500;
+  font-size: 28rpx;
+  text-align: center;
+  border-radius: 44rpx;
+}
+.kick-confirm__btn--confirm::after {
+  border: none;
+}
+
 .remove-player {
  width: 40rpx;
  height: 40rpx;
@@ -687,4 +859,23 @@ onBeforeUnmount(() => {
  border: 1rpx solid #a3793f66;
  color: #fed847;
 }
+
+.guide-tips__target {
+  font-weight: 400;
+  font-size: 26rpx;
+  color: rgba(255, 217, 71, 0.8);
+}
+
+.guide-tips__warn {
+  font-weight: 400;
+  font-size: 22rpx;
+  color: rgba(255, 255, 255, 0.8);
+  margin-top: 6rpx;
+}
+
+.guide-tips {
+  display: flex;
+  flex-direction: column;
+  padding-left: 20rpx;
+}
 </style>
--- a/src/pages/device-intro.vue
+++ b/src/pages/device-intro.vue
@@ -33,7 +33,7 @@ const onScrollView = (e) => {
    >
      <image
        :style="{ opacity: addBg ? 1 : 0 }"
-        src="../static/app-bg.png"
+        src="https://static.shelingxingqiu.com/shootmini/static/app-bg.png"
        mode="widthFix"
      />
      <navigator open-type="navigateBack">
--- a/src/pages/friend-battle-result.vue
+++ b/src/pages/friend-battle-result.vue
--- a/src/pages/friend-battle.vue
+++ b/src/pages/friend-battle.vue
@@ -73,10 +73,10 @@ const onSignin = () => {
  showSignin.value = false;
 };

-/** 跳转到我的战绩页面 */
+/** 跳转到我的战绩页面，默认展示「好友约战」tab */
 const goMyRecord = () => {
  uni.navigateTo({
-    url: '/pages/my-growth',
+    url: '/pages/my-growth?tab=1',
  });
 };
 onShow(async () => {
--- a/src/pages/index.vue
+++ b/src/pages/index.vue
@@ -13,7 +13,7 @@ import {
  getDeviceBatteryAPI,
  getHomeData,
  getMyDevicesAPI,
-  getRankListAPI,
+  getScoreRankList,
  silentLoginAPI,
 } from "@/apis";
 import {topThreeColors} from "@/constants";
@@ -26,15 +26,23 @@ const {
  updateConfig,
  updateUser,
  updateDevice,
-  updateRank,
  getLvlName,
  getLvlNameByScore,
  updateOnline,
 } = store;
-const {user, device, rankData, online, game} = storeToRefs(store);
+const {user, device, online, game} = storeToRefs(store);

 const showModal = ref(false);
 const showGuide = ref(false);
+const scoreRankList = ref([]);
+
+// 提取积分榜接口返回的榜单数组，兼容数组和对象两种返回格式。
+const getScoreRankData = (result) => {
+  if (Array.isArray(result)) return result;
+  if (Array.isArray(result?.list)) return result.list;
+  if (Array.isArray(result?.items)) return result.items;
+  return [];
+};

 const toPage = async (path) => {
  if (!user.value.id) {
@@ -84,15 +92,15 @@ onShow(async () => {
    }
  }

-  const promises = [getRankListAPI()];
+  const promises = [getScoreRankList(undefined, 1, 10)];
  if (token || user.value.id) {
    promises.push(getHomeData());
  }

  const [rankList, homeData] = await Promise.all(promises);

-  console.log("排行数据", rankList);
-  updateRank(rankList);
+  console.log("积分榜数据", rankList);
+  scoreRankList.value = getScoreRankData(rankList).slice(0, 10);

  if (homeData) {
    console.log("首页数据：", homeData);
@@ -216,7 +224,7 @@ onShareTimeline(() => {
                  class="player-avatar"
                  :style="{
                  zIndex: 8 - i,
-                  borderColor: rankData.rank[i - 1]
+                  borderColor: scoreRankList[i - 1]
                    ? topThreeColors[i - 1] || '#000'
                    : '#000',
                }"
@@ -227,15 +235,15 @@ onShareTimeline(() => {
                <view v-if="i > 3">{{ i }}</view>
                <image
                    :src="
-                    rankData.rank[i - 1]
-                      ? rankData.rank[i - 1].avatar
+                    scoreRankList[i - 1]
+                      ? (scoreRankList[i - 1].avatar || '../static/user-icon.png')
                      : '../static/user-icon-dark.png'
                  "
                    mode="aspectFill"
                />
              </view>
              <view class="more-players">
-                <text>{{ rankData.rank.length }}</text>
+                <text>{{ scoreRankList.length }}</text>
              </view>
            </view>
          </view>
--- a/src/pages/melee-battle.vue
+++ b/src/pages/melee-battle.vue
@@ -20,6 +20,8 @@ const { user } = storeToRefs(store);
 const title = ref("");
 const start = ref(null);
 const battleId = ref("");
+/** 对战模式：1=好友约战 2=排位赛，用于结算页跳转判断 */
+const way = ref(0);
 const currentRound = ref(1);
 const tips = ref("即将开始...");
 const players = ref([]);
@@ -28,15 +30,13 @@ const playersScores = ref([]);
 const halfTimeTip = ref(false);
 const halfRest = ref(false);

-const navigateToResult = () => {
-  uni.redirectTo({ url: `/pages/battle-result?battleId=${battleId.value}` });
-};
-
 function recoverData(battleInfo, { force = false } = {}) {
  if (!battleInfo) return;
  try {
    if (battleInfo.way === 1) title.value = "好友约战 - 大乱斗";
    if (battleInfo.way === 2) title.value = "排位赛 - 大乱斗";
+    // 保存 way 供结算跳转时使用
+    way.value = battleInfo.way ?? 0;
    
    // 优先使用接口数据，否则使用缓存
    if (battleInfo.teams?.[0]?.players) {
@@ -122,8 +122,9 @@ async function onReceiveMessage(msg) {
    tips.value = "准备下半场";
  } else if (msg.type === MESSAGETYPESV2.BattleEnd) {
    setTimeout(() => {
+      // 全部跳转到新结算页
      uni.redirectTo({
-        url: "/pages/battle-result?battleId=" + msg.matchId,
+        url: "/pages/friend-battle-result?battleId=" + msg.matchId,
      });
    }, 1000);
  }
--- a/src/pages/my-growth.vue
+++ b/src/pages/my-growth.vue
@@ -1,5 +1,6 @@
 <script setup>
 import { onMounted } from "vue";
+import { onLoad } from "@dcloudio/uni-app";
 import Container from "@/components/Container.vue";
 import Avatar from "@/components/Avatar.vue";
 import BowData from "@/components/BowData.vue";
@@ -56,6 +57,17 @@ const getName = (battle) => {
  if (battle.mode <= 3) return `${battle.mode}V${battle.mode}`;
  return battle.mode + "人大乱斗";
 };
+
+/**
+ * 支持通过 URL 参数指定初始 tab
+ * @example /pages/my-growth?tab=1 跳转到「好友约战」tab
+ */
+onLoad((options) => {
+  if (options && options.tab !== undefined) {
+    const tabIndex = parseInt(options.tab, 10);
+    if (!isNaN(tabIndex)) selectedIndex.value = tabIndex;
+  }
+});
 </script>

 <template>
--- a/src/pages/point-book-detail-share.vue
+++ b/src/pages/point-book-detail-share.vue
@@ -107,7 +107,7 @@ const targetTypeName = computed(() => {
 <template>
  <view class="container" :style="{ paddingTop: paddingTop + 'px' }">
    <image
-      src="../static/app-bg5.png"
+      src="https://static.shelingxingqiu.com/shootmini/static/app-bg5.png"
      class="bg-image"
      mode="aspectFill"
      :style="{ height: paddingTop + 60 + 'px' }"
--- a/src/pages/practise-one.vue
+++ b/src/pages/practise-one.vue
@@ -59,7 +59,7 @@ async function onReceiveMessage(msg) {
  if (msg.type === MESSAGETYPESV2.ShootResult) {
    scores.value = msg.details;
  } else if (msg.type === MESSAGETYPESV2.BattleEnd) {
-    setTimeout(onOver, 1500);
+    // setTimeout(onOver, 1500);
  }
 }

@@ -84,6 +84,12 @@ const onClickShare = debounce(async () => {
  await wxShare("shareCanvas");
 });

+function onAudioEnded(s) {
+  if (s.indexOf("比赛结束") >= 0) {
+    onOver()
+  }
+}
+
 onMounted(async () => {
  // audioManager.play("第一轮");
  uni.setKeepScreenOn({
@@ -91,6 +97,7 @@ onMounted(async () => {
  });
  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;
 });
@@ -101,6 +108,7 @@ onBeforeUnmount(() => {
  });
  uni.$off("socket-inbox", onReceiveMessage);
  uni.$off("share-image", onClickShare);
+  uni.$off("audioEnded", onAudioEnded);
  audioManager.stopAll();
  endPractiseAPI();
 });
--- a/src/pages/practise-two.vue
+++ b/src/pages/practise-two.vue
@@ -89,7 +89,7 @@ async function onComplete() {
    practiseResult.value = {};
    start.value = false;
    scores.value = [];
-    const result = await createPractiseAPI(total, 360);
+    const result = await createPractiseAPI(total, 3600);
    if (result) practiseId.value = result.id;
  }
 }
@@ -105,7 +105,7 @@ onMounted(async () => {
  });
  uni.$on("socket-inbox", onReceiveMessage);
  uni.$on("share-image", onClickShare);
-  const result = await createPractiseAPI(total, 360, targetType.value);
+  const result = await createPractiseAPI(total, 3600, targetType.value);
  if (result) practiseId.value = result.id;
 });

@@ -132,7 +132,7 @@ onBeforeUnmount(() => {
        <ShootProgress
          :tips="`请连续射${total}支箭`"
          :start="start"
-          :total="360"
+          :total="3600"
          :onStop="onOver"
        />
        <view class="user-row">
--- a/src/pages/rank-list.vue
+++ b/src/pages/rank-list.vue
@@ -1,58 +1,333 @@
 <script setup>
-import { ref, onMounted } from "vue";
+import { computed, nextTick, onMounted, ref } from "vue";
+import { onLoad } from "@dcloudio/uni-app";
 import Avatar from "@/components/Avatar.vue";
+import {
+  getMvpRankList,
+  getMyMvpRank,
+  getMyScoreRank,
+  getMyTenRingRank,
+  getScoreRankList,
+  getTenRingRankList,
+} from "@/apis";
 import { capsuleHeight } from "@/util";
 import useStore from "@/store";
 import { storeToRefs } from "pinia";
+
+const PAGE_SIZE = 10;
+
 const store = useStore();
-const { user, rankData } = storeToRefs(store);
+const { user } = storeToRefs(store);
 const { getLvlName } = store;

-const selectedIndex = ref(0);
-const currentList = ref([]);
-const myData = ref({});
-const addBg = ref(false);
-
-onMounted(async () => {
-  handleSelect(0);
+const createRankState = () => ({
+  list: [],
+  page: 0,
+  pageSize: PAGE_SIZE,
+  loading: false,
+  noMore: false,
+  loaded: false,
+  scrollTop: 0,
+  myData: null,
+  myDataLoaded: false,
 });

-const handleSelect = (index) => {
-  selectedIndex.value = index;
-  myData.value = {};
-  currentList.value = [];
-  if (index === 0) {
-    currentList.value = rankData.value.rank;
-  } else if (index === 1) {
-    currentList.value = rankData.value.mvpRank;
-  } else if (index === 2) {
-    currentList.value = rankData.value.ringRank;
+const rankTabs = [
+  {
+    key: "score",
+    title: "积分榜",
+    subTitle: "排位赛积分",
+    listApi: getScoreRankList,
+    myApi: getMyScoreRank,
+  },
+  {
+    key: "mvp",
+    title: "MVP榜",
+    subTitle: "MVP次数",
+    listApi: getMvpRankList,
+    myApi: getMyMvpRank,
+  },
+  {
+    key: "tenRing",
+    title: "十环榜",
+    subTitle: "十环次数",
+    listApi: getTenRingRankList,
+    myApi: getMyTenRingRank,
+  },
+];
+
+// 解析 ranking 页面传入的榜单参数，进入页面时默认选中对应 tab。
+const getTabIndexByRouteParam = (tab) => {
+  if (tab === "mvp") return 1;
+  if (tab === "tenRing") return 2;
+  return 0;
+};
+
+const rankStates = ref({
+  score: createRankState(),
+  mvp: createRankState(),
+  tenRing: createRankState(),
+});
+
+const selectedIndex = ref(0);
+const initialTabIndex = ref(0);
+const pageMounted = ref(false);
+const initializedFromRoute = ref(false);
+const addBg = ref(false);
+const currentScrollTop = ref(0);
+const restoreScrollTop = ref(0);
+const tabSwitchAnimating = ref(false);
+const suppressScrollSync = ref(false);
+const suppressLoadMore = ref(false);
+const stickyTabsTop = capsuleHeight + 50;
+const stickyTabsActive = ref(false);
+const tabsStickyThreshold = ref(0);
+const tabsStickyReady = ref(false);
+const tabsHeight = ref(0);
+
+const getTabConfig = (index = selectedIndex.value) => rankTabs[index];
+const getTabKey = (index = selectedIndex.value) => getTabConfig(index).key;
+
+// 统一提取榜单接口返回的列表数据，兼容数组和对象两种返回格式。
+const getRankListFromResponse = (result) => {
+  if (Array.isArray(result)) return result;
+  if (Array.isArray(result?.list)) return result.list;
+  if (Array.isArray(result?.items)) return result.items;
+  return [];
+};
+
+// 为当前登录用户构造默认的个人榜单信息，避免接口未返回时底部区域缺数据。
+const buildDefaultMyData = () => ({
+  rank: null,
+  userId: user.value.id,
+  name: user.value.nickName,
+  avatar: user.value.avatar,
+  totalScore: 0,
+  mvpCount: 0,
+  tenRings: 0,
+  totalGames: 0,
+  totalCount: 0,
+  rankName: user.value.lvlName,
+  rankLvl: user.value.rankLvl,
+});
+
+const currentTabKey = computed(() => getTabKey(selectedIndex.value));
+const currentState = computed(() => rankStates.value[currentTabKey.value]);
+const currentList = computed(() => currentState.value.list);
+const currentSubTitle = computed(() => getTabConfig(selectedIndex.value).subTitle);
+const currentMyData = computed(() => {
+  if (!user.value.id) return null;
+  return currentState.value.myData || buildDefaultMyData();
+});
+
+// 统一格式化段位和场次文案，兼容不同接口的字段命名。
+const formatLevelText = (item = {}) => {
+  const levelName = item.rankName || getLvlName(item.rankLvl) || "暂无段位";
+  const totalGames = item.totalGames ?? item.TotalGames ?? 0;
+  return `${levelName}，${totalGames}场`;
+};
+
+// 统一读取榜单项的排名字段，没有后端 rank 时回退到前端序号。
+const getDisplayRank = (item = {}, index = 0) => {
+  return item.rank ?? index + 1;
+};
+
+// 底部个人排名在未上榜时展示占位符，而不是空白。
+const getDisplayMyRank = (item = {}) => {
+  return item.rank ?? "-";
+};
+
+const getScoreValue = (item = {}) => item.totalScore ?? 0;
+const getMvpValue = (item = {}) => item.mvpCount ?? item.totalScore ?? 0;
+const getTenRingValue = (item = {}) =>
+  item.tenRings ?? item.TenRings ?? item.totalScore ?? 0;
+
+// 根据当前选中的榜单类型，读取对应的展示值。
+const getRankValue = (item = {}, index = selectedIndex.value) => {
+  if (index === 0) return getScoreValue(item);
+  if (index === 1) return getMvpValue(item);
+  return getTenRingValue(item);
+};
+
+const getRankUnit = (index = selectedIndex.value) => {
+  if (index === 0) return "分";
+  return "次";
+};
+
+// 统一设置页面当前的视觉滚动状态，避免吸顶和顶部背景不同步。
+const syncScrollVisualState = (scrollTop = 0) => {
+  currentScrollTop.value = scrollTop;
+  addBg.value = scrollTop > 100;
+  if (!tabsStickyReady.value) {
+    stickyTabsActive.value = false;
+    return;
  }
-  if (user.value.id) {
-    currentList.value.some((item) => {
-      if (item.userId === user.value.id) {
-        myData.value = item;
-        return true;
-      }
-      return false;
-    });
-    if (!myData.value.userId) {
-      myData.value = {
-        userId: user.value.id,
-        TotalGames: 0,
-        totalScore: 0,
-        mvpCount: 0,
-        TenRings: 0,
-      };
+  stickyTabsActive.value = scrollTop >= tabsStickyThreshold.value;
+};
+
+// 只保留一条滚动恢复链路：从当前滚动位置平滑滚到目标位置，避免多套控制同时生效造成闪烁。
+const applyScrollPosition = async (
+  fromScrollTop = currentScrollTop.value,
+  toScrollTop = 0,
+  withAnimation = false
+) => {
+  tabSwitchAnimating.value = withAnimation;
+  restoreScrollTop.value = fromScrollTop;
+  await nextTick();
+  restoreScrollTop.value = toScrollTop;
+  syncScrollVisualState(toScrollTop);
+};
+
+// 请求指定榜单的某一页数据，只有当前榜单会追加分页，不影响其他榜单的浏览状态。
+const loadRankPage = async (tabKey, { reset = false } = {}) => {
+  const state = rankStates.value[tabKey];
+  const config = rankTabs.find((item) => item.key === tabKey);
+  if (!config || state.loading) return;
+  if (!reset && state.noMore) return;
+
+  const nextPage = reset ? 1 : state.page + 1;
+  state.loading = true;
+  if (reset) state.noMore = false;
+
+  try {
+    const result = await config.listApi(undefined, nextPage, PAGE_SIZE);
+    const list = getRankListFromResponse(result);
+    state.list = reset ? list : state.list.concat(list);
+    state.page = nextPage;
+    state.loaded = true;
+    state.noMore = list.length < PAGE_SIZE;
+  } catch (error) {
+    if (reset) {
+      state.list = [];
+      state.page = 0;
+      state.loaded = false;
+      state.noMore = false;
    }
+    uni.showToast({
+      title: "排行榜加载失败",
+      icon: "none",
+    });
+    console.error("load rank page error", error);
+  } finally {
+    state.loading = false;
  }
 };

-const onScrollView = (e) => {
-  addBg.value = e.detail.scrollTop > 100;
+// 每个榜单独立请求一次个人排名信息，切回该榜单时直接复用，避免打断浏览上下文。
+const loadMyRankData = async (tabKey) => {
+  if (!user.value.id) return;
+
+  const state = rankStates.value[tabKey];
+  const config = rankTabs.find((item) => item.key === tabKey);
+  if (!config || state.myDataLoaded) return;
+
+  try {
+    const result = await config.myApi();
+    state.myData = {
+      ...buildDefaultMyData(),
+      ...(result || {}),
+    };
+  } catch (error) {
+    state.myData = buildDefaultMyData();
+    console.error("load my rank data error", error);
+  } finally {
+    state.myDataLoaded = true;
+  }
 };

-const subTitles = ["排位赛积分", "MVP次数", "十环次数"];
+// 首次进入或切换到未加载过的榜单时，初始化它的分页数据和个人横条数据。
+const ensureTabReady = async (index = selectedIndex.value) => {
+  const tabKey = getTabKey(index);
+  const state = rankStates.value[tabKey];
+
+  if (!state.loaded) {
+    await loadRankPage(tabKey, { reset: true });
+  }
+
+  if (user.value.id && !state.myDataLoaded) {
+    await loadMyRankData(tabKey);
+  }
+
+  await nextTick();
+  return state.scrollTop || 0;
+};
+
+onLoad((options = {}) => {
+  initialTabIndex.value = getTabIndexByRouteParam(options.tab);
+  selectedIndex.value = initialTabIndex.value;
+  if (pageMounted.value && !initializedFromRoute.value) {
+    initializePage();
+  }
+});
+
+// 页面初始化同时兼容 onLoad 和 onMounted 的先后顺序，确保首屏一定落到路由指定的榜单。
+const initializePage = async () => {
+  if (initializedFromRoute.value) return;
+  initializedFromRoute.value = true;
+  const nextScrollTop = await ensureTabReady(selectedIndex.value);
+  await applyScrollPosition(0, nextScrollTop, false);
+  setTimeout(() => {
+    measureTabsMetrics();
+  }, 0);
+};
+
+onMounted(async () => {
+  pageMounted.value = true;
+  await initializePage();
+});
+
+// 切换榜单时保留原榜单的列表和滚动位置，切回来后继续从之前的位置浏览。
+const handleSelect = async (index) => {
+  if (index === selectedIndex.value) return;
+
+  const previousTabKey = currentTabKey.value;
+  rankStates.value[previousTabKey].scrollTop = currentScrollTop.value;
+  const previousScrollTop = currentScrollTop.value;
+
+  suppressScrollSync.value = true;
+  suppressLoadMore.value = true;
+  selectedIndex.value = index;
+  const nextScrollTop = await ensureTabReady(index);
+  await applyScrollPosition(previousScrollTop, nextScrollTop, false);
+  setTimeout(() => {
+    tabSwitchAnimating.value = false;
+    suppressScrollSync.value = false;
+    suppressLoadMore.value = false;
+  }, 220);
+};
+
+// 触底后只加载当前榜单的下一页数据，其他榜单的数据和页码保持不变。
+const loadMore = async () => {
+  if (suppressLoadMore.value) return;
+  await loadRankPage(currentTabKey.value);
+};
+
+// 实时记录当前榜单的滚动位置，切换回来时恢复到上一次浏览位置。
+const onScrollView = (e) => {
+  const scrollTop = e.detail.scrollTop || 0;
+  if (suppressScrollSync.value) return;
+  syncScrollVisualState(scrollTop);
+  rankStates.value[currentTabKey.value].scrollTop = scrollTop;
+};
+
+// 计算 tab 在滚动内容中的真实位置和高度，作为吸顶切换的唯一依据。
+const measureTabsMetrics = () => {
+  const query = uni.createSelectorQuery();
+  query
+    .select("#rank-list-content-start")
+    .boundingClientRect()
+    .select(".rank-tabs-anchor")
+    .boundingClientRect()
+    .exec((res = []) => {
+      const [startRect, rect] = res;
+      if (!startRect || !rect) return;
+      const tabOffset = rect.top - startRect.top;
+      tabsStickyThreshold.value = Math.max(0, tabOffset - 92);
+      tabsHeight.value = rect.height || 0;
+      tabsStickyReady.value = true;
+      syncScrollVisualState(currentScrollTop.value);
+    });
+};
 </script>

 <template>
@@ -65,7 +340,7 @@ const subTitles = ["排位赛积分", "MVP次数", "十环次数"];
    >
      <image
        :style="{ opacity: addBg ? 1 : 0 }"
-        src="../static/app-bg.png"
+        src="https://static.shelingxingqiu.com/shootmini/static/app-bg.png"
        mode="widthFix"
      />
      <navigator open-type="navigateBack">
@@ -75,18 +350,32 @@ const subTitles = ["排位赛积分", "MVP次数", "十环次数"];
    </view>
    <scroll-view
      scroll-y
+      :scroll-with-animation="tabSwitchAnimating"
+      :scroll-top="restoreScrollTop"
      @scroll="onScrollView"
-      :style="{ height: myData.userId ? '90vh' : '100vh' }"
+      @scrolltolower="loadMore"
+      :style="{ height: user.id ? '90vh' : '100vh' }"
    >
+      <view id="rank-list-content-start" class="content-start-anchor"></view>
      <image
        src="https://static.shelingxingqiu.com/attachment/2025-09-25/dd1p9b3wcrwnlnghiq.png"
        mode="widthFix"
        class="header-bg"
+        @load="measureTabsMetrics"
      />
-      <view class="rank-tabs">
+      <view
+        v-if="stickyTabsActive"
+        class="rank-tabs-placeholder"
+        :style="{ height: `${tabsHeight}px` }"
+      />
+      <view
+        class="rank-tabs rank-tabs-anchor"
+        :class="{ 'rank-tabs-anchor-fixed': stickyTabsActive }"
+        :style="stickyTabsActive ? { top: `${stickyTabsTop}px` } : {}"
+      >
        <view
-          v-for="(rankType, index) in ['积分榜', 'MVP榜', '十环榜']"
-          :key="index"
+          v-for="(rankType, index) in rankTabs"
+          :key="rankType.key"
          :style="{
            fontSize: index === selectedIndex ? '16px' : '14px',
            color: index === selectedIndex ? '#000' : '#fff',
@@ -94,18 +383,18 @@ const subTitles = ["排位赛积分", "MVP次数", "十环次数"];
          }"
          @tap="handleSelect(index)"
        >
-          {{ rankType }}
+          {{ rankType.title }}
        </view>
      </view>
      <view class="rank-list">
        <view class="rank-list-header">
          <text>排名</text>
          <text>用户ID</text>
-          <text>{{ subTitles[selectedIndex] }}</text>
+          <text>{{ currentSubTitle }}</text>
        </view>
        <view
          v-for="(item, index) in currentList"
-          :key="index"
+          :key="`${currentTabKey}-${index}-${item.userId || item.name}`"
          class="rank-list-item"
          :style="{
            backgroundColor: index % 2 === 0 ? '#9898981f' : 'transparent',
@@ -147,65 +436,60 @@ const subTitles = ["排位赛积分", "MVP次数", "十环次数"];
            src="../static/champ3.png"
            mode="widthFix"
          />
-          <view v-if="index > 2" class="view-crown">{{ index + 1 }}</view>
+          <view v-if="index > 2" class="view-crown">
+            {{ getDisplayRank(item, index) }}
+          </view>
          <Avatar :src="item.avatar" />
          <view class="rank-item-content">
            <text class="truncate">{{ item.name }}</text>
-            <text>{{ getLvlName(item.rankLvl) }}，{{ item.TotalGames }}场</text>
+            <text>{{ formatLevelText(item) }}</text>
          </view>
-          <text class="rank-item-integral" v-if="selectedIndex === 0">
+          <text class="rank-item-integral">
            <text
              :style="{ fontSize: '14px', color: '#fff', marginRight: '5px' }"
-              >{{ item.totalScore }} </text
-            >分
-          </text>
-          <text class="rank-item-integral" v-if="selectedIndex === 1">
-            <text
-              :style="{ fontSize: '14px', color: '#fff', marginRight: '5px' }"
-              >{{ item.mvpCount }} </text
-            >次
-          </text>
-          <text class="rank-item-integral" v-if="selectedIndex === 2">
-            <text
-              :style="{ fontSize: '14px', color: '#fff', marginRight: '5px' }"
-              >{{ item.TenRings }} </text
-            >次
+            >
+              {{ getRankValue(item) }}
+            </text>
+            {{ getRankUnit() }}
          </text>
        </view>
-        <view v-if="!currentList.length" class="no-data">
-          <text>筹备中...</text>
+        <view
+          v-if="currentState.loading && !currentList.length"
+          class="no-data"
+        >
+          <text>加载中...</text>
+        </view>
+        <view
+          v-else-if="!currentState.loading && !currentList.length"
+          class="no-data"
+        >
+          <text>暂无数据</text>
+        </view>
+        <view v-else class="list-tip">
+          <text v-if="currentState.loading">加载中...</text>
+          <text v-else-if="currentState.noMore">没有更多了</text>
        </view>
      </view>
    </scroll-view>
-    <view class="my-rank-data" v-if="myData.userId">
+    <view class="my-rank-data" v-if="currentMyData">
      <image
        src="https://static.shelingxingqiu.com/attachment/2025-08-05/dbuaf19pf7qd8ps0uh.png"
        mode="widthFix"
      />
-      <text>{{ myData.rank }}</text>
-      <Avatar :src="user.avatar" />
+      <text>{{ getDisplayMyRank(currentMyData) }}</text>
+      <Avatar :src="currentMyData.avatar || user.avatar" />
      <view class="rank-item-content">
-        <text class="truncate">{{ user.nickName }}</text>
-        <text>{{ user.lvlName }}，{{ myData.TotalGames }}场</text>
+        <text class="truncate">{{ currentMyData.name || user.nickName }}</text>
+        <text>{{ formatLevelText(currentMyData) }}</text>
      </view>
-      <text class="rank-item-integral" v-if="selectedIndex === 0">
+      <text class="rank-item-integral">
        <text
          :style="{ fontSize: '14px', color: '#fff', marginRight: '5px' }"
-          >{{ myData.totalScore || 0 }}</text
-        >分</text
-      >
-      <text class="rank-item-integral" v-if="selectedIndex === 1">
-        <text
-          :style="{ fontSize: '14px', color: '#fff', marginRight: '5px' }"
-          >{{ myData.mvpCount || 0 }}</text
-        >次</text
-      >
-      <text class="rank-item-integral" v-if="selectedIndex === 2">
-        <text
-          :style="{ fontSize: '14px', color: '#fff', marginRight: '5px' }"
-          >{{ myData.TenRings || 0 }}</text
-        >次</text
-      >
+        >
+          {{ getRankValue(currentMyData) }}
+        </text>
+        {{ getRankUnit() }}
+      </text>
    </view>
  </view>
 </template>
@@ -214,9 +498,16 @@ const subTitles = ["排位赛积分", "MVP次数", "十环次数"];
 .container {
  width: 100%;
 }
+
+.content-start-anchor {
+  width: 100%;
+  height: 0;
+}
+
 .header-bg {
  width: 100%;
 }
+
 .header {
  width: 100%;
  height: 50px;
@@ -227,6 +518,7 @@ const subTitles = ["排位赛积分", "MVP次数", "十环次数"];
  z-index: 10;
  overflow: hidden;
 }
+
 .header-back {
  width: 22px;
  height: 22px;
@@ -234,6 +526,7 @@ const subTitles = ["排位赛积分", "MVP次数", "十环次数"];
  margin-top: 5px;
  position: relative;
 }
+
 .header > image:first-child {
  width: 100vw;
  height: 100vh;
@@ -242,25 +535,40 @@ const subTitles = ["排位赛积分", "MVP次数", "十环次数"];
  left: 0;
  transition: all 0.5s ease;
 }
+
 .header > text {
  color: #fff;
  font-weight: bold;
  transition: all 0.5s ease;
  position: relative;
 }
+
 .rank-tabs {
  width: calc(100% - 20px);
  display: flex;
  justify-content: space-around;
-  padding: 0 10px;
-  margin-top: -15px;
+  padding: 20rpx 10px;
 }
+
 .rank-tabs > view {
  width: 25%;
  padding: 10px;
  text-align: center;
  border-radius: 20px;
 }
+
+.rank-tabs-placeholder {
+  width: 100%;
+}
+
+.rank-tabs-anchor-fixed {
+  position: fixed;
+  left: 0;
+  z-index: 11;
+  background: #000000;
+  backdrop-filter: blur(8px);
+}
+
 .rank-list {
  display: flex;
  flex-direction: column;
@@ -268,11 +576,12 @@ const subTitles = ["排位赛积分", "MVP次数", "十环次数"];
  width: calc(100% - 20px);
  color: #fff9;
  font-size: 12px;
-  margin: 10px;
+  margin: 0 10px 10px 10px;
  border: 1px solid rgb(255 217 71 / 0.2);
  border-radius: 10px;
  background-color: #313131;
 }
+
 .rank-list > view {
  display: flex;
  align-items: center;
@@ -281,20 +590,25 @@ const subTitles = ["排位赛积分", "MVP次数", "十环次数"];
  overflow: hidden;
  position: relative;
 }
+
 .rank-list-header {
  width: calc(100% - 20px) !important;
  padding: 10px;
 }
+
 .rank-list-header > text:nth-child(2) {
  width: 14%;
 }
+
 .rank-list-header > text:last-child {
  width: 30%;
  text-align: right;
 }
+
 .rank-list-item {
  padding: 10px 0;
 }
+
 .player-bg {
  position: absolute;
  width: 100%;
@@ -302,12 +616,14 @@ const subTitles = ["排位赛积分", "MVP次数", "十环次数"];
  top: 0;
  left: 0;
 }
+
 .player-crown {
  position: relative;
  width: 27px;
  height: 27px;
  margin: 0 15px;
 }
+
 .view-crown {
  width: 27px;
  height: 27px;
@@ -319,6 +635,7 @@ const subTitles = ["排位赛积分", "MVP次数", "十环次数"];
  background-color: #676767;
  position: relative;
 }
+
 .rank-item-content {
  display: flex;
  flex-direction: column;
@@ -328,17 +645,20 @@ const subTitles = ["排位赛积分", "MVP次数", "十环次数"];
  position: relative;
  padding-left: 10px;
 }
+
 .rank-item-content > text:first-child {
  color: #fff;
  font-size: 14px;
  margin-bottom: 3px;
  width: 120px;
 }
+
 .rank-list-item > text:last-child {
  margin-right: 10px;
  width: 56px;
  text-align: right;
 }
+
 .my-rank-data {
  width: calc(100% - 30px);
  padding: 15px;
@@ -352,12 +672,14 @@ const subTitles = ["排位赛积分", "MVP次数", "十环次数"];
  overflow: hidden;
  border-radius: 10px;
 }
+
 .my-rank-data > image:first-child {
  position: absolute;
  width: 100%;
  left: 0;
  top: -5px;
 }
+
 .my-rank-data > text:nth-child(2) {
  background-color: #c1a434;
  position: relative;
@@ -369,20 +691,24 @@ const subTitles = ["排位赛积分", "MVP次数", "十环次数"];
  min-width: 15px;
  text-align: center;
 }
+
 .my-rank-data > text:last-child {
  position: relative;
  margin-right: 10px;
  width: 65px;
  text-align: right;
 }
+
 .my-rank-data > .rank-item-content > text:first-child {
  color: #fed847;
 }
+
 .my-rank-data > .rank-item-integral {
  color: #fff9;
  font-size: 12px;
  margin-right: 0 !important;
 }
+
 .no-data {
  width: 100%;
  height: 400px;
@@ -392,4 +718,11 @@ const subTitles = ["排位赛积分", "MVP次数", "十环次数"];
  color: #fff9;
  font-size: 14px;
 }
+
+.list-tip {
+  justify-content: center !important;
+  color: #fff9;
+  font-size: 12px;
+  min-height: 60rpx;
+}
 </style>
--- a/src/pages/ranking.vue
+++ b/src/pages/ranking.vue
--- a/src/pages/team-battle.vue
+++ b/src/pages/team-battle.vue
@@ -1,6 +1,6 @@
 <script setup>
-import { ref, onMounted, onBeforeUnmount, nextTick } from "vue";
-import { onLoad, onShow, onHide } from "@dcloudio/uni-app";
+import {ref, onMounted, onBeforeUnmount, nextTick} from "vue";
+import {onLoad, onShow, onHide} from "@dcloudio/uni-app";
 import Container from "@/components/Container.vue";
 import BattleHeader from "@/components/BattleHeader.vue";
 import BowTarget from "@/components/BowTarget.vue";
@@ -11,13 +11,14 @@ import RoundEndTip from "@/components/RoundEndTip.vue";
 import TestDistance from "@/components/TestDistance.vue";
 import TeamAvatars from "@/components/TeamAvatars.vue";
 import ShootProgress2 from "@/components/ShootProgress2.vue";
-import { laserCloseAPI, getBattleAPI } from "@/apis";
-import { MESSAGETYPESV2 } from "@/constants";
+import {laserCloseAPI, getBattleAPI} from "@/apis";
+import {MESSAGETYPESV2} from "@/constants";
 import audioManager from "@/audioManager";
 import useStore from "@/store";
-import { storeToRefs } from "pinia";
+import {storeToRefs} from "pinia";
+
 const store = useStore();
-const { user } = storeToRefs(store);
+const {user} = storeToRefs(store);
 const start = ref(null);
 const tips = ref("");
 const battleId = ref("");
@@ -36,10 +37,15 @@ const bluePoints = ref(0);
 const showRoundTip = ref(false);
 const isFinalShoot = ref(false);
 const matchStatus = ref(undefined);
+const updateRemainSecond = ref(0);
+/** 对战来源类型（1=好友约战，2=匹配对战），用于结算页分流 */
+const battleWay = ref(0);

-const recoverData = (battleInfo, { force = false, arrowOnly = false } = {}) => {
+const recoverData = (battleInfo, {force = false, arrowOnly = false} = {}) => {
  try {
    battleId.value = battleInfo.matchId;
+    // 存储对战来源，供结算跳转分流使用
+    if (battleInfo.way !== undefined) battleWay.value = battleInfo.way;

    // 优先使用接口返回的队伍数据，如果没有则尝试从缓存读取（应对匹配刚完成接口未就绪的情况）
    const t1 = battleInfo.teams?.[1] || {};
@@ -71,28 +77,27 @@ const recoverData = (battleInfo, { force = false, arrowOnly = false } = {}) => {
    if (!arrowOnly) {
      currentShooterId.value = battleInfo.current.playerId;
      const redPlayer = battleInfo.teams[2].players.find(
-        (item) => item.id === battleInfo.current.playerId
+          (item) => item.id === battleInfo.current.playerId
      );
      let nextTips = redPlayer ? "请红队射箭" : "请蓝队射箭";
      if (force) nextTips += "重回";
      if (
-        battleInfo.current.playerId === user.value.id &&
-        redTeam.value.length > 1
+          battleInfo.current.playerId === user.value.id &&
+          redTeam.value.length > 1
      ) {
        nextTips += "你";
      }
      tips.value = nextTips;
      uni.$emit("update-tips", nextTips);
+      uni.$emit("update-remain", {reset: true, value: 15, team: redTeam?'red':'blue'});
      if (force) {
        const remain = (Date.now() - battleInfo.current.startTime) / 1000;
        console.log(`当前轮已进行${remain}秒`);
        if (remain > 0 && remain < 15) {
-          setTimeout(() => {
-            uni.$emit("update-remain", 15 - remain - 0.2);
-          }, 200);
+          updateRemainSecond.value = 15 - remain - 0.2
        }
      } else {
-        uni.$emit("update-remain", battleInfo.readyTime);
+        updateRemainSecond.value = battleInfo.readyTime
      }
    } else {
      currentRound.value = battleInfo.current.round || 1;
@@ -111,15 +116,41 @@ const recoverData = (battleInfo, { force = false, arrowOnly = false } = {}) => {
  }
 };

-function onBattleEnd(){
-  showRoundTip.value = false
-  console.log("onBattleEnd ended...")
+function onAudioEnded(s) {
+  if (s.indexOf('请红方射箭') >= 0 || s.indexOf('请蓝方射箭') >= 0) {
+    let team = s.indexOf('请红方射箭') >= 0 ? 'red' : 'blue';
+    uni.$emit("update-remain", {stop: false, value: updateRemainSecond.value, team: team});
+  }
+  if (s.indexOf("比赛结束") >= 0) {
+    console.log("比赛结束");
+    onBattleEnd()
+  }
+}
+
+function onBattleEnd() {
  if (matchStatus.value === 2) {
+    // 全部跳转到新结算页
    uni.redirectTo({
-      url: `/pages/battle-result?battleId=${battleId.value}`,
+      url: `/pages/friend-battle-result?battleId=${battleId.value}`,
    });
  }
 }
+
+function onNewRound(msg) {
+  showRoundTip.value = true;
+  isFinalShoot.value = msg.current.goldRound;
+  const latestRound = msg.rounds[currentRound.value - 1];
+  if (latestRound) {
+    if (isFinalShoot.value) {
+      currentBluePoint.value = msg.teams[1].score;
+      currentRedPoint.value = msg.teams[2].score;
+    } else {
+      currentBluePoint.value = latestRound.scores[1].score;
+      currentRedPoint.value = latestRound.scores[2].score;
+    }
+  }
+}
+
 async function onReceiveMessage(msg) {
  if (Array.isArray(msg)) return;
  if (msg.type === MESSAGETYPESV2.BattleStart) {
@@ -127,21 +158,13 @@ async function onReceiveMessage(msg) {
  } else if (msg.type === MESSAGETYPESV2.ToSomeoneShoot) {
    recoverData(msg);
  } else if (msg.type === MESSAGETYPESV2.ShootResult) {
+    uni.$emit("update-remain", {stop: true})
    showRoundTip.value = false;
-    recoverData(msg, { arrowOnly: true });
+    recoverData(msg, {arrowOnly: true});
  } else if (msg.type === MESSAGETYPESV2.NewRound) {
-    showRoundTip.value = true;
-    isFinalShoot.value = msg.current.goldRound;
-    const latestRound = msg.rounds[currentRound.value - 1];
-    if (latestRound) {
-      if (isFinalShoot.value) {
-        currentBluePoint.value = msg.teams[1].score;
-        currentRedPoint.value = msg.teams[2].score;
-      } else {
-        currentBluePoint.value = latestRound.scores[1].score;
-        currentRedPoint.value = latestRound.scores[2].score;
-      }
-    }
+    setTimeout(() => {
+      onNewRound(msg)
+    }, 800)
  } else if (msg.type === MESSAGETYPESV2.BattleEnd) {
    matchStatus.value = msg.status;
    if (msg.status === 4) {
@@ -169,13 +192,14 @@ onMounted(async () => {
    keepScreenOn: true,
  });
  uni.$on("socket-inbox", onReceiveMessage);
+  uni.$on("audioEnded", onAudioEnded);
  await laserCloseAPI();
 });
 onBeforeUnmount(() => {
  uni.setKeepScreenOn({
    keepScreenOn: false,
  });
-  uni.$off("socket-inbox", onReceiveMessage);
+  uni.$off("audioEnded", onAudioEnded);
  audioManager.stopAll();
 });
 const refreshTimer = ref(null);
@@ -184,15 +208,12 @@ onShow(async () => {
    const result = await getBattleAPI(battleId.value);
    if (!result) return;
    if (result.status === 2) {
-      uni.showToast({
-        title: "比赛已结束",
-        icon: "none",
-      });
-      uni.navigateBack({
-        delta: 2,
+      // 比赛已结束（如切后台再回来）：跳新结算页
+      uni.redirectTo({
+        url: `/pages/friend-battle-result?battleId=${result.matchId}`,
      });
    } else {
-      recoverData(result, { force: true });
+      recoverData(result, {force: true});
    }
  }
 });
@@ -202,53 +223,53 @@ onShow(async () => {
  <Container :bgType="start ? 3 : 1">
    <view class="container">
      <BattleHeader
-        v-if="start === false"
-        :redTeam="redTeam"
-        :blueTeam="blueTeam"
+          v-if="start === false"
+          :redTeam="redTeam"
+          :blueTeam="blueTeam"
      />
-      <TestDistance v-if="start === false" :guide="false" :isBattle="true" />
+      <TestDistance v-if="start === false" :guide="false" :isBattle="true"/>
      <view v-if="start" class="players-row">
        <TeamAvatars
-          :team="blueTeam"
-          :isRed="false"
-          :currentShooterId="currentShooterId"
+            :team="blueTeam"
+            :isRed="false"
+            :currentShooterId="currentShooterId"
        />
        <ShootProgress2
-          :tips="tips"
-          :currentRound="
+            :tips="tips"
+            :currentRound="
            goldenRound > 0 ? 'gold' + goldenRound : 'round' + currentRound
          "
        />
-        <TeamAvatars :team="redTeam" :currentShooterId="currentShooterId" />
+        <TeamAvatars :team="redTeam" :currentShooterId="currentShooterId"/>
      </view>
      <BowTarget
-        v-if="start"
-        mode="team"
-        :scores="scores"
-        :blueScores="blueScores"
+          v-if="start"
+          mode="team"
+          :scores="scores"
+          :blueScores="blueScores"
      />
      <BattleFooter
-        v-if="start"
-        :roundResults="roundResults"
-        :redPoints="redPoints"
-        :bluePoints="bluePoints"
-        :goldenRound="goldenRound"
+          v-if="start"
+          :roundResults="roundResults"
+          :redPoints="redPoints"
+          :bluePoints="bluePoints"
+          :goldenRound="goldenRound"
      />
      <ScreenHint
-        :show="showRoundTip"
-        :onClose="() => (showRoundTip = false)"
-        :mode="isFinalShoot ? 'tall' : 'normal'"
+          :show="showRoundTip"
+          :onClose="() => (showRoundTip = false)"
+          :mode="isFinalShoot ? 'tall' : 'normal'"
      >
        <RoundEndTip
-          v-if="showRoundTip"
-          :isFinal="isFinalShoot"
-          :round="currentRound"
-          :bluePoint="currentBluePoint"
-          :redPoint="currentRedPoint"
-          :roundData="
+            v-if="showRoundTip"
+            :isFinal="isFinalShoot"
+            :round="currentRound"
+            :bluePoint="currentBluePoint"
+            :redPoint="currentRedPoint"
+            :roundData="
            roundResults[currentRound - 1] ? roundResults[currentRound - 1] : []
          "
-          :onAutoClose="onBattleEnd"
+            :onAutoClose="()=>{ showRoundTip = false}"
        />
      </ScreenHint>
    </view>
@@ -260,6 +281,7 @@ onShow(async () => {
  width: 100%;
  height: 100%;
 }
+
 .players-row {
  display: flex;
  align-items: center;
--- a/src/static/app-bg.png
+++ b/src/static/app-bg.png
--- a/src/static/app-bg2.png
+++ b/src/static/app-bg2.png
--- a/src/static/app-bg3.png
+++ b/src/static/app-bg3.png
--- a/src/static/app-bg4.png
+++ b/src/static/app-bg4.png
--- a/src/static/app-bg5.png
+++ b/src/static/app-bg5.png
--- a/src/static/battle-choose.png
+++ b/src/static/battle-choose.png
--- a/src/static/battle10.png
+++ b/src/static/battle10.png
--- a/src/static/battle1v1.png
+++ b/src/static/battle1v1.png
--- a/src/static/battle2v2.png
+++ b/src/static/battle2v2.png
--- a/src/static/battle3v3.png
+++ b/src/static/battle3v3.png
--- a/src/static/battle5.png
+++ b/src/static/battle5.png
--- a/src/static/friend-battle-result/rank-one.svg
+++ b/src/static/friend-battle-result/rank-one.svg
@@ -0,0 +1,11 @@
+<svg width="156" height="58" viewBox="0 0 156 58" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="&#231;&#188;&#150;&#231;&#187;&#132; 5">
+<rect id="&#231;&#159;&#169;&#229;&#189;&#162;&#229;&#164;&#135;&#228;&#187;&#189;" width="156" height="58" fill="url(#paint0_linear_1394_738459)"/>
+</g>
+<defs>
+<linearGradient id="paint0_linear_1394_738459" x1="0" y1="87" x2="156" y2="87" gradientUnits="userSpaceOnUse">
+<stop stop-color="#7E3627"/>
+<stop offset="1" stop-color="#292826" stop-opacity="0.01"/>
+</linearGradient>
+</defs>
+</svg>
--- a/src/static/friend-battle-result/rank-three.svg
+++ b/src/static/friend-battle-result/rank-three.svg
@@ -0,0 +1,11 @@
+<svg width="156" height="58" viewBox="0 0 156 58" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="&#231;&#188;&#150;&#231;&#187;&#132; 12">
+<rect id="&#231;&#159;&#169;&#229;&#189;&#162;&#229;&#164;&#135;&#228;&#187;&#189;" width="156" height="58" fill="url(#paint0_linear_1394_738487)"/>
+</g>
+<defs>
+<linearGradient id="paint0_linear_1394_738487" x1="0" y1="87" x2="156" y2="87" gradientUnits="userSpaceOnUse">
+<stop stop-color="#573E25"/>
+<stop offset="1" stop-color="#292826" stop-opacity="0.01"/>
+</linearGradient>
+</defs>
+</svg>
--- a/src/static/friend-battle-result/rank-two.svg
+++ b/src/static/friend-battle-result/rank-two.svg
@@ -0,0 +1,11 @@
+<svg width="156" height="58" viewBox="0 0 156 58" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="&#231;&#188;&#150;&#231;&#187;&#132; 9">
+<rect id="&#231;&#159;&#169;&#229;&#189;&#162;&#229;&#164;&#135;&#228;&#187;&#189;" width="156" height="58" fill="url(#paint0_linear_1394_738473)"/>
+</g>
+<defs>
+<linearGradient id="paint0_linear_1394_738473" x1="0.251953" y1="86.9532" x2="156" y2="86.9532" gradientUnits="userSpaceOnUse">
+<stop stop-color="#25476F"/>
+<stop offset="1" stop-color="#292826" stop-opacity="0.01"/>
+</linearGradient>
+</defs>
+</svg>
--- a/src/static/long-bubble-border.png
+++ b/src/static/long-bubble-border.png
--- a/src/static/mvp-blue.png
+++ b/src/static/mvp-blue.png
--- a/src/static/mvp-red.png
+++ b/src/static/mvp-red.png
--- a/src/static/mvp-tip.png
+++ b/src/static/mvp-tip.png
--- a/src/static/rank/battle-choose.png
+++ b/src/static/rank/battle-choose.png
--- a/src/static/rank/battle10.svg
+++ b/src/static/rank/battle10.svg
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="110px" height="54px" viewBox="0 0 110 54" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>编组 5</title>
+    <defs>
+        <linearGradient x1="50%" y1="1.43983214%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#FF7EAF" offset="0%"></stop>
+            <stop stop-color="#C36AFF" offset="100%"></stop>
+        </linearGradient>
+        <rect id="path-2" x="0" y="0" width="110" height="54" rx="8"></rect>
+        <radialGradient cx="50%" cy="50%" fx="50%" fy="50%" r="50%" id="radialGradient-4">
+            <stop stop-color="#FFFFFF" offset="0%"></stop>
+            <stop stop-color="#FFFFFF" stop-opacity="0" offset="100%"></stop>
+        </radialGradient>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-5">
+            <stop stop-color="#FFFFFF" offset="0%"></stop>
+            <stop stop-color="#FFFFFF" stop-opacity="0" offset="100%"></stop>
+        </linearGradient>
+    </defs>
+    <g id="训练功能改版" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="排位赛" transform="translate(-251.000000, -155.000000)">
+            <g id="编组-9" transform="translate(3.000000, 93.000000)">
+                <g id="编组-5" transform="translate(248.000000, 62.000000)">
+                    <g id="编组-4">
+                        <mask id="mask-3" fill="white">
+                            <use xlink:href="#path-2"></use>
+                        </mask>
+                        <use id="矩形" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+                        <circle id="椭圆形" fill="url(#radialGradient-4)" mask="url(#mask-3)" cx="52" cy="64.5" r="64"></circle>
+                        <rect id="矩形" fill="url(#linearGradient-5)" opacity="0.100000001" mask="url(#mask-3)" transform="translate(85.406727, 10.201587) rotate(51.000000) translate(-85.406727, -10.201587) " x="78.4067275" y="-14.2984126" width="14" height="49" rx="7"></rect>
+                    </g>
+                    <text id="10人大乱斗" font-family="DOUYINSANSBOLD-GB, Douyin Sans" font-size="16" font-weight="bold" fill="#FFFFFF">
+                        <tspan x="15" y="32">10人大乱斗</tspan>
+                    </text>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
--- a/src/static/rank/battle1v1.svg
+++ b/src/static/rank/battle1v1.svg
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="111px" height="54px" viewBox="0 0 111 54" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>编组 5@2x</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#896CFF" offset="0%"></stop>
+            <stop stop-color="#9754FF" offset="100%"></stop>
+        </linearGradient>
+        <rect id="path-2" x="0" y="0" width="110" height="54" rx="8"></rect>
+        <radialGradient cx="50%" cy="50%" fx="50%" fy="50%" r="50%" id="radialGradient-4">
+            <stop stop-color="#FFFFFF" offset="0%"></stop>
+            <stop stop-color="#FFFFFF" stop-opacity="0" offset="100%"></stop>
+        </radialGradient>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-5">
+            <stop stop-color="#FFFFFF" offset="0%"></stop>
+            <stop stop-color="#FFFFFF" stop-opacity="0" offset="100%"></stop>
+        </linearGradient>
+    </defs>
+    <g id="训练功能改版" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="排位赛" transform="translate(-132.000000, -93.000000)">
+            <g id="编组-9" transform="translate(3.000000, 93.000000)">
+                <g id="编组-5" transform="translate(129.500000, 0.000000)">
+                    <g id="编组-4">
+                        <mask id="mask-3" fill="white">
+                            <use xlink:href="#path-2"></use>
+                        </mask>
+                        <use id="矩形" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+                        <circle id="椭圆形" fill="url(#radialGradient-4)" mask="url(#mask-3)" cx="55" cy="64.5" r="64"></circle>
+                        <rect id="矩形" fill="url(#linearGradient-5)" opacity="0.100000001" mask="url(#mask-3)" transform="translate(89.406727, 10.201587) rotate(51.000000) translate(-89.406727, -10.201587) " x="82.4067275" y="-14.2984126" width="14" height="49" rx="7"></rect>
+                    </g>
+                    <g id="1v1备份" transform="translate(43.000000, 21.000000)" fill="#FFFFFF" fill-rule="nonzero">
+                        <polygon id="路径" points="0 1.625 0 3.64722222 2.69090909 2.22083333 2.69090909 13 5 13 5 0 3.07272727 0"></polygon>
+                        <polygon id="路径" points="17 3 14.4705882 3 12.0196078 10.5384615 9.60784314 3 7 3 10.5490196 13 13.2941176 13"></polygon>
+                        <polygon id="路径" points="19 1.625 19 3.64722222 21.6909091 2.22083333 21.6909091 13 24 13 24 0 22.0727273 0"></polygon>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
--- a/src/static/rank/battle2v2.svg
+++ b/src/static/rank/battle2v2.svg
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="110px" height="54px" viewBox="0 0 110 54" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>编组 5@2x</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#4A8CFF" offset="0%"></stop>
+            <stop stop-color="#669DFF" offset="100%"></stop>
+        </linearGradient>
+        <rect id="path-2" x="0" y="0" width="110" height="54" rx="8"></rect>
+        <radialGradient cx="50%" cy="50%" fx="50%" fy="50%" r="50%" id="radialGradient-4">
+            <stop stop-color="#FFFFFF" offset="0%"></stop>
+            <stop stop-color="#FFFFFF" stop-opacity="0" offset="100%"></stop>
+        </radialGradient>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-5">
+            <stop stop-color="#FFFFFF" offset="0%"></stop>
+            <stop stop-color="#FFFFFF" stop-opacity="0" offset="100%"></stop>
+        </linearGradient>
+    </defs>
+    <g id="训练功能改版" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="排位赛" transform="translate(-251.000000, -93.000000)">
+            <g id="编组-9" transform="translate(3.000000, 93.000000)">
+                <g id="编组-5" transform="translate(248.000000, 0.000000)">
+                    <g id="编组-4">
+                        <mask id="mask-3" fill="white">
+                            <use xlink:href="#path-2"></use>
+                        </mask>
+                        <use id="矩形" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+                        <circle id="椭圆形" fill="url(#radialGradient-4)" mask="url(#mask-3)" cx="56" cy="64.5" r="64"></circle>
+                        <rect id="矩形" fill="url(#linearGradient-5)" opacity="0.100000001" mask="url(#mask-3)" transform="translate(85.406727, 10.201587) rotate(51.000000) translate(-85.406727, -10.201587) " x="78.4067275" y="-14.2984126" width="14" height="49" rx="7"></rect>
+                    </g>
+                    <text id="2v2" font-family="DOUYINSANSBOLD-GB, Douyin Sans" font-size="18" font-weight="bold" fill="#FFFFFF">
+                        <tspan x="40.408" y="33">2v2</tspan>
+                    </text>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
--- a/src/static/rank/battle3v3.svg
+++ b/src/static/rank/battle3v3.svg
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="110px" height="54px" viewBox="0 0 110 54" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>编组 5@2x</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#FF8787" offset="0%"></stop>
+            <stop stop-color="#FF9696" offset="100%"></stop>
+        </linearGradient>
+        <rect id="path-2" x="0" y="0" width="110" height="54" rx="8"></rect>
+        <radialGradient cx="50%" cy="50%" fx="50%" fy="50%" r="50%" id="radialGradient-4">
+            <stop stop-color="#FFFFFF" offset="0%"></stop>
+            <stop stop-color="#FFFFFF" stop-opacity="0" offset="100%"></stop>
+        </radialGradient>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-5">
+            <stop stop-color="#FFFFFF" offset="0%"></stop>
+            <stop stop-color="#FFFFFF" stop-opacity="0" offset="100%"></stop>
+        </linearGradient>
+    </defs>
+    <g id="训练功能改版" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="排位赛" transform="translate(-14.000000, -155.000000)">
+            <g id="编组-9" transform="translate(3.000000, 93.000000)">
+                <g id="编组-5" transform="translate(11.000000, 62.000000)">
+                    <g id="编组-4">
+                        <mask id="mask-3" fill="white">
+                            <use xlink:href="#path-2"></use>
+                        </mask>
+                        <use id="矩形" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+                        <circle id="椭圆形" fill="url(#radialGradient-4)" mask="url(#mask-3)" cx="56" cy="64.5" r="64"></circle>
+                        <rect id="矩形" fill="url(#linearGradient-5)" opacity="0.100000001" mask="url(#mask-3)" transform="translate(85.406727, 10.201587) rotate(51.000000) translate(-85.406727, -10.201587) " x="78.4067275" y="-14.2984126" width="14" height="49" rx="7"></rect>
+                    </g>
+                    <text id="3v3" font-family="DOUYINSANSBOLD-GB, Douyin Sans" font-size="18" font-weight="bold" fill="#FFFFFF">
+                        <tspan x="40.408" y="33">3v3</tspan>
+                    </text>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
--- a/src/static/rank/battle5.svg
+++ b/src/static/rank/battle5.svg
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="111px" height="54px" viewBox="0 0 111 54" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>编组 5</title>
+    <defs>
+        <linearGradient x1="50%" y1="3.4527039%" x2="50%" y2="99.6818489%" id="linearGradient-1">
+            <stop stop-color="#FFA052" offset="0%"></stop>
+            <stop stop-color="#FFBC4E" offset="100%"></stop>
+        </linearGradient>
+        <rect id="path-2" x="0" y="0" width="110" height="54" rx="8"></rect>
+        <radialGradient cx="50%" cy="50%" fx="50%" fy="50%" r="50%" id="radialGradient-4">
+            <stop stop-color="#FFFFFF" offset="0%"></stop>
+            <stop stop-color="#FFFFFF" stop-opacity="0" offset="100%"></stop>
+        </radialGradient>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-5">
+            <stop stop-color="#FFFFFF" offset="0%"></stop>
+            <stop stop-color="#FFFFFF" stop-opacity="0" offset="100%"></stop>
+        </linearGradient>
+    </defs>
+    <g id="训练功能改版" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="排位赛" transform="translate(-132.000000, -155.000000)">
+            <g id="编组-9" transform="translate(3.000000, 93.000000)">
+                <g id="编组-5" transform="translate(129.500000, 62.000000)">
+                    <g id="编组-4">
+                        <mask id="mask-3" fill="white">
+                            <use xlink:href="#path-2"></use>
+                        </mask>
+                        <use id="矩形" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
+                        <circle id="椭圆形" fill="url(#radialGradient-4)" mask="url(#mask-3)" cx="56" cy="64.5" r="64"></circle>
+                        <rect id="矩形" fill="url(#linearGradient-5)" opacity="0.100000001" mask="url(#mask-3)" transform="translate(85.406727, 10.201587) rotate(51.000000) translate(-85.406727, -10.201587) " x="78.4067275" y="-14.2984126" width="14" height="49" rx="7"></rect>
+                    </g>
+                    <text id="5人大乱斗" font-family="DOUYINSANSBOLD-GB, Douyin Sans" font-size="16" font-weight="bold" fill="#FFFFFF">
+                        <tspan x="18.976" y="32">5人大乱斗</tspan>
+                    </text>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
--- a/src/static/rank/bubble-tip.png
+++ b/src/static/rank/bubble-tip.png
--- a/src/static/rank/star.png
+++ b/src/static/rank/star.png
--- a/src/static/rank/triangle.png
+++ b/src/static/rank/triangle.png
--- a/src/static/shooter2.png
+++ b/src/static/shooter2.png
--- a/src/static/you-lost.png
+++ b/src/static/you-lost.png
--- a/src/static/you-win.png
+++ b/src/static/you-win.png
--- a/src/store.js
+++ b/src/store.js
@@ -79,6 +79,7 @@ export default defineStore("store", {
    game: {
      roomID: "",
      inBattle: false,
+      roomNumber: "", // 当前房间号，供 Header 展示房号胶囊
    },
  }),

@@ -135,6 +136,10 @@ export default defineStore("store", {
      this.game.roomID = roomID;
      this.game.inBattle = inBattle;
    },
+    /** 更新当前房间号，供 Header 组件展示房号胶囊 */
+    updateRoomNumber(number) {
+      this.game.roomNumber = number;
+    },
  },

  // 开启数据持久化
--- a/src/websocket.js
+++ b/src/websocket.js
@@ -14,8 +14,8 @@ function createWebSocket(token, onMessage) {

    switch (envVersion) {
      case "develop": // 开发版
-        url = "ws://localhost:8000/socket";
-        // url = "wss://apitest.shelingxingqiu.com/socket";
+        // url = "ws://localhost:8000/socket";
+        url = "wss://apitest.shelingxingqiu.com/socket";
        break;
      case "trial": // 体验版
        url = "wss://apitest.shelingxingqiu.com/socket";
Author	SHA1	Message	Date
chenlimao	9cc6ef4b88	Merge branch 'new-race-mode' into test	2026-05-09 17:41:54 +08:00
chenlimao	76efe5a207	fix：结算页面经验进度条后端对接完成	2026-05-09 17:41:41 +08:00
chenlimao	3bfd8b2328	fix：房间号模块跟胶囊margin距离根据机型动态写入	2026-05-09 16:41:06 +08:00
chenlimao	fc14489ab3	Merge branch 'new-race-mode' into test	2026-05-09 16:01:21 +08:00
chenlimao	3cf2470ffc	fix：本地图片改为网络图片并删除本地图片	2026-05-09 15:58:55 +08:00
chenlimao	834841a3d5	fix：全部对战页面对接新结算页面	2026-05-09 15:51:51 +08:00
chenlimao	eaa1950a18	fix：大乱斗成绩块样式调整	2026-05-09 15:28:55 +08:00
zhangyibo95	aba2da56d7	Merge branch 'feat-zhangyi' into test	2026-05-09 15:25:52 +08:00
zhangyibo95	24314e5ec8	update:36箭倒计时优化	2026-05-09 15:25:37 +08:00
chenlimao	45cb785ba4	fix：大乱斗比赛页面结束跳转到新结算页面	2026-05-09 15:23:58 +08:00
chenlimao	c4ad44b02a	fix：大乱斗结算页面接口对接完成	2026-05-09 14:24:28 +08:00
chenlimao	df4f8d8fd5	fix：合并代码并解决冲突	2026-05-09 14:00:20 +08:00
chenlimao	6e62ec4348	fix：大乱斗结算页面结构样式完成	2026-05-09 13:57:36 +08:00
zhangyibo95	cf22fe566d	Merge branch 'feat-zhangyi' into test	2026-05-09 13:51:10 +08:00
zhangyibo95	31361cff1e	update: 替换背景图片地址	2026-05-09 13:50:55 +08:00
zhangyibo95	235556e703	Merge branch 'feat-zhangyi' into test	2026-05-09 13:44:33 +08:00
zhangyibo95	0a8c6e7477	update: 优化图片	2026-05-09 13:44:07 +08:00
zhangyibo95	183a1a8385	Merge branch 'feat-zhangyi' into test	2026-05-09 10:05:55 +08:00
zhangyibo95	0e936b8e20	update:排位赛界面、排行榜界面改版，新增agents描述文档	2026-05-09 10:04:15 +08:00
chenlimao	d8a94c8ff6	fix：修复mvp接口字段报错问题	2026-05-08 11:04:21 +08:00
chenlimao	29c6b174d8	fix：对战房间分享文案动态写入完成	2026-05-08 09:28:30 +08:00
linyimin	3ea1a6734a	feat: 添加分支管理说明	2026-05-07 21:03:31 +08:00
linyimin	d1bd036351	fix: 个人练习报环完成之后再弹练习结果弹窗 (cherry picked from commit `a6becf67ff`)	2026-05-07 18:31:55 +08:00
chenlimao	bb43de3a62	fix：修改env配置	2026-05-07 18:29:04 +08:00
chenlimao	d2dc6c51cf	fix：更新约战头部tip模块样式	2026-05-07 18:26:52 +08:00
chenlimao	8c66ef78c6	fix：房间号更新改为pinia	2026-05-07 17:15:28 +08:00
linyimin	29a6f46a0d	Merge remote-tracking branch 'origin/new-race-mode' into new-race-mode	2026-05-07 16:54:32 +08:00
linyimin	895be17f7c	pref: 进度条倒计时	2026-05-07 16:49:09 +08:00
chenlimao	7c8fd9395b	fix：踢出功能二次确认弹窗完成	2026-05-07 14:31:17 +08:00
chenlimao	972d817629	bug：修复房间号模块显示问题	2026-05-07 14:03:53 +08:00
chenlimao	31140c7ae2	fix：好友约战，我的战绩按钮跳转完成	2026-05-07 13:53:51 +08:00
chenlimao	542ee5f031	fix：好友约战首页调整完成	2026-05-07 11:13:18 +08:00