Commit 2972f601 authored by haiyoucuv's avatar haiyoucuv

init

parent db2d8dc5
...@@ -25,16 +25,16 @@ ...@@ -25,16 +25,16 @@
"__id__": 17 "__id__": 17
}, },
{ {
"__id__": 34 "__id__": 32
}, },
{ {
"__id__": 49 "__id__": 47
} }
], ],
"_active": true, "_active": true,
"_components": [], "_components": [],
"_prefab": { "_prefab": {
"__id__": 66 "__id__": 64
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
...@@ -264,7 +264,7 @@ ...@@ -264,7 +264,7 @@
"__id__": 17 "__id__": 17
}, },
"asset": { "asset": {
"__uuid__": "1d050780-084a-4a94-89dc-105ed985a981", "__uuid__": "dd50f117-884d-42a5-af5a-a80c6271db0d",
"__expectedType__": "cc.Prefab" "__expectedType__": "cc.Prefab"
}, },
"fileId": "ca6ZXggr1OPpZ1elxoE4VX", "fileId": "ca6ZXggr1OPpZ1elxoE4VX",
...@@ -273,16 +273,16 @@ ...@@ -273,16 +273,16 @@
}, },
"targetOverrides": [ "targetOverrides": [
{ {
"__id__": 29 "__id__": 27
}, },
{ {
"__id__": 32 "__id__": 30
} }
] ]
}, },
{ {
"__type__": "cc.PrefabInstance", "__type__": "cc.PrefabInstance",
"fileId": "aae/c2DrxJOLchCPcaOgVX", "fileId": "19yIasO0NAn4hLhfOFP3tK",
"prefabRootNode": { "prefabRootNode": {
"__id__": 1 "__id__": 1
}, },
...@@ -303,9 +303,6 @@ ...@@ -303,9 +303,6 @@
}, },
{ {
"__id__": 25 "__id__": 25
},
{
"__id__": 27
} }
], ],
"removedComponents": [] "removedComponents": []
...@@ -318,7 +315,7 @@ ...@@ -318,7 +315,7 @@
"propertyPath": [ "propertyPath": [
"_name" "_name"
], ],
"value": "Sedan" "value": "Car4"
}, },
{ {
"__type__": "cc.TargetInfo", "__type__": "cc.TargetInfo",
...@@ -336,9 +333,9 @@ ...@@ -336,9 +333,9 @@
], ],
"value": { "value": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": -1.2899999618530273, "x": -1.446,
"y": 1.4901161415892261e-9, "y": 0,
"z": -1.2900018692016602 "z": -1.446
} }
}, },
{ {
...@@ -352,9 +349,9 @@ ...@@ -352,9 +349,9 @@
"value": { "value": {
"__type__": "cc.Quat", "__type__": "cc.Quat",
"x": 0, "x": 0,
"y": 0.9238795042037964, "y": 0.9238795302952961,
"z": 0, "z": 0,
"w": -0.3826833963394165 "w": -0.3826834377149643
} }
}, },
{ {
...@@ -368,7 +365,7 @@ ...@@ -368,7 +365,7 @@
"value": { "value": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0, "x": 0,
"y": -134.99999933643895, "y": -134.99999933643898,
"z": 0 "z": 0
} }
}, },
...@@ -388,23 +385,6 @@ ...@@ -388,23 +385,6 @@
"6cFLC99U1Dl405ygHuNfbi" "6cFLC99U1Dl405ygHuNfbi"
] ]
}, },
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 28
},
"propertyPath": [
"_active"
],
"value": true
},
{
"__type__": "cc.TargetInfo",
"localID": [
"ebXDWV+WtBwbX0k+wUYtEb",
"a8lysz3G9WsJw3sNfEgO5Z"
]
},
{ {
"__type__": "cc.TargetOverrideInfo", "__type__": "cc.TargetOverrideInfo",
"source": null, "source": null,
...@@ -413,10 +393,10 @@ ...@@ -413,10 +393,10 @@
"bodyMesh" "bodyMesh"
], ],
"target": { "target": {
"__id__": 30 "__id__": 28
}, },
"targetInfo": { "targetInfo": {
"__id__": 31 "__id__": 29
} }
}, },
{ {
...@@ -426,7 +406,7 @@ ...@@ -426,7 +406,7 @@
{ {
"__type__": "cc.TargetInfo", "__type__": "cc.TargetInfo",
"localID": [ "localID": [
"a8KAKbpytWQIj9beYfhm7E" "a0jw0F0+Rb0ob933IpHVaW"
] ]
}, },
{ {
...@@ -437,16 +417,16 @@ ...@@ -437,16 +417,16 @@
"top" "top"
], ],
"target": { "target": {
"__id__": 30 "__id__": 28
}, },
"targetInfo": { "targetInfo": {
"__id__": 33 "__id__": 31
} }
}, },
{ {
"__type__": "cc.TargetInfo", "__type__": "cc.TargetInfo",
"localID": [ "localID": [
"49vJjWyDlSg5SO/dJHjbmh" "3fjX4tiM9XiqeFm0MyZrGs"
] ]
}, },
{ {
...@@ -456,14 +436,14 @@ ...@@ -456,14 +436,14 @@
"__id__": 1 "__id__": 1
}, },
"_prefab": { "_prefab": {
"__id__": 35 "__id__": 33
}, },
"__editorExtras__": {} "__editorExtras__": {}
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 34 "__id__": 32
}, },
"asset": { "asset": {
"__uuid__": "e9d96308-84db-4157-8abd-43bd86b1b985", "__uuid__": "e9d96308-84db-4157-8abd-43bd86b1b985",
...@@ -471,14 +451,14 @@ ...@@ -471,14 +451,14 @@
}, },
"fileId": "6b9c9AH31BepEFqW2vpkx7", "fileId": "6b9c9AH31BepEFqW2vpkx7",
"instance": { "instance": {
"__id__": 36 "__id__": 34
}, },
"targetOverrides": [ "targetOverrides": [
{ {
"__id__": 44 "__id__": 42
}, },
{ {
"__id__": 47 "__id__": 45
} }
] ]
}, },
...@@ -492,19 +472,19 @@ ...@@ -492,19 +472,19 @@
"mountedComponents": [], "mountedComponents": [],
"propertyOverrides": [ "propertyOverrides": [
{ {
"__id__": 37 "__id__": 35
}, },
{ {
"__id__": 39 "__id__": 37
}, },
{ {
"__id__": 40 "__id__": 38
}, },
{ {
"__id__": 41 "__id__": 39
}, },
{ {
"__id__": 42 "__id__": 40
} }
], ],
"removedComponents": [] "removedComponents": []
...@@ -512,7 +492,7 @@ ...@@ -512,7 +492,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 38 "__id__": 36
}, },
"propertyPath": [ "propertyPath": [
"_name" "_name"
...@@ -528,7 +508,7 @@ ...@@ -528,7 +508,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 38 "__id__": 36
}, },
"propertyPath": [ "propertyPath": [
"_lpos" "_lpos"
...@@ -543,7 +523,7 @@ ...@@ -543,7 +523,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 38 "__id__": 36
}, },
"propertyPath": [ "propertyPath": [
"_lrot" "_lrot"
...@@ -559,7 +539,7 @@ ...@@ -559,7 +539,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 38 "__id__": 36
}, },
"propertyPath": [ "propertyPath": [
"_euler" "_euler"
...@@ -574,7 +554,7 @@ ...@@ -574,7 +554,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 43 "__id__": 41
}, },
"propertyPath": [ "propertyPath": [
"_carColor" "_carColor"
...@@ -595,10 +575,10 @@ ...@@ -595,10 +575,10 @@
"bodyMesh" "bodyMesh"
], ],
"target": { "target": {
"__id__": 45 "__id__": 43
}, },
"targetInfo": { "targetInfo": {
"__id__": 46 "__id__": 44
} }
}, },
{ {
...@@ -619,10 +599,10 @@ ...@@ -619,10 +599,10 @@
"top" "top"
], ],
"target": { "target": {
"__id__": 45 "__id__": 43
}, },
"targetInfo": { "targetInfo": {
"__id__": 48 "__id__": 46
} }
}, },
{ {
...@@ -638,14 +618,14 @@ ...@@ -638,14 +618,14 @@
"__id__": 1 "__id__": 1
}, },
"_prefab": { "_prefab": {
"__id__": 50 "__id__": 48
}, },
"__editorExtras__": {} "__editorExtras__": {}
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 49 "__id__": 47
}, },
"asset": { "asset": {
"__uuid__": "725a11fb-b865-4f16-b582-9bf848fd6a91", "__uuid__": "725a11fb-b865-4f16-b582-9bf848fd6a91",
...@@ -653,14 +633,14 @@ ...@@ -653,14 +633,14 @@
}, },
"fileId": "9cEQF8XeNI/5Zo+nRAEmT8", "fileId": "9cEQF8XeNI/5Zo+nRAEmT8",
"instance": { "instance": {
"__id__": 51 "__id__": 49
}, },
"targetOverrides": [ "targetOverrides": [
{ {
"__id__": 61 "__id__": 59
}, },
{ {
"__id__": 64 "__id__": 62
} }
] ]
}, },
...@@ -674,22 +654,22 @@ ...@@ -674,22 +654,22 @@
"mountedComponents": [], "mountedComponents": [],
"propertyOverrides": [ "propertyOverrides": [
{ {
"__id__": 52 "__id__": 50
}, },
{ {
"__id__": 54 "__id__": 52
}, },
{ {
"__id__": 55 "__id__": 53
}, },
{ {
"__id__": 56 "__id__": 54
}, },
{ {
"__id__": 57 "__id__": 55
}, },
{ {
"__id__": 59 "__id__": 57
} }
], ],
"removedComponents": [] "removedComponents": []
...@@ -697,7 +677,7 @@ ...@@ -697,7 +677,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 53 "__id__": 51
}, },
"propertyPath": [ "propertyPath": [
"_name" "_name"
...@@ -713,7 +693,7 @@ ...@@ -713,7 +693,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 53 "__id__": 51
}, },
"propertyPath": [ "propertyPath": [
"_lpos" "_lpos"
...@@ -728,7 +708,7 @@ ...@@ -728,7 +708,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 53 "__id__": 51
}, },
"propertyPath": [ "propertyPath": [
"_lrot" "_lrot"
...@@ -744,7 +724,7 @@ ...@@ -744,7 +724,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 53 "__id__": 51
}, },
"propertyPath": [ "propertyPath": [
"_euler" "_euler"
...@@ -759,7 +739,7 @@ ...@@ -759,7 +739,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 58 "__id__": 56
}, },
"propertyPath": [ "propertyPath": [
"_carColor" "_carColor"
...@@ -775,7 +755,7 @@ ...@@ -775,7 +755,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 60 "__id__": 58
}, },
"propertyPath": [ "propertyPath": [
"_active" "_active"
...@@ -797,10 +777,10 @@ ...@@ -797,10 +777,10 @@
"bodyMesh" "bodyMesh"
], ],
"target": { "target": {
"__id__": 62 "__id__": 60
}, },
"targetInfo": { "targetInfo": {
"__id__": 63 "__id__": 61
} }
}, },
{ {
...@@ -821,10 +801,10 @@ ...@@ -821,10 +801,10 @@
"top" "top"
], ],
"target": { "target": {
"__id__": 62 "__id__": 60
}, },
"targetInfo": { "targetInfo": {
"__id__": 65 "__id__": 63
} }
}, },
{ {
...@@ -843,13 +823,20 @@ ...@@ -843,13 +823,20 @@
}, },
"fileId": "42Z2ckGKdDSY/taLY7VCka", "fileId": "42Z2ckGKdDSY/taLY7VCka",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": [
{
"__id__": 65
},
{
"__id__": 68
}
],
"nestedPrefabInstanceRoots": [ "nestedPrefabInstanceRoots": [
{ {
"__id__": 49 "__id__": 47
}, },
{ {
"__id__": 34 "__id__": 32
}, },
{ {
"__id__": 17 "__id__": 17
...@@ -858,5 +845,67 @@ ...@@ -858,5 +845,67 @@
"__id__": 2 "__id__": 2
} }
] ]
},
{
"__type__": "cc.TargetOverrideInfo",
"source": {
"__id__": 17
},
"sourceInfo": {
"__id__": 66
},
"propertyPath": [
"bodyMesh"
],
"target": {
"__id__": 17
},
"targetInfo": {
"__id__": 67
}
},
{
"__type__": "cc.TargetInfo",
"localID": [
"6cFLC99U1Dl405ygHuNfbi"
]
},
{
"__type__": "cc.TargetInfo",
"localID": [
"cf/T5kTMtMGbZ+TffqEVBX",
"4bF5OMT+RXw6cUdkZefPcR"
]
},
{
"__type__": "cc.TargetOverrideInfo",
"source": {
"__id__": 17
},
"sourceInfo": {
"__id__": 69
},
"propertyPath": [
"top"
],
"target": {
"__id__": 17
},
"targetInfo": {
"__id__": 70
}
},
{
"__type__": "cc.TargetInfo",
"localID": [
"6cFLC99U1Dl405ygHuNfbi"
]
},
{
"__type__": "cc.TargetInfo",
"localID": [
"cf/T5kTMtMGbZ+TffqEVBX",
"fdy60pQTVT4YJabF3d41KH"
]
} }
] ]
\ No newline at end of file
...@@ -137,7 +137,7 @@ ...@@ -137,7 +137,7 @@
"a6c4d563-2f30-4a18-9d91-80eff8639cac@7c4b3" "a6c4d563-2f30-4a18-9d91-80eff8639cac@7c4b3"
] ]
}, },
"promoteSingleRootNode": true, "promoteSingleRootNode": false,
"meshOptimize": { "meshOptimize": {
"enable": true, "enable": true,
"vertexCache": true, "vertexCache": true,
......
...@@ -22,29 +22,29 @@ ...@@ -22,29 +22,29 @@
"__id__": 2 "__id__": 2
}, },
{ {
"__id__": 13 "__id__": 19
}, },
{ {
"__id__": 67 "__id__": 77
}, },
{ {
"__id__": 89 "__id__": 99
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 94 "__id__": 104
}, },
{ {
"__id__": 96 "__id__": 106
}, },
{ {
"__id__": 98 "__id__": 108
} }
], ],
"_prefab": { "_prefab": {
"__id__": 105 "__id__": 120
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
...@@ -117,16 +117,19 @@ ...@@ -117,16 +117,19 @@
"__id__": 7 "__id__": 7
}, },
{ {
"__id__": 8 "__id__": 9
}, },
{ {
"__id__": 9 "__id__": 11
},
{
"__id__": 13
}, },
{ {
"__id__": 10 "__id__": 15
}, },
{ {
"__id__": 11 "__id__": 17
} }
], ],
"removedComponents": [] "removedComponents": []
...@@ -150,7 +153,7 @@ ...@@ -150,7 +153,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 6 "__id__": 8
}, },
"propertyPath": [ "propertyPath": [
"_lpos" "_lpos"
...@@ -162,10 +165,16 @@ ...@@ -162,10 +165,16 @@
"z": 0 "z": 0
} }
}, },
{
"__type__": "cc.TargetInfo",
"localID": [
"0fOuNaZIxTkr3NQtn1FnIo"
]
},
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 6 "__id__": 10
}, },
"propertyPath": [ "propertyPath": [
"_lrot" "_lrot"
...@@ -178,10 +187,16 @@ ...@@ -178,10 +187,16 @@
"w": 1 "w": 1
} }
}, },
{
"__type__": "cc.TargetInfo",
"localID": [
"0fOuNaZIxTkr3NQtn1FnIo"
]
},
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 6 "__id__": 12
}, },
"propertyPath": [ "propertyPath": [
"_euler" "_euler"
...@@ -193,10 +208,16 @@ ...@@ -193,10 +208,16 @@
"z": 0 "z": 0
} }
}, },
{
"__type__": "cc.TargetInfo",
"localID": [
"0fOuNaZIxTkr3NQtn1FnIo"
]
},
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 6 "__id__": 14
}, },
"propertyPath": [ "propertyPath": [
"_lscale" "_lscale"
...@@ -208,20 +229,50 @@ ...@@ -208,20 +229,50 @@
"z": 7 "z": 7
} }
}, },
{
"__type__": "cc.TargetInfo",
"localID": [
"0fOuNaZIxTkr3NQtn1FnIo"
]
},
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 16
},
"propertyPath": [
"_materials",
"0"
],
"value": {
"__uuid__": "a6c4d563-2f30-4a18-9d91-80eff8639cac@ca88e",
"__expectedType__": "cc.Material"
}
},
{
"__type__": "cc.TargetInfo",
"localID": [
"a0jw0F0+Rb0ob933IpHVaW"
]
},
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 12 "__id__": 18
}, },
"propertyPath": [ "propertyPath": [
"_active" "_materials",
"0"
], ],
"value": true "value": {
"__uuid__": "0d2472bd-75d4-4674-8107-8db3d902af00",
"__expectedType__": "cc.Material"
}
}, },
{ {
"__type__": "cc.TargetInfo", "__type__": "cc.TargetInfo",
"localID": [ "localID": [
"fdE7fAsXxa/pRny7TsxqRp" "3fjX4tiM9XiqeFm0MyZrGs"
] ]
}, },
{ {
...@@ -234,22 +285,22 @@ ...@@ -234,22 +285,22 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 14 "__id__": 20
}, },
{ {
"__id__": 27 "__id__": 35
}, },
{ {
"__id__": 40 "__id__": 50
}, },
{ {
"__id__": 53 "__id__": 63
} }
], ],
"_active": true, "_active": true,
"_components": [], "_components": [],
"_prefab": { "_prefab": {
"__id__": 66 "__id__": 76
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
...@@ -284,17 +335,17 @@ ...@@ -284,17 +335,17 @@
"__type__": "cc.Node", "__type__": "cc.Node",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 13 "__id__": 19
}, },
"_prefab": { "_prefab": {
"__id__": 15 "__id__": 21
}, },
"__editorExtras__": {} "__editorExtras__": {}
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 14 "__id__": 20
}, },
"asset": { "asset": {
"__uuid__": "3b5660ad-e491-4c6f-8713-764d79a681dc@6aa50", "__uuid__": "3b5660ad-e491-4c6f-8713-764d79a681dc@6aa50",
...@@ -302,7 +353,7 @@ ...@@ -302,7 +353,7 @@
}, },
"fileId": "ebX5L0FLNbTZ0Z+4BCei0w", "fileId": "ebX5L0FLNbTZ0Z+4BCei0w",
"instance": { "instance": {
"__id__": 16 "__id__": 22
}, },
"targetOverrides": null "targetOverrides": null
}, },
...@@ -316,19 +367,22 @@ ...@@ -316,19 +367,22 @@
"mountedComponents": [], "mountedComponents": [],
"propertyOverrides": [ "propertyOverrides": [
{ {
"__id__": 17 "__id__": 23
}, },
{ {
"__id__": 19 "__id__": 25
}, },
{ {
"__id__": 21 "__id__": 27
}, },
{ {
"__id__": 23 "__id__": 29
}, },
{ {
"__id__": 25 "__id__": 31
},
{
"__id__": 33
} }
], ],
"removedComponents": [] "removedComponents": []
...@@ -336,7 +390,7 @@ ...@@ -336,7 +390,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 18 "__id__": 24
}, },
"propertyPath": [ "propertyPath": [
"_name" "_name"
...@@ -352,7 +406,7 @@ ...@@ -352,7 +406,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 20 "__id__": 26
}, },
"propertyPath": [ "propertyPath": [
"_lpos" "_lpos"
...@@ -373,7 +427,7 @@ ...@@ -373,7 +427,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 22 "__id__": 28
}, },
"propertyPath": [ "propertyPath": [
"_lrot" "_lrot"
...@@ -395,7 +449,7 @@ ...@@ -395,7 +449,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 24 "__id__": 30
}, },
"propertyPath": [ "propertyPath": [
"_euler" "_euler"
...@@ -416,7 +470,7 @@ ...@@ -416,7 +470,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 26 "__id__": 32
}, },
"propertyPath": [ "propertyPath": [
"_lscale" "_lscale"
...@@ -434,21 +488,41 @@ ...@@ -434,21 +488,41 @@
"ebX5L0FLNbTZ0Z+4BCei0w" "ebX5L0FLNbTZ0Z+4BCei0w"
] ]
}, },
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 34
},
"propertyPath": [
"_materials",
"0"
],
"value": {
"__uuid__": "3b5660ad-e491-4c6f-8713-764d79a681dc@ca88e",
"__expectedType__": "cc.Material"
}
},
{
"__type__": "cc.TargetInfo",
"localID": [
"5dgv+5oEBWYbAxMw4geeXb"
]
},
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 13 "__id__": 19
}, },
"_prefab": { "_prefab": {
"__id__": 28 "__id__": 36
}, },
"__editorExtras__": {} "__editorExtras__": {}
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 27 "__id__": 35
}, },
"asset": { "asset": {
"__uuid__": "3b5660ad-e491-4c6f-8713-764d79a681dc@6aa50", "__uuid__": "3b5660ad-e491-4c6f-8713-764d79a681dc@6aa50",
...@@ -456,7 +530,7 @@ ...@@ -456,7 +530,7 @@
}, },
"fileId": "ebX5L0FLNbTZ0Z+4BCei0w", "fileId": "ebX5L0FLNbTZ0Z+4BCei0w",
"instance": { "instance": {
"__id__": 29 "__id__": 37
}, },
"targetOverrides": null "targetOverrides": null
}, },
...@@ -470,19 +544,22 @@ ...@@ -470,19 +544,22 @@
"mountedComponents": [], "mountedComponents": [],
"propertyOverrides": [ "propertyOverrides": [
{ {
"__id__": 30 "__id__": 38
}, },
{ {
"__id__": 32 "__id__": 40
}, },
{ {
"__id__": 34 "__id__": 42
}, },
{ {
"__id__": 36 "__id__": 44
}, },
{ {
"__id__": 38 "__id__": 46
},
{
"__id__": 48
} }
], ],
"removedComponents": [] "removedComponents": []
...@@ -490,7 +567,7 @@ ...@@ -490,7 +567,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 31 "__id__": 39
}, },
"propertyPath": [ "propertyPath": [
"_name" "_name"
...@@ -506,7 +583,7 @@ ...@@ -506,7 +583,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 33 "__id__": 41
}, },
"propertyPath": [ "propertyPath": [
"_lpos" "_lpos"
...@@ -527,7 +604,7 @@ ...@@ -527,7 +604,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 35 "__id__": 43
}, },
"propertyPath": [ "propertyPath": [
"_lrot" "_lrot"
...@@ -549,7 +626,7 @@ ...@@ -549,7 +626,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 37 "__id__": 45
}, },
"propertyPath": [ "propertyPath": [
"_euler" "_euler"
...@@ -570,7 +647,7 @@ ...@@ -570,7 +647,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 39 "__id__": 47
}, },
"propertyPath": [ "propertyPath": [
"_lscale" "_lscale"
...@@ -588,21 +665,41 @@ ...@@ -588,21 +665,41 @@
"ebX5L0FLNbTZ0Z+4BCei0w" "ebX5L0FLNbTZ0Z+4BCei0w"
] ]
}, },
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 49
},
"propertyPath": [
"_materials",
"0"
],
"value": {
"__uuid__": "3b5660ad-e491-4c6f-8713-764d79a681dc@ca88e",
"__expectedType__": "cc.Material"
}
},
{
"__type__": "cc.TargetInfo",
"localID": [
"5dgv+5oEBWYbAxMw4geeXb"
]
},
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 13 "__id__": 19
}, },
"_prefab": { "_prefab": {
"__id__": 41 "__id__": 51
}, },
"__editorExtras__": {} "__editorExtras__": {}
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 40 "__id__": 50
}, },
"asset": { "asset": {
"__uuid__": "3b5660ad-e491-4c6f-8713-764d79a681dc@6aa50", "__uuid__": "3b5660ad-e491-4c6f-8713-764d79a681dc@6aa50",
...@@ -610,7 +707,7 @@ ...@@ -610,7 +707,7 @@
}, },
"fileId": "ebX5L0FLNbTZ0Z+4BCei0w", "fileId": "ebX5L0FLNbTZ0Z+4BCei0w",
"instance": { "instance": {
"__id__": 42 "__id__": 52
}, },
"targetOverrides": null "targetOverrides": null
}, },
...@@ -624,19 +721,19 @@ ...@@ -624,19 +721,19 @@
"mountedComponents": [], "mountedComponents": [],
"propertyOverrides": [ "propertyOverrides": [
{ {
"__id__": 43 "__id__": 53
}, },
{ {
"__id__": 45 "__id__": 55
}, },
{ {
"__id__": 47 "__id__": 57
}, },
{ {
"__id__": 49 "__id__": 59
}, },
{ {
"__id__": 51 "__id__": 61
} }
], ],
"removedComponents": [] "removedComponents": []
...@@ -644,7 +741,7 @@ ...@@ -644,7 +741,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 44 "__id__": 54
}, },
"propertyPath": [ "propertyPath": [
"_name" "_name"
...@@ -660,7 +757,7 @@ ...@@ -660,7 +757,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 46 "__id__": 56
}, },
"propertyPath": [ "propertyPath": [
"_lpos" "_lpos"
...@@ -681,7 +778,7 @@ ...@@ -681,7 +778,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 48 "__id__": 58
}, },
"propertyPath": [ "propertyPath": [
"_lrot" "_lrot"
...@@ -703,7 +800,7 @@ ...@@ -703,7 +800,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 50 "__id__": 60
}, },
"propertyPath": [ "propertyPath": [
"_euler" "_euler"
...@@ -724,7 +821,7 @@ ...@@ -724,7 +821,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 52 "__id__": 62
}, },
"propertyPath": [ "propertyPath": [
"_lscale" "_lscale"
...@@ -746,17 +843,17 @@ ...@@ -746,17 +843,17 @@
"__type__": "cc.Node", "__type__": "cc.Node",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 13 "__id__": 19
}, },
"_prefab": { "_prefab": {
"__id__": 54 "__id__": 64
}, },
"__editorExtras__": {} "__editorExtras__": {}
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 53 "__id__": 63
}, },
"asset": { "asset": {
"__uuid__": "3b5660ad-e491-4c6f-8713-764d79a681dc@6aa50", "__uuid__": "3b5660ad-e491-4c6f-8713-764d79a681dc@6aa50",
...@@ -764,7 +861,7 @@ ...@@ -764,7 +861,7 @@
}, },
"fileId": "ebX5L0FLNbTZ0Z+4BCei0w", "fileId": "ebX5L0FLNbTZ0Z+4BCei0w",
"instance": { "instance": {
"__id__": 55 "__id__": 65
}, },
"targetOverrides": null "targetOverrides": null
}, },
...@@ -778,19 +875,19 @@ ...@@ -778,19 +875,19 @@
"mountedComponents": [], "mountedComponents": [],
"propertyOverrides": [ "propertyOverrides": [
{ {
"__id__": 56 "__id__": 66
}, },
{ {
"__id__": 58 "__id__": 68
}, },
{ {
"__id__": 60 "__id__": 70
}, },
{ {
"__id__": 62 "__id__": 72
}, },
{ {
"__id__": 64 "__id__": 74
} }
], ],
"removedComponents": [] "removedComponents": []
...@@ -798,7 +895,7 @@ ...@@ -798,7 +895,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 57 "__id__": 67
}, },
"propertyPath": [ "propertyPath": [
"_name" "_name"
...@@ -814,7 +911,7 @@ ...@@ -814,7 +911,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 59 "__id__": 69
}, },
"propertyPath": [ "propertyPath": [
"_lpos" "_lpos"
...@@ -835,7 +932,7 @@ ...@@ -835,7 +932,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 61 "__id__": 71
}, },
"propertyPath": [ "propertyPath": [
"_lrot" "_lrot"
...@@ -857,7 +954,7 @@ ...@@ -857,7 +954,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 63 "__id__": 73
}, },
"propertyPath": [ "propertyPath": [
"_euler" "_euler"
...@@ -878,7 +975,7 @@ ...@@ -878,7 +975,7 @@
{ {
"__type__": "CCPropertyOverrideInfo", "__type__": "CCPropertyOverrideInfo",
"targetInfo": { "targetInfo": {
"__id__": 65 "__id__": 75
}, },
"propertyPath": [ "propertyPath": [
"_lscale" "_lscale"
...@@ -919,22 +1016,22 @@ ...@@ -919,22 +1016,22 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 68 "__id__": 78
}, },
{ {
"__id__": 73 "__id__": 83
}, },
{ {
"__id__": 78 "__id__": 88
}, },
{ {
"__id__": 83 "__id__": 93
} }
], ],
"_active": true, "_active": true,
"_components": [], "_components": [],
"_prefab": { "_prefab": {
"__id__": 88 "__id__": 98
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
...@@ -971,17 +1068,17 @@ ...@@ -971,17 +1068,17 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": { "_parent": {
"__id__": 67 "__id__": 77
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 69 "__id__": 79
} }
], ],
"_prefab": { "_prefab": {
"__id__": 72 "__id__": 82
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
...@@ -1018,11 +1115,11 @@ ...@@ -1018,11 +1115,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 68 "__id__": 78
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 70 "__id__": 80
}, },
"_materials": [ "_materials": [
{ {
...@@ -1032,7 +1129,7 @@ ...@@ -1032,7 +1129,7 @@
], ],
"_visFlags": 0, "_visFlags": 0,
"bakeSettings": { "bakeSettings": {
"__id__": 71 "__id__": 81
}, },
"_mesh": { "_mesh": {
"__uuid__": "c8349573-cd69-452d-acda-15354882576c@bc06f", "__uuid__": "c8349573-cd69-452d-acda-15354882576c@bc06f",
...@@ -1092,17 +1189,17 @@ ...@@ -1092,17 +1189,17 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": { "_parent": {
"__id__": 67 "__id__": 77
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 74 "__id__": 84
} }
], ],
"_prefab": { "_prefab": {
"__id__": 77 "__id__": 87
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
...@@ -1139,11 +1236,11 @@ ...@@ -1139,11 +1236,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 73 "__id__": 83
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 75 "__id__": 85
}, },
"_materials": [ "_materials": [
{ {
...@@ -1153,7 +1250,7 @@ ...@@ -1153,7 +1250,7 @@
], ],
"_visFlags": 0, "_visFlags": 0,
"bakeSettings": { "bakeSettings": {
"__id__": 76 "__id__": 86
}, },
"_mesh": { "_mesh": {
"__uuid__": "c8349573-cd69-452d-acda-15354882576c@bc06f", "__uuid__": "c8349573-cd69-452d-acda-15354882576c@bc06f",
...@@ -1213,17 +1310,17 @@ ...@@ -1213,17 +1310,17 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": { "_parent": {
"__id__": 67 "__id__": 77
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 79 "__id__": 89
} }
], ],
"_prefab": { "_prefab": {
"__id__": 82 "__id__": 92
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
...@@ -1260,11 +1357,11 @@ ...@@ -1260,11 +1357,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 78 "__id__": 88
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 80 "__id__": 90
}, },
"_materials": [ "_materials": [
{ {
...@@ -1274,7 +1371,7 @@ ...@@ -1274,7 +1371,7 @@
], ],
"_visFlags": 0, "_visFlags": 0,
"bakeSettings": { "bakeSettings": {
"__id__": 81 "__id__": 91
}, },
"_mesh": { "_mesh": {
"__uuid__": "c8349573-cd69-452d-acda-15354882576c@bc06f", "__uuid__": "c8349573-cd69-452d-acda-15354882576c@bc06f",
...@@ -1334,17 +1431,17 @@ ...@@ -1334,17 +1431,17 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": { "_parent": {
"__id__": 67 "__id__": 77
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 84 "__id__": 94
} }
], ],
"_prefab": { "_prefab": {
"__id__": 87 "__id__": 97
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
...@@ -1381,11 +1478,11 @@ ...@@ -1381,11 +1478,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 83 "__id__": 93
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 85 "__id__": 95
}, },
"_materials": [ "_materials": [
{ {
...@@ -1395,7 +1492,7 @@ ...@@ -1395,7 +1492,7 @@
], ],
"_visFlags": 0, "_visFlags": 0,
"bakeSettings": { "bakeSettings": {
"__id__": 86 "__id__": 96
}, },
"_mesh": { "_mesh": {
"__uuid__": "c8349573-cd69-452d-acda-15354882576c@bc06f", "__uuid__": "c8349573-cd69-452d-acda-15354882576c@bc06f",
...@@ -1474,11 +1571,11 @@ ...@@ -1474,11 +1571,11 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 90 "__id__": 100
} }
], ],
"_prefab": { "_prefab": {
"__id__": 93 "__id__": 103
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
...@@ -1515,11 +1612,11 @@ ...@@ -1515,11 +1612,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 89 "__id__": 99
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 91 "__id__": 101
}, },
"_materials": [ "_materials": [
{ {
...@@ -1529,7 +1626,7 @@ ...@@ -1529,7 +1626,7 @@
], ],
"_visFlags": 0, "_visFlags": 0,
"bakeSettings": { "bakeSettings": {
"__id__": 92 "__id__": 102
}, },
"_mesh": { "_mesh": {
"__uuid__": "1263d74c-8167-4928-91a6-4e2672411f47@2e76e", "__uuid__": "1263d74c-8167-4928-91a6-4e2672411f47@2e76e",
...@@ -1593,7 +1690,7 @@ ...@@ -1593,7 +1690,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 95 "__id__": 105
}, },
"_group": 2, "_group": 2,
"_type": 4, "_type": 4,
...@@ -1630,7 +1727,7 @@ ...@@ -1630,7 +1727,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 97 "__id__": 107
}, },
"_material": null, "_material": null,
"_isTrigger": true, "_isTrigger": true,
...@@ -1662,7 +1759,7 @@ ...@@ -1662,7 +1759,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 99 "__id__": 109
}, },
"carType": 0, "carType": 0,
"_carColor": 0, "_carColor": 0,
...@@ -1700,9 +1797,11 @@ ...@@ -1700,9 +1797,11 @@
"__expectedType__": "cc.Material" "__expectedType__": "cc.Material"
} }
], ],
"bodyMesh": null, "bodyMesh": {
"__id__": 110
},
"top": { "top": {
"__id__": 100 "__id__": 113
}, },
"_id": "" "_id": ""
}, },
...@@ -1716,24 +1815,24 @@ ...@@ -1716,24 +1815,24 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 101 "__id__": 111
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 103 "__id__": 118
}, },
"_materials": [ "_materials": [
{ {
"__uuid__": "0d2472bd-75d4-4674-8107-8db3d902af00", "__uuid__": "a6c4d563-2f30-4a18-9d91-80eff8639cac@ca88e",
"__expectedType__": "cc.Material" "__expectedType__": "cc.Material"
} }
], ],
"_visFlags": 0, "_visFlags": 0,
"bakeSettings": { "bakeSettings": {
"__id__": 104 "__id__": 119
}, },
"_mesh": { "_mesh": {
"__uuid__": "a6c4d563-2f30-4a18-9d91-80eff8639cac@b4725", "__uuid__": "a6c4d563-2f30-4a18-9d91-80eff8639cac@24e8c",
"__expectedType__": "cc.Mesh" "__expectedType__": "cc.Mesh"
}, },
"_shadowCastingMode": 0, "_shadowCastingMode": 0,
...@@ -1749,21 +1848,72 @@ ...@@ -1749,21 +1848,72 @@
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "top", "_name": "Veh_Sedan_01",
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": { "_parent": {
"__id__": 2 "__id__": 2
}, },
"_children": [
{
"__id__": 112
}
],
"_active": true,
"_components": [
{
"__id__": 110
}
],
"_prefab": {
"__id__": 117
},
"_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": 1073741824,
"_euler": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_id": ""
},
{
"__type__": "cc.Node",
"_name": "top",
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 111
},
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 100 "__id__": 113
} }
], ],
"_prefab": { "_prefab": {
"__id__": 102 "__id__": 116
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
...@@ -1794,6 +1944,67 @@ ...@@ -1794,6 +1944,67 @@
}, },
"_id": "" "_id": ""
}, },
{
"__type__": "cc.MeshRenderer",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 112
},
"_enabled": true,
"__prefab": {
"__id__": 114
},
"_materials": [
{
"__uuid__": "a6c4d563-2f30-4a18-9d91-80eff8639cac@ca88e",
"__expectedType__": "cc.Material"
}
],
"_visFlags": 0,
"bakeSettings": {
"__id__": 115
},
"_mesh": {
"__uuid__": "a6c4d563-2f30-4a18-9d91-80eff8639cac@b4725",
"__expectedType__": "cc.Mesh"
},
"_shadowCastingMode": 0,
"_shadowReceivingMode": 1,
"_shadowBias": 0,
"_shadowNormalBias": 0,
"_reflectionProbeId": -1,
"_reflectionProbeBlendId": -1,
"_reflectionProbeBlendWeight": 0,
"_enabledGlobalStandardSkinObject": false,
"_enableMorph": true,
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "3fjX4tiM9XiqeFm0MyZrGs"
},
{
"__type__": "cc.ModelBakeSettings",
"texture": null,
"uvParam": {
"__type__": "cc.Vec4",
"x": 0,
"y": 0,
"z": 0,
"w": 0
},
"_bakeable": false,
"_castShadow": false,
"_receiveShadow": false,
"_recieveShadow": false,
"_lightmapSize": 64,
"_useLightProbe": false,
"_bakeToLightProbe": true,
"_reflectionProbeType": 0,
"_bakeToReflectionProbe": true
},
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
...@@ -1802,14 +2013,23 @@ ...@@ -1802,14 +2013,23 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "fdE7fAsXxa/pRny7TsxqRp", "fileId": "8aBjXlWplTfY+BohaKpSrn",
"instance": null, "nestedPrefabInstanceRoots": null
"targetOverrides": null, },
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 1
},
"asset": {
"__id__": 0
},
"fileId": "acaXsayZZXfLxumcT1J5+t",
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "fdy60pQTVT4YJabF3d41KH" "fileId": "a0jw0F0+Rb0ob933IpHVaW"
}, },
{ {
"__type__": "cc.ModelBakeSettings", "__type__": "cc.ModelBakeSettings",
...@@ -1843,24 +2063,24 @@ ...@@ -1843,24 +2063,24 @@
"instance": null, "instance": null,
"targetOverrides": [ "targetOverrides": [
{ {
"__id__": 106 "__id__": 121
}, },
{ {
"__id__": 108 "__id__": 123
} }
], ],
"nestedPrefabInstanceRoots": [ "nestedPrefabInstanceRoots": [
{ {
"__id__": 53 "__id__": 63
}, },
{ {
"__id__": 40 "__id__": 50
}, },
{ {
"__id__": 27 "__id__": 35
}, },
{ {
"__id__": 14 "__id__": 20
}, },
{ {
"__id__": 2 "__id__": 2
...@@ -1870,7 +2090,7 @@ ...@@ -1870,7 +2090,7 @@
{ {
"__type__": "cc.TargetOverrideInfo", "__type__": "cc.TargetOverrideInfo",
"source": { "source": {
"__id__": 98 "__id__": 108
}, },
"sourceInfo": null, "sourceInfo": null,
"propertyPath": [ "propertyPath": [
...@@ -1880,19 +2100,19 @@ ...@@ -1880,19 +2100,19 @@
"__id__": 2 "__id__": 2
}, },
"targetInfo": { "targetInfo": {
"__id__": 107 "__id__": 122
} }
}, },
{ {
"__type__": "cc.TargetInfo", "__type__": "cc.TargetInfo",
"localID": [ "localID": [
"4bF5OMT+RXw6cUdkZefPcR" "a0jw0F0+Rb0ob933IpHVaW"
] ]
}, },
{ {
"__type__": "cc.TargetOverrideInfo", "__type__": "cc.TargetOverrideInfo",
"source": { "source": {
"__id__": 98 "__id__": 108
}, },
"sourceInfo": null, "sourceInfo": null,
"propertyPath": [ "propertyPath": [
...@@ -1902,13 +2122,13 @@ ...@@ -1902,13 +2122,13 @@
"__id__": 2 "__id__": 2
}, },
"targetInfo": { "targetInfo": {
"__id__": 109 "__id__": 124
} }
}, },
{ {
"__type__": "cc.TargetInfo", "__type__": "cc.TargetInfo",
"localID": [ "localID": [
"fdy60pQTVT4YJabF3d41KH" "3fjX4tiM9XiqeFm0MyZrGs"
] ]
} }
] ]
\ No newline at end of file
...@@ -23,45 +23,45 @@ const { ccclass, property, executeInEditMode } = _decorator; ...@@ -23,45 +23,45 @@ const { ccclass, property, executeInEditMode } = _decorator;
@executeInEditMode @executeInEditMode
export class CarCarColorsComponent extends Component { export class CarCarColorsComponent extends Component {
@property({ type: Enum(CarTypes) }) @property({ type: Enum(CarTypes) })
carType: CarTypes = CarTypes.CAR10 carType: CarTypes = CarTypes.CAR10;
@property({ type: Enum(CarColors) }) @property({ type: Enum(CarColors) })
get carColor() { get carColor() {
return this._carColor return this._carColor;
} }
set carColor(value) { set carColor(value) {
this._carColor = value this._carColor = value;
this.changeColor() this.changeColor();
} }
@property({ type: Enum(CarColors) }) @property({ type: Enum(CarColors) })
private _carColor: CarColors = CarColors.Purple private _carColor: CarColors = CarColors.Purple;
@property({ @property({
type: [Material] type: [Material]
}) })
colorMaterials: Array<Material> = [] colorMaterials: Array<Material> = [];
@property(MeshRenderer) bodyMesh: MeshRenderer = null @property(MeshRenderer) bodyMesh: MeshRenderer = null;
@property(MeshRenderer) top: MeshRenderer = null @property(MeshRenderer) top: MeshRenderer = null;
get sitNum() { get sitNum() {
return this.node.getChildByName("Seets").children.length; return this.node.getChildByName("Seets").children.length;
} }
halfLen: number = 2 halfLen: number = 2;
roleNum: number = 0 roleNum: number = 0;
isFull: boolean = false isFull: boolean = false;
tweenCount = 0 tweenCount = 0;
onLoad() { onLoad() {
this.changeColor() this.changeColor();
this.halfLen = this.getComponent(BoxCollider).size.z / 2; this.halfLen = this.getComponent(BoxCollider).size.z / 2;
this.roleNum = 0 this.roleNum = 0;
this.isFull = false this.isFull = false;
} }
changeColor() { changeColor() {
...@@ -72,12 +72,12 @@ export class CarCarColorsComponent extends Component { ...@@ -72,12 +72,12 @@ export class CarCarColorsComponent extends Component {
this.bodyMesh.setSharedMaterial(this.colorMaterials[this.carColor], 1); this.bodyMesh.setSharedMaterial(this.colorMaterials[this.carColor], 1);
this.top.setSharedMaterial(this.colorMaterials[this.carColor], this.top.materials.length - 1); this.top.setSharedMaterial(this.colorMaterials[this.carColor], this.top.materials.length - 1);
this.node.getChildByName("arrow").active = true this.node.getChildByName("arrow").active = true;
tween(this.node) tween(this.node)
.to(0.2, { scale: new Vec3(1.4, 1.4, 1.4) }) .to(0.2, { scale: new Vec3(1.4, 1.4, 1.4) })
.to(0.2, { scale: new Vec3(0.95, 0.95, 0.95) }) .to(0.2, { scale: new Vec3(0.95, 0.95, 0.95) })
.start() .start();
} }
addRole(role: Node): boolean { addRole(role: Node): boolean {
...@@ -87,38 +87,37 @@ export class CarCarColorsComponent extends Component { ...@@ -87,38 +87,37 @@ export class CarCarColorsComponent extends Component {
tween(role).to(0.2, { tween(role).to(0.2, {
position: new Vec3(0, 0, -0.1) position: new Vec3(0, 0, -0.1)
}).call(() => { }).call(() => {
this.tweenCount -= 1 this.tweenCount -= 1;
role.setScale(0.9, 0.9, 0.9) role.setScale(0.9, 0.9, 0.9);
role.setRotationFromEuler(0, 0, 0) role.setRotationFromEuler(0, 0, 0);
role.getComponent(RoleCarColorsComponent).playSit() role.getComponent(RoleCarColorsComponent).playSit();
if (this.tweenCount <= 0 && this.isFull) { if (this.tweenCount <= 0 && this.isFull) {
if (carPoint.getSiblingIndex() === 7) { if (carPoint.getSiblingIndex() === 7) {
carPoint.name = "lock" carPoint.name = "lock";
carPoint.children[0].children[0].active = false carPoint.children[0].children[0].active = false;
carPoint.children[0].children[1].active = true carPoint.children[0].children[1].active = true;
} else { } else {
carPoint.name = "empty" carPoint.name = "empty";
} }
this.carOutTween(carPoint) this.carOutTween(carPoint);
} }
}) }).start();
.start()
this.tweenCount += 1 this.tweenCount += 1;
this.roleNum += 1 this.roleNum += 1;
this.isFull = this.roleNum >= this.sitNum; this.isFull = this.roleNum >= this.sitNum;
return this.isFull return this.isFull;
} }
carOut() { carOut() {
this.node.getChildByName("Seets").children.forEach(seat => { this.node.getChildByName("Seets").children.forEach(seat => {
if (seat.children.length === 0) return if (seat.children.length === 0) return;
const roleCom = seat.children[0].getComponent(RoleCarColorsComponent) const roleCom = seat.children[0].getComponent(RoleCarColorsComponent);
CarColorsGlobalInstance.instance.roleSysterm.clearOne(roleCom) CarColorsGlobalInstance.instance.roleSysterm.clearOne(roleCom);
}) });
CarColorsGlobalInstance.instance.carSysterm.removeCar(this.node) CarColorsGlobalInstance.instance.carSysterm.removeCar(this.node);
this.node.removeFromParent() this.node.removeFromParent();
this.node.destroy() this.node.destroy();
// console.log("carOut:", find("Scene/Levels").children.length, find("Scene/Levels").children[0].children.length, find("Scene/Roles").children.length) // console.log("carOut:", find("Scene/Levels").children.length, find("Scene/Levels").children[0].children.length, find("Scene/Roles").children.length)
// 判定胜利 // 判定胜利
...@@ -132,25 +131,26 @@ export class CarCarColorsComponent extends Component { ...@@ -132,25 +131,26 @@ export class CarCarColorsComponent extends Component {
// 车离开 // 车离开
carOutTween(target: Node) { carOutTween(target: Node) {
tween(this.node).to(0.2, { tween(this.node)
worldPosition: target.getWorldPosition() .to(0.2, {
}) worldPosition: target.getWorldPosition()
})
.call(() => { .call(() => {
const carforward = this.node.forward.clone() const carforward = this.node.forward.clone();
tween(carforward).to(0.1, { x: -1, y: 0, z: 0 }, { tween(carforward).to(0.1, { x: -1, y: 0, z: 0 }, {
onUpdate: () => { onUpdate: () => {
this.node.forward = carforward this.node.forward = carforward;
} }
}).start() }).start();
}) })
.delay(0.1) .delay(0.1)
.to(0.2, { .to(0.2, {
worldPosition: find("Scene/physicRoodTop/rightPoint").getWorldPosition() worldPosition: find("Scene/physicRoodTop/rightPoint").getWorldPosition(),
}) })
.call(() => { .call(() => {
this.carOut() this.carOut();
}) })
.start() .start();
} }
} }
......
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