Commit 1b98c460 authored by LWD's avatar LWD

代码提交

parent 93ad0fc2
...@@ -44,7 +44,7 @@ cc.Class({ ...@@ -44,7 +44,7 @@ cc.Class({
//触摸移动 //触摸移动
touchMove: function (event) { touchMove: function (event) {
if (this.node.isComplent) { if (this.node.isComplent || this._isRotate) {
return return
} }
// var posScreen = event.getLocation(); //点击事件获取位置 // var posScreen = event.getLocation(); //点击事件获取位置
...@@ -112,7 +112,7 @@ cc.Class({ ...@@ -112,7 +112,7 @@ cc.Class({
g.game.inst.contentArr_1[1].getChildByName("db").active = true; g.game.inst.contentArr_1[1].getChildByName("db").active = true;
g.game.inst.contentArr_1[1].getChildByName("db").getComponent(dragonBones.ArmatureDisplay).playAnimation("newAnimation", 1); g.game.inst.contentArr_1[1].getChildByName("db").getComponent(dragonBones.ArmatureDisplay).playAnimation("newAnimation", 1);
if (g.game.inst.idx == 1) { if (this.node.width >= 150) {
this.node.scale = 0.666; this.node.scale = 0.666;
this.node.x = 0; this.node.x = 0;
} }
...@@ -141,7 +141,7 @@ cc.Class({ ...@@ -141,7 +141,7 @@ cc.Class({
g.game.inst.contentArr_1[0].getChildByName("db").active = true; g.game.inst.contentArr_1[0].getChildByName("db").active = true;
g.game.inst.contentArr_1[0].getChildByName("db").getComponent(dragonBones.ArmatureDisplay).playAnimation("newAnimation", 1); g.game.inst.contentArr_1[0].getChildByName("db").getComponent(dragonBones.ArmatureDisplay).playAnimation("newAnimation", 1);
if (g.game.inst.idx == 1) { if (this.node.width >= 150) {
this.node.scale = 0.666; this.node.scale = 0.666;
this.node.x = 0; this.node.x = 0;
} }
...@@ -207,6 +207,11 @@ cc.Class({ ...@@ -207,6 +207,11 @@ cc.Class({
var scaleX = this.node.scaleY; var scaleX = this.node.scaleY;
this._isRotate = true;
setTimeout(() => {
this._isRotate = false;
}, 600)
cc.tween(this.node) cc.tween(this.node)
.to(0.3, { scaleX: 0 }) .to(0.3, { scaleX: 0 })
.call(() => { .call(() => {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment