完成大乱斗流程调试

src/pages/melee-match.vue

@@ -6,10 +6,14 @@ import BowTarget from "@/components/BowTarget.vue";
 import ShootProgress from "@/components/ShootProgress.vue";
 import PlayersRow from "@/components/PlayersRow.vue";
 import Timer from "@/components/Timer.vue";
-import BattleFooter from "@/components/BattleFooter.vue";
+import PlayerScore from "@/components/PlayerScore.vue";
 import SButton from "@/components/SButton.vue";
 import { matchGameAPI, readyGameAPI } from "@/apis";
-import { MESSAGETYPES, roundsName } from "@/constants";
+import { MESSAGETYPES } from "@/constants";
+import useStore from "@/store";
+import { storeToRefs } from "pinia";
+const store = useStore();
+const { user } = storeToRefs(store);
 const gameType = ref(0);
 const teamSize = ref(0);
 const matching = ref(false);
@@ -19,14 +23,10 @@ const currentRound = ref(1);
 const totalRounds = ref(0);
 const power = ref(0);
 const scores = ref([]);
-const redTeam = ref([]);
-const blueTeam = ref([]);
-const currentShooterId = ref(0);
 const tips = ref("即将开始...");
-const seq = ref(0);
 const timerSeq = ref(0);
-const roundResults = ref([
-]);
+const players = ref([]);
+const playersScores = ref({});
 
 onLoad((options) => {
   gameType.value = options.gameType;
@@ -66,41 +66,36 @@ async function onReceiveMessage(content) {
       // 这里会掉多次;
       timerSeq.value += 1;
       battleId.value = msg.id;
-      redTeam.value = msg.groupUserStatus.redTeam;
-      blueTeam.value = msg.groupUserStatus.blueTeam;
-      totalRounds.value = msg.groupUserStatus.config.maxRounds;
+      players.value = [
+        ...msg.groupUserStatus.redTeam,
+        ...msg.groupUserStatus.blueTeam,
+      ];
+      players.value.forEach((p) => {
+        playersScores.value[p.id] = [];
+      });
+    }
+    if (!start.value && msg.constructor === MESSAGETYPES.ShootSyncMeArrowID) {
+      scores.value.push(msg.target);
+      power.value = msg.target.battery;
     }
     if (msg.id !== battleId.value) return;
-    if (msg.constructor === MESSAGETYPES.AllReady) {
+    if (msg.constructor === MESSAGETYPES.MeleeAllReady) {
+      totalRounds.value = msg.groupUserStatus.config.maxRounds;
       start.value = true;
       timerSeq.value = 0;
-    }
-    if (msg.constructor === MESSAGETYPES.ToSomeoneShoot) {
+      tips.value = "请在90秒内射完12支箭";
       scores.value = [];
-      seq.value += 1;
-      currentShooterId.value = msg.userId;
-      if (redTeam.value[0].id === currentShooterId.value) {
-        tips.value = `请红队射箭-第${roundsName[currentRound.value]}轮`;
-      } else {
-        tips.value = `请蓝队射箭-第${roundsName[currentRound.value]}轮`;
-      }
     }
     if (msg.constructor === MESSAGETYPES.ShootResult) {
-      scores.value = [msg.target];
-    }
-    if (msg.constructor === MESSAGETYPES.CurrentRoundEnded) {
-      const result = msg.preRoundResult;
-      scores.value = [];
-      currentShooterId.value = 0;
-      if (result.currentRound > 0 && result.currentRound < totalRounds.value) {
-        // 开始下一轮;
-        roundResults.value = result.roundResults;
-        currentRound.value = result.currentRound + 1;
+      if (msg.userId === user.value.id) {
+        scores.value = [msg.target];
+        power.value = msg.target.battery;
       }
+      playersScores.value[msg.userId].push(msg.target);
     }
     if (msg.constructor === MESSAGETYPES.MatchOver) {
       uni.redirectTo({
-        url: "/pages/battle-result?battleId=" + msg.id,
+        url: `/pages/battle-result?battleId=${msg.id}&winner=${msg.endStatus.winner}&gameType=${gameType.value}`,
       });
     }
   });
@@ -117,25 +112,29 @@ onUnmounted(() => {
 </script>
 
 <template>
-  <Container title="排位赛" :bgType="1">
+  <Container title="大乱斗排位赛" :bgType="1">
     <view class="container">
-      <ShootProgress v-if="start" :tips="tips" :seq="seq" />
-      <PlayersRow
+      <ShootProgress v-if="start" :tips="tips" />
+      <!-- <PlayersRow
         v-if="start"
         :currentShooterId="currentShooterId"
         :blueTeam="blueTeam"
         :redTeam="redTeam"
-      />
+      /> -->
       <BowTarget
-        v-if="start"
+        :avatar="user.avatarUrl"
         :power="power"
         :currentRound="currentRound"
         :totalRound="totalRounds"
         :scores="scores"
       />
-      <BattleFooter
-        v-if="roundResults.length > 0"
-        :roundResults="roundResults"
+      <PlayerScore
+        v-if="start"
+        v-for="(player, index) in players"
+        :key="index"
+        :name="player.name"
+        :avatar="player.avatar"
+        :scores="playersScores[player.id]"
       />
       <Timer :seq="timerSeq" :callBack="readyToGo" />
     </view>