From a3fea0bb1f7a1c2a5eff027666694d2a03bcf29c Mon Sep 17 00:00:00 2001
From: kron <kai_hong@126.com>
Date: Mon, 9 Feb 2026 17:27:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0X=E7=8E=AF=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=EF=BC=8C=E6=AF=94=E8=B5=9B=E8=BF=87=E7=A8=8B=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/BowData.vue        |  2 +-
 src/components/BowTarget.vue      |  6 ++-
 src/components/HeaderProgress.vue |  2 +-
 src/components/ScorePanel.vue     | 10 +++--
 src/components/ScorePanel2.vue    | 27 ++++++-------
 src/components/ScoreResult.vue    |  6 +--
 src/components/ShootProgress.vue  |  3 +-
 src/constants.js                  |  2 +-
 src/pages/battle-room.vue         | 63 +++++--------------------------
 src/pages/first-try.vue           |  2 +-
 src/pages/match-detail.vue        | 10 +++--
 src/pages/melee-battle.vue        | 12 +++---
 src/pages/melee-bow-data.vue      |  2 +-
 src/pages/mine-bow-data.vue       |  2 +-
 src/pages/practise-one.vue        |  2 +-
 src/pages/practise-two.vue        |  2 +-
 src/pages/team-battle.vue         | 31 +++++++++++----
 src/pages/team-bow-data.vue       |  2 +-
 18 files changed, 82 insertions(+), 104 deletions(-)

