Bläddra i källkod

修改生物反馈,样式及蓝牙基站连接问题

plg 11 månader sedan
förälder
incheckning
5d229cb670

+ 21 - 3
src/renderer/components/Animation.vue

@@ -11,7 +11,7 @@
       }" @click="singlePeople = false">双人训练</el-button>
     </div>
 
-    <div :class="{animation_zong:singlePeople,animation_zong_shuang:!singlePeople}">
+    <div :class="{animation_zong:true}">
       <div class="animation_main" v-show="!singlePeople">
         <div class="animation_k" @click="goPage('/menu/animationDes', 1)">
           <img class="animation_img_cla" src="../assets/newAnimation/tianping.png" />
@@ -30,6 +30,24 @@
           <span class="animation_des_font">心之花</span>
         </div>
       </div>
+      <div class="animation_main" v-show="!singlePeople">
+        <div class="animation_k" @click="goPage('/menu/animationDes', 1)" style="visibility: hidden">
+          <img class="animation_img_cla" src="../assets/newAnimation/tianping.png" />
+          <div class="animation_des">&nbsp;</div>
+          <span class="animation_des_font">天平倾斜</span>
+        </div>
+        <div class="animation_k" @click="goPage('/menu/animationDes', 2)" style="visibility: hidden">
+          <img class="animation_img_cla" src="../assets/newAnimation/run.png" />
+          <div class="animation_des">&nbsp;</div>
+          <span class="animation_des_font">双人奔跑</span>
+        </div>
+
+        <div class="animation_k" @click="goPage('/menu/animationDes', 3)" style="visibility: hidden">
+          <img class="animation_img_cla" src="../assets/newAnimation/cat.png" />
+          <div class="animation_des">&nbsp;</div>
+          <span class="animation_des_font">心之花</span>
+        </div>
+      </div>
       <div class="animation_main" v-show="singlePeople">
         <div class="animation_k" @click="goPage('/menu/animationDes', 1)">
           <img class="animation_img_cla" src="../assets/newAnimation/long.png" />
@@ -221,8 +239,8 @@ export default {
 .animation_zong_shuang {
   display: flex;
   flex-direction: column;
-  justify-content: space-between;
-  margin-top:54px;
+
+
 
   flex: 1;
   padding-bottom: 20px;

+ 2 - 0
src/renderer/components/AnimationDes.vue

@@ -1206,6 +1206,8 @@ export default {
       this.clearDataFun();
     },
     equipmentFun(val) {
+      //将发送的数据改为0
+      this.attentionAnimation=0;
       //先判断当选择的设备是否连接
       //如果已连接,则继续测试
       //如果未连接则提示连接设备

+ 7 - 4
src/renderer/components/AnimationDouble.vue

@@ -364,8 +364,8 @@ export default {
       focusNao: [],
       // 全量
       focusNaoAll: [],
-      urlThreeP: "../../../static/tianping/index.html",
-      // urlThreeP: __static + "/tianping/index.html",
+      // urlThreeP: "../../../static/tianping/index.html",
+      urlThreeP: __static + "/tianping/index.html",
       pubsrc: __static,
       userLink: {
         num: "",
@@ -1817,6 +1817,9 @@ export default {
       this.clearDataFun();
     },
     equipmentFun(val) {
+      this.attentionAnimation = 0;
+      //脑电--第二个人的测试数据
+      this.attentionSecondAnimation = 0;
       //先判断当选择的设备是否连接
       //如果已连接,则继续测试
       //如果未连接则提示连接设备
@@ -2191,8 +2194,8 @@ export default {
       this.clearDataFun();
       switch (val) {
         case 1:
-          // this.urlThreeP = __static + "/tianping/index.html";
-          this.urlThreeP = "../../../static/tianping/index.html";
+          this.urlThreeP = __static + "/tianping/index.html";
+          // this.urlThreeP = "../../../static/tianping/index.html";
           this.delayTime();
           break;
         case 2:

BIN
static/loong_3/Build/Longfeixing.data


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
static/loong_3/Build/Longfeixing.framework.js


BIN
static/loong_3/Build/Longfeixing.wasm


+ 0 - 5
static/loong_3/index.html

@@ -102,11 +102,6 @@
         this.gameInstance.SendMessage("Main Camera","Fireworklocity",val);
       }
 
-      // setInterval(()=>{
-      //   let a =Math.random()
-
-      //   Bloo(a)
-      // },1000)
       document.body.appendChild(script);
     </script>
   </body>

Vissa filer visades inte eftersom för många filer har ändrats