Merge remote-tracking branch 'origin/master'

minigame/WebContent/js/main.js

@@ -7,9 +7,8 @@ function bodyScroll(event) {
 var canvas = document.getElementById("canvas");
 var stage = new createjs.Stage(canvas);
 
-//createjs.Sound.alternateExtensions = ["mp3"];
-//createjs.Sound.registerSound("sound/qwe.mp3", "sound");
-//createjs.Sound.play("sound");//播放
+createjs.Sound.alternateExtensions = ["mp3"];
+createjs.Sound.registerSound("sound/six.mp3", "six");
 
 window.user_info = {
     uid: 0,
@@ -177,6 +176,7 @@ function handleComplete(evt, comp) {
     }
     function oilIconAnim() {
         oilAnim();
+		createjs.Sound.play("six");//播放
         var anim = new TimelineMax({ repeat:10,delay:1});
         anim.to(exportRoot.pro.oil_icon2, 0.3, {y:"+=100",alpha:0})
         return anim;
@@ -453,6 +453,7 @@ function handleComplete(evt, comp) {
 
             oilIconAnim();
             proAnim(function() {
+				
                 exportRoot.btn2.alpha = 1;
                 btnAnim(exportRoot.btn2);
                 if(dishIndex == 0){
@@ -471,21 +472,22 @@ function handleComplete(evt, comp) {
             materialEnterAnim(exportRoot.blackboard.material1,0.2);
             materialEnterAnim(exportRoot.blackboard.material2,0.4);
             materialEnterAnim(exportRoot.blackboard.material3,0.6);
-            exportRoot.ball1.alpha = 1;
-
-            ballAnim(exportRoot.ball1);
+            
         })
 
         exportRoot.blackboard.material1.addEventListener("mousedown", function() {
             exportRoot.blackboard.material1.removeAllEventListeners();
             exportRoot.blackboard.material2.removeAllEventListeners();
             exportRoot.blackboard.material3.removeAllEventListeners();
+			exportRoot.ball1.alpha = 1;
+
+            ballAnim(exportRoot.ball1);
             chooseType = 3;
             $(".poster-mode").addClass("poster-bg3");
             materialAnim(exportRoot.blackboard.material1, 300, 180, function() {
                 exportRoot.blackboard.material1.x -=300;
                 exportRoot.blackboard.material1.y -=180;
-                $(".shake-mode").show();
+                // $(".shake-mode").show();
                 shakeInit();
             });
         })
@@ -498,7 +500,7 @@ function handleComplete(evt, comp) {
             materialAnim(exportRoot.blackboard.material2, 120, 180, function() {
                 exportRoot.blackboard.material2.x -=120;
                 exportRoot.blackboard.material2.y -=180;
-                $(".shake-mode").show();
+                // $(".shake-mode").show();
                 shakeInit();
             });
         })
@@ -511,7 +513,7 @@ function handleComplete(evt, comp) {
             materialAnim(exportRoot.blackboard.material3, -30, 180, function() {
                 exportRoot.blackboard.material3.x +=30;
                 exportRoot.blackboard.material3.y -=180;
-                $(".shake-mode").show();
+                // $(".shake-mode").show();
                 shakeInit();
             });
         })
@@ -530,7 +532,7 @@ function handleComplete(evt, comp) {
 
 
         bowlAnim(function() {
-            if(dishIndex == 0){
+			if(dishIndex == 0){
                 dishMove(exportRoot.plate.hsr_icon1,0,0);
                 dishMove(exportRoot.plate.hsr_icon2,0,0);
                 dishMove(exportRoot.plate.hsr_icon3,0,0);
@@ -563,35 +565,10 @@ function handleComplete(evt, comp) {
             alert('您的手机不支持摇一摇功能！');
         }
 
-        setTimeout(function(){
-            window.removeEventListener('devicemotion', deviceMotionHandler, false);
-            exportRoot.pot.hsr.play();
-            exportRoot.btn3.alpha = 1;
-            btnAnim(exportRoot.btn3);
-            exportRoot.btn3.addEventListener("mousedown",function(){
-                exportRoot.btn3.removeAllEventListeners();
-                var href = document.location.href + "&type=" + chooseType + "&food=" + dishIndex;
-                history.pushState("", "Title", href);
-                $(".poster-mode").fadeIn();
-            })
-
-
-            if(dishIndex == 0){
-                exportRoot.pot.hsr.gotoAndStop(1);
-            }else if(dishIndex == 1){
-                exportRoot.pot.qcdf.gotoAndStop(1);
-            }else if(dishIndex == 2){
-                exportRoot.bowl.oil.alpha = 0;
-                exportRoot.plate['swy_icon1'].gotoAndStop(2);
-            }else{
-                exportRoot.pot.ymc.gotoAndStop(1);
-            }
-            $(".shake-mode").fadeOut();
-        },3000)
         //获取加速度信息
         //通过监听上一步获取到的x, y, z 值在一定时间范围内的变化率，进行设备是否有进行晃动的判断。
         //而为了防止正常移动的误判，需要给该变化率设置一个合适的临界值。
-        var SHAKE_THRESHOLD = 8000; //阈值越大，触发摇晃事件时手机摇晃的程度越剧烈
+        var SHAKE_THRESHOLD = 10000; //阈值越大，触发摇晃事件时手机摇晃的程度越剧烈
         var last_update = 0;
         var x, y, z, last_x = 0,
             last_y = 0,
@@ -608,6 +585,31 @@ function handleComplete(evt, comp) {
                 z = acceleration.z;
                 var speed = Math.abs(x + y + z - last_x - last_y - last_z) / diffTime * 10000;
                 if (speed > SHAKE_THRESHOLD) {
+                    $(".shake-mode").show();
+                    setTimeout(function(){
+                        window.removeEventListener('devicemotion', deviceMotionHandler, false);
+                        exportRoot.pot.hsr.play();
+                        exportRoot.btn3.alpha = 1;
+                        btnAnim(exportRoot.btn3);
+                        exportRoot.btn3.addEventListener("mousedown",function(){
+                            exportRoot.btn3.removeAllEventListeners();
+                            $(".poster-mode").fadeIn();
+                        })
+
+
+                        if(dishIndex == 0){
+                            exportRoot.pot.hsr.gotoAndStop(1);
+                        }else if(dishIndex == 1){
+                            exportRoot.pot.qcdf.gotoAndStop(1);
+                        }else if(dishIndex == 2){
+                            exportRoot.bowl.oil.alpha = 0;
+                            exportRoot.plate['swy_icon1'].gotoAndStop(2);
+                        }else{
+                            exportRoot.pot.ymc.gotoAndStop(1);
+                        }
+                        $(".shake-mode").fadeOut();
+                    },3000)
+
                     //dosomething
                     $("#fire").addClass("anim-time");
                 }else{
@@ -622,6 +624,10 @@ function handleComplete(evt, comp) {
     }
 
 
+
+
+
+
     //Registers the "tick" event listener.
     function fnStartAnimation() {
         stage.addChild(exportRoot, lineShape);