Skip to content

C
car
Commit e99ddb39 authored by haiyoucuv's avatar haiyoucuv
Browse files
Options

init

parent 2972f601
Show whitespace changes
Inline Side-by-side
Showing with 4402 additions and 2947 deletions
assets/Bundles/MainGame/Levels/level1.prefab
View file @ e99ddb39
......@@ -333,9 +333,9 @@
],
"value": {
"__type__": "cc.Vec3",
"x": -1.446,
"x": -1.618,
"y": 0,
"z": -1.446
"z": -1.618
}
},
{
......
assets/Bundles/MainGame/Levels/level2.prefab
View file @ e99ddb39
This source diff could not be displayed because it is too large. You can view the blob instead.
assets/Bundles/MainGame/Levels/level3.prefab
View file @ e99ddb39
This source diff could not be displayed because it is too large. You can view the blob instead.
assets/Bundles/MainGame/model/Veh_Sedan_01/Veh_Sedan_01.gltf
View file @ e99ddb39
{"asset":{"version":"2.0","generator":"babylon.js glTF exporter for Autodesk MAYA 2022 v20220628.1"},"scene":0,"scenes":[{"nodes":[0]}],"nodes":[{"children":[1],"mesh":0,"name":"Veh_Sedan_01"},{"mesh":1,"name":"top"}],"meshes":[{"primitives":[{"attributes":{"POSITION":1,"TANGENT":2,"NORMAL":3,"TEXCOORD_0":4},"indices":0,"material":0}],"name":"Veh_Sedan_01"},{"primitives":[{"attributes":{"POSITION":6,"TANGENT":7,"NORMAL":8,"TEXCOORD_0":9},"indices":5,"material":0}],"name":"top"}],"accessors":[{"bufferView":0,"componentType":5123,"count":4098,"type":"SCALAR","name":"accessorIndices"},{"bufferView":1,"componentType":5126,"count":1089,"max":[0.100601807,0.1400902,0.232108772],"min":[-0.100601807,0.01729396,-0.236969948],"type":"VEC3","name":"accessorPositions"},{"bufferView":2,"componentType":5126,"count":1089,"type":"VEC4","name":"accessorTangents"},{"bufferView":1,"byteOffset":13068,"componentType":5126,"count":1089,"type":"VEC3","name":"accessorNormals"},{"bufferView":3,"componentType":5126,"count":1089,"type":"VEC2","name":"accessorUVs"},{"bufferView":0,"byteOffset":8196,"componentType":5123,"count":48,"type":"SCALAR","name":"accessorIndices"},{"bufferView":1,"byteOffset":26136,"componentType":5126,"count":15,"max":[0.0566301681,0.142031014,0.03105983],"min":[-0.0566301681,0.130170673,-0.1248754],"type":"VEC3","name":"accessorPositions"},{"bufferView":2,"byteOffset":17424,"componentType":5126,"count":15,"type":"VEC4","name":"accessorTangents"},{"bufferView":1,"byteOffset":26316,"componentType":5126,"count":15,"type":"VEC3","name":"accessorNormals"},{"bufferView":3,"byteOffset":8712,"componentType":5126,"count":15,"type":"VEC2","name":"accessorUVs"}],"bufferViews":[{"buffer":0,"byteLength":8292,"name":"bufferViewScalar"},{"buffer":0,"byteOffset":8292,"byteLength":26496,"byteStride":12,"name":"bufferViewFloatVec3"},{"buffer":0,"byteOffset":34788,"byteLength":17664,"byteStride":16,"name":"bufferViewFloatVec4"},{"buffer":0,"byteOffset":52452,"byteLength":8832,"byteStride":8,"name":"bufferViewFloatVec2"}],"buffers":[{"uri":"Veh_Sedan_01.bin","byteLength":61284}],"materials":[{"pbrMetallicRoughness":{"baseColorTexture":{"index":0},"metallicFactor":0.0,"roughnessFactor":0.450053632},"name":"Material001"}],"textures":[{"sampler":0,"source":0,"name":"city_vehicles_pallete.jpg"}],"images":[{"uri":"city_vehicles_pallete.jpg"}],"samplers":[{"magFilter":9729,"minFilter":9987}]}
\ No newline at end of file
{"asset":{"version":"2.0","generator":"babylon.js glTF exporter for Autodesk MAYA 2022 v20220628.1"},"scene":0,"scenes":[{"nodes":[0]}],"nodes":[{"children":[1],"mesh":0,"name":"Veh_Sedan_01"},{"mesh":1,"name":"top"}],"meshes":[{"primitives":[{"attributes":{"POSITION":1,"TANGENT":2,"NORMAL":3,"TEXCOORD_0":4},"indices":0,"material":0},{"attributes":{"POSITION":6,"TANGENT":7,"NORMAL":8,"TEXCOORD_0":9},"indices":5,"material":1}],"name":"Veh_Sedan_01"},{"primitives":[{"attributes":{"POSITION":11,"TANGENT":12,"NORMAL":13,"TEXCOORD_0":14},"indices":10,"material":1}],"name":"top"}],"accessors":[{"bufferView":0,"componentType":5123,"count":915,"type":"SCALAR","name":"accessorIndices"},{"bufferView":1,"componentType":5126,"count":252,"max":[0.0842952356,0.134458154,0.2244528],"min":[-0.08429641,0.0185105335,-0.226317689],"type":"VEC3","name":"accessorPositions"},{"bufferView":2,"componentType":5126,"count":252,"type":"VEC4","name":"accessorTangents"},{"bufferView":1,"byteOffset":3024,"componentType":5126,"count":252,"type":"VEC3","name":"accessorNormals"},{"bufferView":3,"componentType":5126,"count":252,"type":"VEC2","name":"accessorUVs"},{"bufferView":0,"byteOffset":1832,"componentType":5123,"count":3153,"type":"SCALAR","name":"accessorIndices"},{"bufferView":1,"byteOffset":6048,"componentType":5126,"count":852,"max":[0.100601807,0.1400902,0.232108772],"min":[-0.100601807,0.01729396,-0.236969948],"type":"VEC3","name":"accessorPositions"},{"bufferView":2,"byteOffset":4032,"componentType":5126,"count":852,"type":"VEC4","name":"accessorTangents"},{"bufferView":1,"byteOffset":16272,"componentType":5126,"count":852,"type":"VEC3","name":"accessorNormals"},{"bufferView":3,"byteOffset":2016,"componentType":5126,"count":852,"type":"VEC2","name":"accessorUVs"},{"bufferView":0,"byteOffset":8140,"componentType":5123,"count":48,"type":"SCALAR","name":"accessorIndices"},{"bufferView":1,"byteOffset":26496,"componentType":5126,"count":15,"max":[0.0566301681,0.142031014,0.03105983],"min":[-0.0566301681,0.130170673,-0.1248754],"type":"VEC3","name":"accessorPositions"},{"bufferView":2,"byteOffset":17664,"componentType":5126,"count":15,"type":"VEC4","name":"accessorTangents"},{"bufferView":1,"byteOffset":26676,"componentType":5126,"count":15,"type":"VEC3","name":"accessorNormals"},{"bufferView":3,"byteOffset":8832,"componentType":5126,"count":15,"type":"VEC2","name":"accessorUVs"}],"bufferViews":[{"buffer":0,"byteLength":8236,"name":"bufferViewScalar"},{"buffer":0,"byteOffset":8236,"byteLength":26856,"byteStride":12,"name":"bufferViewFloatVec3"},{"buffer":0,"byteOffset":35092,"byteLength":17904,"byteStride":16,"name":"bufferViewFloatVec4"},{"buffer":0,"byteOffset":52996,"byteLength":8952,"byteStride":8,"name":"bufferViewFloatVec2"}],"buffers":[{"uri":"Veh_Sedan_01.bin","byteLength":61948}],"materials":[{"pbrMetallicRoughness":{"baseColorFactor":[0.0,0.0,0.0,1.0],"metallicFactor":0.0,"roughnessFactor":0.450053632},"name":"lambert2"},{"pbrMetallicRoughness":{"baseColorTexture":{"index":0},"metallicFactor":0.0,"roughnessFactor":0.450053632},"name":"Material001"}],"textures":[{"sampler":0,"source":0,"name":"city_vehicles_pallete.jpg"}],"images":[{"uri":"city_vehicles_pallete.jpg"}],"samplers":[{"magFilter":9729,"minFilter":9987}]}
\ No newline at end of file
assets/Bundles/MainGame/model/Veh_Sedan_01/Veh_Sedan_01.gltf.meta
View file @ e99ddb39
......@@ -13,7 +13,7 @@
"name": "Veh_Sedan_01.mesh",
"userData": {
"gltfIndex": 0,
"triangleCount": 1366
"triangleCount": 1356
},
"ver": "1.1.1",
"imported": true,
......@@ -64,6 +64,22 @@
],
"subMetas": {}
},
"7a3ca": {
"importer": "gltf-material",
"uuid": "a6c4d563-2f30-4a18-9d91-80eff8639cac@7a3ca",
"displayName": "",
"id": "7a3ca",
"name": "lambert2.material",
"userData": {
"gltfIndex": 0
},
"ver": "1.0.14",
"imported": true,
"files": [
".json"
],
"subMetas": {}
},
"ca88e": {
"importer": "gltf-material",
"uuid": "a6c4d563-2f30-4a18-9d91-80eff8639cac@ca88e",
......@@ -71,7 +87,7 @@
"id": "ca88e",
"name": "Material001.material",
"userData": {
"gltfIndex": 0
"gltfIndex": 1
},
"ver": "1.0.14",
"imported": true,
......@@ -131,6 +147,7 @@
"a6c4d563-2f30-4a18-9d91-80eff8639cac@1d4f8"
],
"materials": [
"a6c4d563-2f30-4a18-9d91-80eff8639cac@7a3ca",
"a6c4d563-2f30-4a18-9d91-80eff8639cac@ca88e"
],
"scenes": [
......
assets/Bundles/MainGame/model/Veh_Sedan_01/city_vehicles_pallete.jpg.meta
View file @ e99ddb39
......@@ -15,14 +15,14 @@
"id": "6c48a",
"name": "texture",
"userData": {
"wrapModeS": "clamp-to-edge",
"wrapModeT": "clamp-to-edge",
"wrapModeS": "repeat",
"wrapModeT": "repeat",
"imageUuidOrDatabaseUri": "c193315b-621b-4f68-85fb-e8abcc65bddc",
"isUuid": true,
"visible": false,
"minfilter": "linear",
"magfilter": "linear",
"mipfilter": "none",
"mipfilter": "nearest",
"anisotropy": 0
},
"ver": "1.0.22",
......@@ -31,102 +31,10 @@
".json"
],
"subMetas": {}
},
"f9941": {
"importer": "sprite-frame",
"uuid": "c193315b-621b-4f68-85fb-e8abcc65bddc@f9941",
"displayName": "city_vehicles_pallete",
"id": "f9941",
"name": "spriteFrame",
"userData": {
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 256,
"height": 256,
"rawWidth": 256,
"rawHeight": 256,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"packable": true,
"pixelsToUnit": 100,
"pivotX": 0.5,
"pivotY": 0.5,
"meshType": 0,
"vertices": {
"rawPosition": [
-128,
-128,
0,
128,
-128,
0,
-128,
128,
0,
128,
128,
0
],
"indexes": [
0,
1,
2,
2,
1,
3
],
"uv": [
0,
256,
256,
256,
0,
0,
256,
0
],
"nuv": [
0,
0,
1,
0,
0,
1,
1,
1
],
"minPos": [
-128,
-128,
0
],
"maxPos": [
128,
128,
0
]
},
"isUuid": true,
"imageUuidOrDatabaseUri": "c193315b-621b-4f68-85fb-e8abcc65bddc@6c48a",
"atlasUuid": "",
"trimType": "auto"
},
"ver": "1.0.12",
"imported": true,
"files": [
".json"
],
"subMetas": {}
}
},
"userData": {
"type": "sprite-frame",
"type": "texture",
"hasAlpha": false,
"fixAlphaTransparencyArtifacts": false,
"redirect": "c193315b-621b-4f68-85fb-e8abcc65bddc@6c48a"
......
assets/Bundles/MainGame/model/bus/bus_big_bule.gltf.meta
View file @ e99ddb39
......@@ -54,8 +54,8 @@
"magfilter": "linear",
"mipfilter": "linear",
"anisotropy": 0,
"isUuid": false,
"imageUuidOrDatabaseUri": "db://assets/Bundles/MainGame/model/bus/city_vehicles_pallete.jpg"
"isUuid": true,
"imageUuidOrDatabaseUri": "6b3afa2f-f34c-44b7-9297-59f20d9ceb91"
},
"ver": "1.0.22",
"imported": true,
......@@ -116,6 +116,7 @@
"userData": {
"imageMetas": [
{
"remap": "6b3afa2f-f34c-44b7-9297-59f20d9ceb91",
"uri": "db://assets/Bundles/MainGame/model/bus/city_vehicles_pallete.jpg"
}
],
......
assets/Bundles/MainGame/model/bus/city_vehicles_pallete.jpg.meta
View file @ e99ddb39
......@@ -15,14 +15,14 @@
"id": "6c48a",
"name": "texture",
"userData": {
"wrapModeS": "clamp-to-edge",
"wrapModeT": "clamp-to-edge",
"wrapModeS": "repeat",
"wrapModeT": "repeat",
"imageUuidOrDatabaseUri": "6b3afa2f-f34c-44b7-9297-59f20d9ceb91",
"isUuid": true,
"visible": false,
"minfilter": "linear",
"magfilter": "linear",
"mipfilter": "none",
"mipfilter": "nearest",
"anisotropy": 0
},
"ver": "1.0.22",
......@@ -31,102 +31,10 @@
".json"
],
"subMetas": {}
},
"f9941": {
"importer": "sprite-frame",
"uuid": "6b3afa2f-f34c-44b7-9297-59f20d9ceb91@f9941",
"displayName": "city_vehicles_pallete",
"id": "f9941",
"name": "spriteFrame",
"userData": {
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 256,
"height": 256,
"rawWidth": 256,
"rawHeight": 256,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"packable": true,
"pixelsToUnit": 100,
"pivotX": 0.5,
"pivotY": 0.5,
"meshType": 0,
"vertices": {
"rawPosition": [
-128,
-128,
0,
128,
-128,
0,
-128,
128,
0,
128,
128,
0
],
"indexes": [
0,
1,
2,
2,
1,
3
],
"uv": [
0,
256,
256,
256,
0,
0,
256,
0
],
"nuv": [
0,
0,
1,
0,
0,
1,
1,
1
],
"minPos": [
-128,
-128,
0
],
"maxPos": [
128,
128,
0
]
},
"isUuid": true,
"imageUuidOrDatabaseUri": "6b3afa2f-f34c-44b7-9297-59f20d9ceb91@6c48a",
"atlasUuid": "",
"trimType": "auto"
},
"ver": "1.0.12",
"imported": true,
"files": [
".json"
],
"subMetas": {}
}
},
"userData": {
"type": "sprite-frame",
"type": "texture",
"hasAlpha": false,
"fixAlphaTransparencyArtifacts": false,
"redirect": "6b3afa2f-f34c-44b7-9297-59f20d9ceb91@6c48a"
......
assets/Bundles/MainGame/prefab/Car4.prefab
View file @ e99ddb39
......@@ -22,29 +22,29 @@
"__id__": 2
},
{
"__id__": 19
"__id__": 13
},
{
"__id__": 77
"__id__": 75
},
{
"__id__": 99
"__id__": 97
}
],
"_active": true,
"_components": [
{
"__id__": 104
"__id__": 102
},
{
"__id__": 106
"__id__": 104
},
{
"__id__": 108
"__id__": 106
}
],
"_prefab": {
"__id__": 120
"__id__": 118
},
"_lpos": {
"__type__": "cc.Vec3",
......@@ -103,7 +103,7 @@
},
{
"__type__": "cc.PrefabInstance",
"fileId": "cf/T5kTMtMGbZ+TffqEVBX",
"fileId": "2dniwwVTZE6ps8pUWbzbm8",
"prefabRootNode": {
"__id__": 1
},
......@@ -117,19 +117,16 @@
"__id__": 7
},
{
"__id__": 9
},
{
"__id__": 11
"__id__": 8
},
{
"__id__": 13
"__id__": 9
},
{
"__id__": 15
"__id__": 10
},
{
"__id__": 17
"__id__": 11
}
],
"removedComponents": []
......@@ -153,7 +150,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 8
"__id__": 6
},
"propertyPath": [
"_lpos"
......@@ -165,16 +162,10 @@
"z": 0
}
},
{
"__type__": "cc.TargetInfo",
"localID": [
"0fOuNaZIxTkr3NQtn1FnIo"
]
},
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 10
"__id__": 6
},
"propertyPath": [
"_lrot"
......@@ -187,16 +178,10 @@
"w": 1
}
},
{
"__type__": "cc.TargetInfo",
"localID": [
"0fOuNaZIxTkr3NQtn1FnIo"
]
},
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 12
"__id__": 6
},
"propertyPath": [
"_euler"
......@@ -208,71 +193,35 @@
"z": 0
}
},
{
"__type__": "cc.TargetInfo",
"localID": [
"0fOuNaZIxTkr3NQtn1FnIo"
]
},
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 14
"__id__": 6
},
"propertyPath": [
"_lscale"
],
"value": {
"__type__": "cc.Vec3",
"x": 7,
"y": 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"
"x": 7.5,
"y": 7.5,
"z": 7.5
}
},
{
"__type__": "cc.TargetInfo",
"localID": [
"a0jw0F0+Rb0ob933IpHVaW"
]
},
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 18
"__id__": 12
},
"propertyPath": [
"_materials",
"0"
"_active"
],
"value": {
"__uuid__": "0d2472bd-75d4-4674-8107-8db3d902af00",
"__expectedType__": "cc.Material"
}
"value": true
},
{
"__type__": "cc.TargetInfo",
"localID": [
"3fjX4tiM9XiqeFm0MyZrGs"
"8aBjXlWplTfY+BohaKpSrn"
]
},
{
......@@ -285,22 +234,22 @@
},
"_children": [
{
"__id__": 20
"__id__": 14
},
{
"__id__": 35
"__id__": 29
},
{
"__id__": 50
"__id__": 44
},
{
"__id__": 63
"__id__": 59
}
],
"_active": true,
"_components": [],
"_prefab": {
"__id__": 76
"__id__": 74
},
"_lpos": {
"__type__": "cc.Vec3",
......@@ -335,17 +284,17 @@
"__type__": "cc.Node",
"_objFlags": 0,
"_parent": {
"__id__": 19
"__id__": 13
},
"_prefab": {
"__id__": 21
"__id__": 15
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 20
"__id__": 14
},
"asset": {
"__uuid__": "3b5660ad-e491-4c6f-8713-764d79a681dc@6aa50",
......@@ -353,7 +302,7 @@
},
"fileId": "ebX5L0FLNbTZ0Z+4BCei0w",
"instance": {
"__id__": 22
"__id__": 16
},
"targetOverrides": null
},
......@@ -367,22 +316,22 @@
"mountedComponents": [],
"propertyOverrides": [
{
"__id__": 23
"__id__": 17
},
{
"__id__": 25
"__id__": 19
},
{
"__id__": 27
"__id__": 21
},
{
"__id__": 29
"__id__": 23
},
{
"__id__": 31
"__id__": 25
},
{
"__id__": 33
"__id__": 27
}
],
"removedComponents": []
......@@ -390,7 +339,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 24
"__id__": 18
},
"propertyPath": [
"_name"
......@@ -406,16 +355,16 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 26
"__id__": 20
},
"propertyPath": [
"_lpos"
],
"value": {
"__type__": "cc.Vec3",
"x": 0.553,
"y": 0.219,
"z": 1
"x": 0.569,
"y": 0.255,
"z": 1.107
}
},
{
......@@ -427,7 +376,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 28
"__id__": 22
},
"propertyPath": [
"_lrot"
......@@ -449,7 +398,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 30
"__id__": 24
},
"propertyPath": [
"_euler"
......@@ -470,16 +419,16 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 32
"__id__": 26
},
"propertyPath": [
"_lscale"
],
"value": {
"__type__": "cc.Vec3",
"x": 7.5,
"y": 7.5,
"z": 7.5
"x": 8.5,
"y": 8.5,
"z": 8.5
}
},
{
......@@ -491,7 +440,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 34
"__id__": 28
},
"propertyPath": [
"_materials",
......@@ -512,17 +461,17 @@
"__type__": "cc.Node",
"_objFlags": 0,
"_parent": {
"__id__": 19
"__id__": 13
},
"_prefab": {
"__id__": 36
"__id__": 30
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 35
"__id__": 29
},
"asset": {
"__uuid__": "3b5660ad-e491-4c6f-8713-764d79a681dc@6aa50",
......@@ -530,7 +479,7 @@
},
"fileId": "ebX5L0FLNbTZ0Z+4BCei0w",
"instance": {
"__id__": 37
"__id__": 31
},
"targetOverrides": null
},
......@@ -544,22 +493,22 @@
"mountedComponents": [],
"propertyOverrides": [
{
"__id__": 38
"__id__": 32
},
{
"__id__": 40
"__id__": 34
},
{
"__id__": 42
"__id__": 36
},
{
"__id__": 44
"__id__": 38
},
{
"__id__": 46
"__id__": 40
},
{
"__id__": 48
"__id__": 42
}
],
"removedComponents": []
......@@ -567,7 +516,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 39
"__id__": 33
},
"propertyPath": [
"_name"
......@@ -583,16 +532,16 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 41
"__id__": 35
},
"propertyPath": [
"_lpos"
],
"value": {
"__type__": "cc.Vec3",
"x": 0.553,
"y": 0.199,
"z": -0.963
"x": 0.569,
"y": 0.255,
"z": -1.036
}
},
{
......@@ -604,7 +553,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 43
"__id__": 37
},
"propertyPath": [
"_lrot"
......@@ -626,7 +575,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 45
"__id__": 39
},
"propertyPath": [
"_euler"
......@@ -647,16 +596,16 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 47
"__id__": 41
},
"propertyPath": [
"_lscale"
],
"value": {
"__type__": "cc.Vec3",
"x": 7.5,
"y": 7.5,
"z": 7.5
"x": 8.5,
"y": 8.5,
"z": 8.5
}
},
{
......@@ -668,7 +617,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 49
"__id__": 43
},
"propertyPath": [
"_materials",
......@@ -689,17 +638,17 @@
"__type__": "cc.Node",
"_objFlags": 0,
"_parent": {
"__id__": 19
"__id__": 13
},
"_prefab": {
"__id__": 51
"__id__": 45
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 50
"__id__": 44
},
"asset": {
"__uuid__": "3b5660ad-e491-4c6f-8713-764d79a681dc@6aa50",
......@@ -707,13 +656,13 @@
},
"fileId": "ebX5L0FLNbTZ0Z+4BCei0w",
"instance": {
"__id__": 52
"__id__": 46
},
"targetOverrides": null
},
{
"__type__": "cc.PrefabInstance",
"fileId": "77CwHXcr1ClZrH83jOkYPs",
"fileId": "c0kZw/mCBG9pe1BgFzNNQ2",
"prefabRootNode": {
"__id__": 1
},
......@@ -721,19 +670,22 @@
"mountedComponents": [],
"propertyOverrides": [
{
"__id__": 53
"__id__": 47
},
{
"__id__": 55
"__id__": 49
},
{
"__id__": 57
"__id__": 51
},
{
"__id__": 59
"__id__": 53
},
{
"__id__": 61
"__id__": 55
},
{
"__id__": 57
}
],
"removedComponents": []
......@@ -741,7 +693,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 54
"__id__": 48
},
"propertyPath": [
"_name"
......@@ -757,16 +709,16 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 56
"__id__": 50
},
"propertyPath": [
"_lpos"
],
"value": {
"__type__": "cc.Vec3",
"x": -0.553,
"y": 0.199,
"z": -0.963
"x": -0.569,
"y": 0.255,
"z": -1.036
}
},
{
......@@ -778,7 +730,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 58
"__id__": 52
},
"propertyPath": [
"_lrot"
......@@ -800,7 +752,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 60
"__id__": 54
},
"propertyPath": [
"_euler"
......@@ -821,16 +773,16 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 62
"__id__": 56
},
"propertyPath": [
"_lscale"
],
"value": {
"__type__": "cc.Vec3",
"x": 7.5,
"y": 7.5,
"z": 7.5
"x": 8.5,
"y": 8.5,
"z": 8.5
}
},
{
......@@ -839,21 +791,41 @@
"ebX5L0FLNbTZ0Z+4BCei0w"
]
},
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 58
},
"propertyPath": [
"_materials",
"0"
],
"value": {
"__uuid__": "3b5660ad-e491-4c6f-8713-764d79a681dc@ca88e",
"__expectedType__": "cc.Material"
}
},
{
"__type__": "cc.TargetInfo",
"localID": [
"5dgv+5oEBWYbAxMw4geeXb"
]
},
{
"__type__": "cc.Node",
"_objFlags": 0,
"_parent": {
"__id__": 19
"__id__": 13
},
"_prefab": {
"__id__": 64
"__id__": 60
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 63
"__id__": 59
},
"asset": {
"__uuid__": "3b5660ad-e491-4c6f-8713-764d79a681dc@6aa50",
......@@ -861,19 +833,25 @@
},
"fileId": "ebX5L0FLNbTZ0Z+4BCei0w",
"instance": {
"__id__": 65
"__id__": 61
},
"targetOverrides": null
},
{
"__type__": "cc.PrefabInstance",
"fileId": "2dZk7iWoZLiqVW/bukttZP",
"fileId": "1euplBd05ACJR92vKdKriE",
"prefabRootNode": {
"__id__": 1
},
"mountedChildren": [],
"mountedComponents": [],
"propertyOverrides": [
{
"__id__": 62
},
{
"__id__": 64
},
{
"__id__": 66
},
......@@ -885,9 +863,6 @@
},
{
"__id__": 72
},
{
"__id__": 74
}
],
"removedComponents": []
......@@ -895,7 +870,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 67
"__id__": 63
},
"propertyPath": [
"_name"
......@@ -911,16 +886,16 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 69
"__id__": 65
},
"propertyPath": [
"_lpos"
],
"value": {
"__type__": "cc.Vec3",
"x": -0.553,
"y": 0.219,
"z": 1
"x": -0.569,
"y": 0.255,
"z": 1.107
}
},
{
......@@ -932,7 +907,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 71
"__id__": 67
},
"propertyPath": [
"_lrot"
......@@ -954,7 +929,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 73
"__id__": 69
},
"propertyPath": [
"_euler"
......@@ -975,16 +950,16 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 75
"__id__": 71
},
"propertyPath": [
"_lscale"
],
"value": {
"__type__": "cc.Vec3",
"x": 7.5,
"y": 7.5,
"z": 7.5
"x": 8.5,
"y": 8.5,
"z": 8.5
}
},
{
......@@ -993,6 +968,26 @@
"ebX5L0FLNbTZ0Z+4BCei0w"
]
},
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 73
},
"propertyPath": [
"_materials",
"0"
],
"value": {
"__uuid__": "3b5660ad-e491-4c6f-8713-764d79a681dc@ca88e",
"__expectedType__": "cc.Material"
}
},
{
"__type__": "cc.TargetInfo",
"localID": [
"5dgv+5oEBWYbAxMw4geeXb"
]
},
{
"__type__": "cc.PrefabInfo",
"root": {
......@@ -1016,22 +1011,22 @@
},
"_children": [
{
"__id__": 78
"__id__": 76
},
{
"__id__": 83
"__id__": 81
},
{
"__id__": 88
"__id__": 86
},
{
"__id__": 93
"__id__": 91
}
],
"_active": true,
"_components": [],
"_prefab": {
"__id__": 98
"__id__": 96
},
"_lpos": {
"__type__": "cc.Vec3",
......@@ -1068,23 +1063,23 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 77
"__id__": 75
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 79
"__id__": 77
}
],
"_prefab": {
"__id__": 82
"__id__": 80
},
"_lpos": {
"__type__": "cc.Vec3",
"x": 0.25,
"y": 0.423,
"z": 0.128
"y": 0.52,
"z": 0.14
},
"_lrot": {
"__type__": "cc.Quat",
......@@ -1115,11 +1110,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 78
"__id__": 76
},
"_enabled": true,
"__prefab": {
"__id__": 80
"__id__": 78
},
"_materials": [
{
......@@ -1129,7 +1124,7 @@
],
"_visFlags": 0,
"bakeSettings": {
"__id__": 81
"__id__": 79
},
"_mesh": {
"__uuid__": "c8349573-cd69-452d-acda-15354882576c@bc06f",
......@@ -1189,23 +1184,23 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 77
"__id__": 75
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 84
"__id__": 82
}
],
"_prefab": {
"__id__": 87
"__id__": 85
},
"_lpos": {
"__type__": "cc.Vec3",
"x": -0.25,
"y": 0.423,
"z": 0.128
"y": 0.52,
"z": 0.14
},
"_lrot": {
"__type__": "cc.Quat",
......@@ -1236,11 +1231,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 83
"__id__": 81
},
"_enabled": true,
"__prefab": {
"__id__": 85
"__id__": 83
},
"_materials": [
{
......@@ -1250,7 +1245,7 @@
],
"_visFlags": 0,
"bakeSettings": {
"__id__": 86
"__id__": 84
},
"_mesh": {
"__uuid__": "c8349573-cd69-452d-acda-15354882576c@bc06f",
......@@ -1310,23 +1305,23 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 77
"__id__": 75
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 89
"__id__": 87
}
],
"_prefab": {
"__id__": 92
"__id__": 90
},
"_lpos": {
"__type__": "cc.Vec3",
"x": 0.25,
"y": 0.423,
"z": -0.572
"y": 0.52,
"z": -0.544
},
"_lrot": {
"__type__": "cc.Quat",
......@@ -1357,11 +1352,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 88
"__id__": 86
},
"_enabled": true,
"__prefab": {
"__id__": 90
"__id__": 88
},
"_materials": [
{
......@@ -1371,7 +1366,7 @@
],
"_visFlags": 0,
"bakeSettings": {
"__id__": 91
"__id__": 89
},
"_mesh": {
"__uuid__": "c8349573-cd69-452d-acda-15354882576c@bc06f",
......@@ -1431,23 +1426,23 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 77
"__id__": 75
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 94
"__id__": 92
}
],
"_prefab": {
"__id__": 97
"__id__": 95
},
"_lpos": {
"__type__": "cc.Vec3",
"x": -0.25,
"y": 0.423,
"z": -0.572
"y": 0.52,
"z": -0.544
},
"_lrot": {
"__type__": "cc.Quat",
......@@ -1478,11 +1473,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 93
"__id__": 91
},
"_enabled": true,
"__prefab": {
"__id__": 95
"__id__": 93
},
"_materials": [
{
......@@ -1492,7 +1487,7 @@
],
"_visFlags": 0,
"bakeSettings": {
"__id__": 96
"__id__": 94
},
"_mesh": {
"__uuid__": "c8349573-cd69-452d-acda-15354882576c@bc06f",
......@@ -1571,17 +1566,17 @@
"_active": true,
"_components": [
{
"__id__": 100
"__id__": 98
}
],
"_prefab": {
"__id__": 103
"__id__": 101
},
"_lpos": {
"__type__": "cc.Vec3",
"x": 0,
"y": 1.042,
"z": -0.132
"y": 1.143,
"z": -0.316
},
"_lrot": {
"__type__": "cc.Quat",
......@@ -1612,11 +1607,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 99
"__id__": 97
},
"_enabled": true,
"__prefab": {
"__id__": 101
"__id__": 99
},
"_materials": [
{
......@@ -1626,7 +1621,7 @@
],
"_visFlags": 0,
"bakeSettings": {
"__id__": 102
"__id__": 100
},
"_mesh": {
"__uuid__": "1263d74c-8167-4928-91a6-4e2672411f47@2e76e",
......@@ -1690,7 +1685,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 105
"__id__": 103
},
"_group": 2,
"_type": 4,
......@@ -1727,7 +1722,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 107
"__id__": 105
},
"_material": null,
"_isTrigger": true,
......@@ -1739,9 +1734,9 @@
},
"_size": {
"__type__": "cc.Vec3",
"x": 1.24,
"x": 1.546,
"y": 1,
"z": 3.289
"z": 3.772
},
"_id": ""
},
......@@ -1759,7 +1754,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 109
"__id__": 107
},
"carType": 0,
"_carColor": 0,
......@@ -1798,10 +1793,10 @@
}
],
"bodyMesh": {
"__id__": 110
"__id__": 108
},
"top": {
"__id__": 113
"__id__": 111
},
"_id": ""
},
......@@ -1815,13 +1810,17 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 111
"__id__": 109
},
"_enabled": true,
"__prefab": {
"__id__": 118
"__id__": 116
},
"_materials": [
{
"__uuid__": "a6c4d563-2f30-4a18-9d91-80eff8639cac@7a3ca",
"__expectedType__": "cc.Material"
},
{
"__uuid__": "a6c4d563-2f30-4a18-9d91-80eff8639cac@ca88e",
"__expectedType__": "cc.Material"
......@@ -1829,7 +1828,7 @@
],
"_visFlags": 0,
"bakeSettings": {
"__id__": 119
"__id__": 117
},
"_mesh": {
"__uuid__": "a6c4d563-2f30-4a18-9d91-80eff8639cac@24e8c",
......@@ -1856,17 +1855,17 @@
},
"_children": [
{
"__id__": 112
"__id__": 110
}
],
"_active": true,
"_components": [
{
"__id__": 110
"__id__": 108
}
],
"_prefab": {
"__id__": 117
"__id__": 115
},
"_lpos": {
"__type__": "cc.Vec3",
......@@ -1903,17 +1902,17 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 111
"__id__": 109
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 113
"__id__": 111
}
],
"_prefab": {
"__id__": 116
"__id__": 114
},
"_lpos": {
"__type__": "cc.Vec3",
......@@ -1950,11 +1949,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 112
"__id__": 110
},
"_enabled": true,
"__prefab": {
"__id__": 114
"__id__": 112
},
"_materials": [
{
......@@ -1964,7 +1963,7 @@
],
"_visFlags": 0,
"bakeSettings": {
"__id__": 115
"__id__": 113
},
"_mesh": {
"__uuid__": "a6c4d563-2f30-4a18-9d91-80eff8639cac@b4725",
......@@ -2014,6 +2013,8 @@
"__id__": 0
},
"fileId": "8aBjXlWplTfY+BohaKpSrn",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
},
{
......@@ -2025,6 +2026,8 @@
"__id__": 0
},
"fileId": "acaXsayZZXfLxumcT1J5+t",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
},
{
......@@ -2063,24 +2066,24 @@
"instance": null,
"targetOverrides": [
{
"__id__": 121
"__id__": 119
},
{
"__id__": 123
"__id__": 121
}
],
"nestedPrefabInstanceRoots": [
{
"__id__": 63
"__id__": 59
},
{
"__id__": 50
"__id__": 44
},
{
"__id__": 35
"__id__": 29
},
{
"__id__": 20
"__id__": 14
},
{
"__id__": 2
......@@ -2090,7 +2093,7 @@
{
"__type__": "cc.TargetOverrideInfo",
"source": {
"__id__": 108
"__id__": 106
},
"sourceInfo": null,
"propertyPath": [
......@@ -2100,7 +2103,7 @@
"__id__": 2
},
"targetInfo": {
"__id__": 122
"__id__": 120
}
},
{
......@@ -2112,7 +2115,7 @@
{
"__type__": "cc.TargetOverrideInfo",
"source": {
"__id__": 108
"__id__": 106
},
"sourceInfo": null,
"propertyPath": [
......@@ -2122,7 +2125,7 @@
"__id__": 2
},
"targetInfo": {
"__id__": 124
"__id__": 122
}
},
{
......
assets/Bundles/MainGame/prefab/Car6.prefab
View file @ e99ddb39
......@@ -2226,6 +2226,12 @@
},
{
"__id__": 123
},
{
"__id__": 125
},
{
"__id__": 127
}
],
"nestedPrefabInstanceRoots": [
......@@ -2246,6 +2252,46 @@
}
]
},
{
"__type__": "cc.TargetOverrideInfo",
"source": null,
"sourceInfo": null,
"propertyPath": [
"bodyMesh"
],
"target": {
"__id__": 2
},
"targetInfo": {
"__id__": 122
}
},
{
"__type__": "cc.TargetInfo",
"localID": [
"a8KAKbpytWQIj9beYfhm7E"
]
},
{
"__type__": "cc.TargetOverrideInfo",
"source": null,
"sourceInfo": null,
"propertyPath": [
"top"
],
"target": {
"__id__": 2
},
"targetInfo": {
"__id__": 124
}
},
{
"__type__": "cc.TargetInfo",
"localID": [
"49vJjWyDlSg5SO/dJHjbmh"
]
},
{
"__type__": "cc.TargetOverrideInfo",
"source": {
......@@ -2259,7 +2305,7 @@
"__id__": 2
},
"targetInfo": {
"__id__": 122
"__id__": 126
}
},
{
......@@ -2281,7 +2327,7 @@
"__id__": 2
},
"targetInfo": {
"__id__": 124
"__id__": 128
}
},
{
......
assets/Scripts/Scenes/MainGame/Components/CarCarColorsComponent.ts
View file @ e99ddb39
......@@ -17,6 +17,8 @@ import { RoleCarColorsComponent } from './RoleCarColorsComponent';
import { CarColorsGlobalInstance } from '../CarColorsGlobalInstance';
import { MainGame } from "db://assets/Scripts/Scenes/MainGame/MainGame";
import { EDITOR } from "cc/env";
const { ccclass, property, executeInEditMode } = _decorator;
@ccclass('CarCarColorsComponent')
......@@ -31,6 +33,7 @@ export class CarCarColorsComponent extends Component {
}
set carColor(value) {
if (this._carColor === value) return;
this._carColor = value;
this.changeColor();
}
......@@ -38,9 +41,7 @@ export class CarCarColorsComponent extends Component {
@property({ type: Enum(CarColors) })
private _carColor: CarColors = CarColors.Purple;
@property({
type: [Material]
})
@property({ type: [Material] })
colorMaterials: Array<Material> = [];
@property(MeshRenderer) bodyMesh: MeshRenderer = null;
......@@ -68,6 +69,7 @@ export class CarCarColorsComponent extends Component {
// if (!EDITOR_NOT_IN_PREVIEW){
// this.colorMaterials = find("Scene/mtl").getComponent(MeshRenderer).sharedMaterials
// }
if (EDITOR && this.bodyMesh.getSharedMaterial(1) == this.colorMaterials[this.carColor]) return;
this.bodyMesh.setSharedMaterial(this.colorMaterials[this.carColor], 1);
this.top.setSharedMaterial(this.colorMaterials[this.carColor], this.top.materials.length - 1);
......@@ -76,7 +78,7 @@ export class CarCarColorsComponent extends Component {
tween(this.node)
.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.96, 0.96, 0.96) })
.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