Commit 6fc7d2d8 authored by yu's avatar yu

1

parent dadb3ec0
...@@ -292,8 +292,8 @@ cc.Class({ ...@@ -292,8 +292,8 @@ cc.Class({
//更换书的样子 //更换书的样子
pg.view.visible(btn_next, true);//显示的内容用true pg.view.visible(btn_next, true);//显示的内容用true
pg.view.visible(btn_return, true); pg.view.visible(btn_return, true);
let bg_book_img = this._stageData.img;//从数组中调取img数据 // let bg_book_img = this._stageData.img;//从数组中调取img数据
pg.view.setNetImg(bg_book, bg_book_img);//与界面的节点绑定 // pg.view.setNetImg(bg_book, bg_book_img);//与界面的节点绑定
//拓展加载动画的内容 //拓展加载动画的内容
this.animationName = ""; this.animationName = "";
this._tryagainCount = 0; this._tryagainCount = 0;
......
...@@ -61,7 +61,7 @@ pg.view = { ...@@ -61,7 +61,7 @@ pg.view = {
}) })
}) })
}, },
setNetImg(item, res) { setNetImg(item, res, { w, h }) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
if (!item) return log.w("图片更换失败,传入了错误的item"); if (!item) return log.w("图片更换失败,传入了错误的item");
let node = item.node ? item.node : item; let node = item.node ? item.node : item;
...@@ -71,8 +71,8 @@ pg.view = { ...@@ -71,8 +71,8 @@ pg.view = {
} }
if (!node) return log.w("图片更换失败,传入了错误的item"); if (!node) return log.w("图片更换失败,传入了错误的item");
if (node.net_url == res) return; if (node.net_url == res) return;
let w = node.width; // let w = node.width;
let h = node.height; // let h = node.height;
// node.active = false;// // node.active = false;//
pg.load.loadNetImg(res).then((texture) => { pg.load.loadNetImg(res).then((texture) => {
if (!cc.isValid(node)) return log.i("节点已销毁"); if (!cc.isValid(node)) return log.i("节点已销毁");
...@@ -82,6 +82,17 @@ pg.view = { ...@@ -82,6 +82,17 @@ pg.view = {
let spriteFrame = new cc.SpriteFrame(texture); let spriteFrame = new cc.SpriteFrame(texture);
component.spriteFrame = spriteFrame; component.spriteFrame = spriteFrame;
node.net_url = res; node.net_url = res;
// node.active = true;
if (!cc.isValid(node)) return pg.logger.i("节点已销毁");
if (!node) return pg.logger.w("节点已销毁");
if (w && h) {
let scaleX = w / nw;
let scaleY = h / nh;
let scale = scaleX <= scaleY ? scaleX : scaleY;
node.width = w;//nw * scale;
node.height = h;//nh * scale;
} else {
let a = w / nw;//100 2000 0.05 let a = w / nw;//100 2000 0.05
let b = h / nh;//100 1000 0.1 let b = h / nh;//100 1000 0.1
if (a < b) { if (a < b) {
...@@ -93,7 +104,8 @@ pg.view = { ...@@ -93,7 +104,8 @@ pg.view = {
} }
node.scaleX = node.parent.scaleX; node.scaleX = node.parent.scaleX;
node.scaleY = node.parent.scaleY; node.scaleY = node.parent.scaleY;
// node.active = true; }
node.active = true;
resolve({ w: nw, h: nh }); resolve({ w: nw, h: nh });
}) })
}) })
......
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