|
@@ -32,7 +32,7 @@
|
|
"_active": true,
|
|
"_active": true,
|
|
"_components": [],
|
|
"_components": [],
|
|
"_prefab": {
|
|
"_prefab": {
|
|
- "__id__": 202
|
|
|
|
|
|
+ "__id__": 196
|
|
},
|
|
},
|
|
"_lpos": {
|
|
"_lpos": {
|
|
"__type__": "cc.Vec3",
|
|
"__type__": "cc.Vec3",
|
|
@@ -63,7 +63,7 @@
|
|
},
|
|
},
|
|
"autoReleaseAssets": false,
|
|
"autoReleaseAssets": false,
|
|
"_globals": {
|
|
"_globals": {
|
|
- "__id__": 203
|
|
|
|
|
|
+ "__id__": 197
|
|
},
|
|
},
|
|
"_id": "ca2c3635-7e94-4602-b1eb-136ddb147d5f"
|
|
"_id": "ca2c3635-7e94-4602-b1eb-136ddb147d5f"
|
|
},
|
|
},
|
|
@@ -426,7 +426,7 @@
|
|
"__id__": 180
|
|
"__id__": 180
|
|
},
|
|
},
|
|
{
|
|
{
|
|
- "__id__": 191
|
|
|
|
|
|
+ "__id__": 188
|
|
}
|
|
}
|
|
],
|
|
],
|
|
"_active": true,
|
|
"_active": true,
|
|
@@ -2672,7 +2672,7 @@
|
|
"__id__": 180
|
|
"__id__": 180
|
|
},
|
|
},
|
|
"asset": {
|
|
"asset": {
|
|
- "__uuid__": "5027a7d8-1f72-4507-9c51-58aec590001a@712d1",
|
|
|
|
|
|
+ "__uuid__": "8fbb2db1-1869-4464-8b0a-2eca2a8a84a7",
|
|
"__expectedType__": "cc.Prefab"
|
|
"__expectedType__": "cc.Prefab"
|
|
},
|
|
},
|
|
"fileId": "bdaQ4BCqZXFLSla+tH53Xv",
|
|
"fileId": "bdaQ4BCqZXFLSla+tH53Xv",
|
|
@@ -2700,12 +2700,6 @@
|
|
},
|
|
},
|
|
{
|
|
{
|
|
"__id__": 187
|
|
"__id__": 187
|
|
- },
|
|
|
|
- {
|
|
|
|
- "__id__": 188
|
|
|
|
- },
|
|
|
|
- {
|
|
|
|
- "__id__": 190
|
|
|
|
}
|
|
}
|
|
],
|
|
],
|
|
"removedComponents": []
|
|
"removedComponents": []
|
|
@@ -2772,38 +2766,6 @@
|
|
"z": 0
|
|
"z": 0
|
|
}
|
|
}
|
|
},
|
|
},
|
|
- {
|
|
|
|
- "__type__": "CCPropertyOverrideInfo",
|
|
|
|
- "targetInfo": {
|
|
|
|
- "__id__": 189
|
|
|
|
- },
|
|
|
|
- "propertyPath": [
|
|
|
|
- "_materials",
|
|
|
|
- "0"
|
|
|
|
- ],
|
|
|
|
- "value": {
|
|
|
|
- "__uuid__": "5f43d61f-9d59-4517-8603-fe418dc149d7",
|
|
|
|
- "__expectedType__": "cc.Material"
|
|
|
|
- }
|
|
|
|
- },
|
|
|
|
- {
|
|
|
|
- "__type__": "cc.TargetInfo",
|
|
|
|
- "localID": [
|
|
|
|
- "e9AFSPZAtWApoHJ9gSla72"
|
|
|
|
- ]
|
|
|
|
- },
|
|
|
|
- {
|
|
|
|
- "__type__": "CCPropertyOverrideInfo",
|
|
|
|
- "targetInfo": {
|
|
|
|
- "__id__": 189
|
|
|
|
- },
|
|
|
|
- "propertyPath": [
|
|
|
|
- "_skinningRoot"
|
|
|
|
- ],
|
|
|
|
- "value": {
|
|
|
|
- "__id__": 180
|
|
|
|
- }
|
|
|
|
- },
|
|
|
|
{
|
|
{
|
|
"__type__": "cc.Node",
|
|
"__type__": "cc.Node",
|
|
"_objFlags": 0,
|
|
"_objFlags": 0,
|
|
@@ -2811,22 +2773,22 @@
|
|
"__id__": 15
|
|
"__id__": 15
|
|
},
|
|
},
|
|
"_prefab": {
|
|
"_prefab": {
|
|
- "__id__": 192
|
|
|
|
|
|
+ "__id__": 189
|
|
},
|
|
},
|
|
"__editorExtras__": {}
|
|
"__editorExtras__": {}
|
|
},
|
|
},
|
|
{
|
|
{
|
|
"__type__": "cc.PrefabInfo",
|
|
"__type__": "cc.PrefabInfo",
|
|
"root": {
|
|
"root": {
|
|
- "__id__": 191
|
|
|
|
|
|
+ "__id__": 188
|
|
},
|
|
},
|
|
"asset": {
|
|
"asset": {
|
|
- "__uuid__": "e226a23b-769d-49b2-b4d0-797004482d28@30075",
|
|
|
|
|
|
+ "__uuid__": "43db299d-12c8-48fd-98d8-9840f96d4a86",
|
|
"__expectedType__": "cc.Prefab"
|
|
"__expectedType__": "cc.Prefab"
|
|
},
|
|
},
|
|
"fileId": "bbTTyDvJ5ZiKtJxZQRuYHP",
|
|
"fileId": "bbTTyDvJ5ZiKtJxZQRuYHP",
|
|
"instance": {
|
|
"instance": {
|
|
- "__id__": 193
|
|
|
|
|
|
+ "__id__": 190
|
|
},
|
|
},
|
|
"targetOverrides": null,
|
|
"targetOverrides": null,
|
|
"nestedPrefabInstanceRoots": null
|
|
"nestedPrefabInstanceRoots": null
|
|
@@ -2839,22 +2801,16 @@
|
|
"mountedComponents": [],
|
|
"mountedComponents": [],
|
|
"propertyOverrides": [
|
|
"propertyOverrides": [
|
|
{
|
|
{
|
|
- "__id__": 194
|
|
|
|
- },
|
|
|
|
- {
|
|
|
|
- "__id__": 196
|
|
|
|
- },
|
|
|
|
- {
|
|
|
|
- "__id__": 197
|
|
|
|
|
|
+ "__id__": 191
|
|
},
|
|
},
|
|
{
|
|
{
|
|
- "__id__": 198
|
|
|
|
|
|
+ "__id__": 193
|
|
},
|
|
},
|
|
{
|
|
{
|
|
- "__id__": 199
|
|
|
|
|
|
+ "__id__": 194
|
|
},
|
|
},
|
|
{
|
|
{
|
|
- "__id__": 201
|
|
|
|
|
|
+ "__id__": 195
|
|
}
|
|
}
|
|
],
|
|
],
|
|
"removedComponents": []
|
|
"removedComponents": []
|
|
@@ -2862,7 +2818,7 @@
|
|
{
|
|
{
|
|
"__type__": "CCPropertyOverrideInfo",
|
|
"__type__": "CCPropertyOverrideInfo",
|
|
"targetInfo": {
|
|
"targetInfo": {
|
|
- "__id__": 195
|
|
|
|
|
|
+ "__id__": 192
|
|
},
|
|
},
|
|
"propertyPath": [
|
|
"propertyPath": [
|
|
"_name"
|
|
"_name"
|
|
@@ -2878,7 +2834,7 @@
|
|
{
|
|
{
|
|
"__type__": "CCPropertyOverrideInfo",
|
|
"__type__": "CCPropertyOverrideInfo",
|
|
"targetInfo": {
|
|
"targetInfo": {
|
|
- "__id__": 195
|
|
|
|
|
|
+ "__id__": 192
|
|
},
|
|
},
|
|
"propertyPath": [
|
|
"propertyPath": [
|
|
"_lpos"
|
|
"_lpos"
|
|
@@ -2893,7 +2849,7 @@
|
|
{
|
|
{
|
|
"__type__": "CCPropertyOverrideInfo",
|
|
"__type__": "CCPropertyOverrideInfo",
|
|
"targetInfo": {
|
|
"targetInfo": {
|
|
- "__id__": 195
|
|
|
|
|
|
+ "__id__": 192
|
|
},
|
|
},
|
|
"propertyPath": [
|
|
"propertyPath": [
|
|
"_lrot"
|
|
"_lrot"
|
|
@@ -2909,7 +2865,7 @@
|
|
{
|
|
{
|
|
"__type__": "CCPropertyOverrideInfo",
|
|
"__type__": "CCPropertyOverrideInfo",
|
|
"targetInfo": {
|
|
"targetInfo": {
|
|
- "__id__": 195
|
|
|
|
|
|
+ "__id__": 192
|
|
},
|
|
},
|
|
"propertyPath": [
|
|
"propertyPath": [
|
|
"_euler"
|
|
"_euler"
|
|
@@ -2921,38 +2877,6 @@
|
|
"z": 0
|
|
"z": 0
|
|
}
|
|
}
|
|
},
|
|
},
|
|
- {
|
|
|
|
- "__type__": "CCPropertyOverrideInfo",
|
|
|
|
- "targetInfo": {
|
|
|
|
- "__id__": 200
|
|
|
|
- },
|
|
|
|
- "propertyPath": [
|
|
|
|
- "_materials",
|
|
|
|
- "0"
|
|
|
|
- ],
|
|
|
|
- "value": {
|
|
|
|
- "__uuid__": "5f43d61f-9d59-4517-8603-fe418dc149d7",
|
|
|
|
- "__expectedType__": "cc.Material"
|
|
|
|
- }
|
|
|
|
- },
|
|
|
|
- {
|
|
|
|
- "__type__": "cc.TargetInfo",
|
|
|
|
- "localID": [
|
|
|
|
- "48V9J8rOpUB6eo5e2fPL2S"
|
|
|
|
- ]
|
|
|
|
- },
|
|
|
|
- {
|
|
|
|
- "__type__": "CCPropertyOverrideInfo",
|
|
|
|
- "targetInfo": {
|
|
|
|
- "__id__": 200
|
|
|
|
- },
|
|
|
|
- "propertyPath": [
|
|
|
|
- "_skinningRoot"
|
|
|
|
- ],
|
|
|
|
- "value": {
|
|
|
|
- "__id__": 191
|
|
|
|
- }
|
|
|
|
- },
|
|
|
|
{
|
|
{
|
|
"__type__": "cc.PrefabInfo",
|
|
"__type__": "cc.PrefabInfo",
|
|
"root": null,
|
|
"root": null,
|
|
@@ -3016,35 +2940,35 @@
|
|
"__id__": 180
|
|
"__id__": 180
|
|
},
|
|
},
|
|
{
|
|
{
|
|
- "__id__": 191
|
|
|
|
|
|
+ "__id__": 188
|
|
}
|
|
}
|
|
]
|
|
]
|
|
},
|
|
},
|
|
{
|
|
{
|
|
"__type__": "cc.SceneGlobals",
|
|
"__type__": "cc.SceneGlobals",
|
|
"ambient": {
|
|
"ambient": {
|
|
- "__id__": 204
|
|
|
|
|
|
+ "__id__": 198
|
|
},
|
|
},
|
|
"shadows": {
|
|
"shadows": {
|
|
- "__id__": 205
|
|
|
|
|
|
+ "__id__": 199
|
|
},
|
|
},
|
|
"_skybox": {
|
|
"_skybox": {
|
|
- "__id__": 206
|
|
|
|
|
|
+ "__id__": 200
|
|
},
|
|
},
|
|
"fog": {
|
|
"fog": {
|
|
- "__id__": 207
|
|
|
|
|
|
+ "__id__": 201
|
|
},
|
|
},
|
|
"octree": {
|
|
"octree": {
|
|
- "__id__": 208
|
|
|
|
|
|
+ "__id__": 202
|
|
},
|
|
},
|
|
"skin": {
|
|
"skin": {
|
|
- "__id__": 209
|
|
|
|
|
|
+ "__id__": 203
|
|
},
|
|
},
|
|
"lightProbeInfo": {
|
|
"lightProbeInfo": {
|
|
- "__id__": 210
|
|
|
|
|
|
+ "__id__": 204
|
|
},
|
|
},
|
|
"postSettings": {
|
|
"postSettings": {
|
|
- "__id__": 211
|
|
|
|
|
|
+ "__id__": 205
|
|
},
|
|
},
|
|
"bakedWithStationaryMainLight": false,
|
|
"bakedWithStationaryMainLight": false,
|
|
"bakedWithHighpLightmap": false
|
|
"bakedWithHighpLightmap": false
|