fix(game): 修复新用户socket被错误移除的问题

lovezhangchuangxin · Dec 14, 2024 · 5cbc5a6 · 5cbc5a6
1 parent 3687485
commit 5cbc5a6
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/packages/game/src/App.vue b/packages/game/src/App.vue
@@ -50,8 +50,6 @@ onMounted(() => {
       },
       path: '/ws',
     })
-
-    provide('socket', socket)
   })
 
   // 每隔一定时间刷新 token

diff --git a/packages/game/src/views/login/Login.vue b/packages/game/src/views/login/Login.vue
@@ -154,7 +154,6 @@ import {
   validateVerification,
 } from '@star-angry/shared'
 import { useUserStore } from '@/store'
-import { useRouter } from 'vue-router'
 
 const dialogVisible = ref(false)
 const myEmail = ref('')
@@ -213,7 +212,6 @@ const registerRules = reactive<FormRules<typeof registerForm>>({
 })
 
 const userStore = useUserStore()
-const router = useRouter()
 
 const onSubmit = (formEle?: FormInstance) => {
   if (!formEle) return
@@ -232,7 +230,7 @@ const onSubmit = (formEle?: FormInstance) => {
           const { token, user } = res.data
           localStorage.setItem('token', token)
           userStore.setUserInfo(user)
-          router.push('/')
+          location.href = '/'
         } else {
           message.error(res.msg)
           return

diff --git a/packages/game/src/views/planet/PlanetPage.vue b/packages/game/src/views/planet/PlanetPage.vue
@@ -99,15 +99,16 @@ onUnmounted(() => {
 const getMyData = () => {
   socket?.value?.timeout(5000).emit('getMyData', (err: any, response: any) => {
     if (err) {
-      toast.error('获取游戏数据失败')
+      toast.error('获取我的游戏数据失败')
+      console.log(err)
     } else if (response.code === 0) {
       const data = response.data as UserData
       userData.value = data
       // 暂时只考虑一个星球
       planetId.value = Object.keys(data.planets)[0]
       if (!planetId.value) {
-        toast.error('请先挑选星球')
-        socket.value?.disconnect()
+        toast.warn('请先在星怒页面挑选星球')
+        clearInterval(timerId.value!)
         return
       }
       planetData.value = data.planets[planetId.value]

diff --git a/packages/game/src/views/planet/ShowPanel.vue b/packages/game/src/views/planet/ShowPanel.vue
@@ -306,6 +306,9 @@ watchEffect(() => {
   }
   // 暂时只考虑一个星球
   planetId.value = Object.keys(userData.value.planets)[0]
+  if (!planetId.value) {
+    return
+  }
   planetData.value = userData.value.planets[planetId.value]
   structures.value = Object.values(
     userData.value.planets[planetId.value].structures,
-Original file line number
+Diff line change
@@ Expand Up / @@ -50,8 +50,6 @@ onMounted(() => { @@
           },
           path: '/ws',
         })
-        provide('socket', socket)
       })
       // 每隔一定时间刷新 token
@@ Expand Down @@