Merge branch 'master' of http://git.ycjcjy.com/honghe/roundabout

src/components/FireWorkList.vue

@@ -45,7 +45,7 @@ const props = defineProps({
 
 const fireNum = ref(12)
 const isFinished = ref(true)
-const duration = ref(0.8)
+const duration = ref(1)
 
 const calcLeft = (inx) => {
   let start, end

src/pages/game/game.js

@@ -75,7 +75,7 @@ export default function game({ el, center, onError, onSuccess, onBingo }) {
   let rotateAngle = 0
   
   // 轿厢的旋转速度 - 单位弧度
-  const rotateSpeed = 0.01
+  const rotateSpeed = 0.015
 
   // 目标轿厢与子弹轿厢的映射字典
   const mntMap = {}
@@ -328,10 +328,16 @@ export default function game({ el, center, onError, onSuccess, onBingo }) {
     const cage = cageList.filter((it) => {
       const rect1 = it.getBoundingClientRect();
 
+      // 校验范围为轿厢内部一半的地方
+      const left = rect1.left  + rect1.width / 3
+      const right = rect1.right - rect1.width / 3
+      const top = rect1.top
+      const bottom = rect1.bottom
+
       // 如果当前子弹的中心点位于目标轿厢矩形范围内
       // 则代表击中
-      return x >= rect1.left && x <= rect1.right &&
-          y >= rect1.top && y <= rect1.bottom;
+      return x >= left && x <= right &&
+          y >= top && y <= bottom;
     })[0]
 
     if (!cage) return false;  // 未找到对应的目标轿厢

src/pages/game/index.vue

@@ -42,12 +42,12 @@
       },
       onSuccess: () => {
         firesRef.value.toggle()
-        alert('你真牛逼')
+        // alert('你真牛逼')
         const t = setTimeout(() => {
           localStorage.setItem('loadSign', '1');
           router.push('/OverPage?type=win')
           clearTimeout(t)
-        }, 1000)
+        }, 2000)
       },
       onBingo: () => {
       }