diff --git a/src/components/Guide.vue b/src/components/Guide.vue
index 88bb49b..05958a1 100644
--- a/src/components/Guide.vue
+++ b/src/components/Guide.vue
@@ -23,7 +23,7 @@ const bubbleTypes = [
diff --git a/src/components/RoundEndTip.vue b/src/components/RoundEndTip.vue
index 6514bb1..e5ba3ef 100644
--- a/src/components/RoundEndTip.vue
+++ b/src/components/RoundEndTip.vue
@@ -1,9 +1,9 @@
-
+
@@ -406,10 +414,12 @@ onUnmounted(() => {
{
updateConfig(config);
console.log("全局配置:", config);
const rankList = await getRankListAPI();
- console.log("排位赛数据:", rankList);
updateRank(rankList);
const token = uni.getStorageSync("token");
if (token) {
diff --git a/src/pages/team-match.vue b/src/pages/team-match.vue
index 566569e..84065be 100644
--- a/src/pages/team-match.vue
+++ b/src/pages/team-match.vue
@@ -44,6 +44,7 @@ const bluePoints = ref(0);
const showRoundTip = ref(false);
const onComplete = ref(null);
const showModal = ref(false);
+const isFinalShoot = ref(false);
onLoad(async (options) => {
if (options.battleId) {
@@ -126,9 +127,14 @@ async function onReceiveMessage(messages = []) {
seq.value += 1;
currentShooterId.value = msg.userId;
if (redTeam.value[0].id === currentShooterId.value) {
- tips.value = `请红队射箭-第${roundsName[currentRound.value]}轮`;
+ tips.value = "请红队射箭-";
} else {
- tips.value = `请蓝队射箭-第${roundsName[currentRound.value]}轮`;
+ tips.value = "请蓝队射箭-";
+ }
+ if (isFinalShoot.value) {
+ tips.value += "决金箭";
+ } else {
+ tips.value += `第${roundsName[currentRound.value]}轮`;
}
}
}
@@ -149,10 +155,13 @@ async function onReceiveMessage(messages = []) {
currentRedPoint.value = result.redScore;
bluePoints.value += result.blueScore;
redPoints.value += result.redScore;
- showRoundTip.value = true;
- // 开始下一轮;
roundResults.value = result.roundResults;
currentRound.value = result.currentRound + 1;
+ if (result.currentRound < 5) showRoundTip.value = true;
+ }
+ if (msg.constructor === MESSAGETYPES.FinalShoot) {
+ isFinalShoot.value = true;
+ showRoundTip.value = true;
}
if (msg.constructor === MESSAGETYPES.MatchOver) {
uni.redirectTo({
@@ -223,12 +232,15 @@ onUnmounted(() => {