From 1bc7a3ae47fdb150a0459e62bfac85b8860a852c Mon Sep 17 00:00:00 2001
From: chenli <2291527198@qq.com>
Date: Mon, 14 Mar 2022 11:59:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/NEXT_test001/audios/common.mp3.meta    |  1 -
 assets/NEXT_test001/audios/dan_enter.mp3.meta |  1 -
 assets/NEXT_test001/scene/NEXT_test001.fire   |  6 +--
 assets/NEXT_test001/scene/NEXT_test001.ts     | 37 ++++++++++++++++++-
 .../textures/mine/mengban.png.meta            |  2 +-
 .../NEXT_test001/textures/mine/top.png.meta   |  2 +-
 6 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/assets/NEXT_test001/audios/common.mp3.meta b/assets/NEXT_test001/audios/common.mp3.meta
index d56cfa3..a32064a 100644
--- a/assets/NEXT_test001/audios/common.mp3.meta
+++ b/assets/NEXT_test001/audios/common.mp3.meta
@@ -2,6 +2,5 @@
   "ver": "2.0.1",
   "uuid": "e8f9627a-f0ef-4f6b-9b2d-58518b0e701e",
   "downloadMode": 0,
-  "duration": 3.761633,
   "subMetas": {}
 }
\ No newline at end of file
diff --git a/assets/NEXT_test001/audios/dan_enter.mp3.meta b/assets/NEXT_test001/audios/dan_enter.mp3.meta
index caa1c51..7a25c15 100644
--- a/assets/NEXT_test001/audios/dan_enter.mp3.meta
+++ b/assets/NEXT_test001/audios/dan_enter.mp3.meta
@@ -2,6 +2,5 @@
   "ver": "2.0.1",
   "uuid": "11b780d3-4491-4f17-ab3d-a58660c33d54",
   "downloadMode": 0,
-  "duration": 0.2642,
   "subMetas": {}
 }
\ No newline at end of file
diff --git a/assets/NEXT_test001/scene/NEXT_test001.fire b/assets/NEXT_test001/scene/NEXT_test001.fire
index c65b999..8522196 100644
--- a/assets/NEXT_test001/scene/NEXT_test001.fire
+++ b/assets/NEXT_test001/scene/NEXT_test001.fire
@@ -745,7 +745,7 @@
         "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
       }
     ],
-    "_srcBlendFactor": 770,
+    "_srcBlendFactor": 1,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
       "__uuid__": "46c4adda-8b4b-4b06-8e05-b9e81b5171de"
@@ -1093,7 +1093,7 @@
         "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
       }
     ],
-    "_srcBlendFactor": 770,
+    "_srcBlendFactor": 1,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
       "__uuid__": "6d5066e2-0484-4095-90de-bbbff72fc24c"
@@ -5701,7 +5701,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        0,
+        -5.1,
         0,
         0,
         0,
diff --git a/assets/NEXT_test001/scene/NEXT_test001.ts b/assets/NEXT_test001/scene/NEXT_test001.ts
index 138294a..ccd8fc1 100644
--- a/assets/NEXT_test001/scene/NEXT_test001.ts
+++ b/assets/NEXT_test001/scene/NEXT_test001.ts
@@ -62,7 +62,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
     private sprite_voice:cc.Node;
     private sprite_voiceing:cc.Node;
     private voiceing:boolean = false;
-
+    private voiceingTime:number = 0;
     public startBlue:boolean = false;
     private start_blueTime = 0;
     private rights:Array<boolean> = [];
