bug修复

src/apis.js

@@ -152,8 +152,6 @@ export const getGameAPI = async (battleId) => {
   };
   if (battleStats.mode === 1) {
     data.winner = battleStats.winner;
-    data.redTotal = battleStats.redTotal;
-    data.blueTotal = battleStats.blueTotal;
     data.roundsData = {};
     data.redPlayers = {};
     data.bluePlayers = {};

src/components/BowTarget.vue

@@ -53,6 +53,10 @@ const props = defineProps({
     type: Boolean,
     default: false,
   },
+  mode: {
+    type: String,
+    default: "solo", // solo 单排，team 双排
+  },
 });
 
 const showRoundTips = ref(false);
@@ -89,6 +93,23 @@ watch(
   }
 );
 
+watch(
+  () => props.blueScores,
+  (newVal) => {
+    if (newVal.length - prevLength.value === 1) {
+      if (timer.value) clearTimeout(timer.value);
+      showRoundTips.value = true;
+      timer.value = setTimeout(() => {
+        showRoundTips.value = false;
+      }, 1000);
+    }
+    prevLength.value = newVal.length;
+  },
+  {
+    deep: true,
+  }
+);
+
 function calcRealX(num) {
   const len = 20 + num;
   return `calc(${(len / 40) * 100}% - 10px)`;
@@ -124,16 +145,24 @@ const simulShoot = async () => {
         class="round-tip fade-in"
         >{{ scores[scores.length - 1].ring }}<text>环</text></view
       >
+      <view
+        v-if="blueScores.length && showRoundTips && showLatestArrow"
+        class="round-tip fade-in"
+        >{{ blueScores[blueScores.length - 1].ring }}<text>环</text></view
+      >
       <block v-for="(bow, index) in scores" :key="index">
         <image
           v-if="bow.ring > 0"
           :src="
-            index === scores.length - 1 && !blueScores.length && showLatestArrow
+            index === scores.length - 1 &&
+            !blueScores.length &&
+            showLatestArrow &&
+            mode !== 'team'
               ? '../static/hit-icon-green.png'
               : '../static/hit-icon.png'
           "
           :class="`hit ${
-            index + 1 === scores.length && !blueScores.length && showLatestArrow
+            index === scores.length - 1 && !blueScores.length && showLatestArrow
               ? 'pump-in'
               : ''
           }`"
@@ -148,6 +177,7 @@ const simulShoot = async () => {
           v-if="bow.ring > 0"
           src="../static/hit-icon-blue.png"
           class="hit"
+          :class="`hit ${blueScores.length === 1 ? 'pump-in' : ''}`"
           :style="{
             left: calcRealX(bow.x),
             top: calcRealY(bow.y),

src/components/Matching.vue

@@ -75,7 +75,7 @@ watch(
           clearInterval(timer.value);
           setTimeout(() => {
             newVal();
-          }, 1000);
+          }, 2000);
         } else {
           totalTop.value += 0.5;
         }
@@ -117,7 +117,7 @@ onUnmounted(() => {
           v-for="(name, index) in playerNames"
           :key="index"
           :style="{
-            lineHeight: `${98 / 7}vw`,
+            lineHeight: `${95 / 7}vw`,
             ...(textStyles[index] || {}),
           }"
         >
@@ -129,7 +129,7 @@ onUnmounted(() => {
           v-for="(name, index) in playerNames"
           :key="index"
           :style="{
-            lineHeight: `${98 / 7}vw`,
+            lineHeight: `${95 / 7}vw`,
             ...(textStyles[index + 7] || {}),
           }"
         >
@@ -153,20 +153,19 @@ onUnmounted(() => {
 }
 .matching > view {
   width: 70vw;
-  height: 98vw;
+  height: 95vw;
   overflow: hidden;
   position: relative;
-  transform: translateY(3vw);
 }
 .matching-bg {
   position: absolute;
   width: 70vw;
   height: 102vw;
-  top: 30vw;
+  top: 27vw;
 }
 .matching > button {
   width: 55%;
-  margin-top: 20vw;
+  margin-top: 15vw;
   padding: 18px;
   color: #000;
   background-color: #fed847;
@@ -175,12 +174,11 @@ onUnmounted(() => {
 }
 .player-names {
   width: 100%;
-  height: 98vw;
+  height: 95vw;
   display: flex;
   flex-direction: column;
   position: absolute;
   top: 0;
-  transform: translateY(3vw);
 }
 .player-names > text {
   width: 100%;

src/pages/battle-result.vue

@@ -18,16 +18,16 @@ const totalPoints = ref(0);
 onLoad(async (options) => {
   battleId.value = options.battleId;
   const result = await getGameAPI(
-    // options.battleId || "BATTLE-1750688685843436271-553"
+    options.battleId || "BATTLE-1750867490990424058-718"
-    options.battleId || "BATTLE-1750688536849458226-518"
+    // options.battleId || "BATTLE-1750688536849458226-518"
   );
   data.value = result;
   if (result.mode === 1 && result.redPlayers[user.value.id]) {
-    totalPoints.value = result.redTotal;
+    totalPoints.value = result.redPlayers[user.value.id].totalScore;
     ifWin.value = result.winner === 0;
   }
   if (result.mode === 1 && result.bluePlayers[user.value.id]) {
-    totalPoints.value = result.redTotal;
+    totalPoints.value = result.bluePlayers[user.value.id].totalScore;
     ifWin.value = result.winner === 1;
   }
   if (result.mode === 2) {
@@ -72,7 +72,7 @@ const topThreeColors = ["#FFD947 ", "#D2D2D2", "#FFA515"];
       <view class="battle-winner">
         <image src="../static/shining-bg.png" mode="widthFix" />
         <image src="../static/throphy.png" mode="widthFix" />
-        <text>{{ ifWin && data.winner === 1 ? "蓝队" : "红队" }}获胜</text>
+        <text>{{ data.winner === 1 ? "蓝队" : "红队" }}获胜</text>
         <text>强势登顶，荣耀加冕</text>
       </view>
     </block>
@@ -145,8 +145,12 @@ const topThreeColors = ["#FFD947 ", "#D2D2D2", "#FFA515"];
     </block>
     <view class="battle-e">
       <image src="../static/row-yellow-bg.png" mode="widthFix" />
-      <text v-if="data.gameMode === 1">经验 +{{ totalPoints }}</text>
+      <text v-if="data.gameMode === 1"
-      <text v-if="data.gameMode === 2">积分 +{{ totalPoints }}</text>
+        >经验 {{ totalPoints > 0 ? "+" + totalPoints : totalPoints }}</text
+      >
+      <text v-if="data.gameMode === 2"
+        >积分 {{ totalPoints > 0 ? "+" + totalPoints : totalPoints }}</text
+      >
     </view>
     <text v-if="data.mode === 1" class="description">你是朋友中的佼佼者哦</text>
     <text v-if="data.mode === 2" class="description"

src/pages/battle-room.vue

@@ -121,12 +121,20 @@ async function onReceiveMessage(messages = []) {
     if (msg.roomNumber === roomNumber.value) {
       if (msg.constructor === MESSAGETYPES.UserEnterRoom) {
         if (room.value.battleType === 1) {
+          if (msg.userId === room.value.creator) {
+            owner.value = {
+              id: msg.userId,
+              name: msg.name,
+              avatar: msg.avatar,
+            };
+          } else {
             opponent.value = {
               id: msg.userId,
               name: msg.name,
               avatar: msg.avatar,
             };
           }
+        }
         if (room.value.battleType === 2) {
           players.value.push({
             id: msg.userId,
@@ -137,10 +145,16 @@ async function onReceiveMessage(messages = []) {
       }
       if (!start.value && msg.constructor === MESSAGETYPES.UserExitRoom) {
         if (room.value.battleType === 1) {
+          if (msg.userId === room.value.creator) {
+            owner.value = {
+              id: "",
+            };
+          } else {
             opponent.value = {
               id: "",
             };
           }
+        }
         if (room.value.battleType === 2) {
           players.value = players.value.filter((p) => p.id !== msg.userId);
         }

src/pages/team-match.vue

@@ -28,6 +28,7 @@ const currentBluePoint = ref(0);
 const totalRounds = ref(0);
 const power = ref(0);
 const scores = ref([]);
+const blueScores = ref([]);
 const redTeam = ref([]);
 const blueTeam = ref([]);
 const currentShooterId = ref(0);
@@ -89,6 +90,7 @@ async function onReceiveMessage(messages = []) {
     }
     if (msg.constructor === MESSAGETYPES.ToSomeoneShoot) {
       scores.value = [];
+      blueScores.value = [];
       seq.value += 1;
       currentShooterId.value = msg.userId;
       if (redTeam.value[0].id === currentShooterId.value) {
@@ -98,11 +100,16 @@ async function onReceiveMessage(messages = []) {
       }
     }
     if (msg.constructor === MESSAGETYPES.ShootResult) {
+      const isRed = redTeam.value.find((item) => item.id === msg.userId);
+      if (isRed) {
         scores.value = [msg.target];
+      } else {
+        blueScores.value = [msg.target];
+      }
     }
     if (msg.constructor === MESSAGETYPES.RoundPoint) {
-      bluePoints.value += msg.blueScore;
+      // bluePoints.value += msg.blueScore;
-      redPoints.value += msg.redScore;
+      // redPoints.value += msg.redScore;
     }
     if (msg.constructor === MESSAGETYPES.CurrentRoundEnded) {
       const result = msg.preRoundResult;
@@ -110,6 +117,8 @@ async function onReceiveMessage(messages = []) {
       currentShooterId.value = 0;
       currentBluePoint.value = result.blueScore;
       currentRedPoint.value = result.redScore;
+      bluePoints.value += result.blueScore;
+      redPoints.value += result.redScore;
       showRoundTip.value = true;
       // 开始下一轮;
       roundResults.value = result.roundResults;
@@ -159,11 +168,13 @@ onUnmounted(() => {
           :redTeam="redTeam"
         />
         <BowTarget
+          mode="team"
           :showE="start && user.id === currentShooterId"
           :power="start ? power : 0"
           :currentRound="currentRound"
           :totalRound="totalRounds"
           :scores="scores"
+          :blueScores="blueScores"
           :tips="
             !start && scores.length > 0
               ? `本次射程${scores[scores.length - 1].dst / 100}米，${