update:新版优化练习结束语音
This commit is contained in:
@@ -373,7 +373,7 @@ function getAckAudioKeys(message, businessMessage) {
|
|||||||
if (businessMessage?.type === MESSAGETYPESV2.HalfRest) return ["中场休息"];
|
if (businessMessage?.type === MESSAGETYPESV2.HalfRest) return ["中场休息"];
|
||||||
return ["比赛结束"];
|
return ["比赛结束"];
|
||||||
case ServerMessageType.SERVER_MSG_PRACTICE_END:
|
case ServerMessageType.SERVER_MSG_PRACTICE_END:
|
||||||
return ["比赛结束"];
|
return [currentContext?.practiceEndAudioKey || "比赛结束"];
|
||||||
case ServerMessageType.SERVER_MSG_CHECK:
|
case ServerMessageType.SERVER_MSG_CHECK:
|
||||||
return getTestDistanceAudioKeys(businessMessage?.shootData);
|
return getTestDistanceAudioKeys(businessMessage?.shootData);
|
||||||
case ServerMessageType.SERVER_MSG_NOT_ENOUGH_DISTANCE:
|
case ServerMessageType.SERVER_MSG_NOT_ENOUGH_DISTANCE:
|
||||||
@@ -850,6 +850,7 @@ export function connectMatchWebSocket(options = {}) {
|
|||||||
mode,
|
mode,
|
||||||
requestPracticeInfoOnOpen = false,
|
requestPracticeInfoOnOpen = false,
|
||||||
appHideResumable = false,
|
appHideResumable = false,
|
||||||
|
practiceEndAudioKey = "",
|
||||||
force = false,
|
force = false,
|
||||||
reconnecting = false,
|
reconnecting = false,
|
||||||
reconnectReason = "",
|
reconnectReason = "",
|
||||||
@@ -922,6 +923,7 @@ export function connectMatchWebSocket(options = {}) {
|
|||||||
Number.isFinite(normalizedMode) ? normalizedMode > 3 : undefined,
|
Number.isFinite(normalizedMode) ? normalizedMode > 3 : undefined,
|
||||||
requestPracticeInfoOnOpen: requestPracticeInfoOnOpen === true,
|
requestPracticeInfoOnOpen: requestPracticeInfoOnOpen === true,
|
||||||
appHideResumable: appHideResumable === true,
|
appHideResumable: appHideResumable === true,
|
||||||
|
practiceEndAudioKey: String(practiceEndAudioKey || "").trim(),
|
||||||
meleeHalfRest: isSameContext
|
meleeHalfRest: isSameContext
|
||||||
? currentContext?.meleeHalfRest === true
|
? currentContext?.meleeHalfRest === true
|
||||||
: false,
|
: false,
|
||||||
|
|||||||
@@ -765,6 +765,7 @@ const connectPracticeServer = ({
|
|||||||
userId: user.value.id,
|
userId: user.value.id,
|
||||||
requestPracticeInfoOnOpen: true,
|
requestPracticeInfoOnOpen: true,
|
||||||
appHideResumable: appHideResumable.value,
|
appHideResumable: appHideResumable.value,
|
||||||
|
practiceEndAudioKey: "练习结束",
|
||||||
});
|
});
|
||||||
connectionClosed.value = false;
|
connectionClosed.value = false;
|
||||||
return true;
|
return true;
|
||||||
@@ -1192,7 +1193,7 @@ function onAudioEnded(key) {
|
|||||||
Array.from(audioWaiters).forEach((waiter) => {
|
Array.from(audioWaiters).forEach((waiter) => {
|
||||||
if (waiter.expectedKey === key) waiter.done();
|
if (waiter.expectedKey === key) waiter.done();
|
||||||
});
|
});
|
||||||
if (String(key || "").includes("比赛结束")) {
|
if (["比赛结束", "练习结束"].includes(String(key || ""))) {
|
||||||
void onOver();
|
void onOver();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user