update:新增房间重连逻辑，优化tententen语音，修复mvp斩获环
This commit is contained in:
+130
-46
@@ -8,18 +8,23 @@ import audioManager from "@/audioManager";
|
||||
import { matchGameAPI, getBattleAPI } from "@/apis";
|
||||
import { MESSAGETYPESV2 } from "@/constants";
|
||||
import { isLimitError } from "@/util";
|
||||
import { returnToBattle } from "@/utils/matchReturn";
|
||||
|
||||
const gameType = ref(0);
|
||||
const teamSize = ref(0);
|
||||
const onComplete = ref(null);
|
||||
const showLimitModal = ref(false);
|
||||
const MATCH_READY_SNAPSHOT_PREFIX = "match-ready-snapshot:";
|
||||
const navigationPending = ref(false);
|
||||
let pageMounted = false;
|
||||
let pageVisible = false;
|
||||
let foregroundGeneration = 0;
|
||||
|
||||
/** 匹配超时计时器，用于检测 WS 消息丢失或真正超时 */
|
||||
const matchTimeoutTimer = ref(null);
|
||||
|
||||
/** 匹配超时阈值（ms），后端设置 15s 匹配，前端预留 5s 冗余 */
|
||||
const MATCH_TIMEOUT_MS = 20 * 1000;
|
||||
const MATCH_INFO_RETRY_DELAY_MS = 500;
|
||||
|
||||
/** 清除超时计时器 */
|
||||
const clearMatchTimeout = () => {
|
||||
@@ -29,16 +34,97 @@ const clearMatchTimeout = () => {
|
||||
}
|
||||
};
|
||||
|
||||
const cacheReadyBattle = (battle) => {
|
||||
const matchId = String(battle?.matchId || "");
|
||||
if (!matchId) return;
|
||||
|
||||
uni.setStorageSync(`${MATCH_READY_SNAPSHOT_PREFIX}${matchId}`, {
|
||||
...battle,
|
||||
status: battle.status == null ? 0 : Number(battle.status),
|
||||
savedAt: Date.now(),
|
||||
const wait = (delay) =>
|
||||
new Promise((resolve) => {
|
||||
setTimeout(resolve, delay);
|
||||
});
|
||||
};
|
||||
|
||||
const isCurrentForeground = (generation) =>
|
||||
pageMounted &&
|
||||
pageVisible &&
|
||||
generation === foregroundGeneration &&
|
||||
!navigationPending.value;
|
||||
|
||||
const redirectOnce = (url) =>
|
||||
new Promise((resolve, reject) => {
|
||||
if (navigationPending.value) {
|
||||
resolve(false);
|
||||
return;
|
||||
}
|
||||
|
||||
navigationPending.value = true;
|
||||
clearMatchTimeout();
|
||||
uni.redirectTo({
|
||||
url,
|
||||
success: resolve,
|
||||
fail: (error) => {
|
||||
navigationPending.value = false;
|
||||
reject(error);
|
||||
},
|
||||
});
|
||||
});
|
||||
|
||||
async function queryCurrentBattle(generation) {
|
||||
try {
|
||||
return await getBattleAPI();
|
||||
} catch (error) {
|
||||
await wait(MATCH_INFO_RETRY_DELAY_MS);
|
||||
if (!isCurrentForeground(generation)) throw error;
|
||||
return getBattleAPI();
|
||||
}
|
||||
}
|
||||
|
||||
async function returnToCurrentBattle(battle) {
|
||||
if (!battle?.matchId || navigationPending.value) return false;
|
||||
return returnToBattle(battle, redirectOnce);
|
||||
}
|
||||
|
||||
async function reconcileMatchingPage(generation) {
|
||||
clearMatchTimeout();
|
||||
|
||||
let battle = null;
|
||||
try {
|
||||
battle = await queryCurrentBattle(generation);
|
||||
} catch (error) {
|
||||
if (!isCurrentForeground(generation)) return;
|
||||
console.log("resume match info error", error);
|
||||
uni.showToast({
|
||||
title: "比赛状态查询失败，请重试",
|
||||
icon: "none",
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
if (!isCurrentForeground(generation)) return;
|
||||
if (battle?.matchId) {
|
||||
try {
|
||||
await returnToCurrentBattle(battle);
|
||||
} catch (error) {
|
||||
console.log("return to current match error", error);
|
||||
uni.showToast({
|
||||
title: "进入比赛失败，请重试",
|
||||
icon: "none",
|
||||
});
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
if (!gameType.value || !teamSize.value) return;
|
||||
|
||||
try {
|
||||
await matchGameAPI(true, gameType.value, teamSize.value);
|
||||
if (!isCurrentForeground(generation)) return;
|
||||
matchTimeoutTimer.value = setTimeout(handleMatchTimeout, MATCH_TIMEOUT_MS);
|
||||
} catch (error) {
|
||||
if (!isCurrentForeground(generation)) return;
|
||||
clearMatchTimeout();
|
||||
if (isLimitError(error)) {
|
||||
showLimitModal.value = true;
|
||||
return;
|
||||
}
|
||||
uni.navigateBack();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 超时处理：查询后端是否已分配对局
|
||||
@@ -46,16 +132,12 @@ const cacheReadyBattle = (battle) => {
|
||||
* - 无对局 → 真正超时，提示用户并返回大厅
|
||||
*/
|
||||
const handleMatchTimeout = async () => {
|
||||
if (!pageVisible || navigationPending.value) return;
|
||||
try {
|
||||
const battle = await getBattleAPI();
|
||||
if (battle && battle.matchId) {
|
||||
cacheReadyBattle(battle);
|
||||
uni.showToast({ title: "匹配成功，正在进入...", icon: "none" });
|
||||
if (battle.mode <= 3) {
|
||||
uni.redirectTo({ url: `/pages/team-battle/index?battleId=${battle.matchId}` });
|
||||
} else {
|
||||
uni.redirectTo({ url: `/pages/melee-battle?battleId=${battle.matchId}` });
|
||||
}
|
||||
await returnToCurrentBattle(battle);
|
||||
} else {
|
||||
uni.showToast({ title: "匹配超时，请重试", icon: "none" });
|
||||
try {
|
||||
@@ -93,6 +175,8 @@ const goVipPage = () => {
|
||||
* - 取消失败（后端已分配对局但 WS 未到达）→ 查询并跳入当前对局
|
||||
*/
|
||||
async function cancelMatch() {
|
||||
if (navigationPending.value) return;
|
||||
foregroundGeneration += 1;
|
||||
clearMatchTimeout();
|
||||
try {
|
||||
if (gameType.value && teamSize.value) {
|
||||
@@ -104,11 +188,7 @@ async function cancelMatch() {
|
||||
try {
|
||||
const battle = await getBattleAPI();
|
||||
if (battle && battle.matchId) {
|
||||
if (battle.mode <= 3) {
|
||||
uni.redirectTo({ url: `/pages/team-battle/index?battleId=${battle.matchId}` });
|
||||
} else {
|
||||
uni.redirectTo({ url: `/pages/melee-battle?battleId=${battle.matchId}` });
|
||||
}
|
||||
await returnToCurrentBattle(battle);
|
||||
} else {
|
||||
uni.navigateBack();
|
||||
}
|
||||
@@ -123,18 +203,21 @@ async function onReceiveMessage(msg) {
|
||||
onComplete.value = () => {}
|
||||
}
|
||||
if (msg.type === MESSAGETYPESV2.AboutToStart) {
|
||||
if (navigationPending.value) return;
|
||||
// 收到开始消息，清除超时计时器
|
||||
clearMatchTimeout();
|
||||
// 使用后端下发的 mode 字段判断跳转目标，与好友约战（battle-room.vue）保持一致
|
||||
// mode <= 3 为团队对抗，mode > 3 为大乱斗，覆盖全部 gameType（1~5），不再遗漏
|
||||
if (msg.mode <= 3) {
|
||||
uni.redirectTo({
|
||||
url: `/pages/team-battle/index?battleId=${msg.id}`,
|
||||
});
|
||||
} else {
|
||||
uni.redirectTo({
|
||||
url: `/pages/melee-battle?battleId=${msg.id}`,
|
||||
});
|
||||
const matchId = msg.matchId || msg.id;
|
||||
if (!matchId) return;
|
||||
const url =
|
||||
msg.mode <= 3
|
||||
? `/pages/team-battle/index?battleId=${matchId}`
|
||||
: `/pages/melee-battle?battleId=${matchId}`;
|
||||
try {
|
||||
await redirectOnce(url);
|
||||
} catch (error) {
|
||||
console.log("redirect to matched battle error", error);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -144,6 +227,10 @@ onLoad(async (options) => {
|
||||
gameType.value = options.gameType;
|
||||
teamSize.value = options.teamSize;
|
||||
}
|
||||
if (pageMounted && pageVisible) {
|
||||
const generation = ++foregroundGeneration;
|
||||
void reconcileMatchingPage(generation);
|
||||
}
|
||||
});
|
||||
|
||||
onMounted(() => {
|
||||
@@ -153,9 +240,14 @@ onMounted(() => {
|
||||
});
|
||||
uni.$on("socket-inbox", onReceiveMessage);
|
||||
uni.$on("cancelMatching", cancelMatch);
|
||||
pageMounted = true;
|
||||
if (pageVisible) void reconcileMatchingPage(foregroundGeneration);
|
||||
});
|
||||
|
||||
onBeforeUnmount(() => {
|
||||
pageMounted = false;
|
||||
pageVisible = false;
|
||||
foregroundGeneration += 1;
|
||||
clearMatchTimeout();
|
||||
uni.setKeepScreenOn({
|
||||
keepScreenOn: false,
|
||||
@@ -164,26 +256,18 @@ onBeforeUnmount(() => {
|
||||
uni.$off("cancelMatching", cancelMatch);
|
||||
});
|
||||
|
||||
onShow(async () => {
|
||||
if (gameType.value && teamSize.value) {
|
||||
try {
|
||||
await matchGameAPI(true, gameType.value, teamSize.value);
|
||||
// 启动超时计时器，防止 WS 消息丢失或长时间无对手导致用户卡死
|
||||
clearMatchTimeout();
|
||||
matchTimeoutTimer.value = setTimeout(handleMatchTimeout, MATCH_TIMEOUT_MS);
|
||||
} catch (error) {
|
||||
clearMatchTimeout();
|
||||
if (isLimitError(error)) {
|
||||
showLimitModal.value = true;
|
||||
return;
|
||||
}
|
||||
uni.navigateBack();
|
||||
}
|
||||
}
|
||||
onShow(() => {
|
||||
pageVisible = true;
|
||||
navigationPending.value = false;
|
||||
const generation = ++foregroundGeneration;
|
||||
clearMatchTimeout();
|
||||
if (pageMounted) void reconcileMatchingPage(generation);
|
||||
});
|
||||
|
||||
onHide(() => {
|
||||
|
||||
pageVisible = false;
|
||||
foregroundGeneration += 1;
|
||||
clearMatchTimeout();
|
||||
});
|
||||
</script>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user