Commit d401f0a7 authored by asdf's avatar asdf

.

parent e3444d18
......@@ -412,7 +412,7 @@
"ctor": "Float64Array",
"array": [
0,
40,
0,
0,
0,
0,
......@@ -860,9 +860,6 @@
"nodMask": {
"__id__": 20
},
"nodGroup": {
"__id__": 2
},
"layoutText": {
"__id__": 14
},
......
......@@ -79,9 +79,10 @@ cc.Class({
var imageUrl = this.data.tex_png;
var skeUrl = this.data.ske_json;
var atlasUrl = this.data.tex_json;
// imageUrl = 'http://127.0.0.1/walkingfish_tex.png';
// skeUrl = 'http://127.0.0.1/walkingfish_ske.json';
// atlasUrl = 'http://127.0.0.1/walkingfish_tex.json';
// imageUrl = 'http://staging-teach.cdn.ireadabc.com/c81c13740a8ba7f43362c14f9925a5d7.png';
// skeUrl = 'http://staging-teach.cdn.ireadabc.com/b7fabe0d1eb1e34e36f506b2988edd69.json';
// atlasUrl = 'http://staging-teach.cdn.ireadabc.com/4a330f9f0146d2b53f58dca946895da6.json';
// if(this.index == 1){
// imageUrl = 'http://127.0.0.1/NewProject_2_tex.png';
// skeUrl = 'http://127.0.0.1/NewProject_2_ske.json';
......@@ -169,6 +170,7 @@ cc.Class({
this.dragonBone.node.scale = bgHeight / size.height;
}
}
console.log( this.dragonBone.node.scale)
mask.width = this.dragonBone.node.scale * size.width;
mask.height = this.dragonBone.node.scale * size.height;
......@@ -178,10 +180,10 @@ cc.Class({
initRichText() {
// this.data.text = 'I am flying';
this.sprBg.node.y = 40;
this.dragonBone.node.y = 40;
this.dragonBone.node.parent.y = 40;
if (!this.data.text) {
this.sprBg.node.y = 0;
this.dragonBone.node.y = 0;
this.dragonBone.node.parent.y = 0;
return;
}
this.data.text = this.data.text.replace(/ /g, " |");
......
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