laoma/shoot-miniprograms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复大乱斗返回游戏bug

Browse Source
This commit is contained in:
kron
2025-07-19 16:16:53 +08:00
parent b9aff0082b
commit 31e89144ec
3 changed files with 31 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/pages/battle-room.vue
View File

@@ -150,38 +150,27 @@ onLoad(async (options) => {
}
} else if (battleInfo.config.mode === 2) {
players.value = [...battleInfo.blueTeam, ...battleInfo.redTeam];
players.value.forEach((p) => {
playersScores.value[p.id] = [];
});
if (battleInfo.startTime < 0) return;
start.value = true;
step.value = 3;
players.value.forEach((p) => {
playersScores.value[p.id] = p.arrows;
playersScores.value[p.id] = [...p.arrows];
if (p.id === user.value.id) {
scores.value = p.arrows;
scores.value = [...p.arrows];
}
});
tips.value = `${
scores.value.length ? "下半场-" : "上半场-"
}请连续射6箭`;
const remain = Date.now() / 1000 - battleInfo.startTime;
console.log(`当前局剩余${remain}秒`);
if (remain <= 90) {
console.log(`当前局已进行${remain}秒`);
if (battleInfo.status === 2) {
tips.value = `${
battleInfo.halfGame ? "下半场-" : "上半场-"
}请连续射6箭`;
setTimeout(() => {
uni.$emit("update-ramain", remain);
uni.$emit("update-ramain", 90 - remain);
}, 300);
} else if (remain > 90 && remain <= 110) {
halfTimeTip.value = true;
total.value = 20;
} else if (battleInfo.status === 9) {
startCount.value = false;
tips.value = "准备下半场";
setTimeout(() => {
uni.$emit("update-ramain", 110 - remain);
}, 300);
} else if (remain > 110) {
setTimeout(() => {
uni.$emit("update-ramain", remain - 110);
}, 300);
}
}
}
@@ -405,11 +394,11 @@ async function onReceiveMessage(messages = []) {
}
}
if (battleType.value === 2 && msg.userId === user.value.id) {
scores.value.push(msg.target);
scores.value.push({ ...msg.target });
power.value = msg.target.battery;
}
if (playersScores.value[msg.userId])
playersScores.value[msg.userId].push(msg.target);
playersScores.value[msg.userId].push({ ...msg.target });
}
if (msg.constructor === MESSAGETYPES.CurrentRoundEnded) {
if (battleType.value === 1) {

32
src/pages/melee-match.vue
View File

@@ -58,31 +58,27 @@ onLoad(async (options) => {
if (battleInfo) {
battleId.value = battleInfo.id;
players.value = [...battleInfo.blueTeam, ...battleInfo.redTeam];
players.value.forEach((p) => {
playersScores.value[p.id] = [];
});
if (battleInfo.startTime <= 0) return;
start.value = true;
players.value.forEach((p) => {
playersScores.value[p.id] = p.arrows;
playersScores.value[p.id] = [...p.arrows];
if (p.id === user.value.id) {
scores.value = p.arrows;
scores.value = [...p.arrows];
}
});
tips.value = `${scores.value.length ? "下半场-" : "上半场-"}请连续射6箭`;
const remain = Date.now() / 1000 - battleInfo.startTime;
console.log(`当前局剩余${remain}秒`);
if (remain <= 90) {
// 这里的开始时间不是游戏开始时间，而是上半场或者下半场或者中场的开始时间，还要根据状态来判断
console.log(`当前局已进行${remain}秒`);
if (battleInfo.status === 2) {
tips.value = `${
battleInfo.halfGame ? "下半场-" : "上半场-"
}请连续射6箭`;
setTimeout(() => {
uni.$emit("update-ramain", remain);
uni.$emit("update-ramain", 90 - remain);
}, 300);
} else if (remain > 90 && remain <= 110) {
} else if (battleInfo.status === 9) {
startCount.value = false;
tips.value = "准备下半场";
} else if (remain > 110) {
setTimeout(() => {
uni.$emit("update-ramain", remain - 110);
}, 300);
}
}
} else {
@@ -140,10 +136,10 @@ async function onReceiveMessage(messages = []) {
}
if (msg.constructor === MESSAGETYPES.ShootResult) {
if (msg.userId === user.value.id) {
scores.value.push(msg.target);
scores.value.push({ ...msg.target });
power.value = msg.target.battery;
}
playersScores.value[msg.userId].push(msg.target);
playersScores.value[msg.userId].push({ ...msg.target });
}
if (msg.constructor === MESSAGETYPES.HalfTimeOver) {
uni.$emit("update-ramain", 0);
@@ -190,7 +186,7 @@ onUnmounted(() => {
keepScreenOn: false,
});
uni.$off("socket-inbox", onReceiveMessage);
if (gameType.value && teamSize.value) {
if (gameType.value && teamSize.value && !battleId.value) {
matchGameAPI(false, gameType.value, teamSize.value);
}
});
@@ -207,7 +203,7 @@ onUnmounted(() => {
<BattleHeader v-if="!start" :players="players" />
<TestDistance v-if="!start" :guide="false" />
<ShootProgress
v-if="start"
:show="start"
:seq="seq"
:start="start && startCount"
:tips="tips"