Commit 9044b989 authored by limingzhe's avatar limingzhe

fix: getData

parent ba00d31c
No preview for this file type
...@@ -102,6 +102,18 @@ cc.Class({ ...@@ -102,6 +102,18 @@ cc.Class({
}, },
getData(func) { getData(func) {
if (window && window.courseware) {
window.courseware.getData(func, 'scene');
return;
}
const middleLayer = cc.find('middleLayer');
if (middleLayer) {
const middleLayerComponent = middleLayer.getComponent('middleLayer');
middleLayerComponent.getData(func);
return;
}
func(this.getDefaultData()); func(this.getDefaultData());
}, },
......
{"ios":{"sceneName":"cc_mz_003","version":"ec4a5"},"android":{"sceneName":"cc_mz_003","version":"ec4a5"}} {"ios":{"sceneName":"cc_mz_003","version":"e1a9b"},"android":{"sceneName":"cc_mz_003","version":"e1a9b"}}
\ No newline at end of file \ No newline at end of file
...@@ -21,13 +21,13 @@ ...@@ -21,13 +21,13 @@
"c2jiwBCkpLKLROfPfGjwzP", "c2jiwBCkpLKLROfPfGjwzP",
"07NeQx+mFJuaO0iSf/XOf0", "07NeQx+mFJuaO0iSf/XOf0",
"13f0B3Hs9MPJcknfF1lO29", "13f0B3Hs9MPJcknfF1lO29",
"2eqAEk7JxKRIr+HqH7Z9wG",
"1ciKmQBHxNJJlsKdmvSAmg", "1ciKmQBHxNJJlsKdmvSAmg",
"2eqAEk7JxKRIr+HqH7Z9wG",
"02delMVqdBD70a/HSD99FK", "02delMVqdBD70a/HSD99FK",
"93IDVMKShKZ70YLiLzQc9/", "93IDVMKShKZ70YLiLzQc9/",
"f3sNbslDJMIZ96Djt5W/Jn", "f3sNbslDJMIZ96Djt5W/Jn",
"f0gGIRqHNJKZHFIwxht8RR",
"d8HsitJHxOYqo801xBk8ev", "d8HsitJHxOYqo801xBk8ev",
"f0gGIRqHNJKZHFIwxht8RR",
"2dIkcnaOFP14UhPDlNShCl", "2dIkcnaOFP14UhPDlNShCl",
"54BxrCQpNG/5bxKIuok1Vo", "54BxrCQpNG/5bxKIuok1Vo",
"3dZisF9stDtoGZRqitNVc4", "3dZisF9stDtoGZRqitNVc4",
......
...@@ -335,6 +335,16 @@ window.__require = function e(t, n, r) { ...@@ -335,6 +335,16 @@ window.__require = function e(t, n, r) {
this.preload(); this.preload();
}, },
getData: function getData(func) { getData: function getData(func) {
if (window && window.courseware) {
window.courseware.getData(func, "scene");
return;
}
var middleLayer = cc.find("middleLayer");
if (middleLayer) {
var middleLayerComponent = middleLayer.getComponent("middleLayer");
middleLayerComponent.getData(func);
return;
}
func(this.getDefaultData()); func(this.getDefaultData());
}, },
getDefaultData: function getDefaultData() { getDefaultData: function getDefaultData() {
......
...@@ -41858,14 +41858,14 @@ ...@@ -41858,14 +41858,14 @@
} }
} }
function deserializeCCObject(data, objectData) { function deserializeCCObject(data, objectData) {
var mask = data[4][objectData[0]]; var mask = data[4][objectData[OBJ_DATA_MASK]];
var clazz = mask[0]; var clazz = mask[MASK_CLASS];
var ctor = clazz[0]; var ctor = clazz[CLASS_TYPE];
var obj = new ctor(); var obj = new ctor();
var keys = clazz[1]; var keys = clazz[CLASS_KEYS];
var classTypeOffset = clazz[2]; var classTypeOffset = clazz[CLASS_PROP_TYPE_OFFSET];
var maskTypeOffset = mask[mask.length - 1]; var maskTypeOffset = mask[mask.length - 1];
var i = 1; var i = MASK_CLASS + 1;
for (;i < maskTypeOffset; ++i) { for (;i < maskTypeOffset; ++i) {
var _key = keys[mask[i]]; var _key = keys[mask[i]];
obj[_key] = objectData[i]; obj[_key] = objectData[i];
...@@ -41903,15 +41903,15 @@ ...@@ -41903,15 +41903,15 @@
owner[key] = deserializeCCObject(data, value); owner[key] = deserializeCCObject(data, value);
} }
function parseCustomClass(data, owner, key, value) { function parseCustomClass(data, owner, key, value) {
var ctor = data[3][value[0]]; var ctor = data[3][value[CUSTOM_OBJ_DATA_CLASS]];
owner[key] = deserializeCustomCCObject(data, ctor, value[1]); owner[key] = deserializeCustomCCObject(data, ctor, value[CUSTOM_OBJ_DATA_CONTENT]);
} }
function parseValueTypeCreated(data, owner, key, value) { function parseValueTypeCreated(data, owner, key, value) {
BuiltinValueTypeSetters[value[0]](owner[key], value); BuiltinValueTypeSetters[value[VALUETYPE_SETTER]](owner[key], value);
} }
function parseValueType(data, owner, key, value) { function parseValueType(data, owner, key, value) {
var val = new BuiltinValueTypes[value[0]](); var val = new BuiltinValueTypes[value[VALUETYPE_SETTER]]();
BuiltinValueTypeSetters[value[0]](val, value); BuiltinValueTypeSetters[value[VALUETYPE_SETTER]](val, value);
owner[key] = val; owner[key] = val;
} }
function parseTRS(data, owner, key, value) { function parseTRS(data, owner, key, value) {
...@@ -41919,9 +41919,9 @@ ...@@ -41919,9 +41919,9 @@
typedArray.set(value); typedArray.set(value);
} }
function parseDict(data, owner, key, value) { function parseDict(data, owner, key, value) {
var dict = value[0]; var dict = value[DICT_JSON_LAYOUT];
owner[key] = dict; owner[key] = dict;
for (var i = 1; i < value.length; i += 3) { for (var i = DICT_JSON_LAYOUT + 1; i < value.length; i += 3) {
var _key3 = value[i]; var _key3 = value[i];
var _type2 = value[i + 1]; var _type2 = value[i + 1];
var subValue = value[i + 2]; var subValue = value[i + 2];
...@@ -41930,7 +41930,7 @@ ...@@ -41930,7 +41930,7 @@
} }
} }
function parseArray(data, owner, key, value) { function parseArray(data, owner, key, value) {
var array = value[0]; var array = value[ARRAY_ITEM_VALUES];
owner[key] = array; owner[key] = array;
for (var i = 0; i < array.length; ++i) { for (var i = 0; i < array.length; ++i) {
var subValue = array[i]; var subValue = array[i];
...@@ -41958,7 +41958,7 @@ ...@@ -41958,7 +41958,7 @@
function parseInstances(data) { function parseInstances(data) {
var instances = data[5]; var instances = data[5];
var instanceTypes = data[6]; var instanceTypes = data[6];
var instanceTypesLen = 0 === instanceTypes ? 0 : instanceTypes.length; var instanceTypesLen = instanceTypes === EMPTY_PLACEHOLDER ? 0 : instanceTypes.length;
var rootIndex = instances[instances.length - 1]; var rootIndex = instances[instances.length - 1];
var normalObjectCount = instances.length - instanceTypesLen; var normalObjectCount = instances.length - instanceTypesLen;
if ("number" !== typeof rootIndex) rootIndex = 0; else { if ("number" !== typeof rootIndex) rootIndex = 0; else {
...@@ -42010,8 +42010,8 @@ ...@@ -42010,8 +42010,8 @@
var klassLayout = classes[i]; var klassLayout = classes[i];
if ("string" !== typeof klassLayout) { if ("string" !== typeof klassLayout) {
true; true;
if ("function" === typeof klassLayout[0]) throw new Error("Can not deserialize the same JSON data again."); if ("function" === typeof klassLayout[CLASS_TYPE]) throw new Error("Can not deserialize the same JSON data again.");
var _type5 = klassLayout[0]; var _type5 = klassLayout[CLASS_TYPE];
doLookupClass(classFinder, _type5, klassLayout, CLASS_TYPE, silent, customFinder); doLookupClass(classFinder, _type5, klassLayout, CLASS_TYPE, silent, customFinder);
} else doLookupClass(classFinder, klassLayout, classes, i, silent, customFinder); } else doLookupClass(classFinder, klassLayout, classes, i, silent, customFinder);
} }
...@@ -42022,7 +42022,7 @@ ...@@ -42022,7 +42022,7 @@
var classes = data[3]; var classes = data[3];
for (var i = 0; i < masks.length; ++i) { for (var i = 0; i < masks.length; ++i) {
var mask = masks[i]; var mask = masks[i];
mask[0] = classes[mask[0]]; mask[MASK_CLASS] = classes[mask[MASK_CLASS]];
} }
} }
} }
...@@ -42058,7 +42058,7 @@ ...@@ -42058,7 +42058,7 @@
preprocessed = version.preprocessed; preprocessed = version.preprocessed;
version = version.version; version = version.version;
} }
if (version < 1) throw new Error(cc.debug.getError(5304, version)); if (version < SUPPORT_MIN_FORMAT_VERSION) throw new Error(cc.debug.getError(5304, version));
options._version = version; options._version = version;
options.result = details; options.result = details;
data[0] = options; data[0] = options;
This diff is collapsed.
No preview for this file type
...@@ -93,6 +93,19 @@ cc.Class({ ...@@ -93,6 +93,19 @@ cc.Class({
this.preload(); this.preload();
}, },
getData: function getData(func) { getData: function getData(func) {
if (window && window.courseware) {
window.courseware.getData(func, 'scene');
return;
}
var middleLayer = cc.find('middleLayer');
if (middleLayer) {
var middleLayerComponent = middleLayer.getComponent('middleLayer');
middleLayerComponent.getData(func);
return;
}
func(this.getDefaultData()); func(this.getDefaultData());
}, },
getDefaultData: function getDefaultData() { getDefaultData: function getDefaultData() {
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
{"version":"1.0.8","stats":{"/Users/lmz/Documents/workspace/pro_hw/cc_mz_003/temp/quick-scripts/src/__qc_index__.js":"2021-12-16T10:00:06.040Z","/Users/lmz/Documents/workspace/pro_hw/cc_mz_003/temp/quick-scripts/src/assets/cc_mz_003/script/runtime.js":"2021-12-16T10:00:06.010Z","/Users/lmz/Documents/workspace/pro_hw/cc_mz_003/temp/quick-scripts/src/assets/cc_mz_003/prefab/bgBottom_cc_mz_003.js":"2021-12-16T10:00:06.009Z","/Users/lmz/Documents/workspace/pro_hw/cc_mz_003/temp/quick-scripts/src/assets/cc_mz_003/scene/cc_mz_003.js":"2021-12-16T10:00:06.011Z","/Users/lmz/Documents/workspace/pro_hw/cc_mz_003/temp/quick-scripts/src/assets/cc_mz_003/script/util.js":"2021-12-16T10:00:06.010Z"}} {"version":"1.0.8","stats":{"/Users/lmz/Documents/workspace/pro_hw/cc_mz_003/temp/quick-scripts/src/__qc_index__.js":"2021-12-18T11:22:02.593Z","/Users/lmz/Documents/workspace/pro_hw/cc_mz_003/temp/quick-scripts/src/assets/cc_mz_003/script/util.js":"2021-12-18T11:22:02.573Z","/Users/lmz/Documents/workspace/pro_hw/cc_mz_003/temp/quick-scripts/src/assets/cc_mz_003/scene/cc_mz_003.js":"2021-12-18T11:22:02.574Z","/Users/lmz/Documents/workspace/pro_hw/cc_mz_003/temp/quick-scripts/src/assets/cc_mz_003/prefab/bgBottom_cc_mz_003.js":"2021-12-18T11:22:02.571Z","/Users/lmz/Documents/workspace/pro_hw/cc_mz_003/temp/quick-scripts/src/assets/cc_mz_003/script/runtime.js":"2021-12-18T11:22:02.572Z"}}
This diff is collapsed.
(function () { (function () {
var scripts = [{"deps":{"./assets/cc_mz_003/script/runtime":1,"./assets/cc_mz_003/script/util":4,"./assets/cc_mz_003/prefab/bgBottom_cc_mz_003":2,"./assets/cc_mz_003/scene/cc_mz_003":3},"path":"preview-scripts/__qc_index__.js"},{"deps":{},"path":"preview-scripts/assets/cc_mz_003/script/runtime.js"},{"deps":{"../script/util":4},"path":"preview-scripts/assets/cc_mz_003/prefab/bgBottom_cc_mz_003.js"},{"deps":{},"path":"preview-scripts/assets/cc_mz_003/scene/cc_mz_003.js"},{"deps":{},"path":"preview-scripts/assets/cc_mz_003/script/util.js"}]; var scripts = [{"deps":{"./assets/cc_mz_003/script/util":1,"./assets/cc_mz_003/script/runtime":4,"./assets/cc_mz_003/prefab/bgBottom_cc_mz_003":3,"./assets/cc_mz_003/scene/cc_mz_003":2},"path":"preview-scripts/__qc_index__.js"},{"deps":{},"path":"preview-scripts/assets/cc_mz_003/script/util.js"},{"deps":{},"path":"preview-scripts/assets/cc_mz_003/scene/cc_mz_003.js"},{"deps":{"../script/util":1},"path":"preview-scripts/assets/cc_mz_003/prefab/bgBottom_cc_mz_003.js"},{"deps":{},"path":"preview-scripts/assets/cc_mz_003/script/runtime.js"}];
var entries = ["preview-scripts/__qc_index__.js"]; var entries = ["preview-scripts/__qc_index__.js"];
var bundleScript = 'preview-scripts/__qc_bundle__.js'; var bundleScript = 'preview-scripts/__qc_bundle__.js';
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -93,6 +93,19 @@ cc.Class({ ...@@ -93,6 +93,19 @@ cc.Class({
this.preload(); this.preload();
}, },
getData: function getData(func) { getData: function getData(func) {
if (window && window.courseware) {
window.courseware.getData(func, 'scene');
return;
}
var middleLayer = cc.find('middleLayer');
if (middleLayer) {
var middleLayerComponent = middleLayer.getComponent('middleLayer');
middleLayerComponent.getData(func);
return;
}
func(this.getDefaultData()); func(this.getDefaultData());
}, },
getDefaultData: function getDefaultData() { getDefaultData: function getDefaultData() {
......
This source diff could not be displayed because it is too large. You can view the blob instead.
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