Commit 3f4fa24e authored by Lwd's avatar Lwd

commit

parent 844169bc
This diff is collapsed.
......@@ -95,8 +95,8 @@ var game = cc.Class({
// 求出 ScrollView 可视区域在世界坐标系中的矩形(碰撞盒)
let svBBoxRect = cc.rect(
svLeftBottomPoint.x - 300,
svLeftBottomPoint.y - 500,
svLeftBottomPoint.x,
svLeftBottomPoint.y,
node.width,
node.height
);
......@@ -215,7 +215,7 @@ var game = cc.Class({
//播放猫动画
playLionDragon(name) {
this.dragonLion.armatureName = "armatureName";
this.dragonLion.armatureName = "Armature";
this.dragonLion.playAnimation(name);
},
......@@ -296,7 +296,7 @@ var game = cc.Class({
//传入当前点击的节点坐标,移动至中心点
var beginPos = cc.v2(node.x, node.y + this.contentArr.y);
//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 = cc.tween(this.handTip)
.call(() => {
......
const WIDTH = 2176;
const HEIGTH = 1600;
const WIDTH = 1280;
const HEIGTH = 720;
/**
* 适配
......
......@@ -40,7 +40,7 @@ cc.Class({
LWD_3.game.inst.handTween && LWD_3.game.inst.handTween.stop() && (LWD_3.game.inst.handTip.active = false);
//狮子猫动画
LWD_3.game.inst.playLionDragon("openmouth");
LWD_3.game.inst.playLionDragon("waiting");
LWD_3.res_mgr.playAudioByUrl(this.itemInfo.audio_url, (url) => {
LWD_3.snd_mgr.playEffect(url, null);
......@@ -110,8 +110,8 @@ cc.Class({
// 获取 ScrollView Node 的左下角坐标在世界坐标系中的坐标
let svLeftBottomPoint = this.node.parent.convertToWorldSpaceAR(
cc.v2(
this.node.x - this.node.anchorX * this.node.width,
this.node.y - this.node.anchorY * this.node.height
this.node.x,
this.node.y
)
);
......@@ -143,7 +143,7 @@ cc.Class({
LWD_3.data_mgr.nowNum -= 1;
//狮子猫动画
LWD_3.game.inst.playLionDragon("chew");
LWD_3.game.inst.playLionDragon("right");
//先播放错误声音
LWD_3.speaker.inst.playEffect(LWD_3.enum.E_Audio.Right);
......@@ -187,7 +187,7 @@ cc.Class({
errorEffect: function () {
//狮子猫动画
LWD_3.game.inst.playCatDragon("wrong");
LWD_3.game.inst.playLionDragon("no");
LWD_3.game.inst.playLionDragon("wrong");
//先播放错误声音
LWD_3.speaker.inst.playEffect(LWD_3.enum.E_Audio.Error);
......@@ -279,7 +279,7 @@ cc.Class({
//图片适配
photoScare: function (node, type) {
var maxNum = type == 0 ? 50 : 280;
var maxNum = type == 0 ? 50 : 200;
let maxSize = Math.min(maxNum / node.height, maxNum / node.width);
if (node.perScale == undefined) {
node.perScale = node.scaleX;
......
......@@ -36,12 +36,12 @@ LWD_3.data_mgr = {
{ "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/3134325b66d1b8ecf2f83db853195da5.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_name": "lion_ske.json",
"tex_json": "http://staging-teach.cdn.ireadabc.com/511fe163f2df10925e3da82f0f69590b.json",
"tex_json_name": "lion_tex.json",
"tex_png": "http://staging-teach.cdn.ireadabc.com/2fd2a53fcb36d36281a6ded9500dd54f.png",
"tex_png_name": "lion_tex.png",
"ske_json": "http://staging-teach.cdn.ireadabc.com/343192141e9dfca91571a7208c68d365.json",
"ske_json_name": "queen_ske.json",
"tex_json": "http://staging-teach.cdn.ireadabc.com/e53670138a8dc28727528948bffe0854.json",
"tex_json_name": "queen_tex.json",
"tex_png": "http://staging-teach.cdn.ireadabc.com/9bde7212f4aa705a52e73a23d2902023.png",
"tex_png_name": "queen_tex.png",
"guideBegin_audio_url": "http://staging-teach.cdn.ireadabc.com/bd6e2b3a870ef3f9ee9ad9c0fda79228.mp3",
"guideEnd_audio_url": "http://staging-teach.cdn.ireadabc.com/bd6e2b3a870ef3f9ee9ad9c0fda79228.mp3",
"guideRestart_audio_url": "http://staging-teach.cdn.ireadabc.com/bd6e2b3a870ef3f9ee9ad9c0fda79228.mp3",
......
assets/LWD_3/textures/bg_back.png

152 KB | W: | H:

assets/LWD_3/textures/bg_back.png

141 KB | W: | H:

assets/LWD_3/textures/bg_back.png
assets/LWD_3/textures/bg_back.png
assets/LWD_3/textures/bg_back.png
assets/LWD_3/textures/bg_back.png
  • 2-up
  • Swipe
  • Onion skin
......@@ -22,10 +22,10 @@
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 2176,
"height": 1600,
"rawWidth": 2176,
"rawHeight": 1600,
"width": 1280,
"height": 720,
"rawWidth": 1280,
"rawHeight": 720,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
......
......@@ -22,10 +22,10 @@
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 2176,
"height": 950,
"rawWidth": 2176,
"rawHeight": 950,
"width": 1280,
"height": 465,
"rawWidth": 1280,
"rawHeight": 465,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
......
......@@ -7,8 +7,8 @@
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 88,
"height": 185,
"width": 142,
"height": 160,
"platformSettings": {},
"subMetas": {
"icon_hand": {
......
......@@ -19,8 +19,8 @@
"3D Particle"
],
"preview-port": 7456,
"design-resolution-width": 2176,
"design-resolution-height": 1600,
"design-resolution-width": 1280,
"design-resolution-height": 720,
"fit-width": false,
"fit-height": true,
"use-project-simulator-setting": false,
......
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