Commit cbcce657 authored by limingzhe's avatar limingzhe

refactor: 数据重构 添加动画

parent 9eb2856a
...@@ -22,11 +22,20 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy { ...@@ -22,11 +22,20 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy {
picArr; picArr;
customTypeGroupArr = [ customTypeGroupArr = [
{ {
name: '高亮区', name: '基础资源',
rect: true, rect: true,
audio: true anima: true,
} pic: true,
text: true,
audio: true,
},
// {
// name: '动画',
// rect: true,
// anima: true
// }
] ]
constructor(private appRef: ApplicationRef,private changeDetectorRef: ChangeDetectorRef, private message: NzMessageService) { constructor(private appRef: ApplicationRef,private changeDetectorRef: ChangeDetectorRef, private message: NzMessageService) {
...@@ -80,8 +89,9 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy { ...@@ -80,8 +89,9 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy {
*/ */
onImageUploadSuccess(e, key, it) { onImageUploadSuccess(e, key, it) {
it[key] = e.url;
this.save(); it[key] = e.url;
this.save();
} }
/** /**
...@@ -162,7 +172,7 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy { ...@@ -162,7 +172,7 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy {
save() { save() {
console.log('this.item: ', this.item); console.log('this.item: ', this.item);
console.log('this.item json: ', JSON.stringify(this.item) ); console.log('this.item JSON: ', JSON.stringify(this.item));
(<any> window).courseware.setData(this.item, null, this.saveKey); (<any> window).courseware.setData(this.item, null, this.saveKey);
this.refresh(); this.refresh();
} }
......
This diff is collapsed.
...@@ -88,7 +88,7 @@ cc.Class({ ...@@ -88,7 +88,7 @@ cc.Class({
getDefaultData() { getDefaultData() {
const dataJson = '{"bgItem":{"url":"http://staging-teach.cdn.ireadabc.com/cea0606b09735d7346dc57626f0a0a9b.png","rect":{"x":216.94,"y":0,"width":887.11,"height":499}},"hotZoneItemArr":[{"id":"1597301271886","index":0,"audio_url":"http://staging-teach.cdn.ireadabc.com/263d9cbaef7fbf251f9e3703130fb763.mp3","itemType":"rect","fontScale":1.03203125,"imgScale":1,"mapScale":1.03203125,"gIdx":"0","fontSize":50,"fontName":"BRLNSR_1","ontColor":"#8f3758","rect":{"x":59.06,"y":133.29,"width":220.45,"height":220.45}},{"id":"1597301294854","index":1,"audio_url":"http://staging-teach.cdn.ireadabc.com/28a42e3e77e023c8118624bb8351e7b2.mp3","itemType":"rect","fontScale":1.03203125,"imgScale":1,"mapScale":1.03203125,"gIdx":"0","fontSize":50,"fontName":"BRLNSR_1","ontColor":"#8f3758","rect":{"x":589.68,"y":199.09,"width":80.32,"height":80.32}},{"id":"1597301312248","index":2,"audio_url":"http://staging-teach.cdn.ireadabc.com/954c0b9d01de2cbfbdb6d21f3f8b722b.mp3","itemType":"rect","fontScale":1.03203125,"imgScale":1,"mapScale":1.03203125,"gIdx":"0","fontSize":50,"fontName":"BRLNSR_1","ontColor":"#8f3758","rect":{"x":692.22,"y":70.92,"width":83.74,"height":83.74}}],"picArr":[{"pic_url":"http://staging-teach.cdn.ireadabc.com/29cdcc64c0898a1ec63f89b8b2fdd0e6.png","audio_url":"http://staging-teach.cdn.ireadabc.com/f51e3fedc88aa69a99f6ef579f7de047.mp3","text":"arrow"},{"pic_url":"http://staging-teach.cdn.ireadabc.com/18f2a029e02d679da8d42746daea228f.png","audio_url":"http://staging-teach.cdn.ireadabc.com/fbe2f23b9eb191a9330f99800e0d54d5.mp3","text":"home"}]}' const dataJson = '{"bgItem":{"url":"http://staging-teach.cdn.ireadabc.com/cea0606b09735d7346dc57626f0a0a9b.png","rect":{"x":205.28,"y":0,"width":844.44,"height":475}},"hotZoneItemArr":[{"id":"1597805601321","index":0,"pic_url":"http://staging-teach.cdn.ireadabc.com/ddf2a304102c90bd2ed1cadf27f8feb7.png","text":"arrow","audio_url":"http://staging-teach.cdn.ireadabc.com/1961d807c944e6551af02c7b57e117f3.mp3","itemType":"rect","fontScale":0.98046875,"imgScale":4.139756944444445,"mapScale":0.98046875,"skeJsonData":{"url":"http://staging-teach.cdn.ireadabc.com/ab66b9d704187f60fd8a61c981435b8e.json","name":"finish2_ske.json"},"texJsonData":{"url":"http://staging-teach.cdn.ireadabc.com/a4b74d67df855493b394c7df9625ba24.json","name":"finish2_tex.json"},"texPngData":{"url":"http://staging-teach.cdn.ireadabc.com/e485027385bab93761a5d1749166ba83.png","name":"finish2_tex.png"},"gIdx":"0","fontSize":50,"fontName":"BRLNSR_1","ontColor":"#8f3758","rect":{"x":75.22,"y":135.5,"width":200,"height":200}},{"id":"1597805655229","index":1,"pic_url":"http://staging-teach.cdn.ireadabc.com/18f2a029e02d679da8d42746daea228f.png","text":"home","audio_url":"http://staging-teach.cdn.ireadabc.com/0128a59057e63c4c6b4b96556d077a98.mp3","itemType":"rect","fontScale":0.98046875,"imgScale":3.72578125,"mapScale":0.98046875,"skeJsonData":{"url":"http://staging-teach.cdn.ireadabc.com/bd825dcceea298d1146be8067ae3d17f.json","name":"finish1_ske.json"},"texJsonData":{"url":"http://staging-teach.cdn.ireadabc.com/246f8991b729fa3e5a7f4802de828efa.json","name":"finish1_tex.json"},"texPngData":{"url":"http://staging-teach.cdn.ireadabc.com/5a0c5af3e952acd0ac83a6e5c6f03ff1.png","name":"finish1_tex.png"},"gIdx":"0","fontSize":50,"fontName":"BRLNSR_1","ontColor":"#8f3758","rect":{"x":661.72,"y":69,"width":77,"height":77}}],"picArr":[{"pic_url":"http://staging-teach.cdn.ireadabc.com/29cdcc64c0898a1ec63f89b8b2fdd0e6.png","audio_url":"http://staging-teach.cdn.ireadabc.com/f51e3fedc88aa69a99f6ef579f7de047.mp3","text":"arrow"},{"pic_url":"http://staging-teach.cdn.ireadabc.com/18f2a029e02d679da8d42746daea228f.png","audio_url":"http://staging-teach.cdn.ireadabc.com/fbe2f23b9eb191a9330f99800e0d54d5.mp3","text":"home"}]}'
const data1 = JSON.parse(dataJson); const data1 = JSON.parse(dataJson);
return data1; return data1;
...@@ -520,6 +520,88 @@ cc.Class({ ...@@ -520,6 +520,88 @@ cc.Class({
rectNode.on('click', () => { rectNode.on('click', () => {
this.showCircle(rectNode); this.showCircle(rectNode);
}); });
const animaNode = new cc.Node();
animaNode.name = 'anima_' + data.index;
this.hotZoneBg.addChild(animaNode);
data.animaNode = animaNode;
if (data.audio_url) {
cc.assetManager.loadRemote(data.audio_url, (err, audioClip) => {
animaNode.audioClip = audioClip;
});
}
const dragonDisplay = animaNode.addComponent(dragonBones.ArmatureDisplay);
const image = data.texPngData.url//"http://staging-teach.cdn.ireadabc.com/5a0c5af3e952acd0ac83a6e5c6f03ff1.png";
const ske = data.skeJsonData.url//"http://staging-teach.cdn.ireadabc.com/bd825dcceea298d1146be8067ae3d17f.json";
const atlas = data.texJsonData.url//"http://staging-teach.cdn.ireadabc.com/246f8991b729fa3e5a7f4802de828efa.json";
cc.loader.load(image, (error, texture) => {
cc.loader.load({url: atlas, type: 'txt'}, (error, atlasJson) => {
cc.loader.load({url: ske, type: 'txt'}, (error, dragonBonesJson) => {
const atlas = new dragonBones.DragonBonesAtlasAsset();
atlas.atlasJson = atlasJson;
atlas.texture = texture;
const asset = new dragonBones.DragonBonesAsset();
asset.dragonBonesJson = dragonBonesJson;
dragonDisplay.dragonAtlasAsset = atlas;
dragonDisplay.dragonAsset = asset;
let json = JSON.parse(asset.dragonBonesJson);
let armatures = json["armature"];
console.log('armatures: ', armatures);
let armatureNames = [];
for (let i = 0; i < armatures.length; i++) {
armatureNames.push(armatures[i].name);
}
// console.log('armatureNames: ', armatureNames);
if (armatureNames.length > 0) {
let defaultArmatureName = armatureNames[0];
dragonDisplay.armatureName = defaultArmatureName;
// let animationNames = dragonDisplay.getAnimationNames(defaultArmatureName);
let defaultArmature = armatures[0];
let animations = defaultArmature.animation;
let animationNames = [];
for (let i = 0; i < animations.length; i++) {
animationNames.push(animations[i].name);
}
// rectNode.addComponent(cc.Button);
// rectNode.on('click', () => {
animaNode.showAnima = () => {
if (rectNode.isClicked) {
// return;
}
rectNode.isClicked = true;
console.log('clicked');
if (animaNode.audioClip) {
cc.audioEngine.stopAll();
cc.audioEngine.play(animaNode.audioClip, false, 0.8);
}
if (animationNames.length > 0) {
dragonDisplay.playAnimation(animationNames[0], 1);
}
}
}
});
});
});
}, },
_circle: null, _circle: null,
...@@ -534,10 +616,12 @@ cc.Class({ ...@@ -534,10 +616,12 @@ cc.Class({
console.log(' in showCircle'); console.log(' in showCircle');
if (node == this._circle.itemNode) { if (node == this._circle.itemNode) {
if (node.data.audioClip) {
cc.audioEngine.stopAll(); node.data.animaNode.showAnima();
cc.audioEngine.play(node.data.audioClip, false, 0.8); // if (node.data.audioClip) {
} // cc.audioEngine.stopAll();
// cc.audioEngine.play(node.data.audioClip, false, 0.8);
// }
return; return;
} }
......
...@@ -85,7 +85,7 @@ cc.Class({ ...@@ -85,7 +85,7 @@ cc.Class({
func(this.getDefaultData()); func(this.getDefaultData());
}, },
getDefaultData: function getDefaultData() { getDefaultData: function getDefaultData() {
var dataJson = '{"bgItem":{"url":"http://staging-teach.cdn.ireadabc.com/cea0606b09735d7346dc57626f0a0a9b.png","rect":{"x":216.94,"y":0,"width":887.11,"height":499}},"hotZoneItemArr":[{"id":"1597301271886","index":0,"audio_url":"http://staging-teach.cdn.ireadabc.com/263d9cbaef7fbf251f9e3703130fb763.mp3","itemType":"rect","fontScale":1.03203125,"imgScale":1,"mapScale":1.03203125,"gIdx":"0","fontSize":50,"fontName":"BRLNSR_1","ontColor":"#8f3758","rect":{"x":59.06,"y":133.29,"width":220.45,"height":220.45}},{"id":"1597301294854","index":1,"audio_url":"http://staging-teach.cdn.ireadabc.com/28a42e3e77e023c8118624bb8351e7b2.mp3","itemType":"rect","fontScale":1.03203125,"imgScale":1,"mapScale":1.03203125,"gIdx":"0","fontSize":50,"fontName":"BRLNSR_1","ontColor":"#8f3758","rect":{"x":589.68,"y":199.09,"width":80.32,"height":80.32}},{"id":"1597301312248","index":2,"audio_url":"http://staging-teach.cdn.ireadabc.com/954c0b9d01de2cbfbdb6d21f3f8b722b.mp3","itemType":"rect","fontScale":1.03203125,"imgScale":1,"mapScale":1.03203125,"gIdx":"0","fontSize":50,"fontName":"BRLNSR_1","ontColor":"#8f3758","rect":{"x":692.22,"y":70.92,"width":83.74,"height":83.74}}],"picArr":[{"pic_url":"http://staging-teach.cdn.ireadabc.com/29cdcc64c0898a1ec63f89b8b2fdd0e6.png","audio_url":"http://staging-teach.cdn.ireadabc.com/f51e3fedc88aa69a99f6ef579f7de047.mp3","text":"arrow"},{"pic_url":"http://staging-teach.cdn.ireadabc.com/18f2a029e02d679da8d42746daea228f.png","audio_url":"http://staging-teach.cdn.ireadabc.com/fbe2f23b9eb191a9330f99800e0d54d5.mp3","text":"home"}]}'; var dataJson = '{"bgItem":{"url":"http://staging-teach.cdn.ireadabc.com/cea0606b09735d7346dc57626f0a0a9b.png","rect":{"x":205.28,"y":0,"width":844.44,"height":475}},"hotZoneItemArr":[{"id":"1597805601321","index":0,"pic_url":"http://staging-teach.cdn.ireadabc.com/ddf2a304102c90bd2ed1cadf27f8feb7.png","text":"arrow","audio_url":"http://staging-teach.cdn.ireadabc.com/1961d807c944e6551af02c7b57e117f3.mp3","itemType":"rect","fontScale":0.98046875,"imgScale":4.139756944444445,"mapScale":0.98046875,"skeJsonData":{"url":"http://staging-teach.cdn.ireadabc.com/ab66b9d704187f60fd8a61c981435b8e.json","name":"finish2_ske.json"},"texJsonData":{"url":"http://staging-teach.cdn.ireadabc.com/a4b74d67df855493b394c7df9625ba24.json","name":"finish2_tex.json"},"texPngData":{"url":"http://staging-teach.cdn.ireadabc.com/e485027385bab93761a5d1749166ba83.png","name":"finish2_tex.png"},"gIdx":"0","fontSize":50,"fontName":"BRLNSR_1","ontColor":"#8f3758","rect":{"x":75.22,"y":135.5,"width":200,"height":200}},{"id":"1597805655229","index":1,"pic_url":"http://staging-teach.cdn.ireadabc.com/18f2a029e02d679da8d42746daea228f.png","text":"home","audio_url":"http://staging-teach.cdn.ireadabc.com/0128a59057e63c4c6b4b96556d077a98.mp3","itemType":"rect","fontScale":0.98046875,"imgScale":3.72578125,"mapScale":0.98046875,"skeJsonData":{"url":"http://staging-teach.cdn.ireadabc.com/bd825dcceea298d1146be8067ae3d17f.json","name":"finish1_ske.json"},"texJsonData":{"url":"http://staging-teach.cdn.ireadabc.com/246f8991b729fa3e5a7f4802de828efa.json","name":"finish1_tex.json"},"texPngData":{"url":"http://staging-teach.cdn.ireadabc.com/5a0c5af3e952acd0ac83a6e5c6f03ff1.png","name":"finish1_tex.png"},"gIdx":"0","fontSize":50,"fontName":"BRLNSR_1","ontColor":"#8f3758","rect":{"x":661.72,"y":69,"width":77,"height":77}}],"picArr":[{"pic_url":"http://staging-teach.cdn.ireadabc.com/29cdcc64c0898a1ec63f89b8b2fdd0e6.png","audio_url":"http://staging-teach.cdn.ireadabc.com/f51e3fedc88aa69a99f6ef579f7de047.mp3","text":"arrow"},{"pic_url":"http://staging-teach.cdn.ireadabc.com/18f2a029e02d679da8d42746daea228f.png","audio_url":"http://staging-teach.cdn.ireadabc.com/fbe2f23b9eb191a9330f99800e0d54d5.mp3","text":"home"}]}';
var data1 = JSON.parse(dataJson); var data1 = JSON.parse(dataJson);
return data1; return data1;
var data = { var data = {
...@@ -446,20 +446,90 @@ cc.Class({ ...@@ -446,20 +446,90 @@ cc.Class({
cc.assetManager.loadRemote(data.audio_url, function (err, audioClip) { cc.assetManager.loadRemote(data.audio_url, function (err, audioClip) {
data.audioClip = audioClip; data.audioClip = audioClip;
}); });
} // const ctx = rectNode.addComponent(cc.Graphics); }
// // 红色矩形
// ctx.lineWidth = 4;
// ctx.strokeColor = cc.Color.BLACK;
// ctx.fillColor = cc.Color.WHITE.setA(100);
// ctx.rect(0, 0, rectNode.width, rectNode.height);
// ctx.stroke();
// ctx.fill();
var btn = rectNode.addComponent(cc.Button); rectNode.addComponent(cc.Button);
rectNode.on('click', function () { rectNode.on('click', function () {
_this6.showCircle(rectNode); _this6.showCircle(rectNode);
}); });
var animaNode = new cc.Node();
animaNode.name = 'anima_' + data.index;
this.hotZoneBg.addChild(animaNode);
data.animaNode = animaNode;
if (data.audio_url) {
cc.assetManager.loadRemote(data.audio_url, function (err, audioClip) {
animaNode.audioClip = audioClip;
});
}
var dragonDisplay = animaNode.addComponent(dragonBones.ArmatureDisplay);
var image = data.texPngData.url; //"http://staging-teach.cdn.ireadabc.com/5a0c5af3e952acd0ac83a6e5c6f03ff1.png";
var ske = data.skeJsonData.url; //"http://staging-teach.cdn.ireadabc.com/bd825dcceea298d1146be8067ae3d17f.json";
var atlas = data.texJsonData.url; //"http://staging-teach.cdn.ireadabc.com/246f8991b729fa3e5a7f4802de828efa.json";
cc.loader.load(image, function (error, texture) {
cc.loader.load({
url: atlas,
type: 'txt'
}, function (error, atlasJson) {
cc.loader.load({
url: ske,
type: 'txt'
}, function (error, dragonBonesJson) {
var atlas = new dragonBones.DragonBonesAtlasAsset();
atlas.atlasJson = atlasJson;
atlas.texture = texture;
var asset = new dragonBones.DragonBonesAsset();
asset.dragonBonesJson = dragonBonesJson;
dragonDisplay.dragonAtlasAsset = atlas;
dragonDisplay.dragonAsset = asset;
var json = JSON.parse(asset.dragonBonesJson);
var armatures = json["armature"];
console.log('armatures: ', armatures);
var armatureNames = [];
for (var i = 0; i < armatures.length; i++) {
armatureNames.push(armatures[i].name);
} // console.log('armatureNames: ', armatureNames);
if (armatureNames.length > 0) {
var defaultArmatureName = armatureNames[0];
dragonDisplay.armatureName = defaultArmatureName; // let animationNames = dragonDisplay.getAnimationNames(defaultArmatureName);
var defaultArmature = armatures[0];
var animations = defaultArmature.animation;
var animationNames = [];
for (var _i2 = 0; _i2 < animations.length; _i2++) {
animationNames.push(animations[_i2].name);
} // rectNode.addComponent(cc.Button);
// rectNode.on('click', () => {
animaNode.showAnima = function () {
if (rectNode.isClicked) {// return;
}
rectNode.isClicked = true;
console.log('clicked');
if (animaNode.audioClip) {
cc.audioEngine.stopAll();
cc.audioEngine.play(animaNode.audioClip, false, 0.8);
}
if (animationNames.length > 0) {
dragonDisplay.playAnimation(animationNames[0], 1);
}
};
}
});
});
});
}, },
_circle: null, _circle: null,
initCircle: function initCircle() { initCircle: function initCircle() {
...@@ -471,10 +541,10 @@ cc.Class({ ...@@ -471,10 +541,10 @@ cc.Class({
console.log(' in showCircle'); console.log(' in showCircle');
if (node == this._circle.itemNode) { if (node == this._circle.itemNode) {
if (node.data.audioClip) { node.data.animaNode.showAnima(); // if (node.data.audioClip) {
cc.audioEngine.stopAll(); // cc.audioEngine.stopAll();
cc.audioEngine.play(node.data.audioClip, false, 0.8); // cc.audioEngine.play(node.data.audioClip, false, 0.8);
} // }
return; return;
} }
......
...@@ -505,8 +505,8 @@ ...@@ -505,8 +505,8 @@
"relativePath": "mz_004" "relativePath": "mz_004"
}, },
"4622f21b-4a93-4460-bbc0-350907c5dded": { "4622f21b-4a93-4460-bbc0-350907c5dded": {
"asset": 1596596089666, "asset": 1597302151940,
"meta": 1597128971874, "meta": 1597805785578,
"relativePath": "mz_004/texture" "relativePath": "mz_004/texture"
}, },
"8beb45b3-f75e-4244-a612-1b675fada727": { "8beb45b3-f75e-4244-a612-1b675fada727": {
...@@ -515,13 +515,13 @@ ...@@ -515,13 +515,13 @@
"relativePath": "mz_004/scene" "relativePath": "mz_004/scene"
}, },
"c3f18614-c716-4f1f-899f-09f073ac6c43": { "c3f18614-c716-4f1f-899f-09f073ac6c43": {
"asset": 1597305496490, "asset": 1597806633698,
"meta": 1597305496496, "meta": 1597806633704,
"relativePath": "mz_004/scene/scene.fire" "relativePath": "mz_004/scene/scene.fire"
}, },
"b5c6439b-d99b-428f-9454-22f767de4a02": { "b5c6439b-d99b-428f-9454-22f767de4a02": {
"asset": 1597130132981, "asset": 1597805756853,
"meta": 1597301501813, "meta": 1597805785238,
"relativePath": "mz_004/script" "relativePath": "mz_004/script"
}, },
"3531d7ec-7dc9-49bd-be94-92677dc9b7c0": { "3531d7ec-7dc9-49bd-be94-92677dc9b7c0": {
...@@ -595,8 +595,8 @@ ...@@ -595,8 +595,8 @@
"relativePath": "mz_004/script/util.js" "relativePath": "mz_004/script/util.js"
}, },
"335fe6b8-2b52-45a9-a9c9-cb3b54014251": { "335fe6b8-2b52-45a9-a9c9-cb3b54014251": {
"asset": 1597305166451, "asset": 1597806631630,
"meta": 1597305494194, "meta": 1597806633653,
"relativePath": "mz_004/script/scene.js" "relativePath": "mz_004/script/scene.js"
} }
} }
\ No newline at end of file
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
"url": "app://editor/index.html", "url": "app://editor/index.html",
"windowType": "dockable", "windowType": "dockable",
"x": 0, "x": 0,
"y": 25, "y": 23,
"width": 1680, "width": 1680,
"height": 942, "height": 942,
"layout": { "layout": {
...@@ -105,8 +105,7 @@ ...@@ -105,8 +105,7 @@
"inspector", "inspector",
"cocos-services" "cocos-services"
] ]
}, }
"window-1597305502776": {}
}, },
"panels": { "panels": {
"sprite-editor": { "sprite-editor": {
......
...@@ -35,6 +35,7 @@ ...@@ -35,6 +35,7 @@
"39Y15OWDlFc76I4DuYwljw", "39Y15OWDlFc76I4DuYwljw",
"3bOMn6N4hJP5WlpEgN1tyP", "3bOMn6N4hJP5WlpEgN1tyP",
"2daSEONptJQLYU9aq8TOd+", "2daSEONptJQLYU9aq8TOd+",
"01Xreos21IrrsAvhvN44JE" "01Xreos21IrrsAvhvN44JE",
"63bpvtVEZAqr5FQ8AQOVa5"
] ]
} }
{"version":"1.0.8","stats":{"/Users/lmz/Documents/workspace/git_project/cocos/cc_mz_004/play/temp/quick-scripts/src/__qc_index__.js":"2020-08-13T06:51:41.937Z","/Users/lmz/Documents/workspace/git_project/cocos/cc_mz_004/play/temp/quick-scripts/src/assets/mz_001/script/scene.js":"2020-08-13T06:51:41.920Z","/Users/lmz/Documents/workspace/git_project/cocos/cc_mz_004/play/temp/quick-scripts/src/assets/mz_001/script/util.js":"2020-08-13T06:51:41.921Z","/Users/lmz/Documents/workspace/git_project/cocos/cc_mz_004/play/temp/quick-scripts/src/assets/mz_001/prefab/bgBottom.js":"2020-08-13T06:51:41.922Z"}} {"version":"1.0.8","stats":{"/Users/lmz/Documents/workspace/git_project/cocos/cc_mz_004/play/temp/quick-scripts/src/__qc_index__.js":"2020-08-19T02:56:25.712Z","/Users/lmz/Documents/workspace/git_project/cocos/cc_mz_004/play/temp/quick-scripts/src/assets/mz_004/prefab/bgBottom.js":"2020-08-19T02:56:25.696Z","/Users/lmz/Documents/workspace/git_project/cocos/cc_mz_004/play/temp/quick-scripts/src/assets/mz_004/script/scene.js":"2020-08-19T02:56:25.693Z","/Users/lmz/Documents/workspace/git_project/cocos/cc_mz_004/play/temp/quick-scripts/src/assets/mz_004/script/util.js":"2020-08-19T02:56:25.694Z"}}
This source diff could not be displayed because it is too large. You can view the blob instead.
(function () { (function () {
var scripts = [{"deps":{"./assets/mz_004/script/scene":1,"./assets/mz_004/prefab/bgBottom":2,"./assets/mz_004/script/util":3},"path":"preview-scripts/__qc_index__.js"},{"deps":{"./util":3},"path":"preview-scripts/assets/mz_004/script/scene.js"},{"deps":{"../script/util":3},"path":"preview-scripts/assets/mz_004/prefab/bgBottom.js"},{"deps":{},"path":"preview-scripts/assets/mz_004/script/util.js"}]; var scripts = [{"deps":{"./assets/mz_004/script/scene":2,"./assets/mz_004/prefab/bgBottom":1,"./assets/mz_004/script/util":3},"path":"preview-scripts/__qc_index__.js"},{"deps":{"../script/util":3},"path":"preview-scripts/assets/mz_004/prefab/bgBottom.js"},{"deps":{"./util":3},"path":"preview-scripts/assets/mz_004/script/scene.js"},{"deps":{},"path":"preview-scripts/assets/mz_004/script/util.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.
{"version":3,"sources":["assets/mz_001/script/util.js"],"names":["getPosByAngle","angle","len","radian","Math","PI","x","sin","y","cos","getAngleByPos","px","py","mx","my","abs","z","sqrt","pow","radina","acos","floor","exchangeNodePos","baseNode","targetNode","convertToNodeSpaceAR","_parent","convertToWorldSpaceAR","cc","v2","RandomInt","a","b","max","min","random","randomSortByArr","arr","newArr","tmpArr","concat","length","randomIndex","push","splice","setSprNodeMaxLen","sprNode","maxW","maxH","sx","width","sy","height","s","scale","round"],"mappings":"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","sourceRoot":"/","sourcesContent":["export function getPosByAngle(angle, len) {\n\n const radian = angle * Math.PI / 180;\n const x = Math.sin(radian) * len;\n const y = Math.cos(radian) * len;\n\n return { x, y };\n\n}\n\nexport function getAngleByPos(px, py, mx, my) {\n\n const x = Math.abs(px - mx);\n const y = Math.abs(py - my);\n\n const z = Math.sqrt(Math.pow(x, 2) + Math.pow(y, 2));\n const cos = y / z;\n const radina = Math.acos(cos); // 用反三角函数求弧度\n let angle = Math.floor(180 / (Math.PI / radina) * 100) / 100; // 将弧度转换成角度\n\n if (mx > px && my > py) {// 鼠标在第四象限\n angle = 180 - angle;\n }\n if (mx === px && my > py) {// 鼠标在y轴负方向上\n angle = 180;\n }\n if (mx > px && my === py) {// 鼠标在x轴正方向上\n angle = 90;\n }\n if (mx < px && my > py) {// 鼠标在第三象限\n angle = 180 + angle;\n }\n if (mx < px && my === py) {// 鼠标在x轴负方向\n angle = 270;\n }\n if (mx < px && my < py) {// 鼠标在第二象限\n angle = 360 - angle;\n }\n\n // console.log('angle: ', angle);\n return angle;\n\n}\n\nexport function exchangeNodePos(baseNode, targetNode) {\n return baseNode.convertToNodeSpaceAR(targetNode._parent.convertToWorldSpaceAR(cc.v2(targetNode.x, targetNode.y)));\n}\n\nexport function RandomInt(a, b = 0) {\n let max = Math.max(a, b);\n let min = Math.min(a, b);\n return Math.floor(Math.random() * (max - min) + min);\n}\n\nexport function randomSortByArr(arr) {\n const newArr = [];\n const tmpArr = arr.concat();\n while (tmpArr.length > 0) {\n const randomIndex = Math.floor(tmpArr.length * Math.random());\n newArr.push(tmpArr[randomIndex]);\n tmpArr.splice(randomIndex, 1);\n }\n return newArr;\n}\n\nexport function setSprNodeMaxLen(sprNode, maxW, maxH) {\n const sx = maxW / sprNode.width;\n const sy = maxH / sprNode.height;\n const s = Math.min(sx, sy);\n sprNode.scale = Math.round(s * 1000) / 1000;\n}\n"]}
\ No newline at end of file
...@@ -85,7 +85,7 @@ cc.Class({ ...@@ -85,7 +85,7 @@ cc.Class({
func(this.getDefaultData()); func(this.getDefaultData());
}, },
getDefaultData: function getDefaultData() { getDefaultData: function getDefaultData() {
var dataJson = '{"bgItem":{"url":"http://staging-teach.cdn.ireadabc.com/cea0606b09735d7346dc57626f0a0a9b.png","rect":{"x":216.94,"y":0,"width":887.11,"height":499}},"hotZoneItemArr":[{"id":"1597301271886","index":0,"audio_url":"http://staging-teach.cdn.ireadabc.com/263d9cbaef7fbf251f9e3703130fb763.mp3","itemType":"rect","fontScale":1.03203125,"imgScale":1,"mapScale":1.03203125,"gIdx":"0","fontSize":50,"fontName":"BRLNSR_1","ontColor":"#8f3758","rect":{"x":59.06,"y":133.29,"width":220.45,"height":220.45}},{"id":"1597301294854","index":1,"audio_url":"http://staging-teach.cdn.ireadabc.com/28a42e3e77e023c8118624bb8351e7b2.mp3","itemType":"rect","fontScale":1.03203125,"imgScale":1,"mapScale":1.03203125,"gIdx":"0","fontSize":50,"fontName":"BRLNSR_1","ontColor":"#8f3758","rect":{"x":589.68,"y":199.09,"width":80.32,"height":80.32}},{"id":"1597301312248","index":2,"audio_url":"http://staging-teach.cdn.ireadabc.com/954c0b9d01de2cbfbdb6d21f3f8b722b.mp3","itemType":"rect","fontScale":1.03203125,"imgScale":1,"mapScale":1.03203125,"gIdx":"0","fontSize":50,"fontName":"BRLNSR_1","ontColor":"#8f3758","rect":{"x":692.22,"y":70.92,"width":83.74,"height":83.74}}],"picArr":[{"pic_url":"http://staging-teach.cdn.ireadabc.com/29cdcc64c0898a1ec63f89b8b2fdd0e6.png","audio_url":"http://staging-teach.cdn.ireadabc.com/f51e3fedc88aa69a99f6ef579f7de047.mp3","text":"arrow"},{"pic_url":"http://staging-teach.cdn.ireadabc.com/18f2a029e02d679da8d42746daea228f.png","audio_url":"http://staging-teach.cdn.ireadabc.com/fbe2f23b9eb191a9330f99800e0d54d5.mp3","text":"home"}]}'; var dataJson = '{"bgItem":{"url":"http://staging-teach.cdn.ireadabc.com/cea0606b09735d7346dc57626f0a0a9b.png","rect":{"x":205.28,"y":0,"width":844.44,"height":475}},"hotZoneItemArr":[{"id":"1597805601321","index":0,"pic_url":"http://staging-teach.cdn.ireadabc.com/ddf2a304102c90bd2ed1cadf27f8feb7.png","text":"arrow","audio_url":"http://staging-teach.cdn.ireadabc.com/1961d807c944e6551af02c7b57e117f3.mp3","itemType":"rect","fontScale":0.98046875,"imgScale":4.139756944444445,"mapScale":0.98046875,"skeJsonData":{"url":"http://staging-teach.cdn.ireadabc.com/ab66b9d704187f60fd8a61c981435b8e.json","name":"finish2_ske.json"},"texJsonData":{"url":"http://staging-teach.cdn.ireadabc.com/a4b74d67df855493b394c7df9625ba24.json","name":"finish2_tex.json"},"texPngData":{"url":"http://staging-teach.cdn.ireadabc.com/e485027385bab93761a5d1749166ba83.png","name":"finish2_tex.png"},"gIdx":"0","fontSize":50,"fontName":"BRLNSR_1","ontColor":"#8f3758","rect":{"x":75.22,"y":135.5,"width":200,"height":200}},{"id":"1597805655229","index":1,"pic_url":"http://staging-teach.cdn.ireadabc.com/18f2a029e02d679da8d42746daea228f.png","text":"home","audio_url":"http://staging-teach.cdn.ireadabc.com/0128a59057e63c4c6b4b96556d077a98.mp3","itemType":"rect","fontScale":0.98046875,"imgScale":3.72578125,"mapScale":0.98046875,"skeJsonData":{"url":"http://staging-teach.cdn.ireadabc.com/bd825dcceea298d1146be8067ae3d17f.json","name":"finish1_ske.json"},"texJsonData":{"url":"http://staging-teach.cdn.ireadabc.com/246f8991b729fa3e5a7f4802de828efa.json","name":"finish1_tex.json"},"texPngData":{"url":"http://staging-teach.cdn.ireadabc.com/5a0c5af3e952acd0ac83a6e5c6f03ff1.png","name":"finish1_tex.png"},"gIdx":"0","fontSize":50,"fontName":"BRLNSR_1","ontColor":"#8f3758","rect":{"x":661.72,"y":69,"width":77,"height":77}}],"picArr":[{"pic_url":"http://staging-teach.cdn.ireadabc.com/29cdcc64c0898a1ec63f89b8b2fdd0e6.png","audio_url":"http://staging-teach.cdn.ireadabc.com/f51e3fedc88aa69a99f6ef579f7de047.mp3","text":"arrow"},{"pic_url":"http://staging-teach.cdn.ireadabc.com/18f2a029e02d679da8d42746daea228f.png","audio_url":"http://staging-teach.cdn.ireadabc.com/fbe2f23b9eb191a9330f99800e0d54d5.mp3","text":"home"}]}';
var data1 = JSON.parse(dataJson); var data1 = JSON.parse(dataJson);
return data1; return data1;
var data = { var data = {
...@@ -446,20 +446,90 @@ cc.Class({ ...@@ -446,20 +446,90 @@ cc.Class({
cc.assetManager.loadRemote(data.audio_url, function (err, audioClip) { cc.assetManager.loadRemote(data.audio_url, function (err, audioClip) {
data.audioClip = audioClip; data.audioClip = audioClip;
}); });
} // const ctx = rectNode.addComponent(cc.Graphics); }
// // 红色矩形
// ctx.lineWidth = 4;
// ctx.strokeColor = cc.Color.BLACK;
// ctx.fillColor = cc.Color.WHITE.setA(100);
// ctx.rect(0, 0, rectNode.width, rectNode.height);
// ctx.stroke();
// ctx.fill();
var btn = rectNode.addComponent(cc.Button); rectNode.addComponent(cc.Button);
rectNode.on('click', function () { rectNode.on('click', function () {
_this6.showCircle(rectNode); _this6.showCircle(rectNode);
}); });
var animaNode = new cc.Node();
animaNode.name = 'anima_' + data.index;
this.hotZoneBg.addChild(animaNode);
data.animaNode = animaNode;
if (data.audio_url) {
cc.assetManager.loadRemote(data.audio_url, function (err, audioClip) {
animaNode.audioClip = audioClip;
});
}
var dragonDisplay = animaNode.addComponent(dragonBones.ArmatureDisplay);
var image = data.texPngData.url; //"http://staging-teach.cdn.ireadabc.com/5a0c5af3e952acd0ac83a6e5c6f03ff1.png";
var ske = data.skeJsonData.url; //"http://staging-teach.cdn.ireadabc.com/bd825dcceea298d1146be8067ae3d17f.json";
var atlas = data.texJsonData.url; //"http://staging-teach.cdn.ireadabc.com/246f8991b729fa3e5a7f4802de828efa.json";
cc.loader.load(image, function (error, texture) {
cc.loader.load({
url: atlas,
type: 'txt'
}, function (error, atlasJson) {
cc.loader.load({
url: ske,
type: 'txt'
}, function (error, dragonBonesJson) {
var atlas = new dragonBones.DragonBonesAtlasAsset();
atlas.atlasJson = atlasJson;
atlas.texture = texture;
var asset = new dragonBones.DragonBonesAsset();
asset.dragonBonesJson = dragonBonesJson;
dragonDisplay.dragonAtlasAsset = atlas;
dragonDisplay.dragonAsset = asset;
var json = JSON.parse(asset.dragonBonesJson);
var armatures = json["armature"];
console.log('armatures: ', armatures);
var armatureNames = [];
for (var i = 0; i < armatures.length; i++) {
armatureNames.push(armatures[i].name);
} // console.log('armatureNames: ', armatureNames);
if (armatureNames.length > 0) {
var defaultArmatureName = armatureNames[0];
dragonDisplay.armatureName = defaultArmatureName; // let animationNames = dragonDisplay.getAnimationNames(defaultArmatureName);
var defaultArmature = armatures[0];
var animations = defaultArmature.animation;
var animationNames = [];
for (var _i2 = 0; _i2 < animations.length; _i2++) {
animationNames.push(animations[_i2].name);
} // rectNode.addComponent(cc.Button);
// rectNode.on('click', () => {
animaNode.showAnima = function () {
if (rectNode.isClicked) {// return;
}
rectNode.isClicked = true;
console.log('clicked');
if (animaNode.audioClip) {
cc.audioEngine.stopAll();
cc.audioEngine.play(animaNode.audioClip, false, 0.8);
}
if (animationNames.length > 0) {
dragonDisplay.playAnimation(animationNames[0], 1);
}
};
}
});
});
});
}, },
_circle: null, _circle: null,
initCircle: function initCircle() { initCircle: function initCircle() {
...@@ -471,10 +541,10 @@ cc.Class({ ...@@ -471,10 +541,10 @@ cc.Class({
console.log(' in showCircle'); console.log(' in showCircle');
if (node == this._circle.itemNode) { if (node == this._circle.itemNode) {
if (node.data.audioClip) { node.data.animaNode.showAnima(); // if (node.data.audioClip) {
cc.audioEngine.stopAll(); // cc.audioEngine.stopAll();
cc.audioEngine.play(node.data.audioClip, false, 0.8); // cc.audioEngine.play(node.data.audioClip, false, 0.8);
} // }
return; return;
} }
......
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