From cdddf57cc5fd8b625b2e3291ddc9f1ecef40d44f Mon Sep 17 00:00:00 2001
From: kron <kai_hong@126.com>
Date: Thu, 17 Jul 2025 17:02:05 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/UserHeader.vue | 1 +
 src/pages/battle-result.vue   | 6 +++---
 src/pages/battle-room.vue     | 6 +++---
 src/pages/melee-match.vue     | 4 ++--
 src/pages/team-match.vue      | 2 +-
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/components/UserHeader.vue b/src/components/UserHeader.vue
index adec3a8..fdf6365 100644
--- a/src/components/UserHeader.vue
+++ b/src/components/UserHeader.vue
@@ -189,6 +189,7 @@ watch(
   position: relative;
   background-color: #00000038;
   width: 100rpx;
+  overflow: hidden;
 }
 
 .rank-tag-progress {
diff --git a/src/pages/battle-result.vue b/src/pages/battle-result.vue
index 88e6b93..a6580aa 100644
--- a/src/pages/battle-result.vue
+++ b/src/pages/battle-result.vue
@@ -43,7 +43,7 @@ function exit() {
 }
 onMounted(async () => {
   const battleInfo = uni.getStorageSync("last-battle");
-  // console.log("----battleInfo", battleInfo);
+  console.log("----battleInfo", battleInfo);
   data.value = battleInfo;
   const mine = battleInfo.playerStats.find((p) => p.id === user.value.id);
   rank.value =
@@ -52,8 +52,8 @@ onMounted(async () => {
     totalPoints.value = mine.totalScore;
     ifWin.value = battleInfo.mode === 1 && mine.team === battleInfo.winner;
   }
-  // const result = await getHomeData();
-  // if (result.user) updateUser(result.user);
+  const result = await getHomeData();
+  if (result.user) updateUser(result.user);
 });
 
 const checkBowData = () => {
diff --git a/src/pages/battle-room.vue b/src/pages/battle-room.vue
index 3473d79..e3fcc80 100644
--- a/src/pages/battle-room.vue
+++ b/src/pages/battle-room.vue
@@ -39,7 +39,7 @@ const playersSorted = ref([]);
 const currentRound = ref(1);
 const totalRounds = ref(0);
 const start = ref(false);
-const startCount = ref(false);
+const startCount = ref(true);
 const power = ref(0);
 const scores = ref([]);
 const blueScores = ref([]);
@@ -75,7 +75,7 @@ watch(
 onLoad(async (options) => {
   if (options.battleId) {
     const battleInfo = uni.getStorageSync("current-battle");
-    // console.log("----battleInfo", battleInfo);
+    console.log("----battleInfo", battleInfo);
     if (battleInfo) {
       battleId.value = battleInfo.id;
       battleType.value = battleInfo.config.mode;
@@ -245,7 +245,6 @@ async function onReceiveMessage(messages = []) {
       // 这里会掉多次;
       timerSeq.value += 1;
       battleId.value = msg.id;
-      startCount.value = true;
       step.value = 2;
       if (battleType.value === 1) {
         redTeam.value = msg.groupUserStatus.redTeam;
@@ -336,6 +335,7 @@ async function onReceiveMessage(messages = []) {
       }
       if (msg.constructor === MESSAGETYPES.MeleeAllReady) {
         start.value = true;
+        startCount.value = true;
         step.value = 3;
         seq.value += 1;
         timerSeq.value = 0;
diff --git a/src/pages/melee-match.vue b/src/pages/melee-match.vue
index 638c206..79dcb6f 100644
--- a/src/pages/melee-match.vue
+++ b/src/pages/melee-match.vue
@@ -22,7 +22,7 @@ const { user } = storeToRefs(store);
 const gameType = ref(0);
 const teamSize = ref(0);
 const start = ref(false);
-const startCount = ref(false);
+const startCount = ref(true);
 const battleId = ref("");
 const currentRound = ref(1);
 const power = ref(0);
@@ -117,7 +117,6 @@ async function onReceiveMessage(messages = []) {
         // 这里会掉多次;
         timerSeq.value += 1;
         battleId.value = msg.id;
-        startCount.value = true;
         players.value = [
           ...msg.groupUserStatus.redTeam,
           ...msg.groupUserStatus.blueTeam,
@@ -131,6 +130,7 @@ async function onReceiveMessage(messages = []) {
     if (msg.id !== battleId.value) return;
     if (msg.constructor === MESSAGETYPES.MeleeAllReady) {
       start.value = true;
+      startCount.value = true;
       seq.value += 1;
       timerSeq.value = 0;
       tips.value = "请连续射出6支箭";
diff --git a/src/pages/team-match.vue b/src/pages/team-match.vue
index 988981c..d15cf68 100644
--- a/src/pages/team-match.vue
+++ b/src/pages/team-match.vue
@@ -47,7 +47,7 @@ const isFinalShoot = ref(false);
 onLoad(async (options) => {
   if (options.battleId) {
     const battleInfo = uni.getStorageSync("current-battle");
-    // console.log("----battleInfo", battleInfo);
+    console.log("----battleInfo", battleInfo);
     if (battleInfo) {
       battleId.value = battleInfo.id;
       start.value = true;