Merge remote-tracking branch 'refs/remotes/ckcz123/master' into dev-2.0-appendPic-20180218

This commit is contained in:
YouWei Zhao 2018-02-28 13:38:26 +08:00
commit 9ee573d3af

View File

@ -2993,7 +2993,6 @@ core.prototype.moveBlock = function(x,y,steps,time,immediateHide,callback) {
////// 显示/隐藏某个块时的动画效果 //////
core.prototype.animateBlock = function (loc,type,time,callback) {
if (type!='hide') type='show';
core.status.replay.animate=true;
//clearInterval(core.interval.tipAnimate);
core.saveCanvas('animate');
@ -3019,6 +3018,7 @@ core.prototype.animateBlock = function (loc,type,time,callback) {
return;
}
core.status.replay.animate=true;
var draw = function () {
list.forEach(function (t) {
core.canvas.animate.drawImage(t.blockImage, 0, t.blockIcon * 32, 32, 32, t.x * 32, t.y * 32, 32, 32);