@@ -86,6 +86,8 @@ export default class SceneComponent extends MyCocosSceneComponent {
     private comon_node:cc.Node;
     public zhazha_node:cc.Node;
     
+
+    public startTest:boolean = false;
     addPreloadImage() {
         // TODO 根据自己的配置预加载图片资源
         // this._imageResList.push({ url: this.data.pic_url });
@@ -141,14 +143,24 @@ export default class SceneComponent extends MyCocosSceneComponent {
                 return;
             }
 
+
             lf.voiceing = true;
+            lf.voiceingTime = 0;
+
             lf.sprite_voiceing.active = true;
-            lf.sprite_voice.active = false;
+            lf.sprite_voice.active = true;
+
+            // let action = cc.blink(2,5);
+            // lf.sprite_voiceing.runAction(cc.repeatForever(action));
+            let action2 = cc.blink(2,5);
+            lf.sprite_voice.runAction(cc.repeatForever(action2));
 
             lf.playAudioByUrl(this.data.questions[this.curIndex].audio,function(){
                 lf.voiceing = false;
                 lf.sprite_voiceing.active = false;
                 lf.sprite_voice.active = true;
+                lf.sprite_voice.opacity = 255;
+                lf.sprite_voice.stopAllActions();
             });
         })
 
@@ -160,6 +172,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
         })
 
         this.btn_ok.on('click', () => {
+            if(lf.startTest == false) return;
             lf.pinceOver();
         })
     }
@@ -331,6 +344,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
 
     //最终展示,展示当前
     next(){
+        this.startTest = false;
         this.curIndex = this.curIndex + 1;
         if(this.curIndex >= this.data.questions.length){
             this.gameOver();
@@ -398,6 +412,9 @@ export default class SceneComponent extends MyCocosSceneComponent {
     }
 
     showBlueLaZhu(){
+        this.progress_blue.getChildByName("spine").y = 356;
+        this.progress_blue.getChildByName("spine").active = true;
+        
         this.progress_blue.getChildByName("spine_red").active = false;
 
         this.progress_blue.getComponent(cc.ProgressBar).progress = 1;
@@ -551,6 +568,20 @@ export default class SceneComponent extends MyCocosSceneComponent {
                 this.pinceOver();
             }
         }
+
+        if(this.voiceing){
+            // this.voiceingTime = this.voiceingTime + dt;
+            
+            // if(this.voiceingTime * 1000 >= 100){
+            //     this.voiceingTime = 0;
+            //     this.sprite_voiceing.active = true;
+            //     this.sprite_voice.active = false;
+            // }
+            // else{
+            //     this.sprite_voiceing.active = false;
+            //     this.sprite_voice.active = true;
+            // }
+        }
     }
 
 
@@ -582,6 +613,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
 
         // this.pingceCallBack(90);
         this.log("pinceOver:");
+
         if(!cc.sys.isBrowser){
             let lf = this;
             window["courseware"].stopTest((res) => {
@@ -774,6 +806,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
             lf.playAudioByUrl(this.data.guideAudio,function(){
                 //开始录音
                 lf.startRedTime();
+                lf.startTest = true;
             });
 
         })
diff --git a/assets/NEXT_test001/textures/mine/mengban.png.meta b/assets/NEXT_test001/textures/mine/mengban.png.meta
index 1638433..5185442 100644
--- a/assets/NEXT_test001/textures/mine/mengban.png.meta
+++ b/assets/NEXT_test001/textures/mine/mengban.png.meta
@@ -3,7 +3,7 @@
   "uuid": "95e00b83-b7c3-4648-abee-9576bd7f953e",
   "type": "sprite",
   "wrapMode": "clamp",
-  "filterMode": "bilinear",
+  "filterMode": "point",
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
diff --git a/assets/NEXT_test001/textures/mine/top.png.meta b/assets/NEXT_test001/textures/mine/top.png.meta
index 41b9e6c..f6fee6e 100644
--- a/assets/NEXT_test001/textures/mine/top.png.meta
+++ b/assets/NEXT_test001/textures/mine/top.png.meta
@@ -3,7 +3,7 @@
   "uuid": "9c0653f7-d2c8-44dd-8a1c-72cc0eab9e9f",
   "type": "sprite",
   "wrapMode": "clamp",
-  "filterMode": "bilinear",
+  "filterMode": "point",
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-- 
2.21.0