Commit f8f29464 authored by liujiangnan's avatar liujiangnan

feat: 换遮罩层

parent 888f5f10
{"frameRate":30,"name":"loading","version":"5.5","compatibleVersion":"5.5","armature":[{"type":"Armature","frameRate":30,"name":"Armature","aabb":{"x":-128,"y":-129,"width":256,"height":258},"bone":[{"name":"root","transform":{"skX":77.5101,"skY":77.5101}}],"slot":[{"name":"IP小星星","parent":"root"}],"skin":[{"slot":[{"name":"IP小星星","display":[{"name":"IP小星星","transform":{"scX":0.2266,"scY":0.2266}}]}]}],"animation":[{"duration":48,"playTimes":0,"name":"newAnimation","bone":[{"name":"root","rotateFrame":[{"duration":24,"tweenEasing":0,"rotate":-77.51},{"tweenEasing":0,"rotate":102.49},{"duration":23,"tweenEasing":0,"rotate":106.76},{"duration":0,"rotate":-77.51}]}]}],"defaultActions":[{"gotoAndPlay":"newAnimation"}]}]}
\ No newline at end of file
{
"ver": "1.0.1",
"uuid": "32d4c07d-d14c-472e-9982-d77b5f99f84a",
"subMetas": {}
}
\ No newline at end of file
{"name":"loading","SubTexture":[{"name":"IP小星星","x":1,"height":249,"frameY":-4,"y":1,"frameHeight":258,"frameX":-2,"frameWidth":256,"width":252}],"imagePath":"loading_tex.png","height":256,"width":256}
\ No newline at end of file
{
"ver": "1.0.1",
"uuid": "3cf68978-c51e-4094-8539-c768bbfaf05a",
"subMetas": {}
}
\ No newline at end of file
{
"ver": "2.3.5",
"uuid": "daad9123-eef3-4934-8ddb-6a181b8f358a",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 256,
"height": 256,
"platformSettings": {},
"subMetas": {
"loading_tex": {
"ver": "1.0.4",
"uuid": "f6082448-b4d2-48c4-9132-422baa8ee7be",
"rawTextureUuid": "daad9123-eef3-4934-8ddb-6a181b8f358a",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": -1,
"offsetY": 2.5,
"trimX": 1,
"trimY": 1,
"width": 252,
"height": 249,
"rawWidth": 256,
"rawHeight": 256,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
......@@ -6,24 +6,9 @@ const { ccclass, property } = cc._decorator;
@ccclass
export default class NewClass extends middleLayerBase {
showMask() {
const mask = cc.find('middleLayer/mask');
mask.active = true;
cc.tween(mask)
.set({ opacity: 0 })
.to(0.5, { opacity: 0 })
.start();
}
hideMask() {
const mask = cc.find('middleLayer/mask');
mask.stopAllActions();
cc.tween(mask)
.set({ opacity: 0 })
.to(0.5, { opacity: 0 })
.call(() => {
mask.active = false;
})
.start();
}
onCourseWareLoaded() {
......@@ -51,6 +36,7 @@ export default class NewClass extends middleLayerBase {
initAir(this);
this.reWriteAir();
this.role = 'student';
this.onMiddleLayerLoadingFinish();
}
......@@ -204,8 +190,11 @@ export default class NewClass extends middleLayerBase {
}
onHomeworkFinish(callBack, data = null) {
this.goNextPage();
const loadingBg = cc.find('middleLayer/loadingBg');
loadingBg.opacity = 50;
this.goNextPage();
const process = cc.find(`middleLayer/pageProgress`);
const bar = cc.find(`bar`, process);
let barWidth = process.width / this.courses.length * (this.courseIndex+1);
......@@ -264,6 +253,18 @@ export default class NewClass extends middleLayerBase {
callback && callback(JSON.stringify(data.rows));
});
}
if (!(<any>window).air) {
(<any>window).air = {};
}
(<any>window).air.hideAirClassLoading = () => {
(<any>window).air.onCourseInScreen && (<any>window).air.onCourseInScreen(() => {
console.log("***成功调用onCourseInScreen***");
(<any>window).air.onCourseInScreen = null;
});
this.hideWaitingLetters();
this.hideMask();
}
}
callNativeFunction(param) {
......@@ -287,40 +288,19 @@ export default class NewClass extends middleLayerBase {
}
this.isShowWaiting = true;
const layout = cc.find('middleLayer/layout');
layout.removeAllChildren();
const canvas = cc.find("Canvas");
const bg = layout.addComponent(cc.Graphics);
bg.fillRect(-canvas.width / 2, -canvas.height / 2, canvas.width, canvas.height);
const laodingLayer = cc.find('middleLayer/loadingLayer');
laodingLayer.active = true;
const script = cc.find('middleLayer/loadingLayer/progress').getComponent('progressScript');
script.setProgress(0);
const id = setInterval(() => {
// console.log('changeObj.value: ', changeObj.value);
script.setProgress(changeObj.value);
}, 1);
const changeObj = { value: 0 };
cc.tween(changeObj)
.to(5, { value: 0.9 })
.call(() => {
clearInterval(id);
})
.start();
const loadingBg = cc.find('middleLayer/loadingBg');
loadingBg.active = true;
}
hideWaitingLetters() {
const layout = cc.find('middleLayer/layout');
layout.active = false;
const loadingBg = cc.find('middleLayer/loadingBg');
loadingBg.active = false;
const laodingLayer = cc.find('middleLayer/loadingLayer');
laodingLayer.active = false;
this.isShowWaiting = false;
}
getRainbowColorList() {
......
......@@ -126,8 +126,6 @@ export abstract class middleLayerBase extends cc.Component {
console.log('sceneName = ' + sceneName);
const canvas = cc.find('Canvas');
const middleLayer = cc.find('middleLayer');
this.hideWaitingLetters();
this.hideMask();
canvas.getComponent(cc.Widget).updateAlignment();
middleLayer.scale = canvas.width / middleLayer.width;
// this.showLog('middleLayer.scale = ' + middleLayer.scale);
......
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