Compare commits
3 Commits
c4a3512f30
...
new-race-m
| Author | SHA1 | Date | |
|---|---|---|---|
| 8c0a24fd44 | |||
| a151f2f293 | |||
| 4352fffde7 |
@@ -1,4 +1,5 @@
|
|||||||
export const audioFils = {
|
export const audioFils = {
|
||||||
|
tententen: "https://static.shelingxingqiu.com/shootmini/static/audio/tententen.mp3",
|
||||||
点击按钮: "https://static.shelingxingqiu.com/shootmini/static/audio/%E7%82%B9%E5%87%BB%E6%8C%89%E9%92%AE.mp3",
|
点击按钮: "https://static.shelingxingqiu.com/shootmini/static/audio/%E7%82%B9%E5%87%BB%E6%8C%89%E9%92%AE.mp3",
|
||||||
"20CM全环靶": "https://static.shelingxingqiu.com/shootmini/static/audio/20CM%E5%85%A8%E7%8E%AF%E9%9D%B6-%E6%97%A0%E6%95%88.mp3",
|
"20CM全环靶": "https://static.shelingxingqiu.com/shootmini/static/audio/20CM%E5%85%A8%E7%8E%AF%E9%9D%B6-%E6%97%A0%E6%95%88.mp3",
|
||||||
"40CM全环靶": "https://static.shelingxingqiu.com/shootmini/static/audio/40CM%E5%85%A8%E7%8E%AF%E9%9D%B6-%E6%97%A0%E6%95%88.mp3",
|
"40CM全环靶": "https://static.shelingxingqiu.com/shootmini/static/audio/40CM%E5%85%A8%E7%8E%AF%E9%9D%B6-%E6%97%A0%E6%95%88.mp3",
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
<script setup>
|
<script setup>
|
||||||
import { ref, onMounted, onBeforeUnmount, watch } from "vue";
|
import { ref, onMounted, onBeforeUnmount, watch, nextTick } from "vue";
|
||||||
import { onLoad, onShow, onHide } from "@dcloudio/uni-app";
|
import { onLoad, onShow, onHide } from "@dcloudio/uni-app";
|
||||||
import Container from "@/components/Container.vue";
|
import Container from "@/components/Container.vue";
|
||||||
import BowTarget from "@/components/BowTarget.vue";
|
import BowTarget from "@/components/BowTarget.vue";
|
||||||
@@ -32,6 +32,8 @@ const halfTimeTip = ref(false);
|
|||||||
const halfRest = ref(false);
|
const halfRest = ref(false);
|
||||||
/** 控制设备离线提示弹窗的显示状态 */
|
/** 控制设备离线提示弹窗的显示状态 */
|
||||||
const showOfflineModal = ref(false);
|
const showOfflineModal = ref(false);
|
||||||
|
/** 记录每位玩家当前半场连续 X 环数,key 为 playerId,用于触发 tententen 音效 */
|
||||||
|
const xRingStreaks = ref({});
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 监听设备在线状态,大乱斗比赛进行中设备离线时弹窗提示用户
|
* 监听设备在线状态,大乱斗比赛进行中设备离线时弹窗提示用户
|
||||||
@@ -120,6 +122,28 @@ onLoad(async (options) => {
|
|||||||
// });
|
// });
|
||||||
});
|
});
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 检测指定玩家连续 X 环是否达到 3 箭,达到则在环数播报入队后追加 tententen 音效
|
||||||
|
* @param {number|string} playerId - 本次射手的 ID(大乱斗中 ShootResult 保留 playerId)
|
||||||
|
* @param {boolean} isXRing - 本次射击是否为 X 环
|
||||||
|
*/
|
||||||
|
function checkAndPlayTententen(playerId, isXRing) {
|
||||||
|
if (!playerId) return;
|
||||||
|
const id = parseInt(playerId);
|
||||||
|
if (isXRing) {
|
||||||
|
xRingStreaks.value[id] = (xRingStreaks.value[id] || 0) + 1;
|
||||||
|
// 同一玩家连续 3 箭均为 X 环,追加到环数音效队列尾部播放
|
||||||
|
if (xRingStreaks.value[id] >= 3) {
|
||||||
|
xRingStreaks.value[id] = 0;
|
||||||
|
// nextTick 确保 HeaderProgress 的环数播报已入队后再追加 tententen,避免播放顺序颠倒
|
||||||
|
nextTick(() => audioManager.play("tententen", false));
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// 非 X 环则重置该玩家的连续计数
|
||||||
|
xRingStreaks.value[id] = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
async function onReceiveMessage(msg) {
|
async function onReceiveMessage(msg) {
|
||||||
if (Array.isArray(msg)) return;
|
if (Array.isArray(msg)) return;
|
||||||
if (msg.type === MESSAGETYPESV2.BattleStart) {
|
if (msg.type === MESSAGETYPESV2.BattleStart) {
|
||||||
@@ -127,7 +151,28 @@ async function onReceiveMessage(msg) {
|
|||||||
halfRest.value = false;
|
halfRest.value = false;
|
||||||
recoverData(msg);
|
recoverData(msg);
|
||||||
} else if (msg.type === MESSAGETYPESV2.ShootResult) {
|
} else if (msg.type === MESSAGETYPESV2.ShootResult) {
|
||||||
|
// 更新前快照各玩家本轮已射箭数,用于事后识别本次射手
|
||||||
|
const curRound = playersScores.value[playersScores.value.length - 1] || {};
|
||||||
|
const prevCounts = {};
|
||||||
|
for (const pid of Object.keys(curRound)) {
|
||||||
|
prevCounts[pid] = (curRound[pid] || []).length;
|
||||||
|
}
|
||||||
recoverData(msg);
|
recoverData(msg);
|
||||||
|
// 对比更新后数据找出箭数增加的玩家(即本次射手),并读取其最新箭的 ring 数据
|
||||||
|
const newRound = playersScores.value[playersScores.value.length - 1] || {};
|
||||||
|
let shooterId = null;
|
||||||
|
let isXRing = false;
|
||||||
|
for (const pid of Object.keys(newRound)) {
|
||||||
|
const newLen = (newRound[pid] || []).length;
|
||||||
|
if (newLen > (prevCounts[pid] || 0)) {
|
||||||
|
shooterId = parseInt(pid);
|
||||||
|
const shot = newRound[pid][newLen - 1];
|
||||||
|
isXRing = !!(shot?.ringX && shot?.ring);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// 检测同一玩家三箭全 X 环,触发 tententen 音效
|
||||||
|
checkAndPlayTententen(shooterId, isXRing);
|
||||||
} else if (msg.type === MESSAGETYPESV2.HalfRest) {
|
} else if (msg.type === MESSAGETYPESV2.HalfRest) {
|
||||||
halfTimeTip.value = true;
|
halfTimeTip.value = true;
|
||||||
halfRest.value = true;
|
halfRest.value = true;
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
<script setup>
|
<script setup>
|
||||||
import { ref, onMounted, onBeforeUnmount } from "vue";
|
import { ref, onMounted, onBeforeUnmount, nextTick } from "vue";
|
||||||
import { onLoad } from "@dcloudio/uni-app";
|
import { onLoad } from "@dcloudio/uni-app";
|
||||||
import Container from "@/components/Container.vue";
|
import Container from "@/components/Container.vue";
|
||||||
import ShootProgress from "@/components/ShootProgress.vue";
|
import ShootProgress from "@/components/ShootProgress.vue";
|
||||||
@@ -31,6 +31,8 @@ const { user } = storeToRefs(store);
|
|||||||
const start = ref(false);
|
const start = ref(false);
|
||||||
const scores = ref([]);
|
const scores = ref([]);
|
||||||
const total = 12;
|
const total = 12;
|
||||||
|
/** 当前练习中连续 X 环计数,用于触发 tententen 音效 */
|
||||||
|
const xRingStreak = ref(0);
|
||||||
const practiseResult = ref({});
|
const practiseResult = ref({});
|
||||||
const practiseId = ref("");
|
const practiseId = ref("");
|
||||||
const showGuide = ref(false);
|
const showGuide = ref(false);
|
||||||
@@ -46,6 +48,7 @@ onLoad((options) => {
|
|||||||
const onReady = async () => {
|
const onReady = async () => {
|
||||||
await startPractiseAPI();
|
await startPractiseAPI();
|
||||||
scores.value = [];
|
scores.value = [];
|
||||||
|
xRingStreak.value = 0; // 新一局开始,重置 X 环连续计数
|
||||||
start.value = true;
|
start.value = true;
|
||||||
audioManager.play("练习开始");
|
audioManager.play("练习开始");
|
||||||
};
|
};
|
||||||
@@ -55,9 +58,33 @@ const onOver = async () => {
|
|||||||
start.value = false;
|
start.value = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 检测连续 X 环是否达到 3 箭,达到则播放 tententen 音效
|
||||||
|
* @param {boolean} isXRing - 本次射击是否为 X 环
|
||||||
|
*/
|
||||||
|
function checkAndPlayTententen(isXRing) {
|
||||||
|
if (isXRing) {
|
||||||
|
xRingStreak.value += 1;
|
||||||
|
// 连续 3 箭均为 X 环,在环数播报入队后追加 tententen,避免播放顺序颠倒
|
||||||
|
if (xRingStreak.value >= 3) {
|
||||||
|
xRingStreak.value = 0;
|
||||||
|
nextTick(() => audioManager.play("tententen", false));
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// 非 X 环则重置连续计数
|
||||||
|
xRingStreak.value = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
async function onReceiveMessage(msg) {
|
async function onReceiveMessage(msg) {
|
||||||
if (msg.type === MESSAGETYPESV2.ShootResult) {
|
if (msg.type === MESSAGETYPESV2.ShootResult) {
|
||||||
|
const prevLen = scores.value.length;
|
||||||
scores.value = msg.details;
|
scores.value = msg.details;
|
||||||
|
// 有新箭时取最后一箭判断是否 X 环并检测连续计数
|
||||||
|
if (scores.value.length > prevLen) {
|
||||||
|
const latestArrow = scores.value[scores.value.length - 1];
|
||||||
|
checkAndPlayTententen(!!(latestArrow?.ringX && latestArrow?.ring));
|
||||||
|
}
|
||||||
} else if (msg.type === MESSAGETYPESV2.BattleEnd) {
|
} else if (msg.type === MESSAGETYPESV2.BattleEnd) {
|
||||||
// setTimeout(onOver, 1500);
|
// setTimeout(onOver, 1500);
|
||||||
}
|
}
|
||||||
@@ -74,6 +101,7 @@ async function onComplete() {
|
|||||||
practiseResult.value = {};
|
practiseResult.value = {};
|
||||||
start.value = false;
|
start.value = false;
|
||||||
scores.value = [];
|
scores.value = [];
|
||||||
|
xRingStreak.value = 0; // 重新开始练习,重置 X 环连续计数
|
||||||
const result = await createPractiseAPI(total, 120);
|
const result = await createPractiseAPI(total, 120);
|
||||||
if (result) practiseId.value = result.id;
|
if (result) practiseId.value = result.id;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
<script setup>
|
<script setup>
|
||||||
import { ref, onMounted, onBeforeUnmount } from "vue";
|
import { ref, onMounted, onBeforeUnmount, nextTick } from "vue";
|
||||||
import Container from "@/components/Container.vue";
|
import Container from "@/components/Container.vue";
|
||||||
import ShootProgress from "@/components/ShootProgress.vue";
|
import ShootProgress from "@/components/ShootProgress.vue";
|
||||||
import BowTarget from "@/components/BowTarget.vue";
|
import BowTarget from "@/components/BowTarget.vue";
|
||||||
@@ -31,6 +31,8 @@ const { user } = storeToRefs(store);
|
|||||||
const start = ref(false);
|
const start = ref(false);
|
||||||
const scores = ref([]);
|
const scores = ref([]);
|
||||||
const total = 36;
|
const total = 36;
|
||||||
|
/** 当前练习中连续 X 环计数,用于触发 tententen 音效 */
|
||||||
|
const xRingStreak = ref(0);
|
||||||
const practiseResult = ref({});
|
const practiseResult = ref({});
|
||||||
const practiseId = ref("");
|
const practiseId = ref("");
|
||||||
const showGuide = ref(false);
|
const showGuide = ref(false);
|
||||||
@@ -45,6 +47,7 @@ onLoad((options) => {
|
|||||||
const onReady = async () => {
|
const onReady = async () => {
|
||||||
await startPractiseAPI();
|
await startPractiseAPI();
|
||||||
scores.value = [];
|
scores.value = [];
|
||||||
|
xRingStreak.value = 0; // 新一局开始,重置 X 环连续计数
|
||||||
start.value = true;
|
start.value = true;
|
||||||
audioManager.play("练习开始");
|
audioManager.play("练习开始");
|
||||||
};
|
};
|
||||||
@@ -54,9 +57,33 @@ const onOver = async () => {
|
|||||||
start.value = false;
|
start.value = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 检测连续 X 环是否达到 3 箭,达到则播放 tententen 音效
|
||||||
|
* @param {boolean} isXRing - 本次射击是否为 X 环
|
||||||
|
*/
|
||||||
|
function checkAndPlayTententen(isXRing) {
|
||||||
|
if (isXRing) {
|
||||||
|
xRingStreak.value += 1;
|
||||||
|
// 连续 3 箭均为 X 环,在环数播报入队后追加 tententen,避免播放顺序颠倒
|
||||||
|
if (xRingStreak.value >= 3) {
|
||||||
|
xRingStreak.value = 0;
|
||||||
|
nextTick(() => audioManager.play("tententen", false));
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// 非 X 环则重置连续计数
|
||||||
|
xRingStreak.value = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
async function onReceiveMessage(msg) {
|
async function onReceiveMessage(msg) {
|
||||||
if (msg.type === MESSAGETYPESV2.ShootResult) {
|
if (msg.type === MESSAGETYPESV2.ShootResult) {
|
||||||
|
const prevLen = scores.value.length;
|
||||||
scores.value = msg.details;
|
scores.value = msg.details;
|
||||||
|
// 有新箭时取最后一箭判断是否 X 环并检测连续计数
|
||||||
|
if (scores.value.length > prevLen) {
|
||||||
|
const latestArrow = scores.value[scores.value.length - 1];
|
||||||
|
checkAndPlayTententen(!!(latestArrow?.ringX && latestArrow?.ring));
|
||||||
|
}
|
||||||
} else if (msg.type === MESSAGETYPESV2.BattleEnd) {
|
} else if (msg.type === MESSAGETYPESV2.BattleEnd) {
|
||||||
setTimeout(onOver, 1500);
|
setTimeout(onOver, 1500);
|
||||||
}
|
}
|
||||||
@@ -89,6 +116,7 @@ async function onComplete() {
|
|||||||
practiseResult.value = {};
|
practiseResult.value = {};
|
||||||
start.value = false;
|
start.value = false;
|
||||||
scores.value = [];
|
scores.value = [];
|
||||||
|
xRingStreak.value = 0; // 重新开始练习,重置 X 环连续计数
|
||||||
const result = await createPractiseAPI(total, 360);
|
const result = await createPractiseAPI(total, 360);
|
||||||
if (result) practiseId.value = result.id;
|
if (result) practiseId.value = result.id;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -49,6 +49,8 @@ const battleWay = ref(0);
|
|||||||
const lastToSomeoneShootKey = ref("");
|
const lastToSomeoneShootKey = ref("");
|
||||||
/** 控制设备离线提示弹窗的显示状态 */
|
/** 控制设备离线提示弹窗的显示状态 */
|
||||||
const showOfflineModal = ref(false);
|
const showOfflineModal = ref(false);
|
||||||
|
/** 记录每位玩家当前轮连续 X 环数,key 为 playerId,用于触发 tententen 音效 */
|
||||||
|
const xRingStreaks = ref({});
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 监听设备在线状态,比赛进行中设备离线时弹窗提示用户
|
* 监听设备在线状态,比赛进行中设备离线时弹窗提示用户
|
||||||
@@ -231,6 +233,27 @@ function onNewRound(msg, prevRound) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 检测指定射手连续 X 环是否达到 3 箭,达到则在环数播报入队后追加 tententen 音效
|
||||||
|
* @param {number} shooterId - 本次射手的 ID(取自 currentShooterId.value)
|
||||||
|
* @param {boolean} isXRing - 本次射击是否为 X 环
|
||||||
|
*/
|
||||||
|
function checkAndPlayTententen(shooterId, isXRing) {
|
||||||
|
if (!shooterId) return;
|
||||||
|
if (isXRing) {
|
||||||
|
xRingStreaks.value[shooterId] = (xRingStreaks.value[shooterId] || 0) + 1;
|
||||||
|
// 同一玩家连续 3 箭均为 X 环,追加到环数音效队列尾部播放
|
||||||
|
if (xRingStreaks.value[shooterId] >= 3) {
|
||||||
|
xRingStreaks.value[shooterId] = 0;
|
||||||
|
// nextTick 确保 HeaderProgress 的环数播报已入队后再追加 tententen,避免播放顺序颠倒
|
||||||
|
nextTick(() => audioManager.play("tententen", false));
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// 非 X 环则重置该玩家的连续计数
|
||||||
|
xRingStreaks.value[shooterId] = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
async function onReceiveMessage(msg) {
|
async function onReceiveMessage(msg) {
|
||||||
if (Array.isArray(msg)) return;
|
if (Array.isArray(msg)) return;
|
||||||
if (msg.type === MESSAGETYPESV2.BattleStart) {
|
if (msg.type === MESSAGETYPESV2.BattleStart) {
|
||||||
@@ -245,6 +268,9 @@ async function onReceiveMessage(msg) {
|
|||||||
} else if (msg.type === MESSAGETYPESV2.ShootResult) {
|
} else if (msg.type === MESSAGETYPESV2.ShootResult) {
|
||||||
showRoundTip.value = false;
|
showRoundTip.value = false;
|
||||||
recoverData(msg, {arrowOnly: true});
|
recoverData(msg, {arrowOnly: true});
|
||||||
|
// 检测同一玩家三箭全 X 环,触发 tententen 音效
|
||||||
|
// currentShooterId 在 ToSomeoneShoot 时写入,ShootResult 不会覆盖,可靠识别本次射手
|
||||||
|
checkAndPlayTententen(currentShooterId.value, !!(msg.shootData?.ringX && msg.shootData?.ring));
|
||||||
} else if (msg.type === MESSAGETYPESV2.NewRound) {
|
} else if (msg.type === MESSAGETYPESV2.NewRound) {
|
||||||
// 在进入延迟前先捕获当前轮次,供 onNewRound 使用,防止 800ms 内 ToSomeoneShoot 提前更新 currentRound 造成 Tip 展示错轮
|
// 在进入延迟前先捕获当前轮次,供 onNewRound 使用,防止 800ms 内 ToSomeoneShoot 提前更新 currentRound 造成 Tip 展示错轮
|
||||||
const prevRound = currentRound.value;
|
const prevRound = currentRound.value;
|
||||||
|
|||||||
Reference in New Issue
Block a user