添加匹配中效果

2025-06-25 21:54:18 +08:00
parent 664678cba0
commit 9090f06730
7 changed files with 353 additions and 147 deletions
--- a/src/pages/melee-match.vue
+++ b/src/pages/melee-match.vue
@@ -11,6 +11,7 @@ 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 { matchGameAPI, readyGameAPI } from "@/apis";
 import { MESSAGETYPES, getMessageTypeName } from "@/constants";
 import useStore from "@/store";
@@ -19,7 +20,6 @@ const store = useStore();
 const { user } = storeToRefs(store);
 const gameType = ref(0);
 const teamSize = ref(0);
-const matching = ref(false);
 const start = ref(false);
 const startCount = ref(false);
 const battleId = ref("");
@@ -33,18 +33,17 @@ const timerSeq = ref(0);
 const players = ref([]);
 const playersScores = ref({});
 const halfTimeTip = ref(false);
+const onComplete = ref(null);

-onLoad((options) => {
+onLoad(async (options) => {
  gameType.value = options.gameType;
  teamSize.value = options.teamSize;
+  if (gameType.value && teamSize.value) {
+    await matchGameAPI(true, gameType.value, teamSize.value);
+  }
 });
-async function startMatch() {
-  await matchGameAPI(true, gameType.value, teamSize.value);
-  matching.value = true;
-}
 async function stopMatch() {
-  await matchGameAPI(false, gameType.value, teamSize.value);
-  matching.value = false;
+  uni.navigateBack();
 }
 async function readyToGo() {
  if (battleId.value) {
@@ -65,16 +64,18 @@ async function onReceiveMessage(messages = []) {
      console.log("收到消息：", getMessageTypeName(msg.constructor), msg);
    }
    if (msg.constructor === MESSAGETYPES.WaitForAllReady) {
-      // 这里会掉多次;
-      timerSeq.value += 1;
-      battleId.value = msg.id;
-      players.value = [
-        ...msg.groupUserStatus.redTeam,
-        ...msg.groupUserStatus.blueTeam,
-      ];
-      players.value.forEach((p) => {
-        playersScores.value[p.id] = [];
-      });
+      onComplete.value = () => {
+        // 这里会掉多次;
+        timerSeq.value += 1;
+        battleId.value = msg.id;
+        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);
@@ -113,62 +114,73 @@ onMounted(() => {
 });
 onUnmounted(() => {
  uni.$off("socket-inbox", onReceiveMessage);
-  if (startMatch.value) {
-    matchGameAPI(false, gameType.value, teamSize.value);
+  if (gameType.value && teamSize.value) {
+    matchGameAPI(true, gameType.value, teamSize.value);
  }
 });
 </script>

 <template>
-  <Container title="大乱斗排位赛" :bgType="1">
+  <Container :title="battleId ? '大乱斗排位赛' : '搜索对手...'" :bgType="1">
    <view class="container">
-      <BattleHeader v-if="!start && players.length" :players="players" />
-      <Guide noBg v-if="!start && matching">
-        <view :style="{ display: 'flex', justifyContent: 'space-between' }">
-          <view :style="{ display: 'flex', flexDirection: 'column' }">
-            <text :style="{ color: '#fed847' }">请预先射几箭测试</text>
-            <text>请确保射击距离只有5米</text>
+      <block v-if="battleId">
+        <BattleHeader v-if="players.length" :players="players" />
+        <Guide noBg v-if="!start && battleId">
+          <view :style="{ display: 'flex', justifyContent: 'space-between' }">
+            <view :style="{ display: 'flex', flexDirection: 'column' }">
+              <text :style="{ color: '#fed847' }">请预先射几箭测试</text>
+              <text>请确保射击距离只有5米</text>
+            </view>
+            <BowPower :power="45" />
          </view>
-          <BowPower :power="45" />
+        </Guide>
+        <ShootProgress
+          v-if="start"
+          :seq="seq"
+          :start="startCount"
+          :tips="tips"
+        />
+        <view v-if="start" class="infos">
+          <Avatar :src="user.avatar" :size="35" />
+          <BowPower :power="power" />
        </view>
-      </Guide>
-      <ShootProgress v-if="start" :seq="seq" :start="startCount" :tips="tips" />
-      <view v-if="start" class="infos">
-        <Avatar :src="user.avatar" :size="35" />
-        <BowPower :power="power" />
-      </view>
-      <BowTarget
-        v-if="matching"
-        :showE="start"
-        :currentRound="scores.length"
-        :totalRound="start ? 12 : 0"
-        :scores="scores"
-      />
-      <PlayerScore
-        v-if="start"
-        v-for="(player, index) in players"
-        :key="index"
-        :name="player.name"
-        :avatar="player.avatar"
-        :scores="playersScores[player.id]"
-        :done="playersScores[player.id].length === 12"
-      />
-      <Timer :seq="timerSeq" :callBack="readyToGo" />
-      <ScreenHint
-        :show="halfTimeTip"
-        mode="small"
-        :onClose="() => (halfTimeTip = false)"
-      >
-        <view class="half-time-tip">
-          <text>上半场结束，休息一下吧:）</text>
-          <text>20秒后开始下半场</text>
-        </view>
-      </ScreenHint>
+        <BowTarget
+          v-if="battleId"
+          :showE="start"
+          :currentRound="scores.length"
+          :totalRound="start ? 12 : 0"
+          :scores="scores"
+        />
+        <PlayerScore
+          v-if="start"
+          v-for="(player, index) in players"
+          :key="index"
+          :name="player.name"
+          :avatar="player.avatar"
+          :scores="playersScores[player.id]"
+          :done="playersScores[player.id].length === 12"
+        />
+        <Timer :seq="timerSeq" :callBack="readyToGo" />
+        <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>
    <view :style="{ marginBottom: '20px' }">
-      <SButton v-if="!battleId" :onClick="matching ? stopMatch : startMatch">{{
-        matching ? "取消匹配" : "开始匹配"
-      }}</SButton>
      <SButton v-if="battleId && !start" :onClick="readyToGo">准备完毕</SButton>
    </view>
  </Container>
@@ -177,6 +189,7 @@ onUnmounted(() => {
 <style scoped>
 .container {
  width: 100%;
+  height: 100%;
 }
 .infos {
  display: flex;
--- a/src/pages/team-match.vue
+++ b/src/pages/team-match.vue
@@ -11,6 +11,7 @@ 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 { matchGameAPI, readyGameAPI } from "@/apis";
 import { MESSAGETYPES, roundsName, getMessageTypeName } from "@/constants";
 import useStore from "@/store";
@@ -19,7 +20,6 @@ const store = useStore();
 const { user } = storeToRefs(store);
 const gameType = ref(0);
 const teamSize = ref(0);
-const matching = ref(false);
 const start = ref(false);
 const battleId = ref("");
 const currentRound = ref(1);
@@ -34,32 +34,21 @@ const currentShooterId = ref(0);
 const tips = ref("即将开始...");
 const seq = ref(0);
 const timerSeq = ref(0);
-const roundResults = ref([
-  // {
-  //   blueArrows: [{ ring: 2 }, { ring: 2 }],
-  //   redArrows: [{ ring: 2 }, { ring: 3 }],
-  // },
-]);
+const roundResults = ref([]);
 const redPoints = ref(0);
 const bluePoints = ref(0);
 const showRoundTip = ref(false);
+const onComplete = ref(null);

-onLoad((options) => {
+onLoad(async (options) => {
  gameType.value = options.gameType;
  teamSize.value = options.teamSize;
-});
-async function startMatch() {
  if (gameType.value && teamSize.value) {
-    scores.value = [];
    await matchGameAPI(true, gameType.value, teamSize.value);
-    matching.value = true;
  }
-}
+});
 async function stopMatch() {
-  if (gameType.value && teamSize.value) {
-    await matchGameAPI(false, gameType.value, teamSize.value);
-    matching.value = false;
-  }
+  uni.navigateBack();
 }
 async function readyToGo() {
  if (battleId.value) {
@@ -84,10 +73,12 @@ async function onReceiveMessage(messages = []) {
    }
    if (msg.constructor === MESSAGETYPES.WaitForAllReady) {
      // 这里会掉多次;
-      timerSeq.value += 1;
-      battleId.value = msg.id;
-      redTeam.value = msg.groupUserStatus.redTeam;
-      blueTeam.value = msg.groupUserStatus.blueTeam;
+      onComplete.value = () => {
+        timerSeq.value += 1;
+        battleId.value = msg.id;
+        redTeam.value = msg.groupUserStatus.redTeam;
+        blueTeam.value = msg.groupUserStatus.blueTeam;
+      };
    }
    if (msg.id !== battleId.value) return;
    if (msg.constructor === MESSAGETYPES.AllReady) {
@@ -136,77 +127,85 @@ onMounted(() => {
 });
 onUnmounted(() => {
  uni.$off("socket-inbox", onReceiveMessage);
-  if (matching.value) {
-    matchGameAPI(false, gameType.value, teamSize.value);
+  if (gameType.value && teamSize.value) {
+    matchGameAPI(true, gameType.value, teamSize.value);
  }
 });
 </script>

 <template>
-  <Container title="1V1排位赛" :bgType="1">
+  <Container :title="battleId ? '1V1排位赛' : '搜索对手...'" :bgType="1">
    <view class="container">
-      <BattleHeader
-        v-if="!start && redTeam.length && blueTeam.length"
-        :redTeam="redTeam"
-        :blueTeam="blueTeam"
-      />
-      <Guide noBg v-if="!start && battleId">
-        <view :style="{ display: 'flex', justifyContent: 'space-between' }">
-          <view :style="{ display: 'flex', flexDirection: 'column' }">
-            <text :style="{ color: '#fed847' }">请预先射几箭测试</text>
-            <text>请确保射击距离只有5米</text>
+      <block v-if="battleId">
+        <BattleHeader
+          v-if="!start && redTeam.length && blueTeam.length"
+          :redTeam="redTeam"
+          :blueTeam="blueTeam"
+        />
+        <Guide noBg v-if="!start">
+          <view :style="{ display: 'flex', justifyContent: 'space-between' }">
+            <view :style="{ display: 'flex', flexDirection: 'column' }">
+              <text :style="{ color: '#fed847' }">请预先射几箭测试</text>
+              <text>请确保射击距离只有5米</text>
+            </view>
+            <BowPower :power="45" />
          </view>
-          <BowPower :power="45" />
-        </view>
-      </Guide>
-      <ShootProgress v-if="start" :tips="tips" :seq="seq" :total="15" />
-      <PlayersRow
-        v-if="start"
-        :currentShooterId="currentShooterId"
-        :blueTeam="blueTeam"
-        :redTeam="redTeam"
-      />
-      <BowTarget
-        v-if="battleId"
-        :showE="start && user.id === currentShooterId"
-        :power="start ? power : 0"
-        :currentRound="currentRound"
-        :totalRound="totalRounds"
-        :scores="scores"
-        :tips="
-          !start && scores.length > 0
-            ? `本次射程${scores[scores.length - 1].dst / 100}米，${
-                scores[scores.length - 1].dst / 100 >= 5 ? '已' : '未'
-              }达到距离要求`
-            : ''
-        "
-      />
-      <BattleFooter
-        v-if="start"
-        :roundResults="roundResults"
-        :redPoints="redPoints"
-        :bluePoints="bluePoints"
-      />
-      <Timer :seq="timerSeq" :callBack="readyToGo" />
-      <ScreenHint :show="showRoundTip" :onClose="() => (showRoundTip = false)">
-        <view class="round-end-tip">
-          <text>第{{ currentRound - 1 }}轮射击结束</text>
-          <view>
-            <text>蓝队</text>
-            <text>{{ currentBluePoint }}</text>
-            <text>分，红队</text>
-            <text>{{ currentRedPoint }}</text>
-            <text>分</text>
-          </view>
-          <!-- <text>同分僵局！最后一箭定江山</text>
+        </Guide>
+        <ShootProgress v-if="start" :tips="tips" :seq="seq" :total="15" />
+        <PlayersRow
+          v-if="start"
+          :currentShooterId="currentShooterId"
+          :blueTeam="blueTeam"
+          :redTeam="redTeam"
+        />
+        <BowTarget
+          :showE="start && user.id === currentShooterId"
+          :power="start ? power : 0"
+          :currentRound="currentRound"
+          :totalRound="totalRounds"
+          :scores="scores"
+          :tips="
+            !start && scores.length > 0
+              ? `本次射程${scores[scores.length - 1].dst / 100}米，${
+                  scores[scores.length - 1].dst / 100 >= 5 ? '已' : '未'
+                }达到距离要求`
+              : ''
+          "
+        />
+        <BattleFooter
+          v-if="start"
+          :roundResults="roundResults"
+          :redPoints="redPoints"
+          :bluePoints="bluePoints"
+        />
+        <Timer :seq="timerSeq" :callBack="readyToGo" />
+        <ScreenHint
+          :show="showRoundTip"
+          :onClose="() => (showRoundTip = false)"
+        >
+          <view class="round-end-tip">
+            <text>第{{ currentRound - 1 }}轮射击结束</text>
+            <view>
+              <text>蓝队</text>
+              <text>{{ currentBluePoint }}</text>
+              <text>分，红队</text>
+              <text>{{ currentRedPoint }}</text>
+              <text>分</text>
+            </view>
+            <!-- <text>同分僵局！最后一箭定江山</text>
          <text>10 秒后蓝红双方 决金箭 一箭决胜负</text> -->
-        </view>
-      </ScreenHint>
+          </view>
+        </ScreenHint>
+      </block>
+      <block v-else>
+        <Matching
+          v-if="!battleId"
+          :stopMatch="stopMatch"
+          :onComplete="onComplete"
+        />
+      </block>
    </view>
    <view :style="{ marginBottom: '20px' }">
-      <SButton v-if="!battleId" :onClick="matching ? stopMatch : startMatch">{{
-        matching ? "取消匹配" : "开始匹配"
-      }}</SButton>
      <SButton v-if="battleId && !start" :onClick="readyToGo">准备完毕</SButton>
    </view>
  </Container>
@@ -215,5 +214,6 @@ onUnmounted(() => {
 <style scoped>
 .container {
  width: 100%;
+  height: 100%;
 }
 </style>