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

src/pages/game/game.js

@@ -7,6 +7,7 @@ import wheelImage from '@/assets/RoundaboutImage/2-09.png';
 import cageImage from '@/assets/RoundaboutImage/2-13.png';
 import pedestalImage from '@/assets/RoundaboutImage/2-14.png'
 import countImage from '@/assets/RoundaboutImage/计数.png'
+import lightImage from '@/assets/RoundaboutImage/round.png'
 import ropeImage1 from '@/assets/RoundaboutImage/2-15.png'
 import ropeImage2 from '@/assets/RoundaboutImage/2-16.png'
 import ropeImage3 from '@/assets/RoundaboutImage/2-17.png'
@@ -90,6 +91,7 @@ export default function game({ el, center, onError, onSuccess, onBingo }) {
   
   // 绘制转盘
   const wheelArc = two.makeCircle(center.x, center.y, 0);
+  const lightArc = two.makeCircle(center.x, center.y, 0);
   const drawRoundAbout = () => {
     const { x, y } = center
 
@@ -102,6 +104,18 @@ export default function game({ el, center, onError, onSuccess, onBingo }) {
       wheelArc.scale = scale;
     })
 
+    // 绘制光圈
+    const lightTexture = two.makeTexture(lightImage);
+    lightArc.noStroke();
+    lightArc.fill = lightTexture;
+    lightTexture.bind('load', () => {
+      lightArc.radius = lightTexture.image.naturalWidth / 2;
+      lightArc.scale = scale;
+    })
+    lightArc.bind('update', () => {
+      console.log('-----------lightArc----------')
+    })
+
     // 绘制辅助扇形区域
     const arcList = Array(cageNum).fill().map((_, inx) => {
       const startAngle = 2 * inx * perAngle - offsetAngle; // 实际效果图是圆形有固定大小的, 不能直接从 0° 开始, 需要从 0 - offset 开始
@@ -135,6 +149,11 @@ export default function game({ el, center, onError, onSuccess, onBingo }) {
   }
   const roundAbout = drawRoundAbout()
 
+  // 成功之后的特效
+  const successEffect = () => {
+
+  }
+
   // 旋转
   const rotate = () => {
     rotateAngle += rotateSpeed

src/pages/game/index.vue

@@ -5,15 +5,15 @@
 
 <script setup>
   import { onBeforeUnmount, onMounted, ref } from 'vue';
-  import Two from "two.js";
+import { useRouter } from 'vue-router';
   import FireWorkListVue from '@/components/FireWorkList.vue';
   import game from "./game.js";
 
   const el = ref()
   const destroyRef = ref()
   const firesRef = ref()
+  const router = useRouter()
 
-  const raduis = 145
   const center = {
         x: document.body.offsetWidth / 2,
         y: document.body.offsetHeight / 2,
@@ -24,12 +24,19 @@
     destroyRef.value = game({
       el: el.value,
       center,
-      raduis,
       onError: () => {
         alert('oo ~')
+        const t = setTimeout(() => {
+          router.push('/OverPage?type=lose')
+          clearTimeout(t)
+        }, 1000)
       },
       onSuccess: () => {
         alert('你真牛逼')
+        const t = setTimeout(() => {
+          router.push('/OverPage?type=win')
+          clearTimeout(t)
+        }, 1000)
       },
       onBingo: () => {
         firesRef.value.toggle()