Commit cb4e4a2d authored by wangxin's avatar wangxin

beta 1.4

parent 9ba6a5ca
...@@ -129,7 +129,7 @@ cc.Class({ ...@@ -129,7 +129,7 @@ cc.Class({
getDefaultData() { getDefaultData() {
const dataJson = const dataJson =
'{"title":"hello","audio_title":"http://staging-teach.cdn.ireadabc.com/f7fb9f71ab7d460ac2f78c85efba7610.mp3","options":[{"pic_url":"http://staging-teach.cdn.ireadabc.com/004be996ea209e366951a7c4b6a3e55f.jpeg","audio_url":"http://staging-teach.cdn.ireadabc.com/0f0482ddb8c0d3329165ab0612683148.mp3"},{"pic_url":"http://staging-teach.cdn.ireadabc.com/785b0bc1766658373e4ebdcbd694a088.jpeg","audio_url":"http://staging-teach.cdn.ireadabc.com/784cd4188bf126d6c3c9395d9a807619.mp3"},{"pic_url":"http://staging-teach.cdn.ireadabc.com/5433aa00faced2d5e02f9cecce63ba09.jpeg","audio_url":"http://staging-teach.cdn.ireadabc.com/0f0482ddb8c0d3329165ab0612683148.mp3"},{"pic_url":"http://staging-teach.cdn.ireadabc.com/9298013cc63aa40035dbd18f1f8380a8.jpeg","audio_url":"http://staging-teach.cdn.ireadabc.com/784cd4188bf126d6c3c9395d9a807619.mp3"}]}'; '{"title":"hello","audio_title":"http://staging-teach.cdn.ireadabc.com/f7fb9f71ab7d460ac2f78c85efba7610.mp3","options":[{"pic_url":"http://staging-teach.cdn.ireadabc.com/004be996ea209e366951a7c4b6a3e55f.jpeg","audio_url":"http://staging-teach.cdn.ireadabc.com/0f0482ddb8c0d3329165ab0612683148.mp3"},{"pic_url":"http://staging-teach.cdn.ireadabc.com/785b0bc1766658373e4ebdcbd694a088.jpeg","audio_url":"http://staging-teach.cdn.ireadabc.com/784cd4188bf126d6c3c9395d9a807619.mp3"},{"pic_url":"http://staging-teach.cdn.ireadabc.com/5433aa00faced2d5e02f9cecce63ba09.jpeg","audio_url":"http://staging-teach.cdn.ireadabc.com/0f0482ddb8c0d3329165ab0612683148.mp3"},{"pic_url":"http://staging-teach.cdn.ireadabc.com/9298013cc63aa40035dbd18f1f8380a8.jpeg","audio_url":"http://staging-teach.cdn.ireadabc.com/784cd4188bf126d6c3c9395d9a807619.mp3"},{"pic_url":"http://staging-teach.cdn.ireadabc.com/9298013cc63aa40035dbd18f1f8380a8.jpeg","audio_url":"http://staging-teach.cdn.ireadabc.com/784cd4188bf126d6c3c9395d9a807619.mp3"},{"pic_url":"http://staging-teach.cdn.ireadabc.com/9298013cc63aa40035dbd18f1f8380a8.jpeg","audio_url":"http://staging-teach.cdn.ireadabc.com/784cd4188bf126d6c3c9395d9a807619.mp3"}]}';
const data = JSON.parse(dataJson); const data = JSON.parse(dataJson);
return data; return data;
}, },
...@@ -215,6 +215,7 @@ cc.Class({ ...@@ -215,6 +215,7 @@ cc.Class({
const op_p = cc.instantiate(this.op_pic); const op_p = cc.instantiate(this.op_pic);
op_p.getComponent("op_pic")._opId = i; op_p.getComponent("op_pic")._opId = i;
op_p.getComponent("op_pic")._scale = scale;
op_p.getComponent("op_pic")._picUrl = this.data.options[i].pic_url; op_p.getComponent("op_pic")._picUrl = this.data.options[i].pic_url;
this.pic_container.addChild(op_p); this.pic_container.addChild(op_p);
} }
......
...@@ -34,6 +34,7 @@ cc.Class({ ...@@ -34,6 +34,7 @@ cc.Class({
_width: null, _width: null,
_height: null, _height: null,
_isMoved: false, _isMoved: false,
_scale: 1,
}, },
onEnable() { onEnable() {
...@@ -90,8 +91,8 @@ cc.Class({ ...@@ -90,8 +91,8 @@ cc.Class({
//触摸移动; //触摸移动;
onTouchMove(touch, event) { onTouchMove(touch, event) {
let delta = touch.getDelta(); let delta = touch.getDelta();
this.node.x += delta.x; this.node.x += delta.x / this._scale;
this.node.y += delta.y; this.node.y += delta.y / this._scale;
this._isMoved = true; this._isMoved = true;
}, },
......
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