From 67825d2b24e42275cdada43e22edcddcae285f6b Mon Sep 17 00:00:00 2001
From: kron <kai_hong@126.com>
Date: Tue, 17 Jun 2025 16:02:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=93=E7=AE=AD=E5=8A=A8=E7=94=BB=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/BowData.vue     |  2 +-
 src/components/BowTarget.vue   | 18 +++++++++++-------
 src/components/MeleeResult.vue |  2 +-
 src/components/TeamResult.vue  |  6 +++++-
 src/constants.js               | 11 +++++++++++
 src/pages/melee-match.vue      | 27 ++++++++++++++++++---------
 src/pages/team-match.vue       |  4 ++--
 7 files changed, 49 insertions(+), 21 deletions(-)

diff --git a/src/components/BowData.vue b/src/components/BowData.vue
index 01f90bd..256caa9 100644
--- a/src/components/BowData.vue
+++ b/src/components/BowData.vue
@@ -40,7 +40,7 @@ const props = defineProps({
       </view>
     </view>
     <view :style="{ width: '100%', marginBottom: '20px' }">
-      <BowTarget :scores="arrows" :showE="false" />
+      <BowTarget :scores="arrows" :showLatestArrow="false" />
     </view>
     <view class="desc">
       <text>{{ arrows.length }}</text>
diff --git a/src/components/BowTarget.vue b/src/components/BowTarget.vue
index f37adf3..c78fbd2 100644
--- a/src/components/BowTarget.vue
+++ b/src/components/BowTarget.vue
@@ -34,14 +34,13 @@ const props = defineProps({
     type: Array,
     default: () => [],
   },
-  showE: {
+  showLatestArrow: {
     type: Boolean,
     default: true,
   },
 });
 
 const showRoundTips = ref(false);
-const showLatestArrow = ref(false);
 const prevLength = ref(0);
 const timer = ref(null);
 
@@ -51,7 +50,6 @@ watch(
     if (newVal.length - prevLength.value === 1) {
       if (timer.value) clearTimeout(timer.value);
       showRoundTips.value = true;
-      showLatestArrow.value = true;
       timer.value = setTimeout(() => {
         showRoundTips.value = false;
       }, 1000);
@@ -86,11 +84,13 @@ function calcRealY(num) {
     </view>
     <view class="target">
       <view
-        v-if="scores.length && showRoundTips && showE"
+        v-if="scores.length && showRoundTips && showLatestArrow"
         class="e-value fade-in"
         >经验 +1</view
       >
-      <view v-if="scores.length && showRoundTips" class="round-tip fade-in"
+      <view
+        v-if="scores.length && showRoundTips && showLatestArrow"
+        class="round-tip fade-in"
         >{{ scores[scores.length - 1].ring }}<text>环</text></view
       >
       <image
@@ -101,7 +101,11 @@ function calcRealY(num) {
             ? '../static/hit-icon-green.png'
             : '../static/hit-icon.png'
         "
-        :class="`hit ${index + 1 === scores.length ? 'pump-in' : ''}`"
+        :class="`hit ${
+          index + 1 === scores.length && !blueScores.length && showLatestArrow
+            ? 'pump-in'
+            : ''
+        }`"
         :style="{
           left: calcRealX(bow.x),
           top: calcRealY(bow.y),
@@ -111,7 +115,7 @@ function calcRealY(num) {
         v-for="(bow, index) in blueScores"
         :key="index"
         src="../static/hit-icon-blue.png"
-        :class="`hit ${index + 1 === blueScores.length ? 'pump-in' : ''}`"
+        class="hit"
         :style="{
           left: calcRealX(bow.x),
           top: calcRealY(bow.y),
diff --git a/src/components/MeleeResult.vue b/src/components/MeleeResult.vue
index d727a58..2fb5af5 100644
--- a/src/components/MeleeResult.vue
+++ b/src/components/MeleeResult.vue
@@ -61,7 +61,7 @@ watch(
       </view>
     </view>
     <view :style="{ width: '95%' }">
-      <BowTarget :scores="scores" />
+      <BowTarget :scores="scores" :showLatestArrow="false" />
     </view>
     <view class="score-text"
       ><text :style="{ color: '#fed847' }">12</text>支箭，共<text
diff --git a/src/components/TeamResult.vue b/src/components/TeamResult.vue
index f65f4a5..1cfaf30 100644
--- a/src/components/TeamResult.vue
+++ b/src/components/TeamResult.vue
@@ -97,7 +97,11 @@ watch(
       </view>
     </view>
     <view :style="{ width: '95%' }">
-      <BowTarget :scores="redScores" :blueScores="blueScores" :showE="false" />
+      <BowTarget
+        :scores="redScores"
+        :blueScores="blueScores"
+        :showLatestArrow="false"
+      />
     </view>
     <view class="score-row" v-for="(player, index) in players" :key="index">
       <Avatar
diff --git a/src/constants.js b/src/constants.js
index 9ce8e9b..f0141a4 100644
--- a/src/constants.js
+++ b/src/constants.js
@@ -13,6 +13,17 @@ export const MESSAGETYPES = {
   UserEnterRoom: 2133805521,
   UserExitRoom: 3896523333,
   RoomDestroy: 3617539277,
+  // RoomDestroy: 2921416944,
+  // 下半场: 388606440,
+};
+
+export const getMessageTypeName = (id) => {
+  for (let key in MESSAGETYPES) {
+    if (MESSAGETYPES[key] === id) {
+      return key;
+    }
+  }
+  return null;
 };
 
 export const roundsName = {
diff --git a/src/pages/melee-match.vue b/src/pages/melee-match.vue
index 69b388a..7c99f9c 100644
--- a/src/pages/melee-match.vue
+++ b/src/pages/melee-match.vue
@@ -9,8 +9,9 @@ import BattleHeader from "@/components/BattleHeader.vue";
 import Timer from "@/components/Timer.vue";
 import PlayerScore from "@/components/PlayerScore.vue";
 import SButton from "@/components/SButton.vue";
+import Avatar from "@/components/Avatar.vue";
 import { matchGameAPI, readyGameAPI } from "@/apis";
-import { MESSAGETYPES } from "@/constants";
+import { MESSAGETYPES, getMessageTypeName } from "@/constants";
 import useStore from "@/store";
 import { storeToRefs } from "pinia";
 const store = useStore();
@@ -62,7 +63,7 @@ async function onReceiveMessage(content) {
       (battleId.value && msg.id === battleId.value) ||
       msg.constructor === MESSAGETYPES.WaitForAllReady
     ) {
-      console.log("收到消息：", msg);
+      console.log("收到消息：", getMessageTypeName(msg.constructor), msg);
     }
     if (msg.constructor === MESSAGETYPES.WaitForAllReady) {
       // 这里会掉多次;
@@ -82,11 +83,10 @@ async function onReceiveMessage(content) {
     }
     if (msg.id !== battleId.value) return;
     if (msg.constructor === MESSAGETYPES.MeleeAllReady) {
-      totalRounds.value = msg.groupUserStatus.config.maxRounds;
       start.value = true;
       seq.value += 1;
       timerSeq.value = 0;
-      tips.value = "请在90秒内射完12支箭";
+      tips.value = "请连续射出6支箭";
       scores.value = [];
     }
     if (msg.constructor === MESSAGETYPES.ShootResult) {
@@ -98,7 +98,7 @@ async function onReceiveMessage(content) {
     }
     if (msg.constructor === MESSAGETYPES.MatchOver) {
       uni.redirectTo({
-        url: `/pages/battle-result?battleId=${msg.id}&winner=${msg.endStatus.winner}&gameType=${gameType.value}`,
+        url: `/pages/battle-result?battleId=${msg.id}`,
       });
     }
   });
@@ -128,11 +128,13 @@ onUnmounted(() => {
         </view>
       </Guide>
       <ShootProgress v-if="start" :seq="seq" :start="start" :tips="tips" />
+      <view class="infos">
+        <Avatar :src="user.avatar" :size="35" />
+        <BowPower :power="power" />
+      </view>
       <BowTarget
-        :avatar="user.avatar"
-        :power="power"
-        :currentRound="currentRound"
-        :totalRound="totalRounds"
+        :currentRound="scores.length"
+        :totalRound="12"
         :scores="scores"
       />
       <PlayerScore
@@ -158,4 +160,11 @@ onUnmounted(() => {
 .container {
   width: 100%;
 }
+.infos {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 0 15px;
+  padding-top: 15px;
+}
 </style>
diff --git a/src/pages/team-match.vue b/src/pages/team-match.vue
index d0972d4..a2c9f3c 100644
--- a/src/pages/team-match.vue
+++ b/src/pages/team-match.vue
@@ -11,7 +11,7 @@ import Timer from "@/components/Timer.vue";
 import BattleFooter from "@/components/BattleFooter.vue";
 import SButton from "@/components/SButton.vue";
 import { matchGameAPI, readyGameAPI } from "@/apis";
-import { MESSAGETYPES, roundsName } from "@/constants";
+import { MESSAGETYPES, roundsName, getMessageTypeName } from "@/constants";
 import useStore from "@/store";
 import { storeToRefs } from "pinia";
 const store = useStore();
@@ -73,7 +73,7 @@ async function onReceiveMessage(content) {
       (battleId.value && msg.id === battleId.value) ||
       msg.constructor === MESSAGETYPES.WaitForAllReady
     ) {
-      console.log("收到消息：", msg);
+      console.log("收到消息：", getMessageTypeName(msg.constructor), msg);
     }
     if (!start.value && msg.constructor === MESSAGETYPES.ShootSyncMeArrowID) {
       scores.value.push(msg.target);