|
@@ -191,16 +191,16 @@ function handleComplete(evt, comp) {
|
|
|
function materialAnim(dom, x, y, callback) {
|
|
|
var anim = new TimelineMax({ onComplete: callback });
|
|
|
anim.to(dom, 0.5, { x: "+=" + x, y: "+=" + y,scale:1.1, ease: Power0.easeIn })
|
|
|
- .to(dom, 0.3, { rotation: "-=25", ease: Power0.easeIn })
|
|
|
- .to(exportRoot.powder, 0.1, { alpha: 1, ease: Power0.easeIn },"-=0.1")
|
|
|
- .to(exportRoot.powder, 0.3, { x: "-=15",y:"+=55",alpha:0, ease: Power0.easeIn },'-=0.2')
|
|
|
- .to(dom, 0.3, { rotation: "+=25", ease: Power0.easeIn })
|
|
|
- .to(exportRoot.powder, 0.01, { x: "+=15",y:"-=55",alpha:0, ease: Power0.easeIn })
|
|
|
- .to(dom, 0.3, { rotation: "-=25", ease: Power0.easeIn })
|
|
|
- .to(exportRoot.powder, 0.1, { alpha: 1, ease: Power0.easeIn },"-=0.1")
|
|
|
- .to(exportRoot.powder, 0.3, { x: "-=15",y:"+=55",alpha:0, ease: Power0.easeIn },'-=0.2')
|
|
|
- .to(dom, 0.3, { rotation: "+=25", ease: Power0.easeIn })
|
|
|
- .to(exportRoot.powder, 0.1, { alpha:0, ease: Power0.easeIn });
|
|
|
+ .to(dom, 0.3, { rotation: "-=25", ease: Power0.easeIn })
|
|
|
+ .to(exportRoot.powder, 0.1, { alpha: 1, ease: Power0.easeIn },"-=0.1")
|
|
|
+ .to(exportRoot.powder, 0.3, { x: "-=15",y:"+=55",alpha:0, ease: Power0.easeIn },'-=0.2')
|
|
|
+ .to(dom, 0.3, { rotation: "+=25", ease: Power0.easeIn })
|
|
|
+ .to(exportRoot.powder, 0.01, { x: "+=15",y:"-=55",alpha:0, ease: Power0.easeIn })
|
|
|
+ .to(dom, 0.3, { rotation: "-=25", ease: Power0.easeIn })
|
|
|
+ .to(exportRoot.powder, 0.1, { alpha: 1, ease: Power0.easeIn },"-=0.1")
|
|
|
+ .to(exportRoot.powder, 0.3, { x: "-=15",y:"+=55",alpha:0, ease: Power0.easeIn },'-=0.2')
|
|
|
+ .to(dom, 0.3, { rotation: "+=25", ease: Power0.easeIn })
|
|
|
+ .to(exportRoot.powder, 0.1, { alpha:0, ease: Power0.easeIn });
|
|
|
return anim;
|
|
|
}
|
|
|
|
|
@@ -243,7 +243,7 @@ function handleComplete(evt, comp) {
|
|
|
}else if(dishIndex == 1){
|
|
|
noice = createjs.Sound.play("qcdf");//播放
|
|
|
setTimeout(function(){
|
|
|
- soup = createjs.Sound.play("soup");//播放
|
|
|
+ video = createjs.Sound.play("oil");//播放
|
|
|
}, 2000);
|
|
|
}else if(dishIndex == 2){
|
|
|
noice = createjs.Sound.play("swy");//播放
|
|
@@ -255,11 +255,11 @@ function handleComplete(evt, comp) {
|
|
|
}
|
|
|
noice.volume = 1;
|
|
|
video.volume = 0.2;
|
|
|
- soup.volume = 0.8;
|
|
|
+ //soup.volume = 0.8;
|
|
|
setTimeout(function(){
|
|
|
video.paused = true;
|
|
|
- soup.paused = true;
|
|
|
- }, 4500);
|
|
|
+ //soup.paused = true;
|
|
|
+ }, 6000);
|
|
|
|
|
|
var anim = new TimelineMax({ repeat:10,delay:1});
|
|
|
anim.to(exportRoot.pro.oil_icon2, 0.3, {y:"+=100",alpha:0})
|