|
@@ -393,7 +393,7 @@
|
|
"a": 255
|
|
"a": 255
|
|
},
|
|
},
|
|
"_skeletonData": {
|
|
"_skeletonData": {
|
|
- "__uuid__": "8985a22f-7052-4458-a143-87f369b07cf5",
|
|
|
|
|
|
+ "__uuid__": "a35308ab-bf3a-4d35-977b-30cad3e0f335",
|
|
"__expectedType__": "sp.SkeletonData"
|
|
"__expectedType__": "sp.SkeletonData"
|
|
},
|
|
},
|
|
"defaultSkin": "water04",
|
|
"defaultSkin": "water04",
|
|
@@ -496,13 +496,13 @@
|
|
"_dstBlendFactor": 4,
|
|
"_dstBlendFactor": 4,
|
|
"_color": {
|
|
"_color": {
|
|
"__type__": "cc.Color",
|
|
"__type__": "cc.Color",
|
|
- "r": 184,
|
|
|
|
|
|
+ "r": 255,
|
|
"g": 0,
|
|
"g": 0,
|
|
- "b": 255,
|
|
|
|
|
|
+ "b": 0,
|
|
"a": 255
|
|
"a": 255
|
|
},
|
|
},
|
|
"_skeletonData": {
|
|
"_skeletonData": {
|
|
- "__uuid__": "8985a22f-7052-4458-a143-87f369b07cf5",
|
|
|
|
|
|
+ "__uuid__": "a35308ab-bf3a-4d35-977b-30cad3e0f335",
|
|
"__expectedType__": "sp.SkeletonData"
|
|
"__expectedType__": "sp.SkeletonData"
|
|
},
|
|
},
|
|
"defaultSkin": "water03",
|
|
"defaultSkin": "water03",
|
|
@@ -605,13 +605,13 @@
|
|
"_dstBlendFactor": 4,
|
|
"_dstBlendFactor": 4,
|
|
"_color": {
|
|
"_color": {
|
|
"__type__": "cc.Color",
|
|
"__type__": "cc.Color",
|
|
- "r": 0,
|
|
|
|
- "g": 194,
|
|
|
|
- "b": 255,
|
|
|
|
|
|
+ "r": 255,
|
|
|
|
+ "g": 0,
|
|
|
|
+ "b": 0,
|
|
"a": 255
|
|
"a": 255
|
|
},
|
|
},
|
|
"_skeletonData": {
|
|
"_skeletonData": {
|
|
- "__uuid__": "8985a22f-7052-4458-a143-87f369b07cf5",
|
|
|
|
|
|
+ "__uuid__": "a35308ab-bf3a-4d35-977b-30cad3e0f335",
|
|
"__expectedType__": "sp.SkeletonData"
|
|
"__expectedType__": "sp.SkeletonData"
|
|
},
|
|
},
|
|
"defaultSkin": "water02",
|
|
"defaultSkin": "water02",
|
|
@@ -714,13 +714,13 @@
|
|
"_dstBlendFactor": 4,
|
|
"_dstBlendFactor": 4,
|
|
"_color": {
|
|
"_color": {
|
|
"__type__": "cc.Color",
|
|
"__type__": "cc.Color",
|
|
- "r": 0,
|
|
|
|
- "g": 255,
|
|
|
|
- "b": 20,
|
|
|
|
|
|
+ "r": 255,
|
|
|
|
+ "g": 0,
|
|
|
|
+ "b": 0,
|
|
"a": 255
|
|
"a": 255
|
|
},
|
|
},
|
|
"_skeletonData": {
|
|
"_skeletonData": {
|
|
- "__uuid__": "8985a22f-7052-4458-a143-87f369b07cf5",
|
|
|
|
|
|
+ "__uuid__": "a35308ab-bf3a-4d35-977b-30cad3e0f335",
|
|
"__expectedType__": "sp.SkeletonData"
|
|
"__expectedType__": "sp.SkeletonData"
|
|
},
|
|
},
|
|
"defaultSkin": "water01",
|
|
"defaultSkin": "water01",
|
|
@@ -829,7 +829,7 @@
|
|
"a": 255
|
|
"a": 255
|
|
},
|
|
},
|
|
"_skeletonData": {
|
|
"_skeletonData": {
|
|
- "__uuid__": "8985a22f-7052-4458-a143-87f369b07cf5",
|
|
|
|
|
|
+ "__uuid__": "a35308ab-bf3a-4d35-977b-30cad3e0f335",
|
|
"__expectedType__": "sp.SkeletonData"
|
|
"__expectedType__": "sp.SkeletonData"
|
|
},
|
|
},
|
|
"defaultSkin": "cup",
|
|
"defaultSkin": "cup",
|
|
@@ -894,7 +894,7 @@
|
|
"__id__": 35
|
|
"__id__": 35
|
|
}
|
|
}
|
|
],
|
|
],
|
|
- "_active": true,
|
|
|
|
|
|
+ "_active": false,
|
|
"_components": [
|
|
"_components": [
|
|
{
|
|
{
|
|
"__id__": 38
|
|
"__id__": 38
|
|
@@ -1457,7 +1457,7 @@
|
|
"a": 255
|
|
"a": 255
|
|
},
|
|
},
|
|
"_skeletonData": {
|
|
"_skeletonData": {
|
|
- "__uuid__": "8985a22f-7052-4458-a143-87f369b07cf5",
|
|
|
|
|
|
+ "__uuid__": "a35308ab-bf3a-4d35-977b-30cad3e0f335",
|
|
"__expectedType__": "sp.SkeletonData"
|
|
"__expectedType__": "sp.SkeletonData"
|
|
},
|
|
},
|
|
"defaultSkin": "cup",
|
|
"defaultSkin": "cup",
|
|
@@ -1646,7 +1646,7 @@
|
|
"a": 255
|
|
"a": 255
|
|
},
|
|
},
|
|
"_skeletonData": {
|
|
"_skeletonData": {
|
|
- "__uuid__": "a6af6be8-e5ad-4e5d-80f8-3df118dfca06",
|
|
|
|
|
|
+ "__uuid__": "64ec6560-1352-4be0-8aa3-858fac6fe1e1",
|
|
"__expectedType__": "sp.SkeletonData"
|
|
"__expectedType__": "sp.SkeletonData"
|
|
},
|
|
},
|
|
"defaultSkin": "water03",
|
|
"defaultSkin": "water03",
|
|
@@ -1755,7 +1755,7 @@
|
|
"a": 255
|
|
"a": 255
|
|
},
|
|
},
|
|
"_skeletonData": {
|
|
"_skeletonData": {
|
|
- "__uuid__": "a6af6be8-e5ad-4e5d-80f8-3df118dfca06",
|
|
|
|
|
|
+ "__uuid__": "64ec6560-1352-4be0-8aa3-858fac6fe1e1",
|
|
"__expectedType__": "sp.SkeletonData"
|
|
"__expectedType__": "sp.SkeletonData"
|
|
},
|
|
},
|
|
"defaultSkin": "water02",
|
|
"defaultSkin": "water02",
|
|
@@ -1864,7 +1864,7 @@
|
|
"a": 255
|
|
"a": 255
|
|
},
|
|
},
|
|
"_skeletonData": {
|
|
"_skeletonData": {
|
|
- "__uuid__": "a6af6be8-e5ad-4e5d-80f8-3df118dfca06",
|
|
|
|
|
|
+ "__uuid__": "64ec6560-1352-4be0-8aa3-858fac6fe1e1",
|
|
"__expectedType__": "sp.SkeletonData"
|
|
"__expectedType__": "sp.SkeletonData"
|
|
},
|
|
},
|
|
"defaultSkin": "water01",
|
|
"defaultSkin": "water01",
|
|
@@ -1973,7 +1973,7 @@
|
|
"a": 255
|
|
"a": 255
|
|
},
|
|
},
|
|
"_skeletonData": {
|
|
"_skeletonData": {
|
|
- "__uuid__": "a6af6be8-e5ad-4e5d-80f8-3df118dfca06",
|
|
|
|
|
|
+ "__uuid__": "64ec6560-1352-4be0-8aa3-858fac6fe1e1",
|
|
"__expectedType__": "sp.SkeletonData"
|
|
"__expectedType__": "sp.SkeletonData"
|
|
},
|
|
},
|
|
"defaultSkin": "cup",
|
|
"defaultSkin": "cup",
|
|
@@ -2420,7 +2420,7 @@
|
|
"_lpos": {
|
|
"_lpos": {
|
|
"__type__": "cc.Vec3",
|
|
"__type__": "cc.Vec3",
|
|
"x": 0,
|
|
"x": 0,
|
|
- "y": -2.036000000000058,
|
|
|
|
|
|
+ "y": 0,
|
|
"z": 0
|
|
"z": 0
|
|
},
|
|
},
|
|
"_lrot": {
|
|
"_lrot": {
|
|
@@ -2489,11 +2489,11 @@
|
|
"a": 255
|
|
"a": 255
|
|
},
|
|
},
|
|
"_skeletonData": {
|
|
"_skeletonData": {
|
|
- "__uuid__": "a6af6be8-e5ad-4e5d-80f8-3df118dfca06",
|
|
|
|
|
|
+ "__uuid__": "64ec6560-1352-4be0-8aa3-858fac6fe1e1",
|
|
"__expectedType__": "sp.SkeletonData"
|
|
"__expectedType__": "sp.SkeletonData"
|
|
},
|
|
},
|
|
"defaultSkin": "cup",
|
|
"defaultSkin": "cup",
|
|
- "defaultAnimation": "",
|
|
|
|
|
|
+ "defaultAnimation": "<None>",
|
|
"_premultipliedAlpha": false,
|
|
"_premultipliedAlpha": false,
|
|
"_timeScale": 1,
|
|
"_timeScale": 1,
|
|
"_preCacheMode": 0,
|
|
"_preCacheMode": 0,
|
|
@@ -2675,7 +2675,7 @@
|
|
"a": 255
|
|
"a": 255
|
|
},
|
|
},
|
|
"_skeletonData": {
|
|
"_skeletonData": {
|
|
- "__uuid__": "3de19b80-ee70-4c0d-910c-c6b9f78eebbf",
|
|
|
|
|
|
+ "__uuid__": "e6b4a09f-6608-4f68-ad04-2ee8d3fa6e99",
|
|
"__expectedType__": "sp.SkeletonData"
|
|
"__expectedType__": "sp.SkeletonData"
|
|
},
|
|
},
|
|
"defaultSkin": "water02",
|
|
"defaultSkin": "water02",
|
|
@@ -2784,7 +2784,7 @@
|
|
"a": 255
|
|
"a": 255
|
|
},
|
|
},
|
|
"_skeletonData": {
|
|
"_skeletonData": {
|
|
- "__uuid__": "3de19b80-ee70-4c0d-910c-c6b9f78eebbf",
|
|
|
|
|
|
+ "__uuid__": "e6b4a09f-6608-4f68-ad04-2ee8d3fa6e99",
|
|
"__expectedType__": "sp.SkeletonData"
|
|
"__expectedType__": "sp.SkeletonData"
|
|
},
|
|
},
|
|
"defaultSkin": "water01",
|
|
"defaultSkin": "water01",
|
|
@@ -2893,7 +2893,7 @@
|
|
"a": 255
|
|
"a": 255
|
|
},
|
|
},
|
|
"_skeletonData": {
|
|
"_skeletonData": {
|
|
- "__uuid__": "3de19b80-ee70-4c0d-910c-c6b9f78eebbf",
|
|
|
|
|
|
+ "__uuid__": "e6b4a09f-6608-4f68-ad04-2ee8d3fa6e99",
|
|
"__expectedType__": "sp.SkeletonData"
|
|
"__expectedType__": "sp.SkeletonData"
|
|
},
|
|
},
|
|
"defaultSkin": "cup",
|
|
"defaultSkin": "cup",
|
|
@@ -3297,7 +3297,7 @@
|
|
"a": 255
|
|
"a": 255
|
|
},
|
|
},
|
|
"_skeletonData": {
|
|
"_skeletonData": {
|
|
- "__uuid__": "3de19b80-ee70-4c0d-910c-c6b9f78eebbf",
|
|
|
|
|
|
+ "__uuid__": "e6b4a09f-6608-4f68-ad04-2ee8d3fa6e99",
|
|
"__expectedType__": "sp.SkeletonData"
|
|
"__expectedType__": "sp.SkeletonData"
|
|
},
|
|
},
|
|
"defaultSkin": "cup",
|
|
"defaultSkin": "cup",
|