Commit 90ac6516 authored by Chen Jiping's avatar Chen Jiping

Merge branch 'master' of http://vcs.ireadabc.com/template/OP-03-1

parents c81a6f58 1d79a986
{"name":"op-osmo","SubTexture":[{"name":"480","x":1,"height":488,"y":601,"width":728},{"name":"左-下手","x":772,"height":172,"y":1,"width":179},{"name":"右-下手","x":772,"height":172,"y":175,"width":179},{"name":"书","x":1,"height":312,"y":1091,"width":773},{"name":"左-上手","x":772,"height":143,"y":349,"width":102},{"name":"右-上手","x":876,"height":143,"y":349,"width":101},{"name":"p","x":1,"height":285,"y":1405,"width":362},{"name":"闪光灯","x":762,"height":27,"y":1033,"width":28},{"name":"绿色按钮","x":731,"height":29,"y":1033,"width":29},{"name":"指屏幕","x":731,"height":430,"y":601,"width":255},{"name":"光","x":1,"height":598,"y":1,"width":769}],"imagePath":"op-osmo_tex.png","height":2048,"width":1024} {"name":"op-osmo","SubTexture":[{"name":"480","x":1,"height":488,"y":601,"width":728},{"name":"左-下手","x":772,"height":172,"y":1,"width":179},{"name":"右-下手","x":772,"height":172,"y":175,"width":179},{"name":"书","x":1,"height":312,"y":1091,"width":773},{"name":"左-上手","x":772,"height":143,"y":349,"width":102},{"name":"右-上手","x":876,"height":143,"y":349,"width":101},{"name":"p","x":1,"height":285,"y":1405,"width":362},{"name":"闪光灯","x":762,"height":27,"y":1033,"width":28},{"name":"绿色按钮","x":731,"height":29,"y":1033,"width":29},{"name":"指屏幕","x":731,"height":430,"y":601,"width":255},{"name":"光","x":1,"height":598,"y":1,"width":769}],"imagePath":"op_osmo_tex.png","height":2048,"width":1024}
\ No newline at end of file \ No newline at end of file
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
"height": 2048, "height": 2048,
"platformSettings": {}, "platformSettings": {},
"subMetas": { "subMetas": {
"op-osmo_tex": { "op_osmo_tex": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "ed323cb2-ab5d-4da1-8dce-09de5e3ef255", "uuid": "ed323cb2-ab5d-4da1-8dce-09de5e3ef255",
"rawTextureUuid": "aac322ca-9f15-4ef2-aaf5-847f7ca1b29d", "rawTextureUuid": "aac322ca-9f15-4ef2-aaf5-847f7ca1b29d",
......
...@@ -2594,7 +2594,9 @@ ...@@ -2594,7 +2594,9 @@
"__id__": 55 "__id__": 55
}, },
"_enabled": true, "_enabled": true,
"_clip": null, "_clip": {
"__uuid__": "58b7914c-5652-4c51-b14e-5c99e5627fcc"
},
"_volume": 1, "_volume": 1,
"_mute": false, "_mute": false,
"_loop": false, "_loop": false,
......
...@@ -134,9 +134,16 @@ cc.Class({ ...@@ -134,9 +134,16 @@ cc.Class({
const preloadArr = this._imageResList.concat(this._audioResList).concat(this._animaResList); const preloadArr = this._imageResList.concat(this._audioResList).concat(this._animaResList);
cc.assetManager.loadAny(preloadArr, null, null, (err, data) => { cc.assetManager.loadAny(preloadArr, null, null, (err, data) => {
this.loadEnd();
if (window && window["air"]) { if (window && window["air"]) {
window["air"].hideAirClassLoading(); cc.find('Canvas').opacity = 0;
window.air.onCourseInScreen = (next) => {
cc.find('Canvas').opacity = 255;
this.loadEnd();
next();
}
window.air.hideAirClassLoading();
} else {
this.loadEnd();
} }
cc.debug.setDisplayStats(false); cc.debug.setDisplayStats(false);
......
export const defaultData = {
"exercises": {
"wordArr": [{
"val": "A",
"lrcData": {
"audio_url": "http://staging-teach.cdn.ireadabc.com/e896863da284cf8ba738caf98d568d39.mp3",
"fontSize": 24,
"lineHeight": 32,
"lyrics": [{
"time": 0,
"data": "",
"newLine": false
}, {
"time": 1.211424,
"data": "",
"newLine": false
}, {
"time": 2.411394,
"data": "",
"newLine": false
}]
},
"audioUrl": "http://staging-teach.cdn.ireadabc.com/e896863da284cf8ba738caf98d568d39.mp3"
}, {
"val": "a",
"lrcData": {
"audio_url": "http://staging-teach.cdn.ireadabc.com/9747c77fc914684e151aac636e1b47b6.mp3",
"fontSize": 24,
"lineHeight": 32,
"lyrics": [{
"time": 0,
"data": "",
"newLine": false
}, {
"time": 1.258075,
"data": "",
"newLine": false
}, {
"time": 2.532695,
"data": "",
"newLine": false
}]
},
"audioUrl": "http://staging-teach.cdn.ireadabc.com/9747c77fc914684e151aac636e1b47b6.mp3"
}],
"picUrl": "http://staging-teach.cdn.ireadabc.com/d125fe9022b0528cfbb621dd5b9f701a.png"
}
}
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
"height": 515, "height": 515,
"platformSettings": {}, "platformSettings": {},
"subMetas": { "subMetas": {
"bg_word-background2": { "bg_word_background2": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "e61a88ac-0f60-44e6-9564-ad926b6759a8", "uuid": "e61a88ac-0f60-44e6-9564-ad926b6759a8",
"rawTextureUuid": "17fc757e-b869-4c95-a0fa-e9433e7f6929", "rawTextureUuid": "17fc757e-b869-4c95-a0fa-e9433e7f6929",
......
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