|
@@ -52,7 +52,7 @@
|
|
},
|
|
},
|
|
"autoReleaseAssets": false,
|
|
"autoReleaseAssets": false,
|
|
"_globals": {
|
|
"_globals": {
|
|
- "__id__": 174
|
|
|
|
|
|
+ "__id__": 184
|
|
},
|
|
},
|
|
"_id": "2031795d-6ee4-433a-a4c3-6c5688b83d87"
|
|
"_id": "2031795d-6ee4-433a-a4c3-6c5688b83d87"
|
|
},
|
|
},
|
|
@@ -97,18 +97,21 @@
|
|
},
|
|
},
|
|
{
|
|
{
|
|
"__id__": 155
|
|
"__id__": 155
|
|
|
|
+ },
|
|
|
|
+ {
|
|
|
|
+ "__id__": 171
|
|
}
|
|
}
|
|
],
|
|
],
|
|
"_active": true,
|
|
"_active": true,
|
|
"_components": [
|
|
"_components": [
|
|
{
|
|
{
|
|
- "__id__": 171
|
|
|
|
|
|
+ "__id__": 181
|
|
},
|
|
},
|
|
{
|
|
{
|
|
- "__id__": 172
|
|
|
|
|
|
+ "__id__": 182
|
|
},
|
|
},
|
|
{
|
|
{
|
|
- "__id__": 173
|
|
|
|
|
|
+ "__id__": 183
|
|
}
|
|
}
|
|
],
|
|
],
|
|
"_prefab": null,
|
|
"_prefab": null,
|
|
@@ -2666,7 +2669,7 @@
|
|
"a": 255
|
|
"a": 255
|
|
},
|
|
},
|
|
"_skeletonData": {
|
|
"_skeletonData": {
|
|
- "__uuid__": "a76ee3d1-453c-492e-9e37-ae3842cb6fde",
|
|
|
|
|
|
+ "__uuid__": "3de19b80-ee70-4c0d-910c-c6b9f78eebbf",
|
|
"__expectedType__": "sp.SkeletonData"
|
|
"__expectedType__": "sp.SkeletonData"
|
|
},
|
|
},
|
|
"defaultSkin": "water02",
|
|
"defaultSkin": "water02",
|
|
@@ -2775,7 +2778,7 @@
|
|
"a": 255
|
|
"a": 255
|
|
},
|
|
},
|
|
"_skeletonData": {
|
|
"_skeletonData": {
|
|
- "__uuid__": "a76ee3d1-453c-492e-9e37-ae3842cb6fde",
|
|
|
|
|
|
+ "__uuid__": "3de19b80-ee70-4c0d-910c-c6b9f78eebbf",
|
|
"__expectedType__": "sp.SkeletonData"
|
|
"__expectedType__": "sp.SkeletonData"
|
|
},
|
|
},
|
|
"defaultSkin": "water01",
|
|
"defaultSkin": "water01",
|
|
@@ -2884,7 +2887,7 @@
|
|
"a": 255
|
|
"a": 255
|
|
},
|
|
},
|
|
"_skeletonData": {
|
|
"_skeletonData": {
|
|
- "__uuid__": "a76ee3d1-453c-492e-9e37-ae3842cb6fde",
|
|
|
|
|
|
+ "__uuid__": "3de19b80-ee70-4c0d-910c-c6b9f78eebbf",
|
|
"__expectedType__": "sp.SkeletonData"
|
|
"__expectedType__": "sp.SkeletonData"
|
|
},
|
|
},
|
|
"defaultSkin": "cup",
|
|
"defaultSkin": "cup",
|
|
@@ -3288,7 +3291,7 @@
|
|
"a": 255
|
|
"a": 255
|
|
},
|
|
},
|
|
"_skeletonData": {
|
|
"_skeletonData": {
|
|
- "__uuid__": "a76ee3d1-453c-492e-9e37-ae3842cb6fde",
|
|
|
|
|
|
+ "__uuid__": "3de19b80-ee70-4c0d-910c-c6b9f78eebbf",
|
|
"__expectedType__": "sp.SkeletonData"
|
|
"__expectedType__": "sp.SkeletonData"
|
|
},
|
|
},
|
|
"defaultSkin": "cup",
|
|
"defaultSkin": "cup",
|
|
@@ -6408,6 +6411,384 @@
|
|
"loop": true,
|
|
"loop": true,
|
|
"_id": "d1QwBNkIVIXY6lGGdxv1S7"
|
|
"_id": "d1QwBNkIVIXY6lGGdxv1S7"
|
|
},
|
|
},
|
|
|
|
+ {
|
|
|
|
+ "__type__": "cc.Node",
|
|
|
|
+ "_name": "1water",
|
|
|
|
+ "_objFlags": 0,
|
|
|
|
+ "__editorExtras__": {},
|
|
|
|
+ "_parent": {
|
|
|
|
+ "__id__": 2
|
|
|
|
+ },
|
|
|
|
+ "_children": [
|
|
|
|
+ {
|
|
|
|
+ "__id__": 172
|
|
|
|
+ },
|
|
|
|
+ {
|
|
|
|
+ "__id__": 175
|
|
|
|
+ },
|
|
|
|
+ {
|
|
|
|
+ "__id__": 178
|
|
|
|
+ }
|
|
|
|
+ ],
|
|
|
|
+ "_active": true,
|
|
|
|
+ "_components": [],
|
|
|
|
+ "_prefab": null,
|
|
|
|
+ "_lpos": {
|
|
|
|
+ "__type__": "cc.Vec3",
|
|
|
|
+ "x": 224.442,
|
|
|
|
+ "y": -122.837,
|
|
|
|
+ "z": 0
|
|
|
|
+ },
|
|
|
|
+ "_lrot": {
|
|
|
|
+ "__type__": "cc.Quat",
|
|
|
|
+ "x": 0,
|
|
|
|
+ "y": 0,
|
|
|
|
+ "z": 0,
|
|
|
|
+ "w": 1
|
|
|
|
+ },
|
|
|
|
+ "_lscale": {
|
|
|
|
+ "__type__": "cc.Vec3",
|
|
|
|
+ "x": 1,
|
|
|
|
+ "y": 1,
|
|
|
|
+ "z": 1
|
|
|
|
+ },
|
|
|
|
+ "_mobility": 0,
|
|
|
|
+ "_layer": 1073741824,
|
|
|
|
+ "_euler": {
|
|
|
|
+ "__type__": "cc.Vec3",
|
|
|
|
+ "x": 0,
|
|
|
|
+ "y": 0,
|
|
|
|
+ "z": 0
|
|
|
|
+ },
|
|
|
|
+ "_id": "95C3o79NpKdpv8bThgEXEY"
|
|
|
|
+ },
|
|
|
|
+ {
|
|
|
|
+ "__type__": "cc.Node",
|
|
|
|
+ "_name": "water01",
|
|
|
|
+ "_objFlags": 0,
|
|
|
|
+ "__editorExtras__": {},
|
|
|
|
+ "_parent": {
|
|
|
|
+ "__id__": 171
|
|
|
|
+ },
|
|
|
|
+ "_children": [],
|
|
|
|
+ "_active": true,
|
|
|
|
+ "_components": [
|
|
|
|
+ {
|
|
|
|
+ "__id__": 173
|
|
|
|
+ },
|
|
|
|
+ {
|
|
|
|
+ "__id__": 174
|
|
|
|
+ }
|
|
|
|
+ ],
|
|
|
|
+ "_prefab": null,
|
|
|
|
+ "_lpos": {
|
|
|
|
+ "__type__": "cc.Vec3",
|
|
|
|
+ "x": 0,
|
|
|
|
+ "y": 0,
|
|
|
|
+ "z": 0
|
|
|
|
+ },
|
|
|
|
+ "_lrot": {
|
|
|
|
+ "__type__": "cc.Quat",
|
|
|
|
+ "x": 0,
|
|
|
|
+ "y": 0,
|
|
|
|
+ "z": 0,
|
|
|
|
+ "w": 1
|
|
|
|
+ },
|
|
|
|
+ "_lscale": {
|
|
|
|
+ "__type__": "cc.Vec3",
|
|
|
|
+ "x": 1,
|
|
|
|
+ "y": 1,
|
|
|
|
+ "z": 1
|
|
|
|
+ },
|
|
|
|
+ "_mobility": 0,
|
|
|
|
+ "_layer": 33554432,
|
|
|
|
+ "_euler": {
|
|
|
|
+ "__type__": "cc.Vec3",
|
|
|
|
+ "x": 0,
|
|
|
|
+ "y": 0,
|
|
|
|
+ "z": 0
|
|
|
|
+ },
|
|
|
|
+ "_id": "bcldj4l6NJc6JNFA+sdHSE"
|
|
|
|
+ },
|
|
|
|
+ {
|
|
|
|
+ "__type__": "cc.UITransform",
|
|
|
|
+ "_name": "",
|
|
|
|
+ "_objFlags": 0,
|
|
|
|
+ "__editorExtras__": {},
|
|
|
|
+ "node": {
|
|
|
|
+ "__id__": 172
|
|
|
|
+ },
|
|
|
|
+ "_enabled": true,
|
|
|
|
+ "__prefab": null,
|
|
|
|
+ "_contentSize": {
|
|
|
|
+ "__type__": "cc.Size",
|
|
|
|
+ "width": 104.66000366210938,
|
|
|
|
+ "height": 99.25
|
|
|
|
+ },
|
|
|
|
+ "_anchorPoint": {
|
|
|
|
+ "__type__": "cc.Vec2",
|
|
|
|
+ "x": 0.4998089006586676,
|
|
|
|
+ "y": 0.6444332401458203
|
|
|
|
+ },
|
|
|
|
+ "_id": "a8pN+js1JPGbrW01y8qilu"
|
|
|
|
+ },
|
|
|
|
+ {
|
|
|
|
+ "__type__": "sp.Skeleton",
|
|
|
|
+ "_name": "",
|
|
|
|
+ "_objFlags": 0,
|
|
|
|
+ "__editorExtras__": {},
|
|
|
|
+ "node": {
|
|
|
|
+ "__id__": 172
|
|
|
|
+ },
|
|
|
|
+ "_enabled": true,
|
|
|
|
+ "__prefab": null,
|
|
|
|
+ "_customMaterial": null,
|
|
|
|
+ "_srcBlendFactor": 2,
|
|
|
|
+ "_dstBlendFactor": 4,
|
|
|
|
+ "_color": {
|
|
|
|
+ "__type__": "cc.Color",
|
|
|
|
+ "r": 255,
|
|
|
|
+ "g": 255,
|
|
|
|
+ "b": 255,
|
|
|
|
+ "a": 255
|
|
|
|
+ },
|
|
|
|
+ "_skeletonData": {
|
|
|
|
+ "__uuid__": "a1c8b9af-803b-46c4-9017-8841020376c2",
|
|
|
|
+ "__expectedType__": "sp.SkeletonData"
|
|
|
|
+ },
|
|
|
|
+ "defaultSkin": "water01",
|
|
|
|
+ "defaultAnimation": "pour_01",
|
|
|
|
+ "_premultipliedAlpha": false,
|
|
|
|
+ "_timeScale": 1,
|
|
|
|
+ "_preCacheMode": 0,
|
|
|
|
+ "_cacheMode": 0,
|
|
|
|
+ "_sockets": [],
|
|
|
|
+ "_useTint": false,
|
|
|
|
+ "_debugMesh": false,
|
|
|
|
+ "_debugBones": false,
|
|
|
|
+ "_debugSlots": false,
|
|
|
|
+ "_enableBatch": false,
|
|
|
|
+ "loop": true,
|
|
|
|
+ "_id": "2dSbGUfBFNSqjslx/EDkk2"
|
|
|
|
+ },
|
|
|
|
+ {
|
|
|
|
+ "__type__": "cc.Node",
|
|
|
|
+ "_name": "colorB",
|
|
|
|
+ "_objFlags": 0,
|
|
|
|
+ "__editorExtras__": {},
|
|
|
|
+ "_parent": {
|
|
|
|
+ "__id__": 171
|
|
|
|
+ },
|
|
|
|
+ "_children": [],
|
|
|
|
+ "_active": true,
|
|
|
|
+ "_components": [
|
|
|
|
+ {
|
|
|
|
+ "__id__": 176
|
|
|
|
+ },
|
|
|
|
+ {
|
|
|
|
+ "__id__": 177
|
|
|
|
+ }
|
|
|
|
+ ],
|
|
|
|
+ "_prefab": null,
|
|
|
|
+ "_lpos": {
|
|
|
|
+ "__type__": "cc.Vec3",
|
|
|
|
+ "x": 0,
|
|
|
|
+ "y": 0,
|
|
|
|
+ "z": 0
|
|
|
|
+ },
|
|
|
|
+ "_lrot": {
|
|
|
|
+ "__type__": "cc.Quat",
|
|
|
|
+ "x": 0,
|
|
|
|
+ "y": 0,
|
|
|
|
+ "z": 0,
|
|
|
|
+ "w": 1
|
|
|
|
+ },
|
|
|
|
+ "_lscale": {
|
|
|
|
+ "__type__": "cc.Vec3",
|
|
|
|
+ "x": 1,
|
|
|
|
+ "y": 1,
|
|
|
|
+ "z": 1
|
|
|
|
+ },
|
|
|
|
+ "_mobility": 0,
|
|
|
|
+ "_layer": 33554432,
|
|
|
|
+ "_euler": {
|
|
|
|
+ "__type__": "cc.Vec3",
|
|
|
|
+ "x": 0,
|
|
|
|
+ "y": 0,
|
|
|
|
+ "z": 0
|
|
|
|
+ },
|
|
|
|
+ "_id": "73aw66jA9GkYR9fz0NSL+i"
|
|
|
|
+ },
|
|
|
|
+ {
|
|
|
|
+ "__type__": "cc.UITransform",
|
|
|
|
+ "_name": "",
|
|
|
|
+ "_objFlags": 0,
|
|
|
|
+ "__editorExtras__": {},
|
|
|
|
+ "node": {
|
|
|
|
+ "__id__": 175
|
|
|
|
+ },
|
|
|
|
+ "_enabled": true,
|
|
|
|
+ "__prefab": null,
|
|
|
|
+ "_contentSize": {
|
|
|
|
+ "__type__": "cc.Size",
|
|
|
|
+ "width": 104.66000366210938,
|
|
|
|
+ "height": 99.25
|
|
|
|
+ },
|
|
|
|
+ "_anchorPoint": {
|
|
|
|
+ "__type__": "cc.Vec2",
|
|
|
|
+ "x": 0.4998089006586676,
|
|
|
|
+ "y": 0.6444332401458203
|
|
|
|
+ },
|
|
|
|
+ "_id": "18hKsqEQtDHaugsJ74JX0b"
|
|
|
|
+ },
|
|
|
|
+ {
|
|
|
|
+ "__type__": "sp.Skeleton",
|
|
|
|
+ "_name": "",
|
|
|
|
+ "_objFlags": 0,
|
|
|
|
+ "__editorExtras__": {},
|
|
|
|
+ "node": {
|
|
|
|
+ "__id__": 175
|
|
|
|
+ },
|
|
|
|
+ "_enabled": true,
|
|
|
|
+ "__prefab": null,
|
|
|
|
+ "_customMaterial": null,
|
|
|
|
+ "_srcBlendFactor": 2,
|
|
|
|
+ "_dstBlendFactor": 4,
|
|
|
|
+ "_color": {
|
|
|
|
+ "__type__": "cc.Color",
|
|
|
|
+ "r": 255,
|
|
|
|
+ "g": 255,
|
|
|
|
+ "b": 255,
|
|
|
|
+ "a": 255
|
|
|
|
+ },
|
|
|
|
+ "_skeletonData": {
|
|
|
|
+ "__uuid__": "a1c8b9af-803b-46c4-9017-8841020376c2",
|
|
|
|
+ "__expectedType__": "sp.SkeletonData"
|
|
|
|
+ },
|
|
|
|
+ "defaultSkin": "colorB",
|
|
|
|
+ "defaultAnimation": "pour_01",
|
|
|
|
+ "_premultipliedAlpha": false,
|
|
|
|
+ "_timeScale": 1,
|
|
|
|
+ "_preCacheMode": 0,
|
|
|
|
+ "_cacheMode": 0,
|
|
|
|
+ "_sockets": [],
|
|
|
|
+ "_useTint": false,
|
|
|
|
+ "_debugMesh": false,
|
|
|
|
+ "_debugBones": false,
|
|
|
|
+ "_debugSlots": false,
|
|
|
|
+ "_enableBatch": false,
|
|
|
|
+ "loop": true,
|
|
|
|
+ "_id": "9eN4I3hBNJYowf2X20b7OP"
|
|
|
|
+ },
|
|
|
|
+ {
|
|
|
|
+ "__type__": "cc.Node",
|
|
|
|
+ "_name": "goblet",
|
|
|
|
+ "_objFlags": 0,
|
|
|
|
+ "__editorExtras__": {},
|
|
|
|
+ "_parent": {
|
|
|
|
+ "__id__": 171
|
|
|
|
+ },
|
|
|
|
+ "_children": [],
|
|
|
|
+ "_active": true,
|
|
|
|
+ "_components": [
|
|
|
|
+ {
|
|
|
|
+ "__id__": 179
|
|
|
|
+ },
|
|
|
|
+ {
|
|
|
|
+ "__id__": 180
|
|
|
|
+ }
|
|
|
|
+ ],
|
|
|
|
+ "_prefab": null,
|
|
|
|
+ "_lpos": {
|
|
|
|
+ "__type__": "cc.Vec3",
|
|
|
|
+ "x": 0,
|
|
|
|
+ "y": 0,
|
|
|
|
+ "z": 0
|
|
|
|
+ },
|
|
|
|
+ "_lrot": {
|
|
|
|
+ "__type__": "cc.Quat",
|
|
|
|
+ "x": 0,
|
|
|
|
+ "y": 0,
|
|
|
|
+ "z": 0,
|
|
|
|
+ "w": 1
|
|
|
|
+ },
|
|
|
|
+ "_lscale": {
|
|
|
|
+ "__type__": "cc.Vec3",
|
|
|
|
+ "x": 1,
|
|
|
|
+ "y": 1,
|
|
|
|
+ "z": 1
|
|
|
|
+ },
|
|
|
|
+ "_mobility": 0,
|
|
|
|
+ "_layer": 33554432,
|
|
|
|
+ "_euler": {
|
|
|
|
+ "__type__": "cc.Vec3",
|
|
|
|
+ "x": 0,
|
|
|
|
+ "y": 0,
|
|
|
|
+ "z": 0
|
|
|
|
+ },
|
|
|
|
+ "_id": "4bIQFjqAJPwICyqNXrHsGy"
|
|
|
|
+ },
|
|
|
|
+ {
|
|
|
|
+ "__type__": "cc.UITransform",
|
|
|
|
+ "_name": "",
|
|
|
|
+ "_objFlags": 0,
|
|
|
|
+ "__editorExtras__": {},
|
|
|
|
+ "node": {
|
|
|
|
+ "__id__": 178
|
|
|
|
+ },
|
|
|
|
+ "_enabled": true,
|
|
|
|
+ "__prefab": null,
|
|
|
|
+ "_contentSize": {
|
|
|
|
+ "__type__": "cc.Size",
|
|
|
|
+ "width": 104.66000366210938,
|
|
|
|
+ "height": 99.25
|
|
|
|
+ },
|
|
|
|
+ "_anchorPoint": {
|
|
|
|
+ "__type__": "cc.Vec2",
|
|
|
|
+ "x": 0.4998089006586676,
|
|
|
|
+ "y": 0.6444332401458203
|
|
|
|
+ },
|
|
|
|
+ "_id": "dbreJ+y8tOabyvtNkBsNuk"
|
|
|
|
+ },
|
|
|
|
+ {
|
|
|
|
+ "__type__": "sp.Skeleton",
|
|
|
|
+ "_name": "",
|
|
|
|
+ "_objFlags": 0,
|
|
|
|
+ "__editorExtras__": {},
|
|
|
|
+ "node": {
|
|
|
|
+ "__id__": 178
|
|
|
|
+ },
|
|
|
|
+ "_enabled": true,
|
|
|
|
+ "__prefab": null,
|
|
|
|
+ "_customMaterial": null,
|
|
|
|
+ "_srcBlendFactor": 2,
|
|
|
|
+ "_dstBlendFactor": 4,
|
|
|
|
+ "_color": {
|
|
|
|
+ "__type__": "cc.Color",
|
|
|
|
+ "r": 255,
|
|
|
|
+ "g": 255,
|
|
|
|
+ "b": 255,
|
|
|
|
+ "a": 255
|
|
|
|
+ },
|
|
|
|
+ "_skeletonData": {
|
|
|
|
+ "__uuid__": "a1c8b9af-803b-46c4-9017-8841020376c2",
|
|
|
|
+ "__expectedType__": "sp.SkeletonData"
|
|
|
|
+ },
|
|
|
|
+ "defaultSkin": "goblet",
|
|
|
|
+ "defaultAnimation": "pour_01",
|
|
|
|
+ "_premultipliedAlpha": false,
|
|
|
|
+ "_timeScale": 1,
|
|
|
|
+ "_preCacheMode": 0,
|
|
|
|
+ "_cacheMode": 0,
|
|
|
|
+ "_sockets": [],
|
|
|
|
+ "_useTint": false,
|
|
|
|
+ "_debugMesh": false,
|
|
|
|
+ "_debugBones": false,
|
|
|
|
+ "_debugSlots": false,
|
|
|
|
+ "_enableBatch": false,
|
|
|
|
+ "loop": true,
|
|
|
|
+ "_id": "d8J2yqf05EtL26Z6TXb3r5"
|
|
|
|
+ },
|
|
{
|
|
{
|
|
"__type__": "cc.UITransform",
|
|
"__type__": "cc.UITransform",
|
|
"_name": "",
|
|
"_name": "",
|
|
@@ -6479,28 +6860,28 @@
|
|
{
|
|
{
|
|
"__type__": "cc.SceneGlobals",
|
|
"__type__": "cc.SceneGlobals",
|
|
"ambient": {
|
|
"ambient": {
|
|
- "__id__": 175
|
|
|
|
|
|
+ "__id__": 185
|
|
},
|
|
},
|
|
"shadows": {
|
|
"shadows": {
|
|
- "__id__": 176
|
|
|
|
|
|
+ "__id__": 186
|
|
},
|
|
},
|
|
"_skybox": {
|
|
"_skybox": {
|
|
- "__id__": 177
|
|
|
|
|
|
+ "__id__": 187
|
|
},
|
|
},
|
|
"fog": {
|
|
"fog": {
|
|
- "__id__": 178
|
|
|
|
|
|
+ "__id__": 188
|
|
},
|
|
},
|
|
"octree": {
|
|
"octree": {
|
|
- "__id__": 179
|
|
|
|
|
|
+ "__id__": 189
|
|
},
|
|
},
|
|
"skin": {
|
|
"skin": {
|
|
- "__id__": 180
|
|
|
|
|
|
+ "__id__": 190
|
|
},
|
|
},
|
|
"lightProbeInfo": {
|
|
"lightProbeInfo": {
|
|
- "__id__": 181
|
|
|
|
|
|
+ "__id__": 191
|
|
},
|
|
},
|
|
"postSettings": {
|
|
"postSettings": {
|
|
- "__id__": 182
|
|
|
|
|
|
+ "__id__": 192
|
|
},
|
|
},
|
|
"bakedWithStationaryMainLight": false,
|
|
"bakedWithStationaryMainLight": false,
|
|
"bakedWithHighpLightmap": false
|
|
"bakedWithHighpLightmap": false
|