|
@@ -32,7 +32,7 @@
|
|
|
"_active": true,
|
|
|
"_components": [],
|
|
|
"_prefab": {
|
|
|
- "__id__": 190
|
|
|
+ "__id__": 179
|
|
|
},
|
|
|
"_lpos": {
|
|
|
"__type__": "cc.Vec3",
|
|
@@ -63,7 +63,7 @@
|
|
|
},
|
|
|
"autoReleaseAssets": false,
|
|
|
"_globals": {
|
|
|
- "__id__": 191
|
|
|
+ "__id__": 180
|
|
|
},
|
|
|
"_id": "ca2c3635-7e94-4602-b1eb-136ddb147d5f"
|
|
|
},
|
|
@@ -420,7 +420,7 @@
|
|
|
"__id__": 163
|
|
|
},
|
|
|
{
|
|
|
- "__id__": 173
|
|
|
+ "__id__": 171
|
|
|
}
|
|
|
],
|
|
|
"_active": true,
|
|
@@ -2428,19 +2428,18 @@
|
|
|
"__id__": 163
|
|
|
},
|
|
|
"asset": {
|
|
|
- "__uuid__": "7d73f4a9-9eed-410d-86dd-846d594cb91e",
|
|
|
+ "__uuid__": "f22b4686-9e9f-4b8b-8c0c-d217bc7cfe23",
|
|
|
"__expectedType__": "cc.Prefab"
|
|
|
},
|
|
|
- "fileId": "a4iPd9cBZXvJFXwtNxAO5S",
|
|
|
+ "fileId": "4aIn0GW/pEWotYsJwbj7V9",
|
|
|
"instance": {
|
|
|
"__id__": 165
|
|
|
},
|
|
|
- "targetOverrides": null,
|
|
|
- "nestedPrefabInstanceRoots": null
|
|
|
+ "targetOverrides": null
|
|
|
},
|
|
|
{
|
|
|
"__type__": "cc.PrefabInstance",
|
|
|
- "fileId": "05Nw5AZr5PuazoUy8toVm2",
|
|
|
+ "fileId": "bamwndhRpKvKRfhR43Mgc5",
|
|
|
"prefabRootNode": null,
|
|
|
"mountedChildren": [],
|
|
|
"mountedComponents": [],
|
|
@@ -2456,9 +2455,6 @@
|
|
|
},
|
|
|
{
|
|
|
"__id__": 170
|
|
|
- },
|
|
|
- {
|
|
|
- "__id__": 171
|
|
|
}
|
|
|
],
|
|
|
"removedComponents": []
|
|
@@ -2471,12 +2467,12 @@
|
|
|
"propertyPath": [
|
|
|
"_name"
|
|
|
],
|
|
|
- "value": "ta"
|
|
|
+ "value": "whitehouse"
|
|
|
},
|
|
|
{
|
|
|
"__type__": "cc.TargetInfo",
|
|
|
"localID": [
|
|
|
- "a4iPd9cBZXvJFXwtNxAO5S"
|
|
|
+ "4aIn0GW/pEWotYsJwbj7V9"
|
|
|
]
|
|
|
},
|
|
|
{
|
|
@@ -2489,9 +2485,9 @@
|
|
|
],
|
|
|
"value": {
|
|
|
"__type__": "cc.Vec3",
|
|
|
- "x": -13.991,
|
|
|
+ "x": 22.401,
|
|
|
"y": 0,
|
|
|
- "z": -22.939
|
|
|
+ "z": -31.372
|
|
|
}
|
|
|
},
|
|
|
{
|
|
@@ -2525,25 +2521,6 @@
|
|
|
"z": 0
|
|
|
}
|
|
|
},
|
|
|
- {
|
|
|
- "__type__": "CCPropertyOverrideInfo",
|
|
|
- "targetInfo": {
|
|
|
- "__id__": 172
|
|
|
- },
|
|
|
- "propertyPath": [
|
|
|
- "_mesh"
|
|
|
- ],
|
|
|
- "value": {
|
|
|
- "__uuid__": "c501f6ef-c32d-4bb6-9908-748b686a362a@05761",
|
|
|
- "__expectedType__": "cc.Mesh"
|
|
|
- }
|
|
|
- },
|
|
|
- {
|
|
|
- "__type__": "cc.TargetInfo",
|
|
|
- "localID": [
|
|
|
- "6dJm+EqcBbr4fwWDMkSLwg"
|
|
|
- ]
|
|
|
- },
|
|
|
{
|
|
|
"__type__": "cc.Node",
|
|
|
"_objFlags": 0,
|
|
@@ -2551,61 +2528,44 @@
|
|
|
"__id__": 15
|
|
|
},
|
|
|
"_prefab": {
|
|
|
- "__id__": 174
|
|
|
+ "__id__": 172
|
|
|
},
|
|
|
"__editorExtras__": {}
|
|
|
},
|
|
|
{
|
|
|
"__type__": "cc.PrefabInfo",
|
|
|
"root": {
|
|
|
- "__id__": 173
|
|
|
+ "__id__": 171
|
|
|
},
|
|
|
"asset": {
|
|
|
- "__uuid__": "f22b4686-9e9f-4b8b-8c0c-d217bc7cfe23",
|
|
|
+ "__uuid__": "7d73f4a9-9eed-410d-86dd-846d594cb91e",
|
|
|
"__expectedType__": "cc.Prefab"
|
|
|
},
|
|
|
- "fileId": "4aIn0GW/pEWotYsJwbj7V9",
|
|
|
+ "fileId": "a4iPd9cBZXvJFXwtNxAO5S",
|
|
|
"instance": {
|
|
|
- "__id__": 175
|
|
|
+ "__id__": 173
|
|
|
},
|
|
|
- "targetOverrides": null
|
|
|
+ "targetOverrides": null,
|
|
|
+ "nestedPrefabInstanceRoots": null
|
|
|
},
|
|
|
{
|
|
|
"__type__": "cc.PrefabInstance",
|
|
|
- "fileId": "bamwndhRpKvKRfhR43Mgc5",
|
|
|
+ "fileId": "d2gXgW2h1C5ptrslgzx1zp",
|
|
|
"prefabRootNode": null,
|
|
|
"mountedChildren": [],
|
|
|
"mountedComponents": [],
|
|
|
"propertyOverrides": [
|
|
|
{
|
|
|
- "__id__": 176
|
|
|
- },
|
|
|
- {
|
|
|
- "__id__": 178
|
|
|
- },
|
|
|
- {
|
|
|
- "__id__": 179
|
|
|
- },
|
|
|
- {
|
|
|
- "__id__": 180
|
|
|
+ "__id__": 174
|
|
|
},
|
|
|
{
|
|
|
- "__id__": 181
|
|
|
- },
|
|
|
- {
|
|
|
- "__id__": 183
|
|
|
- },
|
|
|
- {
|
|
|
- "__id__": 185
|
|
|
- },
|
|
|
- {
|
|
|
- "__id__": 187
|
|
|
+ "__id__": 176
|
|
|
},
|
|
|
{
|
|
|
- "__id__": 188
|
|
|
+ "__id__": 177
|
|
|
},
|
|
|
{
|
|
|
- "__id__": 189
|
|
|
+ "__id__": 178
|
|
|
}
|
|
|
],
|
|
|
"removedComponents": []
|
|
@@ -2613,38 +2573,38 @@
|
|
|
{
|
|
|
"__type__": "CCPropertyOverrideInfo",
|
|
|
"targetInfo": {
|
|
|
- "__id__": 177
|
|
|
+ "__id__": 175
|
|
|
},
|
|
|
"propertyPath": [
|
|
|
"_name"
|
|
|
],
|
|
|
- "value": "whitehouse"
|
|
|
+ "value": "ta"
|
|
|
},
|
|
|
{
|
|
|
"__type__": "cc.TargetInfo",
|
|
|
"localID": [
|
|
|
- "4aIn0GW/pEWotYsJwbj7V9"
|
|
|
+ "a4iPd9cBZXvJFXwtNxAO5S"
|
|
|
]
|
|
|
},
|
|
|
{
|
|
|
"__type__": "CCPropertyOverrideInfo",
|
|
|
"targetInfo": {
|
|
|
- "__id__": 177
|
|
|
+ "__id__": 175
|
|
|
},
|
|
|
"propertyPath": [
|
|
|
"_lpos"
|
|
|
],
|
|
|
"value": {
|
|
|
"__type__": "cc.Vec3",
|
|
|
- "x": 22.401,
|
|
|
+ "x": -13.991,
|
|
|
"y": 0,
|
|
|
- "z": -31.372
|
|
|
+ "z": -22.939
|
|
|
}
|
|
|
},
|
|
|
{
|
|
|
"__type__": "CCPropertyOverrideInfo",
|
|
|
"targetInfo": {
|
|
|
- "__id__": 177
|
|
|
+ "__id__": 175
|
|
|
},
|
|
|
"propertyPath": [
|
|
|
"_lrot"
|
|
@@ -2660,7 +2620,7 @@
|
|
|
{
|
|
|
"__type__": "CCPropertyOverrideInfo",
|
|
|
"targetInfo": {
|
|
|
- "__id__": 177
|
|
|
+ "__id__": 175
|
|
|
},
|
|
|
"propertyPath": [
|
|
|
"_euler"
|
|
@@ -2672,108 +2632,6 @@
|
|
|
"z": 0
|
|
|
}
|
|
|
},
|
|
|
- {
|
|
|
- "__type__": "CCPropertyOverrideInfo",
|
|
|
- "targetInfo": {
|
|
|
- "__id__": 182
|
|
|
- },
|
|
|
- "propertyPath": [
|
|
|
- "_materials",
|
|
|
- "0"
|
|
|
- ],
|
|
|
- "value": {
|
|
|
- "__uuid__": "5f43d61f-9d59-4517-8603-fe418dc149d7",
|
|
|
- "__expectedType__": "cc.Material"
|
|
|
- }
|
|
|
- },
|
|
|
- {
|
|
|
- "__type__": "cc.TargetInfo",
|
|
|
- "localID": [
|
|
|
- "43ZSDJWW9PFrh5lj/kdtdk",
|
|
|
- "beWd1qbCldr4NAkCN7xR5X"
|
|
|
- ]
|
|
|
- },
|
|
|
- {
|
|
|
- "__type__": "CCPropertyOverrideInfo",
|
|
|
- "targetInfo": {
|
|
|
- "__id__": 184
|
|
|
- },
|
|
|
- "propertyPath": [
|
|
|
- "_materials",
|
|
|
- "0"
|
|
|
- ],
|
|
|
- "value": {
|
|
|
- "__uuid__": "5f43d61f-9d59-4517-8603-fe418dc149d7",
|
|
|
- "__expectedType__": "cc.Material"
|
|
|
- }
|
|
|
- },
|
|
|
- {
|
|
|
- "__type__": "cc.TargetInfo",
|
|
|
- "localID": [
|
|
|
- "1aQz+pIWVEuJ0vaQy9HB+p",
|
|
|
- "afiSyzIw9exLlFAQqfv12g"
|
|
|
- ]
|
|
|
- },
|
|
|
- {
|
|
|
- "__type__": "CCPropertyOverrideInfo",
|
|
|
- "targetInfo": {
|
|
|
- "__id__": 186
|
|
|
- },
|
|
|
- "propertyPath": [
|
|
|
- "_materials",
|
|
|
- "0"
|
|
|
- ],
|
|
|
- "value": {
|
|
|
- "__uuid__": "5f43d61f-9d59-4517-8603-fe418dc149d7",
|
|
|
- "__expectedType__": "cc.Material"
|
|
|
- }
|
|
|
- },
|
|
|
- {
|
|
|
- "__type__": "cc.TargetInfo",
|
|
|
- "localID": [
|
|
|
- "38D/AKbX9OVohjjuiYJmHg",
|
|
|
- "bbzFURwJlRk785DRlj9ipr"
|
|
|
- ]
|
|
|
- },
|
|
|
- {
|
|
|
- "__type__": "CCPropertyOverrideInfo",
|
|
|
- "targetInfo": {
|
|
|
- "__id__": 186
|
|
|
- },
|
|
|
- "propertyPath": [
|
|
|
- "_mesh"
|
|
|
- ],
|
|
|
- "value": {
|
|
|
- "__uuid__": "507739fa-1ef5-4b0a-9af3-c7f4fd3b9d75@da4a5",
|
|
|
- "__expectedType__": "cc.Mesh"
|
|
|
- }
|
|
|
- },
|
|
|
- {
|
|
|
- "__type__": "CCPropertyOverrideInfo",
|
|
|
- "targetInfo": {
|
|
|
- "__id__": 184
|
|
|
- },
|
|
|
- "propertyPath": [
|
|
|
- "_mesh"
|
|
|
- ],
|
|
|
- "value": {
|
|
|
- "__uuid__": "859a5180-7f6a-4d80-b7b2-2d9a465d17c4@93068",
|
|
|
- "__expectedType__": "cc.Mesh"
|
|
|
- }
|
|
|
- },
|
|
|
- {
|
|
|
- "__type__": "CCPropertyOverrideInfo",
|
|
|
- "targetInfo": {
|
|
|
- "__id__": 182
|
|
|
- },
|
|
|
- "propertyPath": [
|
|
|
- "_mesh"
|
|
|
- ],
|
|
|
- "value": {
|
|
|
- "__uuid__": "fdaf78f6-99c1-4cd3-8d1b-d9046c72ba20@ab16c",
|
|
|
- "__expectedType__": "cc.Mesh"
|
|
|
- }
|
|
|
- },
|
|
|
{
|
|
|
"__type__": "cc.PrefabInfo",
|
|
|
"root": null,
|
|
@@ -2831,35 +2689,35 @@
|
|
|
"__id__": 163
|
|
|
},
|
|
|
{
|
|
|
- "__id__": 173
|
|
|
+ "__id__": 171
|
|
|
}
|
|
|
]
|
|
|
},
|
|
|
{
|
|
|
"__type__": "cc.SceneGlobals",
|
|
|
"ambient": {
|
|
|
- "__id__": 192
|
|
|
+ "__id__": 181
|
|
|
},
|
|
|
"shadows": {
|
|
|
- "__id__": 193
|
|
|
+ "__id__": 182
|
|
|
},
|
|
|
"_skybox": {
|
|
|
- "__id__": 194
|
|
|
+ "__id__": 183
|
|
|
},
|
|
|
"fog": {
|
|
|
- "__id__": 195
|
|
|
+ "__id__": 184
|
|
|
},
|
|
|
"octree": {
|
|
|
- "__id__": 196
|
|
|
+ "__id__": 185
|
|
|
},
|
|
|
"skin": {
|
|
|
- "__id__": 197
|
|
|
+ "__id__": 186
|
|
|
},
|
|
|
"lightProbeInfo": {
|
|
|
- "__id__": 198
|
|
|
+ "__id__": 187
|
|
|
},
|
|
|
"postSettings": {
|
|
|
- "__id__": 199
|
|
|
+ "__id__": 188
|
|
|
},
|
|
|
"bakedWithStationaryMainLight": false,
|
|
|
"bakedWithHighpLightmap": false
|