Commit 0a57d259 authored by Lwd's avatar Lwd

aaaa

parent ea972d13
......@@ -189,7 +189,7 @@
"array": [
0,
0,
355.0704155516199,
278.86018001858923,
0,
0,
0,
......@@ -667,8 +667,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-372.5,
298.5,
-306.5,
308.5,
0,
0,
0,
......@@ -853,9 +853,9 @@
"alignMode": 1,
"_target": null,
"_alignFlags": 9,
"_left": 0,
"_left": 66,
"_right": 0,
"_top": 20,
"_top": 10,
"_bottom": 0,
"_verticalCenter": 0,
"_horizontalCenter": 0,
......@@ -3037,7 +3037,7 @@
"_isSystemFontUsed": false,
"_spacingX": 0,
"_batchAsBitmap": false,
"_styleFlags": 0,
"_styleFlags": 1,
"_underlineHeight": 0,
"_N$horizontalAlign": 1,
"_N$verticalAlign": 1,
......@@ -3200,7 +3200,7 @@
"_isSystemFontUsed": false,
"_spacingX": 0,
"_batchAsBitmap": false,
"_styleFlags": 0,
"_styleFlags": 1,
"_underlineHeight": 0,
"_N$horizontalAlign": 1,
"_N$verticalAlign": 1,
......@@ -3711,7 +3711,7 @@
"_isSystemFontUsed": false,
"_spacingX": 0,
"_batchAsBitmap": false,
"_styleFlags": 0,
"_styleFlags": 1,
"_underlineHeight": 0,
"_N$horizontalAlign": 1,
"_N$verticalAlign": 1,
......@@ -3874,7 +3874,7 @@
"_isSystemFontUsed": false,
"_spacingX": 0,
"_batchAsBitmap": false,
"_styleFlags": 0,
"_styleFlags": 1,
"_underlineHeight": 0,
"_N$horizontalAlign": 1,
"_N$verticalAlign": 1,
......@@ -6147,7 +6147,7 @@
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_srcBlendFactor": 1,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "130348e9-f1a0-4858-8d2a-dfd298bc57f1"
......@@ -6241,7 +6241,7 @@
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_srcBlendFactor": 1,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "130348e9-f1a0-4858-8d2a-dfd298bc57f1"
......@@ -6335,7 +6335,7 @@
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_srcBlendFactor": 1,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "130348e9-f1a0-4858-8d2a-dfd298bc57f1"
......@@ -6429,7 +6429,7 @@
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_srcBlendFactor": 1,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "130348e9-f1a0-4858-8d2a-dfd298bc57f1"
......@@ -6523,7 +6523,7 @@
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_srcBlendFactor": 1,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "130348e9-f1a0-4858-8d2a-dfd298bc57f1"
......
......@@ -100,66 +100,51 @@ cc.Class({
// console.log("坐标" + svLeftBottomPoint.x + "," + svLeftBottomPoint.y + "是否包含" + isIntersect_1);
if (isIntersect_1) {
if (this.node.type == 2) {
this.Item_complete.active = true;
this.node.isComplent = true;
g.data_mgr.nowNum -= 1;
if (g.data_mgr.nowNum == 0) {
g.effect.inst.showEffect2();
}
g.speaker.inst.play_good();
var newItem_temp = cc.instantiate(g.game.inst.Item_0[2]);
g.game.inst.contentArr_1[1].getChildByName("db").active = true;
g.game.inst.contentArr_1[1].getChildByName("db").getComponent(dragonBones.ArmatureDisplay).playAnimation("newAnimation", 1);
if (this.node.width >= 150) {
this.node.scale = 0.666;
this.node.x = 0;
}
this.node.parent = newItem_temp;
newItem_temp.parent = g.game.inst.contentArr_1[1].getChildByName("connent_3").getChildByName("Layout");
this.node.x = 0;
this.node.y = 0;
this.setItemState(g.game.inst.contentArr_1[1]);
}
else {
this.errorEffect();
}
console.log("被1包含" + isIntersect_1);
} else
if (isIntersect_0) {
if (this.node.type == 1) {
this.setItemState(g.game.inst.contentArr_1[0]);
}
else {
this.errorEffect();
}
}
else {
//回到原来的位置
this.node.x = 0;
this.node.y = 0;
}
},
setItemState: function (content) {
this.Item_complete.active = true;
this.node.isComplent = true;
g.data_mgr.nowNum -= 1;
if (g.data_mgr.nowNum == 0) {
setTimeout(() => {
g.speaker.inst.play_congratulation();
g.effect.inst.showEffect2();
}, 500)
}
g.speaker.inst.play_good();
var newItem_temp = cc.instantiate(g.game.inst.Item_0[2]);
g.game.inst.contentArr_1[0].getChildByName("db").active = true;
g.game.inst.contentArr_1[0].getChildByName("db").getComponent(dragonBones.ArmatureDisplay).playAnimation("newAnimation", 1);
content.getChildByName("db").active = true;
content.getChildByName("db").getComponent(dragonBones.ArmatureDisplay).playAnimation("newAnimation", 1);
if (this.node.width >= 150) {
this.node.scale = 0.666;
this.node.x = 0;
}
this.node.parent = newItem_temp;
newItem_temp.parent = g.game.inst.contentArr_1[0].getChildByName("connent_3").getChildByName("Layout");
newItem_temp.parent = content.getChildByName("connent_3").getChildByName("Layout");
this.node.x = 0;
this.node.y = 0;
console.log("被2包含" + isIntersect_0);
}
else {
this.errorEffect();
}
}
else {
//回到原来的位置
this.node.x = 0;
this.node.y = 0;
}
},
errorEffect: function () {
......
......@@ -4,7 +4,7 @@
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"premultiplyAlpha": true,
"genMipmaps": false,
"packable": true,
"width": 36,
......
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