From fa959c73aa3d20332e9d0e198aa0c5d819fc8ddf Mon Sep 17 00:00:00 2001
From: kron <kai_hong@126.com>
Date: Sun, 13 Jul 2025 14:57:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=85=A8=E5=B1=80=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E6=B8=B8=E6=88=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/BackToGame.vue    |  60 +++++++++++++++++++++++++++++++
 src/components/BowTarget.vue     |   2 +-
 src/components/Container.vue     |  10 +++++-
 src/components/ShootProgress.vue |  14 ++++++--
 src/pages/battle-room.vue        |  12 ++++++-
 src/pages/index.vue              |   2 ++
 src/pages/melee-match.vue        |   3 +-
 src/pages/team-match.vue         |  16 +++++++--
 src/static/back-to-game-bg.png   | Bin 0 -> 2118 bytes
 src/static/pk-icon.png           | Bin 0 -> 2084 bytes
 10 files changed, 109 insertions(+), 10 deletions(-)
 create mode 100644 src/components/BackToGame.vue
 create mode 100644 src/static/back-to-game-bg.png
 create mode 100644 src/static/pk-icon.png

diff --git a/src/components/BackToGame.vue b/src/components/BackToGame.vue
new file mode 100644
index 0000000..f8158d1
--- /dev/null
+++ b/src/components/BackToGame.vue
@@ -0,0 +1,60 @@
+<script setup>
+import { ref, onMounted } from "vue";
+import { onShow } from "@dcloudio/uni-app";
+import { isGamingAPI, getCurrentGameAPI } from "@/apis";
+const props = defineProps({
+  signin: {
+    type: Function,
+    default: () => {},
+  },
+});
+const show = ref(false);
+onShow(async () => {
+  const isGaming = await isGamingAPI();
+  show.value = isGaming;
+});
+const onClick = async () => {
+  const result = await getCurrentGameAPI();
+};
+</script>
+
+<template>
+  <view v-if="show" class="back-to-game" @click="onClick">
+    <image src="../static/back-to-game-bg.png" mode="widthFix" />
+    <image src="../static/pk-icon.png" mode="widthFix" />
+    <text>返回进行中的对局</text>
+    <image src="../static/back.png" mode="widthFix" />
+  </view>
+</template>
+
+<style scoped>
+.back-to-game {
+  position: fixed;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  color: #fff;
+  width: 56vw;
+  left: calc(50% - 28vw);
+  top: 12%;
+  z-index: 999;
+}
+.back-to-game > image:first-child {
+  position: absolute;
+  width: 100%;
+}
+.back-to-game > image:nth-child(2) {
+  position: relative;
+  width: 50px;
+}
+.back-to-game > text:nth-child(3) {
+  position: relative;
+  font-size: 14px;
+}
+.back-to-game > image:nth-child(4) {
+  position: relative;
+  width: 15px;
+  margin-left: 5px;
+  transform: rotate(180deg);
+}
+</style>
diff --git a/src/components/BowTarget.vue b/src/components/BowTarget.vue
index 3d009cf..2fe597a 100644
--- a/src/components/BowTarget.vue
+++ b/src/components/BowTarget.vue
@@ -214,7 +214,7 @@ const simulShoot2 = async () => {
             top: calcRealY(bow.y),
             backgroundColor: 'blue',
           }"
-          >{{ bow.ring }}</view
+          >{{ index + 1 }}</view
         >
       </block>
       <image src="../static/bow-target.png" mode="widthFix" />
diff --git a/src/components/Container.vue b/src/components/Container.vue
index 3b9c14f..b434554 100644
--- a/src/components/Container.vue
+++ b/src/components/Container.vue
@@ -4,6 +4,7 @@ import { onShow } from "@dcloudio/uni-app";
 import AppBackground from "@/components/AppBackground.vue";
 import Header from "@/components/Header.vue";
 import ScreenHint from "@/components/ScreenHint.vue";
+import BackToGame from "@/components/BackToGame.vue";
 import { getCurrentGameAPI } from "@/apis";
 import { debounce } from "@/util";
 defineProps({
@@ -27,6 +28,10 @@ defineProps({
     type: Boolean,
     default: false,
   },
+  showBackToGame: {
+    type: Boolean,
+    default: true,
+  },
 });
 const isIos = ref(true);
 const showHint = ref(false);
@@ -55,6 +60,7 @@ const goBack = () => {
   <view>
     <AppBackground :type="bgType" />
     <Header v-if="!isHome" :title="title" :onBack="onBack" />
+    <BackToGame v-if="showBackToGame" />
     <view
       class="content"
       :style="{
@@ -66,7 +72,9 @@ const goBack = () => {
     </view>
     <ScreenHint :show="showHint">
       <view v-if="hintType === 1" class="tip-content">
-        <text>完成进行中的对局才能开启新的。您有正在进行中的对局，是否进入?</text>
+        <text
+          >完成进行中的对局才能开启新的。您有正在进行中的对局，是否进入?</text
+        >
         <view>
           <button hover-class="none" @click="backToGame">进入</button>
           <button hover-class="none" @click="() => (showHint = false)">
diff --git a/src/components/ShootProgress.vue b/src/components/ShootProgress.vue
index d33a3c3..cb370d0 100644
--- a/src/components/ShootProgress.vue
+++ b/src/components/ShootProgress.vue
@@ -56,11 +56,11 @@ watch(
 
 watch(
   () => props.start,
-  (newVal, oldVal) => {
-    if (newVal === false) {
+  (newVal) => {
+    if (!newVal && timer.value) {
       if (timer.value) clearInterval(timer.value);
     }
-    if (!oldVal && newVal === true) {
+    if (newVal) {
       remain.value = props.total;
       // setTimeout(() => {
       timer.value = setInterval(() => {
@@ -81,7 +81,15 @@ watch(
 );
 
 const updateRemain = (value) => {
+  if (timer.value) clearInterval(timer.value);
   remain.value = Math.floor(value);
+  timer.value = setInterval(() => {
+    if (remain.value > 0) {
+      remain.value--;
+    } else {
+      props.onTimeIsUp();
+    }
+  }, 1000);
 };
 
 onMounted(() => {
diff --git a/src/pages/battle-room.vue b/src/pages/battle-room.vue
index e7e6fad..e375c0e 100644
--- a/src/pages/battle-room.vue
+++ b/src/pages/battle-room.vue
@@ -277,6 +277,11 @@ async function onReceiveMessage(messages = []) {
                 msg.target
               );
             }
+          } else {
+            roundResults.value.push({
+              redArrows: [],
+              blueArrows: [],
+            });
           }
         }
         if (room.value.battleType === 2) {
@@ -373,7 +378,12 @@ onUnmounted(() => {
 </script>
 
 <template>
-  <Container title="对战" :onBack="onBack" :bgType="battleId ? 1 : 0">
+  <Container
+    title="对战"
+    :onBack="onBack"
+    :bgType="battleId ? 1 : 0"
+    :showBackToGame="false"
+  >
     <view class="standby-phase" v-if="step === 1">
       <Guide>
         <view class="battle-guide">
diff --git a/src/pages/index.vue b/src/pages/index.vue
index d8e09d1..0fd8bf0 100644
--- a/src/pages/index.vue
+++ b/src/pages/index.vue
@@ -7,6 +7,7 @@ import UserHeader from "@/components/UserHeader.vue";
 import SModal from "@/components/SModal.vue";
 import Signin from "@/components/Signin.vue";
 import BubbleTip from "@/components/BubbleTip.vue";
+import BackToGame from "@/components/BackToGame.vue";
 import {
   getAppConfig,
   getHomeData,
@@ -100,6 +101,7 @@ const comingSoon = () => {
   <Container :isHome="true">
     <view class="container" :style="{ paddingTop: isIos ? '100rpx' : '70rpx' }">
       <UserHeader showRank :onSignin="() => (showModal = true)" />
+      <BackToGame />
       <view :style="{ padding: '12px 10px' }">
         <view class="feature-grid">
           <view class="bow-card">
diff --git a/src/pages/melee-match.vue b/src/pages/melee-match.vue
index 8dc7661..a94a56a 100644
--- a/src/pages/melee-match.vue
+++ b/src/pages/melee-match.vue
@@ -93,7 +93,7 @@ onLoad(async (options) => {
   }
 });
 async function stopMatch() {
-  uni.navigateBack();
+  uni.$showHint(3);
 }
 async function readyToGo() {
   if (battleId.value) {
@@ -184,6 +184,7 @@ onUnmounted(() => {
     :title="battleId ? '大乱斗排位赛' : '搜索对手...'"
     :bgType="1"
     :onBack="onBack"
+    :showBackToGame="false"
   >
     <view class="container">
       <block v-if="battleId">
diff --git a/src/pages/team-match.vue b/src/pages/team-match.vue
index 5c69ad3..7e173b8 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(`battle-${options.battleId}`);
-    // console.log("----battleInfo", battleInfo);
+    console.log("----battleInfo", battleInfo);
     if (battleInfo) {
       battleId.value = battleInfo.id;
       start.value = true;
@@ -83,7 +83,7 @@ onLoad(async (options) => {
   }
 });
 async function stopMatch() {
-  uni.navigateBack();
+  uni.$showHint(3);
 }
 async function readyToGo() {
   if (battleId.value) {
@@ -153,6 +153,11 @@ async function onReceiveMessage(messages = []) {
             msg.target
           );
         }
+      } else {
+        roundResults.value.push({
+          redArrows: [],
+          blueArrows: [],
+        });
       }
     }
     if (msg.constructor === MESSAGETYPES.CurrentRoundEnded) {
@@ -217,6 +222,7 @@ onUnmounted(() => {
     :title="battleId ? '1V1排位赛' : '搜索对手...'"
     :bgType="1"
     :onBack="onBack"
+    :showBackToGame="false"
   >
     <view class="container">
       <block v-if="battleId">
@@ -260,7 +266,11 @@ onUnmounted(() => {
             :round="currentRound - 1"
             :bluePoint="currentBluePoint"
             :redPoint="currentRedPoint"
-            :roundData="roundResults[roundResults.length - 1]"
+            :roundData="
+              roundResults[roundResults.length - 2]
+                ? roundResults[roundResults.length - 2]
+                : []
+            "
             :onAutoClose="() => (showRoundTip = false)"
           />
         </ScreenHint>
diff --git a/src/static/back-to-game-bg.png b/src/static/back-to-game-bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..a60037209ab54f8f7c3fd4c15cdbc7f9cc122c67
GIT binary patch
literal 2118
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

literal 0
HcmV?d00001

diff --git a/src/static/pk-icon.png b/src/static/pk-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..3be9a7bab9520b7831c1e9cb2c71accf0ec81a58
GIT binary patch
literal 2084
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
O0000<MNUMnLSTZr1t#(U

literal 0
HcmV?d00001