From 725a3ddcb93fd7b5f92f259fd9af76d1c540894a Mon Sep 17 00:00:00 2001
From: zhangyibo95 <690096405@qq.com>
Date: Thu, 9 Jul 2026 16:15:27 +0800
Subject: [PATCH] =?UTF-8?q?update:=E4=BC=98=E5=8C=96=E6=AF=94=E8=B5=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apis.js                     | 4 ++--
 src/pages/melee-battle.vue      | 2 +-
 src/pages/team-battle.vue       | 2 +-
 src/pages/team-battle/index.vue | 4 ++--
 src/websocket.js                | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/apis.js b/src/apis.js
index c885963..867dacc 100644
--- a/src/apis.js
+++ b/src/apis.js
@@ -8,8 +8,8 @@ try {
 
     switch (envVersion) {
         case "develop": // 开发版
-            BASE_URL = "http://192.168.1.2:8000/api/shoot";
-            // BASE_URL = "https://apitest.shelingxingqiu.com/api/shoot";
+            // BASE_URL = "http://192.168.1.2:8000/api/shoot";
+            BASE_URL = "https://apitest.shelingxingqiu.com/api/shoot";
             break;
         case "trial": // 体验版
             BASE_URL = "https://apitest.shelingxingqiu.com/api/shoot";
diff --git a/src/pages/melee-battle.vue b/src/pages/melee-battle.vue
index bb0cebc..57b30e3 100644
--- a/src/pages/melee-battle.vue
+++ b/src/pages/melee-battle.vue
@@ -235,7 +235,7 @@ function recoverData(battleInfo, { force = false } = {}) {
     }
 
     if (battleInfo.status === 0) {
-      const readyRemain = (Date.now() - (battleInfo.createTime || Date.now())) / 1000;
+      const readyRemain = (Date.now() - (battleInfo.serverTime || Date.now())) / 1000;
       if (readyRemain > 0 && readyRemain < 15) {
         setTimeout(() => uni.$emit("update-timer", 15 - readyRemain - 0.2), 200);
       }
diff --git a/src/pages/team-battle.vue b/src/pages/team-battle.vue
index 1a0d802..cdd9414 100644
--- a/src/pages/team-battle.vue
+++ b/src/pages/team-battle.vue
@@ -86,7 +86,7 @@ const recoverData = (battleInfo, {force = false, arrowOnly = false} = {}) => {
     start.value = battleInfo.status !== 0;
 
     if (battleInfo.status === 0) {
-      const readyRemain = (Date.now() - (battleInfo.createTime || Date.now())) / 1000;
+      const readyRemain = (Date.now() - (battleInfo.serverTime || Date.now())) / 1000;
       if (readyRemain > 0 && readyRemain < 15) {
         setTimeout(() => {
           uni.$emit("update-timer", 15 - readyRemain - 0.2);
diff --git a/src/pages/team-battle/index.vue b/src/pages/team-battle/index.vue
index d455359..cd748ac 100644
--- a/src/pages/team-battle/index.vue
+++ b/src/pages/team-battle/index.vue
@@ -841,8 +841,8 @@ function applyReadyState(battleInfo) {
   clearProgressZeroWaiters();
   cancelRoundTipDisplay();
 
-  const createTime = normalizeTimestamp(battleInfo?.createTime || Date.now());
-  const readyElapsed = (Date.now() - createTime) / 1000;
+  const serverTime = normalizeTimestamp(battleInfo?.serverTime || Date.now());
+  const readyElapsed = (Date.now() - serverTime) / 1000;
   if (readyElapsed > 0 && readyElapsed < READY_SECONDS) {
     setTimeout(() => {
       uni.$emit("update-timer", READY_SECONDS - readyElapsed - 0.2);
diff --git a/src/websocket.js b/src/websocket.js
index 736ab22..73e7132 100644
--- a/src/websocket.js
+++ b/src/websocket.js
@@ -24,8 +24,8 @@ function createWebSocket(token, onMessage) {
 
     switch (envVersion) {
       case "develop": // 开发版
-        url = "ws://192.168.1.2:8000/socket";
-        // url = "wss://apitest.shelingxingqiu.com/socket";
+        // url = "ws://192.168.1.2:8000/socket";
+        url = "wss://apitest.shelingxingqiu.com/socket";
         break;
       case "trial": // 体验版
         url = "wss://apitest.shelingxingqiu.com/socket";