sunyadv 5 years ago
parent
commit
2d1a044cd7
2 changed files with 9 additions and 7 deletions
  1. 9 7
      minigame/WebContent/js/main.js
  2. BIN
      minigame/WebContent/sound/six.mp3

+ 9 - 7
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,15 +472,16 @@ 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() {
@@ -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);

BIN
minigame/WebContent/sound/six.mp3