Commit 4f707d8e authored by Tt's avatar Tt

调整

parent b6dc43d5
...@@ -738,7 +738,7 @@ ...@@ -738,7 +738,7 @@
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
} }
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 1,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "ca14e2fd-63e3-4c46-8eec-91fd20af5f60" "__uuid__": "ca14e2fd-63e3-4c46-8eec-91fd20af5f60"
...@@ -837,8 +837,8 @@ ...@@ -837,8 +837,8 @@
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_string": "Read and classify the words", "_string": "",
"_N$string": "Read and classify the words", "_N$string": "",
"_fontSize": 27, "_fontSize": 27,
"_lineHeight": 40, "_lineHeight": 40,
"_enableWrapText": true, "_enableWrapText": true,
...@@ -853,7 +853,7 @@ ...@@ -853,7 +853,7 @@
"_N$horizontalAlign": 1, "_N$horizontalAlign": 1,
"_N$verticalAlign": 1, "_N$verticalAlign": 1,
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 2,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "a2BOp+Uy5MHLpnYBX+6/W+" "_id": "a2BOp+Uy5MHLpnYBX+6/W+"
}, },
...@@ -2511,7 +2511,7 @@ ...@@ -2511,7 +2511,7 @@
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
} }
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 1,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "577b0319-8a9a-4503-ab96-f3dd5b000a53" "__uuid__": "577b0319-8a9a-4503-ab96-f3dd5b000a53"
...@@ -2555,7 +2555,7 @@ ...@@ -2555,7 +2555,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 140.27, "width": 180,
"height": 50.4 "height": 50.4
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -2610,7 +2610,7 @@ ...@@ -2610,7 +2610,7 @@
"_string": "animal", "_string": "animal",
"_N$string": "animal", "_N$string": "animal",
"_fontSize": 42, "_fontSize": 42,
"_lineHeight": 40, "_lineHeight": 45,
"_enableWrapText": true, "_enableWrapText": true,
"_N$file": { "_N$file": {
"__uuid__": "f792997f-f029-4df1-9adb-5e28c3e1a1c4" "__uuid__": "f792997f-f029-4df1-9adb-5e28c3e1a1c4"
...@@ -2623,7 +2623,7 @@ ...@@ -2623,7 +2623,7 @@
"_N$horizontalAlign": 1, "_N$horizontalAlign": 1,
"_N$verticalAlign": 1, "_N$verticalAlign": 1,
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 2,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "e94TUSrRxLwoxQpQFZLleL" "_id": "e94TUSrRxLwoxQpQFZLleL"
}, },
...@@ -2803,7 +2803,7 @@ ...@@ -2803,7 +2803,7 @@
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
} }
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 1,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "39ce2398-164a-4dba-829f-646ed523cd4a" "__uuid__": "39ce2398-164a-4dba-829f-646ed523cd4a"
...@@ -2847,7 +2847,7 @@ ...@@ -2847,7 +2847,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 103.32, "width": 180,
"height": 50.4 "height": 50.4
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -2915,7 +2915,7 @@ ...@@ -2915,7 +2915,7 @@
"_N$horizontalAlign": 1, "_N$horizontalAlign": 1,
"_N$verticalAlign": 1, "_N$verticalAlign": 1,
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 2,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "352Zi2NBJGYKeMbWzimzMd" "_id": "352Zi2NBJGYKeMbWzimzMd"
}, },
...@@ -3091,7 +3091,7 @@ ...@@ -3091,7 +3091,7 @@
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
} }
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 1,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "817eb1a2-dace-4cc4-8f23-4a03b692dbb6" "__uuid__": "817eb1a2-dace-4cc4-8f23-4a03b692dbb6"
...@@ -3135,7 +3135,7 @@ ...@@ -3135,7 +3135,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 93.25, "width": 150,
"height": 50.4 "height": 50.4
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -3148,7 +3148,7 @@ ...@@ -3148,7 +3148,7 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-1.798, -1.798,
4.552, 3,
0, 0,
0, 0,
0, 0,
...@@ -3190,7 +3190,7 @@ ...@@ -3190,7 +3190,7 @@
"_string": "food", "_string": "food",
"_N$string": "food", "_N$string": "food",
"_fontSize": 42, "_fontSize": 42,
"_lineHeight": 40, "_lineHeight": 45,
"_enableWrapText": true, "_enableWrapText": true,
"_N$file": { "_N$file": {
"__uuid__": "f792997f-f029-4df1-9adb-5e28c3e1a1c4" "__uuid__": "f792997f-f029-4df1-9adb-5e28c3e1a1c4"
...@@ -3203,7 +3203,7 @@ ...@@ -3203,7 +3203,7 @@
"_N$horizontalAlign": 1, "_N$horizontalAlign": 1,
"_N$verticalAlign": 1, "_N$verticalAlign": 1,
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 2,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "4dOWUWrcJLNoAOLcPD5MkO" "_id": "4dOWUWrcJLNoAOLcPD5MkO"
}, },
...@@ -3435,7 +3435,7 @@ ...@@ -3435,7 +3435,7 @@
"__id__": 67 "__id__": 67
}, },
"_children": [], "_children": [],
"_active": true, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 69 "__id__": 69
...@@ -3502,7 +3502,7 @@ ...@@ -3502,7 +3502,7 @@
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
} }
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 1,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "43bb4581-6acd-4928-9a46-b10ee983cb60" "__uuid__": "43bb4581-6acd-4928-9a46-b10ee983cb60"
...@@ -3596,7 +3596,7 @@ ...@@ -3596,7 +3596,7 @@
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
} }
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 1,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "49454315-2fbc-49d7-980b-03990d784088" "__uuid__": "49454315-2fbc-49d7-980b-03990d784088"
...@@ -3640,7 +3640,7 @@ ...@@ -3640,7 +3640,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 150, "width": 140,
"height": 50.4 "height": 50.4
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -3926,7 +3926,7 @@ ...@@ -3926,7 +3926,7 @@
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
} }
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 1,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "14e8da8f-dacf-4974-a738-0b9bc5747dac" "__uuid__": "14e8da8f-dacf-4974-a738-0b9bc5747dac"
...@@ -4020,7 +4020,7 @@ ...@@ -4020,7 +4020,7 @@
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
} }
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 1,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "86d42669-be71-4333-a47a-e75f1d141a5c" "__uuid__": "86d42669-be71-4333-a47a-e75f1d141a5c"
...@@ -4158,8 +4158,8 @@ ...@@ -4158,8 +4158,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 80, "width": 120,
"height": 48 "height": 52
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -4214,7 +4214,7 @@ ...@@ -4214,7 +4214,7 @@
"__uuid__": "405a5ae7-9f20-4d23-8681-455a17ac3514" "__uuid__": "405a5ae7-9f20-4d23-8681-455a17ac3514"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 0,
"_fillType": 0, "_fillType": 0,
"_fillCenter": { "_fillCenter": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -4304,8 +4304,8 @@ ...@@ -4304,8 +4304,8 @@
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_string": "chicken", "_string": "qabfsss",
"_N$string": "chicken", "_N$string": "qabfsss",
"_fontSize": 38, "_fontSize": 38,
"_lineHeight": 40, "_lineHeight": 40,
"_enableWrapText": true, "_enableWrapText": true,
...@@ -4470,10 +4470,10 @@ ...@@ -4470,10 +4470,10 @@
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_string": "milk", "_string": "qabf",
"_N$string": "milk", "_N$string": "qabf",
"_fontSize": 30, "_fontSize": 30,
"_lineHeight": 30, "_lineHeight": 43,
"_enableWrapText": true, "_enableWrapText": true,
"_N$file": { "_N$file": {
"__uuid__": "5d8c6a7f-89af-4150-a1e1-c687492e05c3" "__uuid__": "5d8c6a7f-89af-4150-a1e1-c687492e05c3"
...@@ -4498,7 +4498,7 @@ ...@@ -4498,7 +4498,7 @@
"__id__": 86 "__id__": 86
}, },
"_children": [], "_children": [],
"_active": true, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 90 "__id__": 90
...@@ -4515,7 +4515,7 @@ ...@@ -4515,7 +4515,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 60, "width": 81,
"height": 36 "height": 36
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -4597,7 +4597,7 @@ ...@@ -4597,7 +4597,7 @@
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
} }
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 1,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "efc40866-ef82-4fac-b41b-99795e03cf96" "__uuid__": "efc40866-ef82-4fac-b41b-99795e03cf96"
......
...@@ -491,6 +491,7 @@ cc.Class({ ...@@ -491,6 +491,7 @@ cc.Class({
this.updateItem(item); this.updateItem(item);
}, },
initButton(item) { initButton(item) {
item._cusStartPos = cc.v2(item.x, item.y);
item.on(cc.Node.EventType.TOUCH_START, this.onStartItem, this); item.on(cc.Node.EventType.TOUCH_START, this.onStartItem, this);
item.on(cc.Node.EventType.TOUCH_END, this.onEndItem, this); item.on(cc.Node.EventType.TOUCH_END, this.onEndItem, this);
item.on(cc.Node.EventType.TOUCH_MOVE, this.onMoveItem, this); item.on(cc.Node.EventType.TOUCH_MOVE, this.onMoveItem, this);
...@@ -502,7 +503,7 @@ cc.Class({ ...@@ -502,7 +503,7 @@ cc.Class({
let item = touch.target; let item = touch.target;
if (item.moveState == 2) return; if (item.moveState == 2) return;
//判断是否是在原地并没有到处移动 //判断是否是在原地并没有到处移动
this._startPos = cc.v2(touch.target.x, touch.target.y); this._startPos = touch.target._cusStartPos;//cc.v2(touch.target.x, touch.target.y);
}, },
//1.移动效果--在节点上绑定一个运动的type 根据type来刷新按钮效果 刷新type的方法,和具体的执行的时候刷新type //1.移动效果--在节点上绑定一个运动的type 根据type来刷新按钮效果 刷新type的方法,和具体的执行的时候刷新type
//2.成功效果-- //2.成功效果--
...@@ -511,24 +512,17 @@ cc.Class({ ...@@ -511,24 +512,17 @@ cc.Class({
if (this._cantouch != 1) return; if (this._cantouch != 1) return;
this._cantouch = 2; this._cantouch = 2;
let item = touch.target; let item = touch.target;
if (item.moveState == 2) return;
if (item.moveState == 3) return; if (item.moveState == 3) return;
let startPos = item.parent.convertToNodeSpaceAR(touch.getStartLocation());
let touchPos = item.parent.convertToNodeSpaceAR(touch.getLocation()); let touchPos = item.parent.convertToNodeSpaceAR(touch.getLocation());
//判断是否是在原地并没有到处移动 //判断是否是在原地并没有到处移动
if (this.checkCollider({ if (Math.abs(startPos.x - touchPos.x) < 50 && Math.abs(startPos.y - touchPos.y) < 50) {
x: touchPos.x,
y: touchPos.y
}, {
x: this._startPos.x,
y: this._startPos.y,
width: 15,//item.width,
height: 15,//item.height
})) {
//回归原位 //回归原位
this.backItem(item, this._startPos); item.moveState != 2 && this.backItem(item, this._startPos);
//变换动画 //变换动画
ani.flipX0(item).then(() => { ani.flipX0(item).then(() => {
item.cardState = item.cardState == 0 ? 1 : 0; item.cardState = item.cardState == 0 ? 1 : 0;
item.moveState != 2 && this.backItem(item, this._startPos);
this.updateItem(item); this.updateItem(item);
ani.flipX1(item); ani.flipX1(item);
this._cantouch = 0; this._cantouch = 0;
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
"premultiplyAlpha": false, "premultiplyAlpha": true,
"genMipmaps": false, "genMipmaps": false,
"packable": true, "packable": true,
"width": 502, "width": 502,
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
"premultiplyAlpha": false, "premultiplyAlpha": true,
"genMipmaps": false, "genMipmaps": false,
"packable": true, "packable": true,
"width": 150, "width": 150,
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
"premultiplyAlpha": false, "premultiplyAlpha": true,
"genMipmaps": false, "genMipmaps": false,
"packable": true, "packable": true,
"width": 430, "width": 430,
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
"premultiplyAlpha": false, "premultiplyAlpha": true,
"genMipmaps": false, "genMipmaps": false,
"packable": true, "packable": true,
"width": 470, "width": 470,
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
"premultiplyAlpha": false, "premultiplyAlpha": true,
"genMipmaps": false, "genMipmaps": false,
"packable": true, "packable": true,
"width": 208, "width": 208,
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
"premultiplyAlpha": false, "premultiplyAlpha": true,
"genMipmaps": false, "genMipmaps": false,
"packable": true, "packable": true,
"width": 186, "width": 186,
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
"premultiplyAlpha": false, "premultiplyAlpha": true,
"genMipmaps": false, "genMipmaps": false,
"packable": true, "packable": true,
"width": 186, "width": 186,
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
"premultiplyAlpha": false, "premultiplyAlpha": true,
"genMipmaps": false, "genMipmaps": false,
"packable": true, "packable": true,
"width": 154, "width": 154,
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
"premultiplyAlpha": false, "premultiplyAlpha": true,
"genMipmaps": false, "genMipmaps": false,
"packable": true, "packable": true,
"width": 124, "width": 124,
......
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