Commit 85562a95 authored by 李维's avatar 李维

dev commit

parent f3911585
This diff is collapsed.
This diff is collapsed.
......@@ -65,6 +65,7 @@ export default class Cartoon {
this.elements[key] = {};
this.elements[key].node = node;
this.elements[key].node.key = key;
return this.elements[key]
}
getSpritNode(nodeName, nameSpace = "") {
......@@ -584,8 +585,6 @@ class DragonBones {
}
})
}
let sx = parentNode.width / animaNode.width;
let sy = parentNode.height / animaNode.height;
......
This diff is collapsed.
......@@ -111,7 +111,6 @@ export async function asyncPlayDragonBoneAnimation(node, animationName, time = 1
export async function asyncPlayEffectByUrl(url, loop = false) {
return new Promise((resolve, reject) => {
cc.assetManager.loadRemote(url, (err, clip) => {
console.log(clip);
cc.audioEngine.playEffect(clip, loop);
resolve();
});
......
{
"ver": "1.1.2",
"uuid": "df377864-1f81-4768-8887-e49c3016c1ff",
"isBundle": false,
"bundleName": "",
"priority": 1,
"compressionType": {},
"optimizeHotUpdate": {},
"inlineSpriteFrames": {},
"isRemoteBundle": {},
"subMetas": {}
}
\ No newline at end of file
{
"ver": "2.3.5",
"uuid": "11e45dd8-3ece-46fb-96f3-19c979b5f1e0",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 500,
"height": 500,
"platformSettings": {},
"subMetas": {
"bubble_ani (1)": {
"ver": "1.0.4",
"uuid": "4fa000f0-d76e-4956-80ea-3039b76442c3",
"rawTextureUuid": "11e45dd8-3ece-46fb-96f3-19c979b5f1e0",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": -3.5,
"offsetY": 11.5,
"trimX": 174,
"trimY": 163,
"width": 145,
"height": 151,
"rawWidth": 500,
"rawHeight": 500,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
{
"ver": "2.3.5",
"uuid": "dae4eef6-c4de-49d3-8b82-bad78035553f",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 500,
"height": 500,
"platformSettings": {},
"subMetas": {
"bubble_ani (2)": {
"ver": "1.0.4",
"uuid": "b8c0bcdb-74e7-4b9d-ad16-5117716997a2",
"rawTextureUuid": "dae4eef6-c4de-49d3-8b82-bad78035553f",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 9,
"trimX": 148,
"trimY": 146,
"width": 204,
"height": 190,
"rawWidth": 500,
"rawHeight": 500,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
{
"ver": "2.3.5",
"uuid": "5d16a674-b231-4414-a440-3c42db4876a5",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 500,
"height": 500,
"platformSettings": {},
"subMetas": {
"bubble_ani (3)": {
"ver": "1.0.4",
"uuid": "d9d9d899-c61d-486f-beb2-d50f68204a5e",
"rawTextureUuid": "5d16a674-b231-4414-a440-3c42db4876a5",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 9,
"trimX": 137,
"trimY": 136,
"width": 226,
"height": 210,
"rawWidth": 500,
"rawHeight": 500,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
{
"ver": "2.3.5",
"uuid": "fa4375a1-631c-4c99-adfe-2d771bbbe7c3",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 500,
"height": 500,
"platformSettings": {},
"subMetas": {
"bubble_ani (4)": {
"ver": "1.0.4",
"uuid": "09ddffcf-a332-412e-bfe5-7d195984e9bd",
"rawTextureUuid": "fa4375a1-631c-4c99-adfe-2d771bbbe7c3",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": -0.5,
"offsetY": 8,
"trimX": 137,
"trimY": 136,
"width": 225,
"height": 212,
"rawWidth": 500,
"rawHeight": 500,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
{
"ver": "2.3.5",
"uuid": "1f371c5a-055f-4b4d-8f34-5f53bd4b22ff",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 500,
"height": 500,
"platformSettings": {},
"subMetas": {
"bubble_ani (5)": {
"ver": "1.0.4",
"uuid": "f58c319b-319e-4639-a522-1010e6cfd148",
"rawTextureUuid": "1f371c5a-055f-4b4d-8f34-5f53bd4b22ff",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": -0.5,
"offsetY": 8,
"trimX": 121,
"trimY": 121,
"width": 257,
"height": 242,
"rawWidth": 500,
"rawHeight": 500,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
{
"ver": "2.3.5",
"uuid": "eb5b0c88-eff1-40de-b826-e8d226a63fc5",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 500,
"height": 500,
"platformSettings": {},
"subMetas": {
"bubble_ani (6)": {
"ver": "1.0.4",
"uuid": "7303a330-a4c5-435f-8b54-987b70a40a6b",
"rawTextureUuid": "eb5b0c88-eff1-40de-b826-e8d226a63fc5",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": -0.5,
"offsetY": 7.5,
"trimX": 120,
"trimY": 121,
"width": 259,
"height": 243,
"rawWidth": 500,
"rawHeight": 500,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
{
"ver": "2.3.5",
"uuid": "b21ffe26-9138-4cb7-b145-4f46a551f659",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 500,
"height": 500,
"platformSettings": {},
"subMetas": {
"bubble_ani (7)": {
"ver": "1.0.4",
"uuid": "4c765d84-a51f-432f-b031-89a5ef7a7080",
"rawTextureUuid": "b21ffe26-9138-4cb7-b145-4f46a551f659",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0.5,
"offsetY": 7.5,
"trimX": 112,
"trimY": 118,
"width": 277,
"height": 249,
"rawWidth": 500,
"rawHeight": 500,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
{
"ver": "2.3.5",
"uuid": "b61f1332-53b3-40f7-9536-1e660d679521",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 500,
"height": 500,
"platformSettings": {},
"subMetas": {
"bubble_ani (8)": {
"ver": "1.0.4",
"uuid": "c13caa19-b445-463f-9afe-b84acf12d2d5",
"rawTextureUuid": "b61f1332-53b3-40f7-9536-1e660d679521",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": -13,
"offsetY": 5,
"trimX": 112,
"trimY": 118,
"width": 250,
"height": 254,
"rawWidth": 500,
"rawHeight": 500,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
{
"ver": "2.3.5",
"uuid": "36cfb9cd-7b92-4efd-a322-30cda9f176b6",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 500,
"height": 500,
"platformSettings": {},
"subMetas": {
"bubble_ani (9)": {
"ver": "1.0.4",
"uuid": "d93cf7e1-8f50-43f9-805b-f9d9b93cd13b",
"rawTextureUuid": "36cfb9cd-7b92-4efd-a322-30cda9f176b6",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": -7.5,
"offsetY": -1,
"trimX": 115,
"trimY": 121,
"width": 255,
"height": 260,
"rawWidth": 500,
"rawHeight": 500,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
{
"ver": "2.3.5",
"uuid": "9f2c46fb-7499-456b-8e6c-689cb86a8bdf",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 36,
"height": 24,
"platformSettings": {},
"subMetas": {
"bg_sahua": {
"ver": "1.0.4",
"uuid": "a3cc433a-f6df-4267-a442-c0ac476ebaae",
"rawTextureUuid": "9f2c46fb-7499-456b-8e6c-689cb86a8bdf",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 36,
"height": 24,
"rawWidth": 36,
"rawHeight": 24,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
......@@ -7,8 +7,8 @@
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 262,
"height": 261,
"width": 195,
"height": 195,
"platformSettings": {},
"subMetas": {
"bubble": {
......
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