From 78504f501dfcbad2fb326ed86a668ff3ebb184ae Mon Sep 17 00:00:00 2001
From: kron <kai_hong@126.com>
Date: Tue, 17 Jun 2025 21:34:41 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Avatar.vue      |  1 +
 src/components/MeleeResult.vue |  2 +-
 src/components/PlayerScore.vue |  1 +
 src/components/UserHeader.vue  | 35 +++++++++++++++++++++++-----------
 src/constants.js               |  4 ++--
 src/pages/battle-result.vue    |  3 ++-
 src/pages/first-try.vue        |  5 ++++-
 src/pages/match-detail.vue     |  8 ++++----
 src/pages/melee-match.vue      |  3 +++
 src/pages/practise-one.vue     |  8 +++++---
 src/pages/practise-two.vue     |  8 +++++---
 src/pages/user.vue             |  4 ++--
 12 files changed, 54 insertions(+), 28 deletions(-)

diff --git a/src/components/Avatar.vue b/src/components/Avatar.vue
index f21a8ef..c6d5a49 100644
--- a/src/components/Avatar.vue
+++ b/src/components/Avatar.vue
@@ -69,6 +69,7 @@ const borderColors = {
       :style="{
         width: size + 'px',
         height: size + 'px',
+        minHeight: size + 'px',
         borderColor: borderColors[borderColor],
       }"
       class="avatar-image"
diff --git a/src/components/MeleeResult.vue b/src/components/MeleeResult.vue
index 2fb5af5..2dfca46 100644
--- a/src/components/MeleeResult.vue
+++ b/src/components/MeleeResult.vue
@@ -56,7 +56,7 @@ watch(
         >
         <text>{{ player.totalRings }}环</text>
         <text v-for="(arrow, index2) in player.arrowHistory" :key="index2">
-          {{ arrow.ringScore }}环
+          {{ arrow.ring }}环
         </text>
       </view>
     </view>
diff --git a/src/components/PlayerScore.vue b/src/components/PlayerScore.vue
index 0be59f4..281d6bd 100644
--- a/src/components/PlayerScore.vue
+++ b/src/components/PlayerScore.vue
@@ -59,6 +59,7 @@ const rowCount = new Array(6).fill(0);
 .container > image:first-child {
   width: 30px;
   height: 30px;
+  min-height: 30px;
   border: 1px solid #fff3;
   border-radius: 50%;
   margin-right: 10px;
diff --git a/src/components/UserHeader.vue b/src/components/UserHeader.vue
index 4ffe451..4184592 100644
--- a/src/components/UserHeader.vue
+++ b/src/components/UserHeader.vue
@@ -1,16 +1,18 @@
 <script setup>
-import { computed } from "vue";
+import { ref, onMounted, computed } from "vue";
 import Avatar from "@/components/Avatar.vue";
 import useStore from "@/store";
 import { storeToRefs } from "pinia";
 const store = useStore();
-const { user } = storeToRefs(store);
+const { user, config } = storeToRefs(store);
 const props = defineProps({
   showRank: {
     type: Boolean,
     default: false,
   },
 });
+const lvlName = ref("");
+const nextLvlPoints = ref("");
 const containerWidth = computed(() => (props.showRank ? "72vw" : "100vw"));
 const toUserPage = () => {
   // 获取当前页面路径
@@ -24,16 +26,25 @@ const toUserPage = () => {
     });
   }
 };
+onMounted(() => {
+  const rankInfos = config.value.randInfos || [];
+  rankInfos.some((r, index) => {
+    lvlName.value = rankInfos[index].name;
+    if (r.upgrade_scores > user.value.scores) {
+      nextLvlPoints.value = r.upgrade_scores;
+      if (rankInfos[index - 1]) {
+        lvlName.value = rankInfos[index - 1].name;
+      }
+      return true;
+    }
+    return false;
+  });
+});
 </script>
 
 <template>
   <view class="container" :style="{ width: containerWidth }">
-    <Avatar
-      :frame="true"
-      :src="user.avatar"
-      :onClick="toUserPage"
-      :size="42"
-    />
+    <Avatar :frame="true" :src="user.avatar" :onClick="toUserPage" :size="42" />
     <view class="user-details">
       <view class="user-name">
         <text>{{ user.nickName }}</text>
@@ -44,11 +55,13 @@ const toUserPage = () => {
         />
       </view>
       <view class="user-stats">
-        <text class="level-tag level-tag-first">钻石1级</text>
-        <text class="level-tag level-tag-second">{{ user.lvl }}</text>
+        <text class="level-tag level-tag-first">{{ lvlName }}</text>
+        <text class="level-tag level-tag-second">L{{ user.lvl }}</text>
         <view class="rank-tag">
           <view class="rank-tag-progress" :style="{ width: '40%' }" />
-          <text class="rank-tag-text">{{ user.lvl }}/{{ user.lvlPoints }}</text>
+          <text class="rank-tag-text"
+            >{{ user.scores }}/{{ user.nextLvlPoints }}</text
+          >
         </view>
       </view>
     </view>
diff --git a/src/constants.js b/src/constants.js
index f0141a4..92d3fae 100644
--- a/src/constants.js
+++ b/src/constants.js
@@ -13,8 +13,8 @@ export const MESSAGETYPES = {
   UserEnterRoom: 2133805521,
   UserExitRoom: 3896523333,
   RoomDestroy: 3617539277,
-  // RoomDestroy: 2921416944,
-  // 下半场: 388606440,
+  SomeoneComplete: 2921416944,
+  HalfTimeOver: 388606440,
 };
 
 export const getMessageTypeName = (id) => {
diff --git a/src/pages/battle-result.vue b/src/pages/battle-result.vue
index f935b57..c1f20bf 100644
--- a/src/pages/battle-result.vue
+++ b/src/pages/battle-result.vue
@@ -20,8 +20,9 @@ onLoad(async (options) => {
   battleId.value = options.battleId;
   const result = await getGameAPI(
     // options.battleId || "BATTLE-1749386862250435325-854"
-    options.battleId || "BATTLE-1749397329251504706-197"
+    options.battleId || "BATTLE-1750142722977234017-746"
   );
+  console.log(1212, result);
   data.value = result;
   if (result.mode === 1 && result.redPlayers[user.value.id]) {
     totalPoints.value = result.redTotal;
diff --git a/src/pages/first-try.vue b/src/pages/first-try.vue
index 0df0bc0..022a11c 100644
--- a/src/pages/first-try.vue
+++ b/src/pages/first-try.vue
@@ -10,12 +10,13 @@ import ScorePanel from "@/components/ScorePanel.vue";
 import Container from "@/components/Container.vue";
 import Avatar from "@/components/Avatar.vue";
 import BowPower from "@/components/BowPower.vue";
-import { createPractiseAPI } from "@/apis";
+import { createPractiseAPI, getHomeData } from "@/apis";
 import { MESSAGETYPES } from "@/constants";
 import useStore from "@/store";
 import { storeToRefs } from "pinia";
 const store = useStore();
 const { user } = storeToRefs(store);
+const { updateUser } = store;
 const scores = ref([]);
 const step = ref(0);
 const showScore = ref(false);
@@ -89,6 +90,8 @@ const nextStep = async () => {
       start.value = true;
     }, 500);
   } else if (step.value === 5) {
+    const result = await getHomeData();
+    if (result.user) updateUser(result.user);
     uni.navigateBack({
       delta: 1,
     });
diff --git a/src/pages/match-detail.vue b/src/pages/match-detail.vue
index 075df44..ead8da0 100644
--- a/src/pages/match-detail.vue
+++ b/src/pages/match-detail.vue
@@ -34,14 +34,14 @@ onLoad(async (options) => {
             name: result.bluePlayers[blueId].name,
             avatar: result.bluePlayers[blueId].avatar,
             arrows: item[blueId],
-            totalRing: item[blueId].reduce((a, b) => a + b.ringScore, 0),
+            totalRing: item[blueId].reduce((a, b) => a + b.ring, 0),
             totalScore: item[blueId].reduce((a, b) => a + b.ringScore, 0),
           },
           red: {
             name: result.redPlayers[redId].name,
             avatar: result.redPlayers[redId].avatar,
             arrows: item[redId],
-            totalRing: item[redId].reduce((a, b) => a + b.ringScore, 0),
+            totalRing: item[redId].reduce((a, b) => a + b.ring, 0),
             totalScore: item[redId].reduce((a, b) => a + b.ringScore, 0),
           },
         });
@@ -102,7 +102,7 @@ onLoad(async (options) => {
           <view>
             <Avatar :src="round.blue.avatar" :size="25" :borderColor="1" />
             <text v-for="(arrow, index2) in round.blue.arrows" :key="index2">
-              {{ arrow.ringScore }}环
+              {{ arrow.ring }}环
             </text>
           </view>
           <view>
@@ -116,7 +116,7 @@ onLoad(async (options) => {
           <view>
             <Avatar :src="round.red.avatar" :size="25" :borderColor="2" />
             <text v-for="(arrow, index2) in round.red.arrows" :key="index2">
-              {{ arrow.ringScore }}环
+              {{ arrow.ring }}环
             </text>
           </view>
           <view>
diff --git a/src/pages/melee-match.vue b/src/pages/melee-match.vue
index 1594459..07ed256 100644
--- a/src/pages/melee-match.vue
+++ b/src/pages/melee-match.vue
@@ -93,6 +93,9 @@ async function onReceiveMessage(content) {
       }
       playersScores.value[msg.userId].push(msg.target);
     }
+    if (msg.constructor === MESSAGETYPES.HalfTimeOver) {
+      tips.value = "上半场结束，休息一下吧：） 20秒后进入下半场";
+    }
     if (msg.constructor === MESSAGETYPES.MatchOver) {
       uni.redirectTo({
         url: `/pages/battle-result?battleId=${msg.id}`,
diff --git a/src/pages/practise-one.vue b/src/pages/practise-one.vue
index 727da16..bb2be35 100644
--- a/src/pages/practise-one.vue
+++ b/src/pages/practise-one.vue
@@ -8,12 +8,13 @@ import ScoreResult from "@/components/ScoreResult.vue";
 import SButton from "@/components/SButton.vue";
 import Avatar from "@/components/Avatar.vue";
 import BowPower from "@/components/BowPower.vue";
-import { createPractiseAPI } from "@/apis";
+import { createPractiseAPI, getHomeData } from "@/apis";
 import { MESSAGETYPES, roundsName } from "@/constants";
 import useStore from "@/store";
 import { storeToRefs } from "pinia";
 const store = useStore();
 const { user } = storeToRefs(store);
+const { updateUser } = store;
 const start = ref(false);
 const showScore = ref(false);
 const scores = ref([]);
@@ -52,9 +53,10 @@ async function onReceiveMessage(content) {
   });
 }
 
-function onComplete() {
+async function onComplete() {
+  const result = await getHomeData();
+  if (result.user) updateUser(result.user);
   uni.navigateBack();
-  showScore.value = false;
 }
 
 onMounted(() => {
diff --git a/src/pages/practise-two.vue b/src/pages/practise-two.vue
index 8603a20..eeb3a66 100644
--- a/src/pages/practise-two.vue
+++ b/src/pages/practise-two.vue
@@ -8,12 +8,13 @@ import ScoreResult from "@/components/ScoreResult.vue";
 import SButton from "@/components/SButton.vue";
 import Avatar from "@/components/Avatar.vue";
 import BowPower from "@/components/BowPower.vue";
-import { createPractiseAPI } from "@/apis";
+import { createPractiseAPI, getHomeData } from "@/apis";
 import { MESSAGETYPES } from "@/constants";
 import useStore from "@/store";
 import { storeToRefs } from "pinia";
 const store = useStore();
 const { user } = storeToRefs(store);
+const { updateUser } = store;
 const start = ref(false);
 const showScore = ref(false);
 const scores = ref([]);
@@ -49,9 +50,10 @@ async function onReceiveMessage(content) {
   });
 }
 
-function onComplete() {
+async function onComplete() {
+  const result = await getHomeData();
+  if (result.user) updateUser(result.user);
   uni.navigateBack();
-  showScore.value = false;
 }
 
 onMounted(() => {
diff --git a/src/pages/user.vue b/src/pages/user.vue
index 60f6834..8a4f589 100644
--- a/src/pages/user.vue
+++ b/src/pages/user.vue
@@ -73,9 +73,9 @@ const logout = () => {
       />
       <UserItem
         title="新手试炼场"
-        :onClick="user.trio > 1 ? null : toFristTryPage"
+        :onClick="user.trio > 0 ? null : toFristTryPage"
       >
-        <text v-if="user.trio > 1" :style="{ color: '#259249' }">已完成</text>
+        <text v-if="user.trio > 0" :style="{ color: '#259249' }">已完成</text>
         <text v-else :style="{ color: '#CC311F' }">未完成</text>
       </UserItem>
       <UserItem title="会员" :onClick="toBeVipPage"> 已赠送6个月会员 </UserItem>