Commit dc67c3db authored by Lwd's avatar Lwd

commit

parent 4db6ea6a
{
"ver": "1.1.2",
"uuid": "de93dea6-de18-4f49-abf1-86bd2ea3662b",
"isBundle": false,
"bundleName": "",
"priority": 1,
"compressionType": {},
"optimizeHotUpdate": {},
"inlineSpriteFrames": {},
"isRemoteBundle": {},
"subMetas": {}
}
\ No newline at end of file
This diff is collapsed.
{
"ver": "1.0.1",
"uuid": "8549fef3-5ffa-4e88-9496-13fe5201e87d",
"subMetas": {}
}
\ No newline at end of file
{"width":2048,"SubTexture":[{"width":958,"y":2137,"height":140,"name":"正常-影子","x":961},{"width":840,"y":1344,"height":274,"name":"正常-身体","x":1},{"width":291,"y":2452,"height":167,"name":"正常-手上","x":1736},{"width":254,"y":2495,"height":119,"name":"正常-下巴","x":1064},{"width":211,"y":1263,"height":71,"name":"正常-嘴巴","x":992},{"width":417,"y":1619,"height":374,"name":"正常-脸","x":843},{"width":351,"y":2660,"height":162,"name":"正常-耳朵","x":711},{"width":209,"y":1146,"height":115,"name":"正常-睁眼","x":992},{"width":198,"y":2923,"height":94,"name":"正常-半睁眼","x":982},{"width":198,"y":2826,"height":115,"name":"正常-闭眼","x":1544},{"width":492,"y":352,"height":492,"name":"正常-头","x":1239},{"width":214,"y":2824,"height":94,"name":"正常-鼻子","x":774},{"width":232,"y":850,"height":294,"name":"正常-手右","x":992},{"width":554,"y":2764,"height":87,"name":"正常尾巴","x":1},{"width":958,"y":2137,"height":140,"name":"皱眉-影子","x":1},{"width":206,"y":2920,"height":96,"name":"皱眉-摆手胳膊","x":774},{"width":286,"y":1619,"height":278,"name":"皱眉-摆手","x":1670},{"width":419,"y":2751,"height":73,"name":"皱眉-尾巴-后","x":1607},{"width":739,"y":1,"height":400,"name":"皱眉-身体","x":1},{"width":292,"y":1063,"height":168,"name":"皱眉-正常收上","x":1733},{"width":420,"y":899,"height":397,"name":"皱眉-脸","x":1},{"frameX":0,"y":1620,"frameY":-39,"frameWidth":417,"width":417,"frameHeight":483,"height":444,"name":"皱眉-正常脸","x":1},{"width":352,"y":2421,"height":163,"name":"皱眉-耳朵","x":357},{"width":209,"y":700,"height":115,"name":"皱眉-睁眼","x":498},{"width":199,"y":1233,"height":115,"name":"皱眉-半睁眼","x":1841},{"width":495,"y":403,"height":494,"name":"皱眉-头发","x":1},{"width":492,"y":846,"height":492,"name":"皱眉-正常头发","x":1239},{"width":199,"y":2806,"height":115,"name":"皱眉-闭眼","x":1064},{"width":215,"y":2824,"height":94,"name":"皱眉-鼻子","x":557},{"width":231,"y":300,"height":295,"name":"皱眉-手1","x":1733},{"width":557,"y":2586,"height":87,"name":"皱眉-尾巴-前","x":1},{"width":958,"y":2279,"height":140,"name":"张嘴-影子","x":1},{"width":842,"y":1,"height":349,"name":"张嘴-身体","x":742},{"width":292,"y":892,"height":169,"name":"张嘴-上手","x":1733},{"width":271,"y":2677,"height":122,"name":"张-下巴","x":1334},{"width":403,"y":2494,"height":181,"name":"张-鼻","x":1331},{"width":351,"y":2495,"height":163,"name":"张嘴-耳朵","x":711},{"width":366,"y":2279,"height":213,"name":"张嘴-脸","x":1331},{"width":268,"y":2677,"height":127,"name":"张嘴-下巴","x":1064},{"width":285,"y":2621,"height":128,"name":"张嘴-张嘴","x":1736},{"width":212,"y":2421,"height":71,"name":"张嘴-闭嘴嘴","x":711},{"width":406,"y":1619,"height":229,"name":"张嘴-脸-中","x":1262},{"width":368,"y":1919,"height":214,"name":"张嘴-脸-上","x":420},{"width":208,"y":2801,"height":114,"name":"张嘴-睁眼","x":1334},{"width":198,"y":2826,"height":114,"name":"张嘴-半眼","x":1744},{"width":199,"y":2917,"height":114,"name":"张嘴-闭眼","x":1265},{"width":492,"y":850,"height":492,"name":"张嘴-头发","x":498},{"width":214,"y":2942,"height":95,"name":"张嘴-鼻子","x":1744},{"width":232,"y":597,"height":293,"name":"张嘴-手下","x":1733},{"width":555,"y":2675,"height":87,"name":"张嘴-尾巴","x":1},{"width":958,"y":1995,"height":140,"name":"嚼--影子","x":843},{"width":847,"y":1340,"height":277,"name":"嚼-身体","x":992},{"width":294,"y":2279,"height":171,"name":"嚼-手-上-完整","x":1699},{"width":406,"y":1,"height":297,"name":"lian","x":1586},{"width":406,"y":1620,"height":297,"name":"嚼-脸_拷贝","x":420},{"width":354,"y":2421,"height":163,"name":"嚼-左耳","x":1},{"width":368,"y":2279,"height":214,"name":"嚼-脸-上","x":961},{"width":210,"y":1989,"height":115,"name":"嚼-睁眼","x":1803},{"width":199,"y":1350,"height":115,"name":"嚼-半睁眼","x":1841},{"width":495,"y":352,"height":496,"name":"嚼-毛发","x":742},{"width":199,"y":1467,"height":115,"name":"嚼-闭眼","x":1841},{"width":215,"y":2943,"height":94,"name":"嚼-鼻子_","x":1466},{"width":233,"y":403,"height":295,"name":"嚼-手-下","x":498},{"width":559,"y":1899,"height":88,"name":"嚼-尾巴-前","x":1262},{"width":198,"y":3019,"height":94,"name":"皱眉-正常-半睁眼 ","x":982}],"height":4096,"name":"lion","imagePath":"lion_tex.png"}
\ No newline at end of file
{
"ver": "1.0.1",
"uuid": "27736c82-e8ad-4ec9-9aa8-93dd4278069b",
"subMetas": {}
}
\ No newline at end of file
This diff is collapsed.
{
"ver": "2.3.5",
"uuid": "c2512365-4d01-4adf-8d7f-8795350351bc",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 2048,
"height": 4096,
"platformSettings": {},
"subMetas": {
"lion_tex": {
"ver": "1.0.4",
"uuid": "f2fec664-8c69-43fb-a0f1-d63abfebf8f0",
"rawTextureUuid": "c2512365-4d01-4adf-8d7f-8795350351bc",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": -3.5,
"offsetY": 491,
"trimX": 1,
"trimY": 1,
"width": 2039,
"height": 3112,
"rawWidth": 2048,
"rawHeight": 4096,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
This diff is collapsed.
...@@ -92,8 +92,8 @@ var game = cc.Class({ ...@@ -92,8 +92,8 @@ var game = cc.Class({
// 求出 ScrollView 可视区域在世界坐标系中的矩形(碰撞盒) // 求出 ScrollView 可视区域在世界坐标系中的矩形(碰撞盒)
let svBBoxRect = cc.rect( let svBBoxRect = cc.rect(
svLeftBottomPoint.x - 300, svLeftBottomPoint.x - node.anchorX * node.width / 2,
svLeftBottomPoint.y - 500, svLeftBottomPoint.y - node.anchorY * node.height / 2,
node.width, node.width,
node.height node.height
); );
...@@ -226,7 +226,7 @@ var game = cc.Class({ ...@@ -226,7 +226,7 @@ var game = cc.Class({
//播放猫动画 normal wrong right waiting //播放猫动画 normal wrong right waiting
playLionDragon(name) { playLionDragon(name) {
this.dragonLion.armatureName = "armatureName"; this.dragonLion.armatureName = "Armature";
this.dragonLion.playAnimation(name); this.dragonLion.playAnimation(name);
}, },
...@@ -244,7 +244,7 @@ var game = cc.Class({ ...@@ -244,7 +244,7 @@ var game = cc.Class({
} }
//如果结束了则提示音 //如果结束了则提示音
if (this.btnReStart.active) { if (this.btnReStart.active || this.nodEndEffect.active) {
let path = OP26.data_mgr.getAudioReStart(); let path = OP26.data_mgr.getAudioReStart();
if (path == -1) return; if (path == -1) return;
this._isSpeak = true this._isSpeak = true
...@@ -307,7 +307,7 @@ var game = cc.Class({ ...@@ -307,7 +307,7 @@ var game = cc.Class({
//传入当前点击的节点坐标,移动至中心点 //传入当前点击的节点坐标,移动至中心点
var beginPos = cc.v2(node.x, node.y + this.contentArr.y); var beginPos = cc.v2(node.x, node.y + this.contentArr.y);
//50偏移量到嘴巴 //50偏移量到嘴巴
var EndPos = cc.v2(this.dragonLion.node.x, this.dragonLion.node.y - 300); var EndPos = cc.v2(this.dragonLion.node.x, this.dragonLion.node.y);
this.handTween && this.handTween.stop(); this.handTween && this.handTween.stop();
this.handTween = cc.tween(this.handTip) this.handTween = cc.tween(this.handTip)
.call(() => { .call(() => {
......
...@@ -257,7 +257,7 @@ cc.Class({ ...@@ -257,7 +257,7 @@ cc.Class({
//图片适配 //图片适配
photoScare: function (node, type) { photoScare: function (node, type) {
var maxNum = type == 0 ? 50 : 168; var maxNum = type == 0 ? 50 : 200;
let maxSize = Math.min(maxNum / node.height, maxNum / node.width); let maxSize = Math.min(maxNum / node.height, maxNum / node.width);
if (node.perScale == undefined) { if (node.perScale == undefined) {
node.perScale = node.scaleX; node.perScale = node.scaleX;
......
...@@ -92,6 +92,19 @@ cc.Class({ ...@@ -92,6 +92,19 @@ cc.Class({
.call(() => { .call(() => {
this.rotateItem(this.nodEffLight) this.rotateItem(this.nodEffLight)
this.playStar(); this.playStar();
this._timeoutIds.push(setTimeout(() => {
this.scaleItemHide(this.nodScale);
}, 2000));
})
.start();
},
scaleItemHide(item) {
cc.tween(item)
.to(0.3, { scale: 0 })
.call(() => {
this.onHide();
OP26.game.inst.showRestartBtn();
}) })
.start(); .start();
}, },
...@@ -104,7 +117,7 @@ cc.Class({ ...@@ -104,7 +117,7 @@ cc.Class({
tex_png: OP26.data_mgr.data.tex_png1, tex_png: OP26.data_mgr.data.tex_png1,
} }
OP26.res_mgr.loadSpine(this.dragonItem, Info); OP26.res_mgr.loadSpine(this.dragonItem, Info);
this.playDragon("normal"); this.playDragon("finish");
}, },
//播放星星动画 //播放星星动画
...@@ -116,7 +129,7 @@ cc.Class({ ...@@ -116,7 +129,7 @@ cc.Class({
//播放动画 //播放动画
playDragon(name) { playDragon(name) {
this.dragonItem.armatureName = "armatureName"; this.dragonItem.armatureName = "Armature";
this.dragonItem.playAnimation(name); this.dragonItem.playAnimation(name);
}, },
}); });
...@@ -14,40 +14,40 @@ OP26.data_mgr = { ...@@ -14,40 +14,40 @@ OP26.data_mgr = {
"maxWrongNumber": 4, "maxWrongNumber": 4,
"question_arr": [{ "question_arr": [{
"question_audio_url": "http://staging-teach.cdn.ireadabc.com/25432da42768ff9681946ea7fc7ee272.mp3", "question_audio_url": "http://staging-teach.cdn.ireadabc.com/25432da42768ff9681946ea7fc7ee272.mp3",
"option_arr": [{ "pic_url": "http://staging-teach.cdn.ireadabc.com/3134325b66d1b8ecf2f83db853195da5.png", "audio_url": "http://staging-teach.cdn.ireadabc.com/e3921a16a8313df274d8bc4e3f2bedd8.mp3", "is_right": true, "text": "a" }, "option_arr": [{ "pic_url": "http://staging-teach.cdn.ireadabc.com/b2f4061157c41880e85991b64050652c.png", "audio_url": "http://staging-teach.cdn.ireadabc.com/e3921a16a8313df274d8bc4e3f2bedd8.mp3", "is_right": true, "text": "a" },
{ "pic_url": "http://staging-teach.cdn.ireadabc.com/3134325b66d1b8ecf2f83db853195da5.png", "audio_url": "http://staging-teach.cdn.ireadabc.com/58eec304909298176bde6c408c9dac1b.mp3", "is_right": false, "text": "b" }, { "pic_url": "http://staging-teach.cdn.ireadabc.com/b2f4061157c41880e85991b64050652c.png", "audio_url": "http://staging-teach.cdn.ireadabc.com/58eec304909298176bde6c408c9dac1b.mp3", "is_right": false, "text": "b" },
{ "pic_url": "http://staging-teach.cdn.ireadabc.com/3134325b66d1b8ecf2f83db853195da5.png", "audio_url": "http://staging-teach.cdn.ireadabc.com/e3921a16a8313df274d8bc4e3f2bedd8.mp3", "is_right": true, "text": "c" }], { "pic_url": "http://staging-teach.cdn.ireadabc.com/b2f4061157c41880e85991b64050652c.png", "audio_url": "http://staging-teach.cdn.ireadabc.com/e3921a16a8313df274d8bc4e3f2bedd8.mp3", "is_right": true, "text": "c" }],
}, },
{ {
"question_audio_url": "http://staging-teach.cdn.ireadabc.com/25432da42768ff9681946ea7fc7ee272.mp3", "question_audio_url": "http://staging-teach.cdn.ireadabc.com/25432da42768ff9681946ea7fc7ee272.mp3",
"option_arr": [{ "pic_url": "http://staging-teach.cdn.ireadabc.com/3134325b66d1b8ecf2f83db853195da5.png", "audio_url": "http://staging-teach.cdn.ireadabc.com/e3921a16a8313df274d8bc4e3f2bedd8.mp3", "is_right": true, "text": "a" }, "option_arr": [{ "pic_url": "http://staging-teach.cdn.ireadabc.com/b2f4061157c41880e85991b64050652c.png", "audio_url": "http://staging-teach.cdn.ireadabc.com/e3921a16a8313df274d8bc4e3f2bedd8.mp3", "is_right": true, "text": "a" },
{ "pic_url": "http://staging-teach.cdn.ireadabc.com/3134325b66d1b8ecf2f83db853195da5.png", "audio_url": "http://staging-teach.cdn.ireadabc.com/58eec304909298176bde6c408c9dac1b.mp3", "is_right": false, "text": "b" }, { "pic_url": "http://staging-teach.cdn.ireadabc.com/b2f4061157c41880e85991b64050652c.png", "audio_url": "http://staging-teach.cdn.ireadabc.com/58eec304909298176bde6c408c9dac1b.mp3", "is_right": false, "text": "b" },
{ "pic_url": "http://staging-teach.cdn.ireadabc.com/3134325b66d1b8ecf2f83db853195da5.png", "audio_url": "http://staging-teach.cdn.ireadabc.com/e3921a16a8313df274d8bc4e3f2bedd8.mp3", "is_right": true, "text": "c" }, { "pic_url": "http://staging-teach.cdn.ireadabc.com/b2f4061157c41880e85991b64050652c.png", "audio_url": "http://staging-teach.cdn.ireadabc.com/e3921a16a8313df274d8bc4e3f2bedd8.mp3", "is_right": true, "text": "c" },
{ "pic_url": "http://staging-teach.cdn.ireadabc.com/3134325b66d1b8ecf2f83db853195da5.png", "audio_url": "http://staging-teach.cdn.ireadabc.com/58eec304909298176bde6c408c9dac1b.mp3", "is_right": false, "text": "d" }] { "pic_url": "http://staging-teach.cdn.ireadabc.com/b2f4061157c41880e85991b64050652c.png", "audio_url": "http://staging-teach.cdn.ireadabc.com/58eec304909298176bde6c408c9dac1b.mp3", "is_right": false, "text": "d" }]
}, },
{ {
"question_audio_url": "http://staging-teach.cdn.ireadabc.com/25432da42768ff9681946ea7fc7ee272.mp3", "question_audio_url": "http://staging-teach.cdn.ireadabc.com/25432da42768ff9681946ea7fc7ee272.mp3",
"option_arr": [{ "pic_url": "http://staging-teach.cdn.ireadabc.com/3134325b66d1b8ecf2f83db853195da5.png", "audio_url": "http://staging-teach.cdn.ireadabc.com/e3921a16a8313df274d8bc4e3f2bedd8.mp3", "is_right": true, "text": "a" }] "option_arr": [{ "pic_url": "http://staging-teach.cdn.ireadabc.com/b2f4061157c41880e85991b64050652c.png", "audio_url": "http://staging-teach.cdn.ireadabc.com/e3921a16a8313df274d8bc4e3f2bedd8.mp3", "is_right": true, "text": "a" }]
}, },
{ {
"question_audio_url": "http://staging-teach.cdn.ireadabc.com/25432da42768ff9681946ea7fc7ee272.mp3", "question_audio_url": "http://staging-teach.cdn.ireadabc.com/25432da42768ff9681946ea7fc7ee272.mp3",
"option_arr": [ "option_arr": [
{ "pic_url": "http://staging-teach.cdn.ireadabc.com/3134325b66d1b8ecf2f83db853195da5.png", "audio_url": "http://staging-teach.cdn.ireadabc.com/e3921a16a8313df274d8bc4e3f2bedd8.mp3", "is_right": true, "text": "a" }, { "pic_url": "http://staging-teach.cdn.ireadabc.com/b2f4061157c41880e85991b64050652c.png", "audio_url": "http://staging-teach.cdn.ireadabc.com/e3921a16a8313df274d8bc4e3f2bedd8.mp3", "is_right": true, "text": "a" },
{ "pic_url": "http://staging-teach.cdn.ireadabc.com/3134325b66d1b8ecf2f83db853195da5.png", "audio_url": "http://staging-teach.cdn.ireadabc.com/58eec304909298176bde6c408c9dac1b.mp3", "is_right": false, "text": "b" }] { "pic_url": "http://staging-teach.cdn.ireadabc.com/b2f4061157c41880e85991b64050652c.png", "audio_url": "http://staging-teach.cdn.ireadabc.com/58eec304909298176bde6c408c9dac1b.mp3", "is_right": false, "text": "b" }]
}], }],
"ske_json": "http://staging-teach.cdn.ireadabc.com/7355648029551e6848a2cf36ea8a6ba6.json", "ske_json": "http://staging-teach.cdn.ireadabc.com/343192141e9dfca91571a7208c68d365.json",
"ske_json_name": "lion_ske.json", "ske_json_name": "queen_ske.json",
"tex_json": "http://staging-teach.cdn.ireadabc.com/511fe163f2df10925e3da82f0f69590b.json", "tex_json": "http://staging-teach.cdn.ireadabc.com/e53670138a8dc28727528948bffe0854.json",
"tex_json_name": "lion_tex.json", "tex_json_name": "queen_tex.json",
"tex_png": "http://staging-teach.cdn.ireadabc.com/2fd2a53fcb36d36281a6ded9500dd54f.png", "tex_png": "http://staging-teach.cdn.ireadabc.com/9bde7212f4aa705a52e73a23d2902023.png",
"tex_png_name": "lion_tex.png", "tex_png_name": "queen_tex.png",
// "ske_json1": "http://staging-teach.cdn.ireadabc.com/7355648029551e6848a2cf36ea8a6ba6.json", "ske_json1": "http://staging-teach.cdn.ireadabc.com/5f9a06ccce437e448012f199a05cd5fd.json",
// "ske_json1_name": "lion_ske.json", "ske_json1_name": "4zebras_ske.json",
// "tex_json1": "http://staging-teach.cdn.ireadabc.com/511fe163f2df10925e3da82f0f69590b.json", "tex_json1": "http://staging-teach.cdn.ireadabc.com/bbb924f9ed2382487ad66c055df856a2.json",
// "tex_json1_name": "lion_tex.json", "tex_json1_name": "4zebras_tex.json",
// "tex_png1": "http://staging-teach.cdn.ireadabc.com/2fd2a53fcb36d36281a6ded9500dd54f.png", "tex_png1": "http://staging-teach.cdn.ireadabc.com/736882276cc98ec49928940b0225a113.png",
// "tex_png1_name": "lion_tex.png", "tex_png1_name": "4zebras_tex.png",
"guideBegin_audio_url": "http://staging-teach.cdn.ireadabc.com/bd6e2b3a870ef3f9ee9ad9c0fda79228.mp3", "guideBegin_audio_url": "http://staging-teach.cdn.ireadabc.com/bd6e2b3a870ef3f9ee9ad9c0fda79228.mp3",
"guideEnd_audio_url": "http://staging-teach.cdn.ireadabc.com/bd6e2b3a870ef3f9ee9ad9c0fda79228.mp3", "guideEnd_audio_url": "http://staging-teach.cdn.ireadabc.com/bd6e2b3a870ef3f9ee9ad9c0fda79228.mp3",
......
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