Commit cd54f7c1 authored by liujiangnan's avatar liujiangnan

feat:

parent 574b3526
...@@ -1257,7 +1257,7 @@ ...@@ -1257,7 +1257,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"showInEditor": false, "showInEditor": false,
"_id": "65RFFwYwBNU4ru547FlAHZ" "_id": "c9t2uHDm5IeaRcQRUj1dJN"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
...@@ -1292,7 +1292,7 @@ ...@@ -1292,7 +1292,7 @@
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 0,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "f5pAhdWtJMzoxgdISt1bZG" "_id": "f27+po/9xE6oAVsq5ZV7Uz"
}, },
{ {
"__type__": "cc.RichText", "__type__": "cc.RichText",
...@@ -9324,7 +9324,7 @@ ...@@ -9324,7 +9324,7 @@
} }
], ],
"_prefab": null, "_prefab": null,
"_opacity": 103, "_opacity": 180,
"_color": { "_color": {
"__type__": "cc.Color", "__type__": "cc.Color",
"r": 255, "r": 255,
......
...@@ -638,8 +638,8 @@ cc.Class({ ...@@ -638,8 +638,8 @@ cc.Class({
const Canvas = cc.find('Canvas'); const Canvas = cc.find('Canvas');
const middleLayer = cc.find('middleLayer'); const middleLayer = cc.find('middleLayer');
// cc.find('middleLayer/ExitBtn').active = true; // cc.find('middleLayer/ExitBtn').active = true;
this.hideWaitingLetters();
this.hideMask(); this.hideMask();
this.hideWaitingLetters();
Canvas.getComponent(cc.Widget).updateAlignment(); Canvas.getComponent(cc.Widget).updateAlignment();
middleLayer.scale = Canvas.width / middleLayer.width; middleLayer.scale = Canvas.width / middleLayer.width;
// this.showLog('middleLayer.scale = ' + middleLayer.scale); // this.showLog('middleLayer.scale = ' + middleLayer.scale);
...@@ -650,7 +650,6 @@ cc.Class({ ...@@ -650,7 +650,6 @@ cc.Class({
reloadBundle() { reloadBundle() {
const { sceneName, version, bondleUrl } = this.currentBundleInfo; const { sceneName, version, bondleUrl } = this.currentBundleInfo;
this.loadBundle(sceneName, version, bondleUrl); this.loadBundle(sceneName, version, bondleUrl);
}, },
...@@ -659,7 +658,7 @@ cc.Class({ ...@@ -659,7 +658,7 @@ cc.Class({
mask.active = true; mask.active = true;
cc.tween(mask) cc.tween(mask)
.set({ opacity: 0 }) .set({ opacity: 0 })
.to(0.5, { opacity: 0 }) .to(0.2, { opacity: 180 })
.start(); .start();
}, },
...@@ -667,8 +666,8 @@ cc.Class({ ...@@ -667,8 +666,8 @@ cc.Class({
const mask = cc.find('middleLayer/mask'); const mask = cc.find('middleLayer/mask');
mask.stopAllActions(); mask.stopAllActions();
cc.tween(mask) cc.tween(mask)
.set({ opacity: 0 }) .set({ opacity: 180 })
.to(0.5, { opacity: 0 }) .to(0.2, { opacity: 0 })
.call(() => { .call(() => {
mask.active = false; mask.active = false;
}) })
...@@ -763,12 +762,9 @@ cc.Class({ ...@@ -763,12 +762,9 @@ cc.Class({
}, },
hideWaitingLetters() { hideWaitingLetters() {
const layout = cc.find('middleLayer/layout'); const layout = cc.find('middleLayer/layout');
layout.active = false; layout.active = false;
this.isShowWaiting = false;
const laodingLayer = cc.find('middleLayer/loadingLayer');
laodingLayer.active = false;
}, },
showLog(str) { showLog(str) {
......
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