比赛逻辑代码统一

src/components/ShootProgress.vue

@@ -23,10 +23,6 @@ const props = defineProps({
     type: Number,
     default: 120,
   },
-  seq: {
-    type: Number,
-    default: 0,
-  },
   currentRound: {
     type: Number,
     default: 0,
@@ -47,7 +43,7 @@ const timer = ref(null);
 const sound = ref(true);
 const currentSound = ref("");
 const currentRound = ref(props.currentRound);
-const currentRoundEnded = ref(!props.battleId);
+const currentRoundEnded = ref(false);
 const ended = ref(false);
 const halfTime = ref(false);
 
@@ -79,26 +75,21 @@ watch(
 watch(
   () => props.tips,
   (newVal) => {
-    let key = "";
     if (newVal.includes("红队")) barColor.value = "#FF6060";
     if (newVal.includes("蓝队")) barColor.value = "#5FADFF";
+    if (newVal.includes("红队") || newVal.includes("蓝队")) {
+      if (timer.value) clearInterval(timer.value);
+      remain.value = props.total;
+      timer.value = setInterval(() => {
+        if (remain.value > 0) remain.value--;
+      }, 1000);
+    }
   },
   {
     immediate: true,
   }
 );
 
-watch(
-  () => [props.seq],
-  () => {
-    if (timer.value) clearInterval(timer.value);
-    remain.value = props.total;
-    timer.value = setInterval(() => {
-      if (remain.value > 0) remain.value--;
-    }, 1000);
-  }
-);
-
 watch(
   () => props.start,
   (newVal) => {

src/pages.json

@@ -3,6 +3,9 @@
     {
       "path": "pages/index"
     },
+    {
+      "path": "pages/match-page"
+    },
     {
       "path": "pages/image-share"
     },

src/pages/battle-room.vue

@@ -4,222 +4,23 @@ import { onLoad, onShow, onHide } from "@dcloudio/uni-app";
 import Container from "@/components/Container.vue";
 import PlayerSeats from "@/components/PlayerSeats.vue";
 import Guide from "@/components/Guide.vue";
-import Timer from "@/components/Timer.vue";
 import SButton from "@/components/SButton.vue";
-import BowTarget from "@/components/BowTarget.vue";
-import BattleHeader from "@/components/BattleHeader.vue";
-import BattleFooter from "@/components/BattleFooter.vue";
-import BowPower from "@/components/BowPower.vue";
-import ShootProgress from "@/components/ShootProgress.vue";
-import PlayersRow from "@/components/PlayersRow.vue";
 import SModal from "@/components/SModal.vue";
-import ScreenHint from "@/components/ScreenHint.vue";
+import { getRoomAPI, destroyRoomAPI, exitRoomAPI, startRoomAPI } from "@/apis";
-import RoundEndTip from "@/components/RoundEndTip.vue";
+import { MESSAGETYPES } from "@/constants";
-import TestDistance from "@/components/TestDistance.vue";
-import PlayerScore from "@/components/PlayerScore.vue";
-import Avatar from "@/components/Avatar.vue";
-import {
-  getRoomAPI,
-  destroyRoomAPI,
-  exitRoomAPI,
-  startRoomAPI,
-  getCurrentGameAPI,
-} from "@/apis";
-import { isGameEnded } from "@/util";
-import { MESSAGETYPES, roundsName, getMessageTypeName } from "@/constants";
 import useStore from "@/store";
 import { storeToRefs } from "pinia";
 const store = useStore();
 const { user } = storeToRefs(store);
-const step = ref(1);
-const seq = ref(0);
-const battleId = ref("");
 const room = ref({});
 const roomNumber = ref("");
 const owner = ref({});
 const opponent = ref({});
-const redTeam = ref([]);
-const blueTeam = ref([]);
-const currentShooterId = ref(0);
 const players = ref([]);
-const playersSorted = ref([]);
+
-const currentRound = ref(1);
-const totalRounds = ref(0);
-const start = ref(false);
-const startCount = ref(true);
-const power = ref(0);
-const scores = ref([]);
-const blueScores = ref([]);
-const tips = ref("即将开始...");
-const roundResults = ref([]);
-const redPoints = ref(0);
-const bluePoints = ref(0);
-const currentRedPoint = ref(0);
-const currentBluePoint = ref(0);
-const showRoundTip = ref(false);
-const playersScores = ref({});
 const showModal = ref(false);
-const halfTimeTip = ref(false);
-const isFinalShoot = ref(false);
-const total = ref(15);
 const battleType = ref(0);
-const isEnded = ref(false);
 const refreshRoomTimer = ref(null);
-const refreshTimer = ref(null);
-
-watch(
-  () => [players.value, playersScores.value],
-  ([n_players, n_scores]) => {
-    if (n_players.length) {
-      playersSorted.value = Object.keys(n_scores)
-        .sort((a, b) => n_scores[b].length - n_scores[a].length)
-        .map((pid) => n_players.find((p) => p.id == pid));
-    }
-  },
-  {
-    deep: true, // 添加深度监听
-    immediate: true,
-  }
-);
-
-function recoverData(battleInfo) {
-  uni.removeStorageSync("last-awake-time");
-  battleId.value = battleInfo.id;
-  battleType.value = battleInfo.config.mode;
-  step.value = 2;
-  if (battleInfo.status === 0) {
-    const readyRemain = Date.now() / 1000 - battleInfo.startTime;
-    console.log(`当前局已进行${readyRemain}秒`);
-    if (readyRemain > 0) {
-      setTimeout(() => {
-        uni.$emit("update-timer", 15 - readyRemain);
-      }, 200);
-    }
-    return;
-  } else {
-    step.value = 3;
-    start.value = true;
-  }
-  if (battleInfo.config.mode === 1) {
-    redTeam.value = battleInfo.redTeam;
-    blueTeam.value = battleInfo.blueTeam;
-    if (battleInfo.status !== 0) {
-      bluePoints.value = 0;
-      redPoints.value = 0;
-      currentRound.value = battleInfo.currentRound;
-      totalRounds.value = battleInfo.maxRound;
-      roundResults.value = battleInfo.roundResults;
-      battleInfo.roundResults.forEach((round) => {
-        const blueTotal = round.blueArrows.reduce(
-          (last, next) => last + next.ring,
-          0
-        );
-        const redTotal = round.redArrows.reduce(
-          (last, next) => last + next.ring,
-          0
-        );
-        if (blueTotal === redTotal) {
-          bluePoints.value += 1;
-          redPoints.value += 1;
-        } else if (blueTotal > redTotal) {
-          bluePoints.value += 2;
-        } else {
-          redPoints.value += 2;
-        }
-      });
-      if (
-        battleInfo.redTeam[0].shotHistory[battleInfo.currentRound] ||
-        battleInfo.blueTeam[0].shotHistory[battleInfo.currentRound]
-      ) {
-        roundResults.value.push({
-          redArrows: battleInfo.redTeam[0].shotHistory[
-            battleInfo.currentRound
-          ].filter((item) => !!item.playerId),
-          blueArrows: battleInfo.blueTeam[0].shotHistory[
-            battleInfo.currentRound
-          ].filter((item) => !!item.playerId),
-        });
-      } else if (battleInfo.currentRound < 5) {
-        roundResults.value.push({
-          redArrows: [],
-          blueArrows: [],
-        });
-      }
-      if (battleInfo.goldenRound) {
-        const { ShotCount, RedRecords, BlueRecords } = battleInfo.goldenRound;
-        const roundCount = Math.max(RedRecords.length, BlueRecords.length);
-        currentRound.value += roundCount;
-        isFinalShoot.value = true;
-        for (let i = 0; i < roundCount; i++) {
-          const roundData = {
-            redArrows:
-              RedRecords && RedRecords[i] ? RedRecords[i].Arrows || [] : [],
-            blueArrows:
-              BlueRecords && BlueRecords[i] ? BlueRecords[i].Arrows || [] : [],
-          };
-          if (roundResults.value[5 + i]) {
-            roundResults.value[5 + i] = roundData;
-          } else {
-            roundResults.value.push(roundData);
-          }
-        }
-      }
-      const lastIndex = roundResults.value.length - 1;
-      if (roundResults.value[lastIndex]) {
-        const redArrows = roundResults.value[lastIndex].redArrows;
-        scores.value = [...redArrows].filter((item) => !!item.playerId);
-        const blueArrows = roundResults.value[lastIndex].blueArrows;
-        blueScores.value = [...blueArrows].filter((item) => !!item.playerId);
-      }
-    }
-    // 这个状态不准
-    // if (battleInfo.status !== 11) return;
-    if (battleInfo.firePlayerIndex) {
-      currentShooterId.value = battleInfo.firePlayerIndex;
-      tips.value =
-        redTeam.value[0].id === currentShooterId.value
-          ? "请红队射箭 - "
-          : "请蓝队射箭 - ";
-      tips.value += isFinalShoot.value
-        ? "决金箭"
-        : `第${roundsName[currentRound.value]}轮`;
-    }
-    if (battleInfo.fireTime > 0) {
-      const remain = Date.now() / 1000 - battleInfo.fireTime;
-      console.log(`当前箭已过${remain}秒`);
-      if (remain > 0 && remain < 15) {
-        // 等渲染好再通知
-        setTimeout(() => {
-          uni.$emit("update-ramain", 15 - remain);
-        }, 300);
-      }
-    }
-  } else if (battleInfo.config.mode === 2) {
-    total.value = 90;
-    players.value = [...battleInfo.blueTeam, ...battleInfo.redTeam];
-    players.value.forEach((p) => {
-      playersScores.value[p.id] = [...p.arrows];
-      if (p.id === user.value.id) scores.value = [...p.arrows];
-    });
-    if (battleInfo.status === 2) {
-      startCount.value = true;
-      const remain = Date.now() / 1000 - battleInfo.startTime;
-      console.log(`当前局已进行${remain}秒`);
-      tips.value = battleInfo.halfGame
-        ? "下半场：请再射6箭"
-        : "上半场：请先射6箭";
-      setTimeout(() => {
-        uni.$emit("update-ramain", 90 - remain);
-      }, 300);
-    } else if (battleInfo.status === 9) {
-      startCount.value = false;
-      tips.value = "准备下半场";
-      setTimeout(() => {
-        uni.$emit("update-ramain", 0);
-      }, 300);
-    }
-  }
-}
 
 async function refreshRoomData() {
   if (!roomNumber.value) return;
@@ -275,29 +76,10 @@ async function refreshRoomData() {
 
 const startGame = async () => {
   const result = await startRoomAPI(room.value.number);
-  step.value = 2;
 };
 
 async function onReceiveMessage(messages = []) {
   messages.forEach((msg) => {
-    if (msg.constructor === MESSAGETYPES.WaitForAllReady) {
-      if (refreshRoomTimer.value) clearInterval(refreshRoomTimer.value);
-      // 这里会掉多次;
-      battleId.value = msg.id;
-      step.value = 2;
-      if (battleType.value === 1) {
-        redTeam.value = msg.groupUserStatus.redTeam;
-        blueTeam.value = msg.groupUserStatus.blueTeam;
-      } else if (battleType.value === 2) {
-        players.value = [
-          ...msg.groupUserStatus.redTeam,
-          ...msg.groupUserStatus.blueTeam,
-        ];
-        players.value.forEach((p) => {
-          playersScores.value[p.id] = [];
-        });
-      }
-    }
     if (msg.roomNumber === roomNumber.value) {
       if (msg.constructor === MESSAGETYPES.UserEnterRoom) {
         if (battleType.value === 1) {
@@ -331,7 +113,7 @@ async function onReceiveMessage(messages = []) {
           }
         }
       }
-      if (!start.value && msg.constructor === MESSAGETYPES.UserExitRoom) {
+      if (msg.constructor === MESSAGETYPES.UserExitRoom) {
         if (battleType.value === 1) {
           if (msg.userId === room.value.creator) {
             owner.value = {
@@ -347,7 +129,7 @@ async function onReceiveMessage(messages = []) {
           players.value = players.value.filter((p) => p.id !== msg.userId);
         }
       }
-      if (msg.constructor === MESSAGETYPES.RoomDestroy && !battleId.value) {
+      if (msg.constructor === MESSAGETYPES.RoomDestroy) {
         uni.showToast({
           title: "房间已解散",
           icon: "none",
@@ -358,138 +140,25 @@ async function onReceiveMessage(messages = []) {
         }, 1000);
       }
     }
-    if (msg.id === battleId.value) {
+    if (msg.constructor === MESSAGETYPES.WaitForAllReady) {
-      if (msg.constructor === MESSAGETYPES.AllReady) {
+      if (msg.groupUserStatus) {
-        start.value = true;
+        uni.setStorageSync("red-team", msg.groupUserStatus.redTeam);
-        totalRounds.value = msg.groupUserStatus.config.maxRounds;
+        uni.setStorageSync("blue-team", msg.groupUserStatus.blueTeam);
-        step.value = 3;
+        uni.setStorageSync("melee-players", [
-        roundResults.value.push({
-          redArrows: [],
-          blueArrows: [],
-        });
-        total.value = 15;
-      }
-      if (msg.constructor === MESSAGETYPES.MeleeAllReady) {
-        start.value = true;
-        startCount.value = true;
-        step.value = 3;
-        seq.value += 1;
-        tips.value = scores.value.length
-          ? "下半场：请再射6箭"
-          : "上半场：请先射6箭";
-        total.value = 90;
-        halfTimeTip.value = false;
-      }
-      if (msg.constructor === MESSAGETYPES.ToSomeoneShoot) {
-        if (battleType.value === 1) {
-          if (currentShooterId.value !== msg.userId) {
-            seq.value += 1;
-            currentShooterId.value = msg.userId;
-            tips.value =
-              redTeam.value[0].id === currentShooterId.value
-                ? "请红队射箭 - "
-                : "请蓝队射箭 - ";
-            tips.value += isFinalShoot.value
-              ? "决金箭"
-              : `第${roundsName[currentRound.value]}轮`;
-          }
-        }
-      }
-      if (msg.constructor === MESSAGETYPES.ShootResult) {
-        if (battleType.value === 1) {
-          // 会有在蓝队射箭时间，红队射箭也有结果返回的情况
-          if (currentShooterId.value !== msg.userId) return;
-          const isRed = redTeam.value.find((item) => item.id === msg.userId);
-          if (isRed) scores.value.push({ ...msg.target });
-          else blueScores.value.push({ ...msg.target });
-          if (!roundResults.value[currentRound.value - 1]) {
-            roundResults.value.push({
-              redArrows: [],
-              blueArrows: [],
-            });
-          }
-          roundResults.value[currentRound.value - 1][
-            isRed ? "redArrows" : "blueArrows"
-          ].push({ ...msg.target });
-        }
-        if (battleType.value === 2 && msg.userId === user.value.id) {
-          scores.value.push({ ...msg.target });
-          power.value = msg.target.battery;
-        }
-        if (playersScores.value[msg.userId])
-          playersScores.value[msg.userId].push({ ...msg.target });
-      }
-      if (msg.constructor === MESSAGETYPES.CurrentRoundEnded) {
-        if (battleType.value === 1) {
-          const result = msg.preRoundResult;
-          scores.value = [];
-          blueScores.value = [];
-          currentShooterId.value = 0;
-          currentBluePoint.value = result.blueScore;
-          currentRedPoint.value = result.redScore;
-          bluePoints.value += result.blueScore;
-          redPoints.value += result.redScore;
-          uni.$emit("update-ramain", 0);
-          if (result.currentRound < 5) {
-            currentRound.value += 1;
-            roundResults.value.push({
-              redArrows: [],
-              blueArrows: [],
-            });
-            showRoundTip.value = true;
-          }
-        }
-      }
-      if (msg.constructor === MESSAGETYPES.FinalShoot) {
-        currentShooterId.value = 0;
-        currentRound.value += 1;
-        roundResults.value.push({
-          redArrows: [],
-          blueArrows: [],
-        });
-        if (!isFinalShoot.value) {
-          isFinalShoot.value = true;
-          showRoundTip.value = true;
-          tips.value = "准备开始决金箭";
-        }
-      }
-      if (msg.constructor === MESSAGETYPES.HalfTimeOver) {
-        uni.$emit("update-ramain", 0);
-        [
           ...msg.groupUserStatus.redTeam,
           ...msg.groupUserStatus.blueTeam,
-        ].forEach((player) => {
+        ]);
-          playersScores.value[player.id] = [...player.arrows];
+        uni.removeStorageSync("current-battle");
-          if (player.id === user.value.id) scores.value = [...player.arrows];
+        if (msg.groupUserStatus.config.mode == 1) {
-        });
+          uni.redirectTo({
-        startCount.value = false;
+            url: `/pages/team-match?battleId=${msg.id}&gameMode=1`,
-        halfTimeTip.value = true;
+          });
-        tips.value = "准备下半场";
+        } else if (msg.groupUserStatus.config.mode == 2) {
-      }
+          uni.redirectTo({
-      if (msg.constructor === MESSAGETYPES.MatchOver) {
+            url: `/pages/melee-match?battleId=${msg.id}&gameMode=1`,
-        if (msg.endStatus.noSaved) {
+          });
-          // 正常每回合结束通知，回合会加上1
-          currentRound.value += 1;
-          currentBluePoint.value = 0;
-          currentRedPoint.value = 0;
-          showRoundTip.value = true;
-          setTimeout(() => {
-            uni.navigateBack();
-          }, 3000);
-        } else {
-          isEnded.value = true;
-          uni.setStorageSync("last-battle", msg.endStatus);
-          setTimeout(() => {
-            uni.redirectTo({
-              url: "/pages/battle-result",
-            });
-          }, 1500);
         }
       }
-      if (msg.constructor === MESSAGETYPES.BackToGame) {
-        uni.$emit("update-header-loading", false);
-        if (msg.battleInfo) recoverData(msg.battleInfo);
-      }
     }
   });
 }
@@ -512,23 +181,11 @@ const setClipboardData = () => {
 };
 
 const onBack = () => {
-  if (battleId.value) {
+  showModal.value = true;
-    uni.$showHint(2);
-  } else {
-    showModal.value = true;
-  }
 };
 
 onLoad(async (options) => {
-  if (options.battleId) {
+  if (options.roomNumber) {
-    const battleInfo = uni.getStorageSync("current-battle");
-    if (battleInfo) {
-      await nextTick(() => {
-        recoverData(battleInfo);
-      });
-      setTimeout(getCurrentGameAPI, 2000);
-    }
-  } else if (options.roomNumber) {
     roomNumber.value = options.roomNumber;
     refreshRoomData();
     refreshRoomTimer.value = setInterval(refreshRoomData, 2000);
@@ -544,43 +201,24 @@ onMounted(() => {
 
 onUnmounted(() => {
   if (refreshRoomTimer.value) clearInterval(refreshRoomTimer.value);
-  if (refreshTimer.value) clearInterval(refreshTimer.value);
   uni.setKeepScreenOn({
     keepScreenOn: false,
   });
   uni.$off("socket-inbox", onReceiveMessage);
-  if (roomNumber.value && owner.value.id !== user.value.id && !battleId.value) {
+  if (roomNumber.value && owner.value.id !== user.value.id) {
     exitRoomAPI(roomNumber.value);
   }
 });
 
 onShow(async () => {
-  if (battleId.value) {
+  refreshRoomData();
-    if (!isEnded.value && (await isGameEnded(battleId.value))) return;
-    getCurrentGameAPI();
-    const refreshData = () => {
-      const lastAwakeTime = uni.getStorageSync("last-awake-time");
-      if (lastAwakeTime) getCurrentGameAPI();
-      else clearInterval(refreshTimer.value);
-    };
-    refreshTimer.value = setInterval(refreshData, 2000);
-  } else {
-    refreshRoomData();
-  }
-});
-onHide(() => {
-  if (refreshTimer.value) clearInterval(refreshTimer.value);
-  uni.setStorageSync("last-awake-time", Date.now());
 });
+onHide(() => {});
 </script>
 
 <template>
-  <Container
+  <Container :title="`好友约战 - ${roomNumber}`" :onBack="onBack">
-    :title="`好友约战 ${battleId ? '' : '- ' + roomNumber}`"
+    <view class="standby-phase">
-    :onBack="onBack"
-    :bgType="battleId ? 1 : 0"
-  >
-    <view class="standby-phase" v-if="step === 1">
       <Guide>
         <view class="battle-guide">
           <view :style="{ display: 'flex', flexDirection: 'column' }">
@@ -640,104 +278,15 @@ onHide(() => {
         <text class="tips">创建者点击下一步，所有人即可进入游戏。</text>
       </view>
     </view>
-    <view v-if="step === 2" :style="{ width: '100%' }">
-      <BattleHeader
-        :blueTeam="blueTeam"
-        :redTeam="redTeam"
-        :players="players"
-      />
-      <TestDistance :guide="false" />
-      <Timer />
-    </view>
-    <view v-if="step === 3" :style="{ width: '100%' }">
-      <ShootProgress
-        :tips="tips"
-        :seq="seq"
-        :start="players.length > 0 && start && startCount"
-        :total="total"
-        :currentRound="currentRound"
-        :battleId="battleId"
-        :melee="players.length > 0"
-      />
-      <PlayersRow
-        v-if="blueTeam.length && redTeam.length"
-        :blueTeam="blueTeam"
-        :redTeam="redTeam"
-        :currentShooterId="currentShooterId"
-      />
-      <view v-if="battleType === 2" class="user-row">
-        <Avatar :src="user.avatar" :size="35" />
-        <BowPower :power="power" />
-      </view>
-      <BowTarget
-        :mode="battleType === 1 ? 'team' : 'solo'"
-        :power="battleType === 1 ? power : 0"
-        :currentRound="scores.length"
-        :totalRound="battleType === 1 ? 3 : totalRounds"
-        :scores="scores"
-        :blueScores="blueScores"
-        :stop="!startCount"
-      />
-      <BattleFooter
-        v-if="roundResults.length"
-        :roundResults="roundResults"
-        :redPoints="redPoints"
-        :bluePoints="bluePoints"
-      />
-      <PlayerScore
-        v-if="playersSorted.length"
-        v-for="(player, index) in playersSorted"
-        :key="index"
-        :name="player.name"
-        :avatar="player.avatar"
-        :scores="playersScores[player.id] || []"
-      />
-    </view>
-    <ScreenHint
-      :show="showRoundTip"
-      :onClose="() => (showRoundTip = false)"
-      :mode="isFinalShoot ? 'tall' : 'normal'"
-    >
-      <RoundEndTip
-        v-if="showRoundTip"
-        :isFinal="isFinalShoot"
-        :round="currentRound - 1"
-        :bluePoint="currentBluePoint"
-        :redPoint="currentRedPoint"
-        :roundData="
-          roundResults[roundResults.length - 2]
-            ? roundResults[roundResults.length - 2]
-            : []
-        "
-        :onAutoClose="() => (showRoundTip = false)"
-      />
-    </ScreenHint>
-    <ScreenHint
-      :show="halfTimeTip"
-      mode="small"
-      :onClose="() => (halfTimeTip = false)"
-    >
-      <view class="half-time-tip">
-        <text>上半场结束，休息一下吧:）</text>
-        <text>20秒后开始下半场</text>
-      </view>
-    </ScreenHint>
     <SModal :show="showModal" :onClose="() => (showModal = false)">
       <view class="btns">
-        <block v-if="!battleId">
+        <SButton :onClick="exitRoom" width="200px" :rounded="20">
-          <SButton :onClick="exitRoom" width="200px" :rounded="20">
+          暂时离开
-            暂时离开
+        </SButton>
-          </SButton>
+        <block v-if="owner.id === user.id">
-          <block v-if="owner.id === user.id">
+          <view :style="{ height: '20px' }"></view>
-            <view :style="{ height: '20px' }"></view>
+          <SButton :onClick="destroyRoom" width="200px" :rounded="20">
-            <SButton :onClick="destroyRoom" width="200px" :rounded="20">
+            解散房间
-              解散房间
-            </SButton>
-          </block>
-        </block>
-        <block v-else>
-          <SButton :onClick="exitRoom" width="200px" :rounded="20">
-            退出比赛
           </SButton>
         </block>
       </view>

src/pages/match-page.vue

@@ -0,0 +1,98 @@
+<script setup>
+import { ref, onMounted, onUnmounted } from "vue";
+import { onLoad, onShow, onHide } from "@dcloudio/uni-app";
+import Container from "@/components/Container.vue";
+import Matching from "@/components/Matching.vue";
+import RoundEndTip from "@/components/RoundEndTip.vue";
+import TestDistance from "@/components/TestDistance.vue";
+import { matchGameAPI } from "@/apis";
+import { MESSAGETYPES } from "@/constants";
+
+const gameType = ref(0);
+const teamSize = ref(0);
+const onComplete = ref(null);
+
+async function stopMatch() {
+  uni.$showHint(3);
+}
+
+async function onReceiveMessage(messages = []) {
+  messages.forEach((msg) => {
+    if (msg.constructor === MESSAGETYPES.WaitForAllReady) {
+      if (!onComplete.value) {
+        onComplete.value = () => {
+          if (msg.groupUserStatus) {
+            uni.setStorageSync("red-team", msg.groupUserStatus.redTeam);
+            uni.setStorageSync("blue-team", msg.groupUserStatus.blueTeam);
+            uni.setStorageSync("melee-players", [
+              ...msg.groupUserStatus.redTeam,
+              ...msg.groupUserStatus.blueTeam,
+            ]);
+          }
+          uni.removeStorageSync("current-battle");
+          if (gameType.value == 1) {
+            uni.redirectTo({
+              url: `/pages/team-match?battleId=${msg.id}&gameMode=2`,
+            });
+          } else if (gameType.value == 2) {
+            uni.redirectTo({
+              url: `/pages/melee-match?battleId=${msg.id}&gameMode=2`,
+            });
+          }
+        };
+      }
+    }
+  });
+}
+
+onLoad(async (options) => {
+  if (options.gameType && options.teamSize) {
+    gameType.value = options.gameType;
+    teamSize.value = options.teamSize;
+  }
+});
+
+onMounted(() => {
+  uni.setKeepScreenOn({
+    keepScreenOn: true,
+  });
+  uni.$on("socket-inbox", onReceiveMessage);
+});
+
+onUnmounted(() => {
+  uni.setKeepScreenOn({
+    keepScreenOn: false,
+  });
+  uni.$off("socket-inbox", onReceiveMessage);
+  if (gameType.value && teamSize.value) {
+    matchGameAPI(false, gameType.value, teamSize.value);
+  }
+});
+
+onShow(async () => {
+  if (gameType.value && teamSize.value) {
+    matchGameAPI(true, gameType.value, teamSize.value);
+  }
+});
+
+onHide(() => {
+  if (gameType.value && teamSize.value) {
+    matchGameAPI(false, gameType.value, teamSize.value);
+  }
+});
+</script>
+
+<template>
+  <Container title="搜索对手..." :bgType="1" :onBack="stopMatch">
+    <view class="container">
+      <Matching :stopMatch="stopMatch" :onComplete="onComplete" />
+    </view>
+  </Container>
+</template>
+
+<style scoped>
+.container {
+  width: 100%;
+  height: 100%;
+}
+</style>

src/pages/melee-match.vue

@@ -4,24 +4,21 @@ import { onLoad, onShow, onHide } from "@dcloudio/uni-app";
 import Container from "@/components/Container.vue";
 import BowTarget from "@/components/BowTarget.vue";
 import ShootProgress from "@/components/ShootProgress.vue";
-import Guide from "@/components/Guide.vue";
 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 ScreenHint from "@/components/ScreenHint.vue";
-import Matching from "@/components/Matching.vue";
 import TestDistance from "@/components/TestDistance.vue";
-import { getCurrentGameAPI, matchGameAPI } from "@/apis";
+import { getCurrentGameAPI } from "@/apis";
 import { isGameEnded } from "@/util";
-import { MESSAGETYPES, getMessageTypeName } 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 title = ref("大乱斗");
-const teamSize = ref(0);
 const start = ref(false);
 const startCount = ref(true);
 const battleId = ref("");
@@ -29,12 +26,10 @@ const currentRound = ref(1);
 const power = ref(0);
 const scores = ref([]);
 const tips = ref("即将开始...");
-const seq = ref(0);
 const players = ref([]);
 const playersSorted = ref([]);
 const playersScores = ref({});
 const halfTimeTip = ref(false);
-const onComplete = ref(null);
 const isEnded = ref(false);
 
 watch(
@@ -92,44 +87,31 @@ function recoverData(battleInfo) {
 }
 
 onLoad(async (options) => {
+  if (options.gameMode == 1) title.value = "好友约战 - 大乱斗";
+  if (options.gameMode == 2) title.value = "排位赛 - 大乱斗";
   if (options.battleId) {
+    battleId.value = options.battleId;
+    const players = uni.getStorageSync("melee-players");
+    if (players) {
+      players.value = players;
+      players.value.forEach((p) => {
+        playersScores.value[p.id] = [];
+      });
+    }
     const battleInfo = uni.getStorageSync("current-battle");
-    if (battleInfo) recoverData(battleInfo);
+    if (battleInfo) {
-    setTimeout(getCurrentGameAPI, 2000);
+      recoverData(battleInfo);
-  } else {
+      setTimeout(getCurrentGameAPI, 2000);
-    gameType.value = options.gameType;
-    teamSize.value = options.teamSize;
-    if (gameType.value && teamSize.value) {
-      await matchGameAPI(true, gameType.value, teamSize.value);
     }
   }
 });
 
-async function stopMatch() {
-  uni.$showHint(3);
-}
-
 async function onReceiveMessage(messages = []) {
   messages.forEach((msg) => {
-    if (msg.constructor === MESSAGETYPES.WaitForAllReady) {
-      onComplete.value = () => {
-        // 这里会掉多次;
-        battleId.value = msg.id;
-        players.value = [
-          ...msg.groupUserStatus.redTeam,
-          ...msg.groupUserStatus.blueTeam,
-        ];
-        players.value.forEach((p) => {
-          playersScores.value[p.id] = [];
-        });
-        uni.$hideHint();
-      };
-    }
     if (msg.id !== battleId.value) return;
     if (msg.constructor === MESSAGETYPES.MeleeAllReady) {
       start.value = true;
       startCount.value = true;
-      seq.value += 1;
       tips.value = scores.value.length
         ? "下半场：请再射6箭"
         : "上半场：请先射6箭";
@@ -171,11 +153,7 @@ async function onReceiveMessage(messages = []) {
   });
 }
 const onBack = () => {
-  if (battleId.value) {
+  uni.$showHint(2);
-    uni.$showHint(2);
-  } else {
-    uni.$showHint(3);
-  }
 };
 onMounted(() => {
   uni.setKeepScreenOn({
@@ -188,9 +166,6 @@ onUnmounted(() => {
     keepScreenOn: false,
   });
   uni.$off("socket-inbox", onReceiveMessage);
-  if (gameType.value && teamSize.value && !battleId.value) {
-    matchGameAPI(false, gameType.value, teamSize.value);
-  }
 });
 const refreshTimer = ref(null);
 onShow(async () => {
@@ -215,64 +190,50 @@ onHide(() => {
 </script>
 
 <template>
-  <Container
+  <Container :title="title" :bgType="1" :onBack="onBack">
-    :title="battleId ? '大乱斗排位赛' : '搜索对手...'"
-    :bgType="1"
-    :onBack="onBack"
-  >
     <view class="container">
-      <block v-if="battleId">
+      <BattleHeader v-if="!start" :players="players" />
-        <BattleHeader v-if="!start" :players="players" />
+      <TestDistance v-if="!start" :guide="false" />
-        <TestDistance v-if="!start" :guide="false" />
+      <ShootProgress
-        <ShootProgress
+        :show="start"
-          :show="start"
+        :start="start && startCount"
-          :seq="seq"
+        :tips="tips"
-          :start="start && startCount"
+        :total="90"
-          :tips="tips"
+        :melee="true"
-          :total="90"
+        :battleId="battleId"
-          :melee="true"
+      />
-          :battleId="battleId"
+      <view v-if="start" class="user-row">
-        />
+        <Avatar :src="user.avatar" :size="35" />
-        <view v-if="start" class="user-row">
+        <BowPower :power="power" />
-          <Avatar :src="user.avatar" :size="35" />
+      </view>
-          <BowPower :power="power" />
+      <BowTarget
-        </view>
+        v-if="start"
-        <BowTarget
+        :currentRound="scores.length"
+        :totalRound="12"
+        :scores="scores"
+        :stop="!startCount"
+      />
+      <view :style="{ paddingBottom: '20px' }">
+        <PlayerScore
           v-if="start"
-          :currentRound="scores.length"
+          v-for="(player, index) in playersSorted"
-          :totalRound="12"
+          :key="index"
-          :scores="scores"
+          :name="player.name"
-          :stop="!startCount"
+          :avatar="player.avatar"
+          :scores="playersScores[player.id] || []"
         />
-        <view :style="{ paddingBottom: '20px' }">
+      </view>
-          <PlayerScore
+      <Timer v-if="!start" />
-            v-if="start"
+      <ScreenHint
-            v-for="(player, index) in playersSorted"
+        :show="halfTimeTip"
-            :key="index"
+        mode="small"
-            :name="player.name"
+        :onClose="() => (halfTimeTip = false)"
-            :avatar="player.avatar"
+      >
-            :scores="playersScores[player.id] || []"
+        <view class="half-time-tip">
-          />
+          <text>上半场结束，休息一下吧:）</text>
+          <text>20秒后开始下半场</text>
         </view>
-        <Timer v-if="!start" />
+      </ScreenHint>
-        <ScreenHint
-          :show="halfTimeTip"
-          mode="small"
-          :onClose="() => (halfTimeTip = false)"
-        >
-          <view class="half-time-tip">
-            <text>上半场结束，休息一下吧:）</text>
-            <text>20秒后开始下半场</text>
-          </view>
-        </ScreenHint>
-      </block>
-      <block v-else>
-        <Matching
-          v-if="!battleId"
-          :stopMatch="stopMatch"
-          :onComplete="onComplete"
-        />
-      </block>
     </view>
   </Container>
 </template>

src/pages/ranking.vue

@@ -36,24 +36,7 @@ const handleSelect = (index) => {
   }
 };
 
-const toTeamMatchPage = async (gameType, teamSize) => {
+const toMatchPage = async (gameType, teamSize) => {
-  if (!device.value.deviceId) {
-    return uni.showToast({
-      title: "请先绑定设备",
-      icon: "none",
-    });
-  }
-  const isGaming = await isGamingAPI();
-  if (isGaming) {
-    uni.$showHint(1);
-    return;
-  }
-  uni.navigateTo({
-    url: `/pages/team-match?gameType=${gameType}&teamSize=${teamSize}`,
-  });
-};
-
-const toMeleeMatchPage = async (gameType, teamSize) => {
   if (!device.value.deviceId) {
     return uni.showToast({
       title: "请先绑定设备",
@@ -72,7 +55,7 @@ const toMeleeMatchPage = async (gameType, teamSize) => {
     return;
   }
   uni.navigateTo({
-    url: `/pages/melee-match?gameType=${gameType}&teamSize=${teamSize}`,
+    url: `/pages/match-page?gameType=${gameType}&teamSize=${teamSize}`,
   });
 };
 const toMyGrowthPage = () => {
@@ -205,17 +188,17 @@ onShow(async () => {
           <image
             src="../static/battle1v1.png"
             mode="widthFix"
-            @click.stop="() => toTeamMatchPage(1, 2)"
+            @click.stop="() => toMatchPage(1, 2)"
           />
           <image
             src="../static/battle5.png"
             mode="widthFix"
-            @click.stop="() => toMeleeMatchPage(2, 5)"
+            @click.stop="() => toMatchPage(2, 5)"
           />
           <image
             src="../static/battle10.png"
             mode="widthFix"
-            @click.stop="() => toMeleeMatchPage(2, 10)"
+            @click.stop="() => toMatchPage(2, 10)"
           />
         </view>
         <view class="data-progress">

src/pages/team-match.vue

@@ -3,7 +3,6 @@ import { ref, onMounted, onUnmounted, nextTick } from "vue";
 import { onLoad, onShow, onHide } from "@dcloudio/uni-app";
 import Container from "@/components/Container.vue";
 import BattleHeader from "@/components/BattleHeader.vue";
-import Guide from "@/components/Guide.vue";
 import BowTarget from "@/components/BowTarget.vue";
 import ShootProgress from "@/components/ShootProgress.vue";
 import PlayersRow from "@/components/PlayersRow.vue";
@@ -11,18 +10,16 @@ import Timer from "@/components/Timer.vue";
 import BattleFooter from "@/components/BattleFooter.vue";
 import ScreenHint from "@/components/ScreenHint.vue";
 import SButton from "@/components/SButton.vue";
-import Matching from "@/components/Matching.vue";
 import RoundEndTip from "@/components/RoundEndTip.vue";
 import TestDistance from "@/components/TestDistance.vue";
-import { getCurrentGameAPI, matchGameAPI } from "@/apis";
+import { getCurrentGameAPI } from "@/apis";
 import { isGameEnded } from "@/util";
 import { MESSAGETYPES, roundsName } from "@/constants";
 import useStore from "@/store";
 import { storeToRefs } from "pinia";
 const store = useStore();
 const { user } = storeToRefs(store);
-const gameType = ref(0);
+const title = ref("1V1");
-const teamSize = ref(0);
 const start = ref(false);
 const battleId = ref("");
 const currentRound = ref(1);
@@ -36,12 +33,10 @@ const redTeam = ref([]);
 const blueTeam = ref([]);
 const currentShooterId = ref(0);
 const tips = ref("即将开始...");
-const seq = ref(0);
 const roundResults = ref([]);
 const redPoints = ref(0);
 const bluePoints = ref(0);
 const showRoundTip = ref(false);
-const onComplete = ref(null);
 const isFinalShoot = ref(false);
 const isEnded = ref(false);
 
@@ -127,47 +122,33 @@ function recoverData(battleInfo) {
       const blueArrows = roundResults.value[lastIndex].blueArrows;
       blueScores.value = [...blueArrows].filter((item) => !!item.playerId);
     }
-  }
+    // if (battleInfo.status !== 11) return;
-  // if (battleInfo.status !== 11) return;
+    if (battleInfo.firePlayerIndex) {
-  if (battleInfo.firePlayerIndex) {
+      currentShooterId.value = battleInfo.firePlayerIndex;
-    currentShooterId.value = battleInfo.firePlayerIndex;
+      const teamPrefix =
-    const teamPrefix =
+        redTeam.value[0].id === currentShooterId.value
-      redTeam.value[0].id === currentShooterId.value
+          ? "请红队射箭 - "
-        ? "请红队射箭 - "
+          : "请蓝队射箭 - ";
-        : "请蓝队射箭 - ";
+      const roundSuffix = isFinalShoot.value
-    const roundSuffix = isFinalShoot.value
+        ? "决金箭"
-      ? "决金箭"
+        : `第${roundsName[currentRound.value]}轮`;
-      : `第${roundsName[currentRound.value]}轮`;
+      tips.value = teamPrefix + roundSuffix;
-    tips.value = teamPrefix + roundSuffix;
+    }
-  }
+    if (battleInfo.fireTime > 0) {
-  if (battleInfo.fireTime > 0) {
+      const remain = Date.now() / 1000 - battleInfo.fireTime;
-    const remain = Date.now() / 1000 - battleInfo.fireTime;
+      console.log(`当前箭已过${remain}秒`);
-    console.log(`当前箭已过${remain}秒`);
+      if (remain > 0 && remain <= 15) {
-    if (remain > 0 && remain <= 15) {
+        // 等渲染好再通知
-      // 等渲染好再通知
+        setTimeout(() => {
-      setTimeout(() => {
+          uni.$emit("update-ramain", 15 - remain);
-        uni.$emit("update-ramain", 15 - remain);
+        }, 300);
-      }, 300);
+      }
     }
   }
 }
-async function stopMatch() {
-  uni.$showHint(3);
-}
 
 async function onReceiveMessage(messages = []) {
   messages.forEach((msg) => {
-    if (msg.constructor === MESSAGETYPES.WaitForAllReady) {
-      // 这里会掉多次;
-      if (!onComplete.value) {
-        onComplete.value = () => {
-          battleId.value = msg.id;
-          redTeam.value = msg.groupUserStatus.redTeam;
-          blueTeam.value = msg.groupUserStatus.blueTeam;
-          uni.$hideHint();
-        };
-      }
-    }
     if (msg.id !== battleId.value) return;
     if (msg.constructor === MESSAGETYPES.AllReady) {
       start.value = true;
@@ -181,7 +162,6 @@ async function onReceiveMessage(messages = []) {
     }
     if (msg.constructor === MESSAGETYPES.ToSomeoneShoot) {
       if (currentShooterId.value !== msg.userId) {
-        seq.value += 1;
         currentShooterId.value = msg.userId;
         const teamPrefix =
           redTeam.value[0].id === currentShooterId.value
@@ -265,15 +245,16 @@ async function onReceiveMessage(messages = []) {
   });
 }
 const onBack = () => {
-  if (battleId.value) {
+  uni.$showHint(2);
-    uni.$showHint(2);
-  } else {
-    uni.$showHint(3);
-  }
 };
 
 onLoad(async (options) => {
+  if (options.gameMode == 1) title.value = "好友约战 - 1V1";
+  if (options.gameMode == 2) title.value = "排位赛 - 1V1";
   if (options.battleId) {
+    battleId.value = options.battleId;
+    redTeam.value = uni.getStorageSync("red-team");
+    blueTeam.value = uni.getStorageSync("blue-team");
     const battleInfo = uni.getStorageSync("current-battle");
     if (battleInfo) {
       await nextTick(() => {
@@ -281,12 +262,6 @@ onLoad(async (options) => {
       });
       setTimeout(getCurrentGameAPI, 2000);
     }
-  } else {
-    gameType.value = options.gameType;
-    teamSize.value = options.teamSize;
-    if (gameType.value && teamSize.value) {
-      await matchGameAPI(true, gameType.value, teamSize.value);
-    }
   }
 });
 onMounted(() => {
@@ -300,9 +275,6 @@ onUnmounted(() => {
     keepScreenOn: false,
   });
   uni.$off("socket-inbox", onReceiveMessage);
-  if (gameType.value && teamSize.value && !battleId.value) {
-    matchGameAPI(false, gameType.value, teamSize.value);
-  }
 });
 const refreshTimer = ref(null);
 onShow(async () => {
@@ -327,72 +299,58 @@ onHide(() => {
 </script>
 
 <template>
-  <Container
+  <Container :title="title" :bgType="1" :onBack="onBack">
-    :title="battleId ? '1V1排位赛' : '搜索对手...'"
-    :bgType="1"
-    :onBack="onBack"
-  >
     <view class="container">
-      <block v-if="battleId">
+      <BattleHeader v-if="!start" :redTeam="redTeam" :blueTeam="blueTeam" />
-        <BattleHeader v-if="!start" :redTeam="redTeam" :blueTeam="blueTeam" />
+      <TestDistance v-if="!start" :guide="false" />
-        <TestDistance v-if="!start" :guide="false" />
+      <ShootProgress
-        <ShootProgress
+        :show="start"
-          :show="start"
+        :tips="tips"
-          :tips="tips"
+        :total="15"
-          :seq="seq"
+        :currentRound="currentRound"
-          :total="15"
+        :battleId="battleId"
-          :currentRound="currentRound"
+      />
-          :battleId="battleId"
+      <PlayersRow
+        v-if="start"
+        :currentShooterId="currentShooterId"
+        :blueTeam="blueTeam"
+        :redTeam="redTeam"
+      />
+      <BowTarget
+        v-if="start"
+        mode="team"
+        :power="start ? power : 0"
+        :currentRound="scores.length"
+        :totalRound="3"
+        :scores="scores"
+        :blueScores="blueScores"
+      />
+      <BattleFooter
+        v-if="start"
+        :roundResults="roundResults"
+        :redPoints="redPoints"
+        :bluePoints="bluePoints"
+      />
+      <Timer v-if="!start" />
+      <ScreenHint
+        :show="showRoundTip"
+        :onClose="() => (showRoundTip = false)"
+        :mode="isFinalShoot ? 'tall' : 'normal'"
+      >
+        <RoundEndTip
+          v-if="showRoundTip"
+          :isFinal="isFinalShoot"
+          :round="currentRound - 1"
+          :bluePoint="currentBluePoint"
+          :redPoint="currentRedPoint"
+          :roundData="
+            roundResults[roundResults.length - 2]
+              ? roundResults[roundResults.length - 2]
+              : []
+          "
+          :onAutoClose="() => (showRoundTip = false)"
         />
-        <PlayersRow
+      </ScreenHint>
-          v-if="start"
-          :currentShooterId="currentShooterId"
-          :blueTeam="blueTeam"
-          :redTeam="redTeam"
-        />
-        <BowTarget
-          v-if="start"
-          mode="team"
-          :power="start ? power : 0"
-          :currentRound="scores.length"
-          :totalRound="3"
-          :scores="scores"
-          :blueScores="blueScores"
-        />
-        <BattleFooter
-          v-if="start"
-          :roundResults="roundResults"
-          :redPoints="redPoints"
-          :bluePoints="bluePoints"
-        />
-        <Timer v-if="!start" />
-        <ScreenHint
-          :show="showRoundTip"
-          :onClose="() => (showRoundTip = false)"
-          :mode="isFinalShoot ? 'tall' : 'normal'"
-        >
-          <RoundEndTip
-            v-if="showRoundTip"
-            :isFinal="isFinalShoot"
-            :round="currentRound - 1"
-            :bluePoint="currentBluePoint"
-            :redPoint="currentRedPoint"
-            :roundData="
-              roundResults[roundResults.length - 2]
-                ? roundResults[roundResults.length - 2]
-                : []
-            "
-            :onAutoClose="() => (showRoundTip = false)"
-          />
-        </ScreenHint>
-      </block>
-      <block v-else>
-        <Matching
-          v-if="!battleId"
-          :stopMatch="stopMatch"
-          :onComplete="onComplete"
-        />
-      </block>
     </view>
   </Container>
 </template>

src/websocket.js

@@ -38,34 +38,17 @@ function createWebSocket(token, onMessage) {
       ) {
         return;
       }
-      // const lastRoute = uni.getStorageSync("last-route");
-      // if (
-      //   lastRoute === "pages/battle-room" ||
-      //   lastRoute === "pages/team-match" ||
-      //   lastRoute === "pages/melee-match"
-      // ) {
-      //   return;
-      // }
       const { battleInfo } = msg;
       uni.setStorageSync("current-battle", battleInfo);
       console.log("----battleInfo", battleInfo);
-      // 约战
+      if (battleInfo.config.mode === 1) {
-      if (battleInfo.config.battleMode === 1) {
         uni.navigateTo({
-          url: `/pages/battle-room?battleId=${battleInfo.id}`,
+          url: `/pages/team-match?battleId=${battleInfo.id}&gameMode=${battleInfo.config.battleMode}`,
+        });
+      } else if (battleInfo.config.mode === 2) {
+        uni.navigateTo({
+          url: `/pages/melee-match?battleId=${battleInfo.id}&gameMode=${battleInfo.config.battleMode}`,
         });
-      }
-      // 排位
-      if (battleInfo.config.battleMode === 2) {
-        if (battleInfo.config.mode === 1) {
-          uni.navigateTo({
-            url: `/pages/team-match?battleId=${battleInfo.id}`,
-          });
-        } else if (battleInfo.config.mode === 2) {
-          uni.navigateTo({
-            url: `/pages/melee-match?battleId=${battleInfo.id}`,
-          });
-        }
       }
     } else if (msg.constructor === MESSAGETYPES.MatchOver) {
       uni.$emit("game-over");