Commit 30b514b2 authored by yu's avatar yu

1

parent f2edd9fa
...@@ -5484,8 +5484,8 @@ ...@@ -5484,8 +5484,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 150.74, "width": 148.45,
"height": 63 "height": 50
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -5570,7 +5570,7 @@ ...@@ -5570,7 +5570,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
208.95399999999995, 206.664,
0, 0,
0, 0,
0, 0,
...@@ -5986,7 +5986,7 @@ ...@@ -5986,7 +5986,7 @@
"_N$verticalAlign": 1, "_N$verticalAlign": 1,
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 0,
"_N$cacheMode": 0, "_N$cacheMode": 2,
"_id": "138922vqZI5LzifYrvZJHA" "_id": "138922vqZI5LzifYrvZJHA"
}, },
{ {
...@@ -6002,7 +6002,7 @@ ...@@ -6002,7 +6002,7 @@
"_alignFlags": 9, "_alignFlags": 9,
"_left": 274.52700000000004, "_left": 274.52700000000004,
"_right": 0, "_right": 0,
"_top": 67.39999999999998, "_top": 73.89999999999998,
"_bottom": 0, "_bottom": 0,
"_verticalCenter": 0, "_verticalCenter": 0,
"_horizontalCenter": 0, "_horizontalCenter": 0,
......
...@@ -299,17 +299,18 @@ export default class PuzzleJigsaw extends MyCocosSceneComponent { ...@@ -299,17 +299,18 @@ export default class PuzzleJigsaw extends MyCocosSceneComponent {
// let dis = this.getDistances(target.getPosition(), bg.getPosition()); // let dis = this.getDistances(target.getPosition(), bg.getPosition());
let dis = this.getDistances(target, bg); let dis = this.getDistances(target, bg);
// if (dis < 100 && bg.sortId == data.id) { // if (dis < 100 && bg.sortId == data.id) {
if (dis < 100 && !cc.find("img", bg)) { // if (dis < 100 && !cc.find("img", bg) ) {
if (dis < 100 && bg.sortId == data.id) {
return bg; return bg;
} }
return null; return null;
}) })
//检测是否在区域内 //检测是否在区域内
let isIn = this.rectCollect(target, this.layout_sort); let isIn = this.rectCollect(target, this.layout_sort);
if (!itemBg && !isIn) { if (!itemBg) {
target.parent = this.right_layout.children[data.count]; target.parent = this.right_layout.children[data.count];
target.setPosition(data.pos); target.setPosition(data.pos);
// this.playLocalAudio("error"); this.playLocalAudio("error");
target.scale = 0.9; target.scale = 0.9;
return; return;
} }
......
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