修改升级接收方式

src/components/UserUpgrade.vue

@@ -49,6 +49,7 @@ onMounted(() => {
       <image src="../static/update-text-bg.png" />
       <text>恭喜你升级到</text>
       <text>射灵{{ lvl }}级</text>
+      <text>!</text>
     </view>
     <button @click="onClose" hover-class="none">关闭</button>
   </view>
@@ -102,7 +103,7 @@ onMounted(() => {
   left: calc(50% - 40vw);
   height: 60px;
 }
-.text-content > text:last-child {
+.text-content > text:nth-child(3) {
   color: #fed847;
 }
 .content > button:last-child {

src/constants.js

@@ -20,6 +20,8 @@ export const MESSAGETYPES = {
   BackToGame: 1899960424,
   FinalShootResult: 3813452544,
   PaySuccess: 3793388244,
+  RankUpdate: 1121669910,
+  LvlUpdate: 3958625354,
 };
 
 export const topThreeColors = ["#FFD947", "#D2D2D2", "#FFA515"];

src/pages/battle-result.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { ref, onMounted } from "vue";
+import { ref, onMounted, onUnmounted } from "vue";
 import { onLoad } from "@dcloudio/uni-app";
 import Avatar from "@/components/Avatar.vue";
 import UserUpgrade from "@/components/UserUpgrade.vue";
@@ -16,37 +16,21 @@ const data = ref({});
 const totalPoints = ref(0);
 const rank = ref(0);
 const showUpgrade = ref(false);
-
+const timer = ref(null);
-// onLoad(async (options) => {
+const latestLvl = ref(0);
-//   battleId.value = options.battleId;
-//   const result = await getGameAPI(
-//     // options.battleId || "BATTLE-1750867490990424058-718"
-//     options.battleId || "BATTLE-1752563964391008873-624"
-//   );
-//   data.value = result;
-//   if (result.mode === 1 && result.redPlayers[user.value.id]) {
-//     totalPoints.value = result.redPlayers[user.value.id].totalScore;
-//     ifWin.value = result.winner === 0;
-//   }
-//   if (result.mode === 1 && result.bluePlayers[user.value.id]) {
-//     totalPoints.value = result.bluePlayers[user.value.id].totalScore;
-//     ifWin.value = result.winner === 1;
-//   }
-//   if (result.mode === 2) {
-//     const mine = result.players.find((p) => p.playerId === user.value.id);
-//     if (mine) totalPoints.value = mine.totalScore;
-//   }
-// });
 
 function exit() {
   uni.navigateBack();
 }
+
+const checkBowData = () => {
+  uni.navigateTo({
+    url: `/pages/match-detail?id=${data.value.id}`,
+  });
+};
 onMounted(async () => {
   const battleInfo = uni.getStorageSync("last-battle");
   console.log("----battleInfo", battleInfo);
-  if (battleInfo.lvl > user.value.lvl) {
-    showUpgrade.value = true;
-  }
   data.value = battleInfo;
   const mine = battleInfo.playerStats.find((p) => p.id === user.value.id);
   rank.value =
@@ -55,13 +39,16 @@ onMounted(async () => {
     totalPoints.value = mine.totalScore;
     ifWin.value = battleInfo.mode === 1 && mine.team === battleInfo.winner;
   }
+  timer.value = setTimeout(() => {
+    const lastLvl = uni.getStorageSync("lastest-lvl");
+    if (parseInt(lastLvl) > user.value.lvl) {
+      latestLvl.value = parseInt(lastLvl);
+    }
+  }, 1000);
+});
+onUnmounted(() => {
+  if (timer.value) clearTimeout(timer.value);
 });
-
-const checkBowData = () => {
-  uni.navigateTo({
-    url: `/pages/match-detail?id=${data.value.id}`,
-  });
-};
 </script>
 
 <template>
@@ -181,7 +168,7 @@ const checkBowData = () => {
     <UserUpgrade
       :show="showUpgrade"
       :onClose="() => (showUpgrade = false)"
-      :lvl="data.lvl"
+      :lvl="latestLvl"
     />
   </view>
 </template>

src/pages/battle-room.vue

@@ -445,7 +445,7 @@ async function onReceiveMessage(messages = []) {
         tips.value = "准备下半场";
       }
       if (msg.constructor === MESSAGETYPES.MatchOver) {
-        uni.setStorageSync("last-battle", { ...msg.endStatus, lvl: msg.lvl });
+        uni.setStorageSync("last-battle", msg.endStatus);
         if (msg.endStatus.nosaved) {
           uni.showToast({
             title: "游戏结束",

src/pages/index.vue

@@ -59,7 +59,8 @@ const toRankListPage = () => {
 };
 
 onShow(async () => {
-  if (user.value.id) {
+  const token = uni.getStorageSync("token");
+  if (token) {
     const result = await getHomeData();
     updateRank(result);
     console.log("首页数据：", result);

src/pages/melee-match.vue

@@ -1,6 +1,6 @@
 <script setup>
 import { ref, watch, onMounted, onUnmounted } from "vue";
-import { onLoad } from "@dcloudio/uni-app";
+import { onLoad, onShow, onHide } from "@dcloudio/uni-app";
 import Container from "@/components/Container.vue";
 import BowTarget from "@/components/BowTarget.vue";
 import ShootProgress from "@/components/ShootProgress.vue";
@@ -155,7 +155,7 @@ async function onReceiveMessage(messages = []) {
       tips.value = "准备下半场";
     }
     if (msg.constructor === MESSAGETYPES.MatchOver) {
-      uni.setStorageSync("last-battle", { ...msg.endStatus, lvl: msg.lvl });
+      uni.setStorageSync("last-battle", msg.endStatus);
       if (msg.endStatus.noSaved) {
         uni.showToast({
           title: "游戏结束",
@@ -177,6 +177,7 @@ const onBack = () => {
     uni.$showHint(3);
   }
 };
+onShow(() => {});
 onMounted(() => {
   uni.setKeepScreenOn({
     keepScreenOn: true,

src/pages/team-match.vue

@@ -227,7 +227,7 @@ async function onReceiveMessage(messages = []) {
       }
     }
     if (msg.constructor === MESSAGETYPES.MatchOver) {
-      uni.setStorageSync("last-battle", { ...msg.endStatus, lvl: msg.lvl });
+      uni.setStorageSync("last-battle", msg.endStatus);
       if (msg.endStatus.noSaved) {
         uni.showToast({
           title: "游戏结束",

src/websocket.js

@@ -48,11 +48,13 @@ function createWebSocket(token, onMessage) {
           });
         }
       }
-    }
+    } else if (msg.constructor === MESSAGETYPES.MatchOver) {
-    if (msg.constructor === MESSAGETYPES.MatchOver) {
       uni.$emit("game-over");
-    }
+    } else if (msg.constructor === MESSAGETYPES.RankUpdate) {
-    if (msg.constructor === MESSAGETYPES.PaySuccess) {
+      console.log("RankUpdate", msg);
+    } else if (msg.constructor === MESSAGETYPES.LvlUpdate) {
+      uni.setStorageSync("latest-lvl", msg.lvl);
+    } else if (msg.constructor === MESSAGETYPES.PaySuccess) {
       console.log(1111111, msg);
     }
   });