Commit 82d1c79b authored by wangxin's avatar wangxin

beta 3

parent b0f35644
......@@ -395,7 +395,7 @@
},
{
"__type__": "cc.Node",
"_name": "1-6@3x_select",
"_name": "描边",
"_objFlags": 0,
"_parent": {
"__id__": 1
......@@ -420,20 +420,20 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 254,
"height": 191
"width": 249,
"height": 204
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
"y": 1
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
-62,
41.879,
0,
0,
0,
......@@ -470,10 +470,10 @@
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 1,
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "8676e03d-253c-47db-aee9-45e71a343f66"
"__uuid__": "95c02d5d-0ed2-4971-8c12-06e460de66fc"
},
"_type": 0,
"_sizeMode": 0,
......@@ -485,7 +485,7 @@
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_isTrimmedMode": false,
"_atlas": null,
"_id": ""
},
......@@ -497,7 +497,7 @@
"asset": {
"__uuid__": "46d02514-75e2-4973-9a0b-bc662330bfb3"
},
"fileId": "fbthVQN9JHirWz+G0IHczt",
"fileId": "c02kXmbtZGKYm8a92NYWKc",
"sync": false
},
{
......@@ -531,8 +531,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 246,
"height": 180
"width": 237,
"height": 187
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -543,8 +543,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
1,
-62,
0,
-60.123,
0,
0,
0,
......@@ -596,7 +596,7 @@
"_contentSize": {
"__type__": "cc.Size",
"width": 244,
"height": 180
"height": 187
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -691,7 +691,7 @@
},
"_type": 2,
"_segments": 64,
"_N$alphaThreshold": 0.5,
"_N$alphaThreshold": 0.2,
"_N$inverted": false,
"_id": ""
},
......
......@@ -626,7 +626,7 @@
"_contentSize": {
"__type__": "cc.Size",
"width": 464,
"height": 105
"height": 104
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -824,7 +824,7 @@
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_srcBlendFactor": 1,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "1bc7daec-c3c3-4c4a-b65a-d0d0eb67d156"
......@@ -856,7 +856,7 @@
"_alignFlags": 9,
"_left": 65,
"_right": 0,
"_top": 20,
"_top": 20.5,
"_bottom": 0,
"_verticalCenter": 0,
"_horizontalCenter": 0,
......
......@@ -121,7 +121,7 @@ cc.Class({
getDefaultData() {
const dataJson =
'{"title":"test","answer":1,"question":"hello world","options":[{"pic_url":"http://staging-teach.cdn.ireadabc.com/c5a7a94fbebdbf635952454cbe8b3371.jpeg","audio_url":"http://staging-teach.cdn.ireadabc.com/fff5204fc774e932bcd597b4094b0852.mp3","text":"选项1"},{"pic_url":"http://staging-teach.cdn.ireadabc.com/3064a1f8bec54390c031b2c2d8b84e7f.jpeg","audio_url":"http://staging-teach.cdn.ireadabc.com/e8627e7f3ec1a04fdb3660eae81f7636.mp3","text":"选项2"}],"audio_title":"http://staging-teach.cdn.ireadabc.com/f7fb9f71ab7d460ac2f78c85efba7610.mp3","audio_question":"http://staging-teach.cdn.ireadabc.com/7934cdcec68eabe639020bad5420d7f8.mp3"}';
'{"title":"test","answer":1,"question":"hello world","options":[{"pic_url":"http://staging-teach.cdn.ireadabc.com/c5a7a94fbebdbf635952454cbe8b3371.jpeg","audio_url":"http://staging-teach.cdn.ireadabc.com/fff5204fc774e932bcd597b4094b0852.mp3","text":"选项1"},{"pic_url":"http://staging-teach.cdn.ireadabc.com/3064a1f8bec54390c031b2c2d8b84e7f.jpeg","audio_url":"http://staging-teach.cdn.ireadabc.com/e8627e7f3ec1a04fdb3660eae81f7636.mp3","text":"选项2"},{"pic_url":"http://staging-teach.cdn.ireadabc.com/3064a1f8bec54390c031b2c2d8b84e7f.jpeg","audio_url":"http://staging-teach.cdn.ireadabc.com/e8627e7f3ec1a04fdb3660eae81f7636.mp3","text":"选项2"},{"pic_url":"http://staging-teach.cdn.ireadabc.com/3064a1f8bec54390c031b2c2d8b84e7f.jpeg","audio_url":"http://staging-teach.cdn.ireadabc.com/e8627e7f3ec1a04fdb3660eae81f7636.mp3","text":"选项2"}],"audio_title":"http://staging-teach.cdn.ireadabc.com/f7fb9f71ab7d460ac2f78c85efba7610.mp3","audio_question":"http://staging-teach.cdn.ireadabc.com/7934cdcec68eabe639020bad5420d7f8.mp3"}';
const data = JSON.parse(dataJson);
return data;
},
......
......@@ -62,20 +62,11 @@ cc.Class({
let targetWidth = 0;
if (this._count >= 4) {
targetWidth = 244;
targetWidth = 237;
} else {
targetWidth = 323;
}
// let scale = 1;
// if (frameSize.height > 180) {
// scale = 168 / frameSize.height;
// }
// this.pic.spriteFrame = frame;
// this.pic.node.width = frameSize.width * scale;
// this.pic.node.height = frameSize.height * scale;
let scale = 1;
scale = targetWidth / frameSize.width;
......
......@@ -4,11 +4,11 @@
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"premultiplyAlpha": true,
"genMipmaps": false,
"packable": true,
"width": 464,
"height": 105,
"height": 104,
"platformSettings": {},
"subMetas": {
"_e-标题": {
......@@ -23,9 +23,9 @@
"trimX": 0,
"trimY": 0,
"width": 464,
"height": 105,
"height": 104,
"rawWidth": 464,
"rawHeight": 105,
"rawHeight": 104,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
......
play/assets/tmpGame/textures/图片.png

66.1 KB | W: | H:

play/assets/tmpGame/textures/图片.png

64.5 KB | W: | H:

play/assets/tmpGame/textures/图片.png
play/assets/tmpGame/textures/图片.png
play/assets/tmpGame/textures/图片.png
play/assets/tmpGame/textures/图片.png
  • 2-up
  • Swipe
  • Onion skin
......@@ -7,8 +7,8 @@
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 243,
"height": 180,
"width": 240,
"height": 187,
"platformSettings": {},
"subMetas": {
"图片": {
......@@ -22,10 +22,10 @@
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 243,
"height": 180,
"rawWidth": 243,
"rawHeight": 180,
"width": 237,
"height": 187,
"rawWidth": 237,
"rawHeight": 187,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
......
{
"ver": "2.3.5",
"uuid": "33a87cde-834b-4561-8a3b-8cea62aa28e8",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 237,
"height": 187,
"platformSettings": {},
"subMetas": {
"图片11111": {
"ver": "1.0.4",
"uuid": "e9d48e1d-a1c8-466f-a170-7f6ae5076c4a",
"rawTextureUuid": "33a87cde-834b-4561-8a3b-8cea62aa28e8",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 237,
"height": 187,
"rawWidth": 237,
"rawHeight": 187,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
{
"ver": "2.3.5",
"uuid": "a2b25027-52d1-4bcf-bf6c-26a7e33bb5f9",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 249,
"height": 200,
"platformSettings": {},
"subMetas": {
"描边": {
"ver": "1.0.4",
"uuid": "95c02d5d-0ed2-4971-8c12-06e460de66fc",
"rawTextureUuid": "a2b25027-52d1-4bcf-bf6c-26a7e33bb5f9",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 249,
"height": 200,
"rawWidth": 249,
"rawHeight": 200,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
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