diff --git a/src/components/BowData.vue b/src/components/BowData.vue
index 6d9aae5..a791499 100644
--- a/src/components/BowData.vue
+++ b/src/components/BowData.vue
@@ -56,7 +56,7 @@ const props = defineProps({
       :completeEffect="false"
       :rowCount="arrows.length === 12 ? 6 : 9"
       :total="total"
-      :scores="arrows.map((a) => a.ring)"
+      :arrows="arrows"
       :margin="arrows.length === 12 ? 4 : 1"
       :fontSize="arrows.length === 12 ? 25 : 22"
     />
diff --git a/src/components/BowTarget.vue b/src/components/BowTarget.vue
index 63611f7..b1e6c5c 100644
--- a/src/components/BowTarget.vue
+++ b/src/components/BowTarget.vue
@@ -92,8 +92,10 @@ const simulShoot = async () => {
   if (device.value.deviceId) await simulShootAPI(device.value.deviceId);
 };
 const simulShoot2 = async () => {
-  if (device.value.deviceId)
-    await simulShootAPI(device.value.deviceId, 0.01, 0.01);
+  if (device.value.deviceId) {
+    const r1 = Math.random() > 0.5 ? 0.01 : 0.02;
+    await simulShootAPI(device.value.deviceId, r1, r1);
+  }
 };
 
 const env = computed(() => {
diff --git a/src/components/HeaderProgress.vue b/src/components/HeaderProgress.vue
index 9a97065..415678d 100644
--- a/src/components/HeaderProgress.vue
+++ b/src/components/HeaderProgress.vue
@@ -69,7 +69,7 @@ async function onReceiveMessage(message) {
           ? `${shootData.ringX ? "X" : shootData.ring}环`
           : "未上靶"
       );
-      if (!shootData.ring)
+      if (shootData.angle !== null)
         key.push(`向${getDirectionText(shootData.angle)}调整`);
       audioManager.play(key, false);
     }
diff --git a/src/components/ScorePanel.vue b/src/components/ScorePanel.vue
index 363ec05..9948199 100644
--- a/src/components/ScorePanel.vue
+++ b/src/components/ScorePanel.vue
@@ -9,7 +9,7 @@ const props = defineProps({
     type: Number,
     default: 0,
   },
-  scores: {
+  arrows: {
     type: Array,
     default: () => [],
   },
@@ -51,7 +51,7 @@ onBeforeUnmount(() => {
 <template>
   <view class="container">
     <image
-      v-if="total > 0 && scores.length === total && completeEffect"
+      v-if="total > 0 && arrows.length === total && completeEffect"
       :src="bgImages[bgIndex]"
       class="complete-light"
       :style="{
@@ -79,8 +79,10 @@ onBeforeUnmount(() => {
     >
       <image src="../static/score-bg.png" mode="widthFix" />
       <text
-        :style="{ fontWeight: scores[index] !== undefined ? 'bold' : 'normal' }"
-        >{{ scores[index] !== undefined ? scores[index] : "-" }}</text
+        :style="{ fontWeight: arrows[index] !== undefined ? 'bold' : 'normal' }"
+        >{{
+          !arrows[index] ? "-" : arrows[index].ringX ? "X" : arrows[index].ring
+        }}</text
       >
     </view>
   </view>
diff --git a/src/components/ScorePanel2.vue b/src/components/ScorePanel2.vue
index a8f8b30..bdd6c04 100644
--- a/src/components/ScorePanel2.vue
+++ b/src/components/ScorePanel2.vue
@@ -1,6 +1,6 @@
 <script setup>
 const props = defineProps({
-  scores: {
+  arrows: {
     type: Array,
     default: () => [],
   },
@@ -10,37 +10,34 @@ const getSum = (a, b, c) => {
   return sum > 0 ? sum + "环" : "-";
 };
 const roundsName = ["第一轮", "第二轮", "第三轮", "第四轮"];
+const getShowText = (arrow = {}) => {
+  return arrow.ring ? (arrow.ringX ? "X" : arrow.ring + "环") : "-";
+};
 </script>
 <template>
   <view class="container">
     <view>
       <text :style="{ transform: 'translateX(-10%)' }">总成绩</text>
-      <text>{{ scores.reduce((last, next) => last + next, 0) }}环</text>
+      <text>{{ arrows.reduce((last, next) => last + next.ring, 0) }}环</text>
     </view>
     <view
       v-for="(_, index) in new Array(
         Math.min(
-          Math.ceil(scores.length / 3) + (scores.length % 3 === 0 ? 1 : 0),
+          Math.ceil(arrows.length / 3) + (arrows.length % 3 === 0 ? 1 : 0),
           4
         )
       ).fill(1)"
       :key="index"
     >
       <text>{{ roundsName[index] }}</text>
-      <text>{{
-        scores[index * 3 + 0] ? scores[index * 3 + 0] + "环" : "-"
-      }}</text>
-      <text>{{
-        scores[index * 3 + 1] ? scores[index * 3 + 1] + "环" : "-"
-      }}</text>
-      <text>{{
-        scores[index * 3 + 2] ? scores[index * 3 + 2] + "环" : "-"
-      }}</text>
+      <text>{{ getShowText(arrows[index * 3 + 0]) }}</text>
+      <text>{{ getShowText(arrows[index * 3 + 1]) }}</text>
+      <text>{{ getShowText(arrows[index * 3 + 2]) }}</text>
       <text :style="{ width: '40%', transform: 'translateX(20%)' }">{{
         getSum(
-          scores[index * 3 + 0],
-          scores[index * 3 + 1],
-          scores[index * 3 + 2]
+          arrows[index * 3 + 0],
+          arrows[index * 3 + 1],
+          arrows[index * 3 + 2]
         )
       }}</text>
     </view>
diff --git a/src/components/ScoreResult.vue b/src/components/ScoreResult.vue
index 27d8de4..1042576 100644
--- a/src/components/ScoreResult.vue
+++ b/src/components/ScoreResult.vue
@@ -63,8 +63,8 @@ const validArrows = computed(() => {
 });
 
 const getRing = (arrow) => {
-  if (arrow && arrow.x !== -30 && arrow.y !== -30) return arrow.ring;
-  return "-";
+  if (arrow.ringX) return "X";
+  return arrow.ring ? arrow.ring + "环" : "-";
 };
 </script>
 
@@ -160,7 +160,7 @@ const getRing = (arrow) => {
       </view>
     </ScreenHint>
     <BowData
-      :total="result.completed_arrows"
+      :total="result.details.length"
       :arrows="result.details"
       :show="showBowData"
       :onClose="() => (showBowData = false)"
diff --git a/src/components/ShootProgress.vue b/src/components/ShootProgress.vue
index 42cb6ca..d837cb4 100644
--- a/src/components/ShootProgress.vue
+++ b/src/components/ShootProgress.vue
@@ -137,7 +137,8 @@ async function onReceiveMessage(msg) {
     }
     let key = [];
     key.push(arrow.ring ? `${arrow.ringX ? "X" : arrow.ring}环` : "未上靶");
-    if (!arrow.ring) key.push(`向${getDirectionText(arrow.angle)}调整`);
+    if (arrow.angle !== null)
+      key.push(`向${getDirectionText(arrow.angle)}调整`);
     audioManager.play(key, false);
   } else if (msg.type === MESSAGETYPESV2.HalfRest) {
     halfTime.value = true;
diff --git a/src/constants.js b/src/constants.js
index f0c5962..9fa55e4 100644
--- a/src/constants.js
+++ b/src/constants.js
@@ -51,7 +51,7 @@ export const getMessageTypeName = (id) => {
   for (let key in MESSAGETYPESV2) {
     if (MESSAGETYPESV2[key] === id) return key;
   }
-  return null;
+  return id;
 };
 
 export const roundsName = {
diff --git a/src/pages/battle-room.vue b/src/pages/battle-room.vue
index e520248..f691516 100644
--- a/src/pages/battle-room.vue
+++ b/src/pages/battle-room.vue
@@ -1,11 +1,10 @@
 <script setup>
-import { ref, watch, onMounted, onBeforeUnmount } from "vue";
+import { ref, onMounted, onBeforeUnmount } from "vue";
 import { onShow, onLoad, onShareAppMessage } from "@dcloudio/uni-app";
 import Container from "@/components/Container.vue";
 import PlayerSeats from "@/components/PlayerSeats.vue";
 import Guide from "@/components/Guide.vue";
 import SButton from "@/components/SButton.vue";
-import SModal from "@/components/SModal.vue";
 import Avatar from "@/components/Avatar.vue";
 import {
   getRoomAPI,
@@ -16,7 +15,6 @@ import {
   getReadyAPI,
   kickPlayerAPI,
 } from "@/apis";
-
 import { MESSAGETYPES, MESSAGETYPESV2 } from "@/constants";
 import useStore from "@/store";
 import { storeToRefs } from "pinia";
@@ -31,8 +29,6 @@ const players = ref([]);
 const blueTeam = ref([]);
 const redTeam = ref([]);
 
-const showModal = ref(false);
-const battleType = ref(0);
 const ready = ref(false);
 const allReady = ref(false);
 const timer = ref(null);
@@ -43,7 +39,6 @@ async function refreshRoomData() {
   const result = await getRoomAPI(roomNumber.value);
   if (result.started) return;
   room.value = result;
-  battleType.value = result.battleType;
   owner.value = {};
   opponent.value = {};
   const members = result.members || [];
@@ -235,15 +230,15 @@ onBeforeUnmount(() => {
         <view class="battle-guide">
           <view class="guide-tips">
             <text>弓箭手们，人都到齐了吗?</text>
-            <text v-if="battleType === 1">{{
+            <text v-if="room.battleType === 1">{{
               `${room.count / 2}v${room.count / 2}比赛即将开始!`
             }}</text>
-            <text v-if="battleType === 2">大乱斗即将开始! </text>
+            <text v-if="room.battleType === 2">大乱斗即将开始! </text>
           </view>
           <button hover-class="none" open-type="share">邀请</button>
         </view>
       </Guide>
-      <view v-if="battleType === 1 && room.count === 2" class="team-mode">
+      <view v-if="room.battleType === 1 && room.count === 2" class="team-mode">
         <image
           src="https://static.shelingxingqiu.com/attachment/2025-08-05/dbua9nuf5fyeph7cxi.png"
           mode="widthFix"
@@ -272,9 +267,9 @@ onBeforeUnmount(() => {
             :style="{ transform: 'translateY(60px)' }"
           >
             <Avatar :src="opponent.avatar" :size="60" />
-            <text :class="{ ready: opponent.ready }">{{
-              opponent.ready ? "已准备" : ""
-            }}</text>
+            <text class="ready" :style="{ opacity: opponent.ready ? 1 : 0 }">
+              已准备
+            </text>
             <text>{{ opponent.name }}</text>
             <button
               v-if="owner.id === user.id"
@@ -290,7 +285,7 @@ onBeforeUnmount(() => {
           </view>
         </view>
       </view>
-      <block v-if="battleType === 1 && room.count >= 4">
+      <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"
@@ -372,60 +367,22 @@ onBeforeUnmount(() => {
         </view>
       </block>
       <PlayerSeats
-        v-if="battleType === 2"
+        v-if="room.battleType === 2"
         :total="room.count || 10"
         :players="players"
         :removePlayer="removePlayer"
       />
       <view>
-        <!-- <SButton
-          v-if="user.id === owner.id && battleType === 1 && room.count === 2"
-          :disabled="!opponent.id"
-          :onClick="startGame"
-          >进入对战</SButton
-        >
-        <SButton
-          v-if="user.id === owner.id && battleType === 2"
-          :disabled="players.length < 3"
-          :onClick="startGame"
-          >进入大乱斗</SButton
-        >
-        <SButton
-          v-if="user.id === owner.id && battleType === 1 && room.count >= 4"
-          :disabled="
-            players.some((p) => p.groupType === undefined || p.groupType === 2)
-          "
-          :onClick="startGame"
-          >开启对局</SButton
-        >
-        <SButton v-if="user.id !== owner.id" disabled>等待房主开启对战</SButton> -->
         <SButton :disabled="ready" :onClick="getReady">{{
           allReady.value
             ? "即将进入对局..."
-            : owner.id === user.id
+            : owner.id === user.id && (room.members || []).length > 2
             ? "开始对局"
             : "我准备好了"
         }}</SButton>
         <text class="tips">所有人准备后自动开始游戏。</text>
       </view>
     </view>
-    <!-- <SModal
-      :show="showModal"
-      :onClose="() => (showModal = false)"
-      height="520rpx"
-    >
-      <view class="btns">
-        <SButton :onClick="exitRoom" width="200px" :rounded="20">
-          暂时离开
-        </SButton>
-        <block v-if="owner.id === user.id">
-          <view :style="{ height: '20px' }"></view>
-          <SButton :onClick="destroyRoom" width="200px" :rounded="20">
-            解散房间
-          </SButton>
-        </block>
-      </view>
-    </SModal> -->
   </Container>
 </template>
 
diff --git a/src/pages/first-try.vue b/src/pages/first-try.vue
index 7479409..e6d4d7b 100644
--- a/src/pages/first-try.vue
+++ b/src/pages/first-try.vue
@@ -262,7 +262,7 @@ const onClose = async () => {
         v-if="step === 4"
         :total="total"
         :rowCount="6"
-        :scores="scores.map((s) => s.ring)"
+        :arrows="scores"
       />
       <ScoreResult
         v-if="practiseResult.details"
diff --git a/src/pages/match-detail.vue b/src/pages/match-detail.vue
index 22bbcbf..c4edb42 100644
--- a/src/pages/match-detail.vue
+++ b/src/pages/match-detail.vue
@@ -16,7 +16,7 @@ const players = ref([]);
 
 onLoad(async (options) => {
   if (!options.battleId) return;
-  battleId.value = options.battleId || "59090720979554304";
+  battleId.value = options.battleId || "60143330377469952";
   const result = await getBattleAPI(battleId.value);
   data.value = result;
   if (result.mode > 3) {
@@ -116,8 +116,12 @@ const checkBowData = (selected) => {
                 mode="widthFix"
               />
             </view>
-            <text v-for="(arrow, index2) in round.shoots[team]" :key="index2">
-              {{ arrow.ring }}环
+            <text
+              v-for="(arrow, index2) in round.shoots[team]"
+              :key="index2"
+              :style="{ color: arrow.ringX ? '#fed847' : '#ccc' }"
+            >
+              {{ arrow.ringX ? "X" : `${arrow.ring}环` }}
             </text>
           </view>
           <view>
diff --git a/src/pages/melee-battle.vue b/src/pages/melee-battle.vue
index 10cb3ff..570c06a 100644
--- a/src/pages/melee-battle.vue
+++ b/src/pages/melee-battle.vue
@@ -82,12 +82,12 @@ function recoverData(battleInfo, { force = false } = {}) {
 
 onLoad(async (options) => {
   if (options.battleId) battleId.value = options.battleId;
-  uni.enableAlertBeforeUnload({
-    message: "离开比赛可能导致比赛失败，是否继续？",
-    success: (res) => {
-      console.log("已启用离开提示");
-    },
-  });
+  // uni.enableAlertBeforeUnload({
+  //   message: "离开比赛可能导致比赛失败，是否继续？",
+  //   success: (res) => {
+  //     console.log("已启用离开提示");
+  //   },
+  // });
 });
 
 async function onReceiveMessage(msg) {
diff --git a/src/pages/melee-bow-data.vue b/src/pages/melee-bow-data.vue
index 4babd09..4a1fc07 100644
--- a/src/pages/melee-bow-data.vue
+++ b/src/pages/melee-bow-data.vue
@@ -90,7 +90,7 @@ onLoad(async (options) => {
           class="score-item"
           :style="{ width: '13vw', height: '13vw' }"
         >
-          {{ score.ring }}
+          {{ score.ringX ? "X" : score.ring }}
         </view>
       </view>
     </view>
diff --git a/src/pages/mine-bow-data.vue b/src/pages/mine-bow-data.vue
index 81d47c7..fd2e4c6 100644
--- a/src/pages/mine-bow-data.vue
+++ b/src/pages/mine-bow-data.vue
@@ -47,7 +47,7 @@ onLoad(async (options) => {
         :completeEffect="false"
         :rowCount="total === 12 ? 6 : 9"
         :total="total"
-        :scores="arrows.map((a) => a.ring)"
+        :arrows="arrows"
         :margin="arrows.length === 12 ? 4 : 1"
         :fontSize="arrows.length === 12 ? 25 : 22"
       />
diff --git a/src/pages/practise-one.vue b/src/pages/practise-one.vue
index b70132e..5f5636c 100644
--- a/src/pages/practise-one.vue
+++ b/src/pages/practise-one.vue
@@ -155,7 +155,7 @@ onBeforeUnmount(() => {
           :currentRound="currentRound"
           :scores="scores"
         />
-        <ScorePanel2 :scores="scores.map((s) => s.ring)" />
+        <ScorePanel2 :arrows="scores" />
         <ScoreResult
           v-if="practiseResult.details"
           :rowCount="6"
diff --git a/src/pages/practise-two.vue b/src/pages/practise-two.vue
index da2caaf..f11aba9 100644
--- a/src/pages/practise-two.vue
+++ b/src/pages/practise-two.vue
@@ -142,7 +142,7 @@ onBeforeUnmount(() => {
         />
         <ScorePanel
           v-if="start"
-          :scores="scores.map((s) => s.ring)"
+          :arrows="scores"
           :total="total"
           :rowCount="total / 4"
           :margin="1.5"
diff --git a/src/pages/team-battle.vue b/src/pages/team-battle.vue
index c7751b4..4d969dd 100644
--- a/src/pages/team-battle.vue
+++ b/src/pages/team-battle.vue
@@ -108,12 +108,27 @@ async function onReceiveMessage(msg) {
     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) {
-      currentBluePoint.value = latestRound.scores[1].score;
-      currentRedPoint.value = latestRound.scores[2].score;
+      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;
+      }
     }
   } else if (msg.type === MESSAGETYPESV2.BattleEnd) {
+    if (msg.status === 4) {
+      showRoundTip.value = true;
+      currentBluePoint.value = 0;
+      currentRedPoint.value = 0;
+      setTimeout(() => {
+        uni.navigateBack();
+      }, 2000);
+      return;
+    }
     uni.redirectTo({
       url: "/pages/battle-result?battleId=" + msg.matchId,
     });
@@ -122,12 +137,12 @@ async function onReceiveMessage(msg) {
 
 onLoad(async (options) => {
   if (options.battleId) battleId.value = options.battleId;
-  uni.enableAlertBeforeUnload({
-    message: "离开比赛可能导致比赛失败，是否继续？",
-    success: (res) => {
-      console.log("已启用离开提示");
-    },
-  });
+  // uni.enableAlertBeforeUnload({
+  //   message: "离开比赛可能导致比赛失败，是否继续？",
+  //   success: (res) => {
+  //     console.log("已启用离开提示");
+  //   },
+  // });
 });
 onMounted(async () => {
   uni.setKeepScreenOn({
diff --git a/src/pages/team-bow-data.vue b/src/pages/team-bow-data.vue
index 9e749cf..70c4da0 100644
--- a/src/pages/team-bow-data.vue
+++ b/src/pages/team-bow-data.vue
@@ -82,7 +82,7 @@ const onClickTab = (index) => {
               :key="index"
               class="score-item"
             >
-              {{ score.ring }}
+              {{ score.ringX ? "X" : score.ring }}
             </view>
           </view>
         </view>