Skip to content

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

init

parent ef7dcfbf
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2751 additions and 7565 deletions
assets/Bundles/MainGame/model/NEW_BUS_TEST/bus_big_bule.gltf.meta
View file @ f9f36f54
......@@ -163,8 +163,9 @@
},
"meshCompress": {
"enable": true,
"encode": false,
"compress": false
"encode": true,
"compress": true,
"quantize": true
}
}
}
assets/Bundles/MainGame/model/NEW_BUS_TEST/bus_medium_bule.gltf.meta
View file @ f9f36f54
......@@ -153,6 +153,19 @@
"scenes": [
"8e9c0e2b-bb1f-424d-bbe2-b63e83bea2db@4912c"
]
},
"promoteSingleRootNode": true,
"meshOptimize": {
"enable": true,
"vertexCache": true,
"vertexFetch": true,
"overdraw": true
},
"meshCompress": {
"enable": true,
"encode": true,
"compress": true,
"quantize": true
}
}
}
assets/Bundles/MainGame/model/NEW_BUS_TEST/bus_small_bule.gltf.meta
View file @ f9f36f54
......@@ -153,6 +153,19 @@
"scenes": [
"b3133ec7-4349-4454-9c82-ea79a856ae2f@00215"
]
},
"promoteSingleRootNode": true,
"meshOptimize": {
"enable": true,
"vertexCache": true,
"vertexFetch": true,
"overdraw": true
},
"meshCompress": {
"enable": true,
"encode": true,
"compress": true,
"quantize": true
}
}
}
assets/Bundles/Maps.meta deleted 100644 → 0
View file @ ef7dcfbf
{
"ver": "1.2.0",
"importer": "directory",
"imported": true,
"uuid": "6ffa85c9-33fc-4d6d-8472-19e8b9b2987f",
"files": [],
"subMetas": {},
"userData": {
"isBundle": true
}
}
assets/Bundles/Maps/map1.prefab deleted 100644 → 0
View file @ ef7dcfbf
This diff is collapsed.
assets/Bundles/Maps/map1.prefab.meta deleted 100644 → 0
View file @ ef7dcfbf
{
"ver": "1.1.50",
"importer": "prefab",
"imported": true,
"uuid": "1f612778-1236-48a7-8c50-d6900c7a3c44",
"files": [
".json"
],
"subMetas": {},
"userData": {
"syncNodeName": "map1"
}
}
assets/CarColorsGame/Bundles/CarColorsCars/Bus.prefab
View file @ f9f36f54
......@@ -904,9 +904,9 @@
"value": {
"__type__": "cc.Quat",
"x": 0,
"y": 0,
"y": 1,
"z": 0,
"w": 1
"w": 6.123233995736766e-17
}
},
{
......@@ -926,7 +926,7 @@
"value": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"y": 180,
"z": 0
}
},
......@@ -1058,9 +1058,9 @@
"value": {
"__type__": "cc.Quat",
"x": 0,
"y": 0,
"y": 1,
"z": 0,
"w": 1
"w": 6.123233995736766e-17
}
},
{
......@@ -1080,7 +1080,7 @@
"value": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"y": 180,
"z": 0
}
},
......@@ -1212,9 +1212,9 @@
"value": {
"__type__": "cc.Quat",
"x": 0,
"y": 0,
"y": 1,
"z": 0,
"w": 1
"w": 6.123233995736766e-17
}
},
{
......@@ -1234,7 +1234,7 @@
"value": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"y": 180,
"z": 0
}
},
......@@ -2778,7 +2778,7 @@
"__id__": 160
},
"carType": 1,
"_carColor": 1,
"_carColor": 3,
"colorMaterials": [
{
"__uuid__": "0d2472bd-75d4-4674-8107-8db3d902af00",
......@@ -2843,7 +2843,7 @@
"__expectedType__": "cc.Material"
},
{
"__uuid__": "4d88ad28-d740-4f52-8b92-8b84bb1a8087@e114f",
"__uuid__": "20730933-a375-49d7-9d0d-5ff3804cd768",
"__expectedType__": "cc.Material"
}
],
......@@ -2978,7 +2978,7 @@
},
"_materials": [
{
"__uuid__": "4d88ad28-d740-4f52-8b92-8b84bb1a8087@e114f",
"__uuid__": "20730933-a375-49d7-9d0d-5ff3804cd768",
"__expectedType__": "cc.Material"
}
],
......
assets/CarColorsGame/CarColors.scene
View file @ f9f36f54
This diff is collapsed.
assets/CarColorsGame/Scrips/CarColorsGlobalTypes.ts
View file @ f9f36f54
......@@ -5,7 +5,6 @@ export const BundleNames = {
CarColorsCharacter:"CarColorsCharacter",
CarColorsLevels: "CarColorsLevels",
Audio:"Audio",
Maps:'Maps'
}
// Ui列表
export enum UINames {
......
assets/CarColorsGame/Scrips/Systerms/BundleCarColorsSysterm.ts
View file @ f9f36f54
......@@ -148,20 +148,6 @@ export class BundleCarColorsSysterm extends Component {
return promise
}
// 加载地图
loadMap(map: number): Promise<Prefab> {
const promise: Promise<Prefab> = new Promise((res, rej) => {
this.bundles.get(BundleNames.Maps).load(`map${map}`, Prefab, (err, prefab: Prefab) => {
if (err) {
// console.error(err)
rej(err)
return
}
res(prefab)
})
})
return promise
}
}
assets/CarColorsGame/Scrips/UI/HomePage.ts
View file @ f9f36f54
......@@ -16,12 +16,9 @@ export class HomePage extends UIBase {
this.startBtn.active = true
AudioMgr.ins.play(AudioClipName.bgm, { loop: true });
CarColorsGlobalInstance.instance.roleSysterm.showHomeRoles()
find("Scene/map").destroyAllChildren()
find("Scene/map").removeAllChildren()
find("Scene/Levels").destroyAllChildren()
find("Scene/Levels").removeAllChildren()
find("Scene/Parkings").active = false
find("Scene/homeScene").active = true
find("Main Camera").active = false
find("HomeCamera").active = true
}
......@@ -32,7 +29,6 @@ export class HomePage extends UIBase {
find("UI/BundleLoading").active = true
find("UI/BundleLoading/ProgressBar").getComponent(ProgressBar).progress = 0.5
find("UI/BundleLoading/Text").getComponent(Label).string = "场景加载中"
find("Scene/homeScene").active = false
find("Scene/Parkings").children.forEach((child, index)=>{
if (index < 4){
......@@ -48,8 +44,6 @@ export class HomePage extends UIBase {
find("Scene/Parkings").active = true
CarColorsGlobalInstance.instance.roleSysterm.clearAll()
CarColorsGlobalInstance.instance.carSysterm.clearAll()
const map = await CarColorsGlobalInstance.instance.bundleSysterm.loadMap(GlobalData.instance.map)
find("Scene/map").addChild(instantiate(map))
CarColorsGlobalInstance.instance.bundleSysterm.loadLevels(GlobalData.instance.getConfigData(ConfigKeys.GameSaveData).level).then((level)=>{
console.log("instantiate(level)")
const Level = instantiate(level)
......
assets/Res/Material/brown.mtl deleted 100644 → 0
View file @ ef7dcfbf
{
"__type__": "cc.Material",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"_native": "",
"_effectAsset": {
"__uuid__": "fabf00b0-3215-4548-b16e-bea97efd2b66",
"__expectedType__": "cc.EffectAsset"
},
"_techIdx": 0,
"_defines": [
{
"USE_OUTLINE_PASS": true,
"USE_INSTANCING": true
},
{
"USE_INSTANCING": true
},
{},
{},
{},
{},
{}
],
"_states": [
{
"rasterizerState": {},
"depthStencilState": {},
"blendState": {
"targets": [
{}
]
}
},
{
"rasterizerState": {},
"depthStencilState": {},
"blendState": {
"targets": [
{}
]
}
},
{
"rasterizerState": {},
"depthStencilState": {},
"blendState": {
"targets": [
{}
]
}
},
{
"rasterizerState": {},
"depthStencilState": {},
"blendState": {
"targets": [
{}
]
}
},
{
"rasterizerState": {},
"depthStencilState": {},
"blendState": {
"targets": [
{}
]
}
},
{
"rasterizerState": {},
"depthStencilState": {},
"blendState": {
"targets": [
{}
]
}
},
{
"rasterizerState": {},
"depthStencilState": {},
"blendState": {
"targets": [
{}
]
}
}
],
"_props": [
{},
{
"mainColor": {
"__type__": "cc.Color",
"r": 255,
"g": 222,
"b": 136,
"a": 255
},
"roughness": 0,
"specularIntensity": 0
},
{},
{},
{},
{},
{}
]
}
\ No newline at end of file
assets/Res/Material/brown.mtl.meta deleted 100644 → 0
View file @ ef7dcfbf
{"ver":"1.0.21","importer":"material","imported":true,"uuid":"129d8107-e592-453a-8f83-d64c56895318","files":[".json"],"subMetas":{},"userData":{}}
assets/Res/Material/green.mtl deleted 100644 → 0
View file @ ef7dcfbf
{
"__type__": "cc.Material",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"_native": "",
"_effectAsset": {
"__uuid__": "fabf00b0-3215-4548-b16e-bea97efd2b66",
"__expectedType__": "cc.EffectAsset"
},
"_techIdx": 0,
"_defines": [
{
"USE_OUTLINE_PASS": true,
"USE_INSTANCING": true
},
{
"USE_INSTANCING": true
},
{},
{},
{},
{},
{}
],
"_states": [
{
"rasterizerState": {},
"depthStencilState": {},
"blendState": {
"targets": [
{}
]
}
},
{
"rasterizerState": {},
"depthStencilState": {},
"blendState": {
"targets": [
{}
]
}
},
{
"rasterizerState": {},
"depthStencilState": {},
"blendState": {
"targets": [
{}
]
}
},
{
"rasterizerState": {},
"depthStencilState": {},
"blendState": {
"targets": [
{}
]
}
},
{
"rasterizerState": {},
"depthStencilState": {},
"blendState": {
"targets": [
{}
]
}
},
{
"rasterizerState": {},
"depthStencilState": {},
"blendState": {
"targets": [
{}
]
}
},
{
"rasterizerState": {},
"depthStencilState": {},
"blendState": {
"targets": [
{}
]
}
}
],
"_props": [
{},
{
"mainColor": {
"__type__": "cc.Color",
"r": 132,
"g": 255,
"b": 36,
"a": 255
},
"roughness": 0,
"specularIntensity": 0
},
{},
{},
{},
{},
{}
]
}
\ No newline at end of file
assets/Res/Material/green.mtl.meta deleted 100644 → 0
View file @ ef7dcfbf
{"ver":"1.0.21","importer":"material","imported":true,"uuid":"caa62f3a-49bc-48b5-a997-edb4338efef3","files":[".json"],"subMetas":{},"userData":{}}
assets/Res/Material/grey.mtl deleted 100644 → 0
View file @ ef7dcfbf
{
"__type__": "cc.Material",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"_native": "",
"_effectAsset": {
"__uuid__": "fabf00b0-3215-4548-b16e-bea97efd2b66",
"__expectedType__": "cc.EffectAsset"
},
"_techIdx": 0,
"_defines": [
{
"USE_OUTLINE_PASS": true,
"USE_INSTANCING": true
},
{
"USE_INSTANCING": true
},
{},
{},
{},
{},
{}
],
"_states": [
{
"rasterizerState": {},
"depthStencilState": {},
"blendState": {
"targets": [
{}
]
}
},
{
"rasterizerState": {},
"depthStencilState": {},
"blendState": {
"targets": [
{}
]
}
},
{
"rasterizerState": {},
"depthStencilState": {},
"blendState": {
"targets": [
{}
]
}
},
{
"rasterizerState": {},
"depthStencilState": {},
"blendState": {
"targets": [
{}
]
}
},
{
"rasterizerState": {},
"depthStencilState": {},
"blendState": {
"targets": [
{}
]
}
},
{
"rasterizerState": {},
"depthStencilState": {},
"blendState": {
"targets": [
{}
]
}
},
{
"rasterizerState": {},
"depthStencilState": {},
"blendState": {
"targets": [
{}
]
}
}
],
"_props": [
{},
{
"mainColor": {
"__type__": "cc.Color",
"r": 126,
"g": 139,
"b": 148,
"a": 255
},
"roughness": 0,
"specularIntensity": 0
},
{},
{},
{},
{},
{}
]
}
\ No newline at end of file
assets/Res/Material/grey.mtl.meta deleted 100644 → 0
View file @ ef7dcfbf
{"ver":"1.0.21","importer":"material","imported":true,"uuid":"2be7d753-010a-4a05-8601-4a87ce15fc76","files":[".json"],"subMetas":{},"userData":{}}
assets/Res/Material/ground.mtl deleted 100644 → 0
View file @ ef7dcfbf
{
"__type__": "cc.Material",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"_native": "",
"_effectAsset": {
"__uuid__": "a3cd009f-0ab0-420d-9278-b9fdab939bbc",
"__expectedType__": "cc.EffectAsset"
},
"_techIdx": 0,
"_defines": [
{
"USE_TEXTURE": true
},
{},
{}
],
"_states": [
{
"rasterizerState": {},
"depthStencilState": {},
"blendState": {
"targets": [
{}
]
}
},
{
"rasterizerState": {},
"depthStencilState": {},
"blendState": {
"targets": [
{}
]
}
},
{
"rasterizerState": {},
"depthStencilState": {},
"blendState": {
"targets": [
{}
]
}
}
],
"_props": [
{
"mainTexture": {
"__uuid__": "688f7f3c-3bdf-4d1a-a4ec-7a62f1c16ff5@6c48a",
"__expectedType__": "cc.Texture2D"
},
"tilingOffset": {
"__type__": "cc.Vec4",
"x": 15,
"y": 15,
"z": 0,
"w": 0
},
"mainColor": {
"__type__": "cc.Color",
"r": 110,
"g": 106,
"b": 115,
"a": 255
}
},
{},
{}
]
}
\ No newline at end of file
assets/Res/Material/ground.mtl.meta deleted 100644 → 0
View file @ ef7dcfbf
{"ver":"1.0.21","importer":"material","imported":true,"uuid":"bdcf2e04-ec6a-4dfd-85a3-a73761e12d63","files":[".json"],"subMetas":{},"userData":{}}
assets/Res/Material/material.mtl deleted 100644 → 0
View file @ ef7dcfbf
{
"__type__": "cc.Material",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"_native": "",
"_effectAsset": {
"__uuid__": "9b20a514-6cc3-49de-b216-b6b863046249",
"__expectedType__": "cc.EffectAsset"
},
"_techIdx": 0,
"_defines": [
{},
{},
{},
{},
{},
{},
{}
],
"_states": [
{
"rasterizerState": {},
"depthStencilState": {},
"blendState": {
"targets": [
{}
]
}
},
{
"rasterizerState": {},
"depthStencilState": {},
"blendState": {
"targets": [
{}
]
}
},
{
"rasterizerState": {},
"depthStencilState": {},
"blendState": {
"targets": [
{}
]
}
},
{
"rasterizerState": {},
"depthStencilState": {},
"blendState": {
"targets": [
{}
]
}
},
{
"rasterizerState": {},
"depthStencilState": {},
"blendState": {
"targets": [
{}
]
}
},
{
"rasterizerState": {},
"depthStencilState": {},
"blendState": {
"targets": [
{}
]
}
},
{
"rasterizerState": {},
"depthStencilState": {},
"blendState": {
"targets": [
{}
]
}
}
],
"_props": [
{},
{},
{},
{},
{},
{},
{}
]
}
\ No newline at end of file
assets/Res/Material/material.mtl.meta deleted 100644 → 0
View file @ ef7dcfbf
{
"ver": "1.0.21",
"importer": "material",
"imported": true,
"uuid": "a9f41b1d-3234-48b3-b868-c6dd984af0d6",
"files": [
".json"
],
"subMetas": {},
"userData": {}
}
assets/Res/Material/metal.mtl deleted 100644 → 0
View file @ ef7dcfbf
{
"__type__": "cc.Material",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"_native": "",
"_effectAsset": {
"__uuid__": "9b20a514-6cc3-49de-b216-b6b863046249",
"__expectedType__": "cc.EffectAsset"
},
"_techIdx": 0,
"_defines": [
{
"USE_OUTLINE_PASS": true,
"USE_INSTANCING": true
},
{
"USE_INSTANCING": true
},
{},
{},
{},
{},
{}
],
"_states": [
{
"rasterizerState": {},
"depthStencilState": {},
"blendState": {
"targets": [
{}
]
}
},
{
"rasterizerState": {},
"depthStencilState": {},
"blendState": {
"targets": [
{}
]
}
},
{
"rasterizerState": {},
"depthStencilState": {},
"blendState": {
"targets": [
{}
]
}
},
{
"rasterizerState": {},
"depthStencilState": {},
"blendState": {
"targets": [
{}
]
}
},
{
"rasterizerState": {},
"depthStencilState": {},
"blendState": {
"targets": [
{}
]
}
},
{
"rasterizerState": {},
"depthStencilState": {},
"blendState": {
"targets": [
{}
]
}
},
{
"rasterizerState": {},
"depthStencilState": {},
"blendState": {
"targets": [
{}
]
}
}
],
"_props": [
{},
{
"mainColor": {
"__type__": "cc.Color",
"r": 101,
"g": 114,
"b": 119,
"a": 255
},
"shadeColor1": {
"__type__": "cc.Color",
"r": 87,
"g": 98,
"b": 102,
"a": 255
},
"shadeColor2": {
"__type__": "cc.Color",
"r": 71,
"g": 80,
"b": 83,
"a": 255
},
"specular": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 20
}
},
{},
{},
{},
{},
{}
]
}
\ No newline at end of file
assets/Res/Material/metal.mtl.meta deleted 100644 → 0
View file @ ef7dcfbf
{"ver":"1.0.21","importer":"material","imported":true,"uuid":"6c4f5935-21ca-4d8d-9ba9-b92c80c3fe70","files":[".json"],"subMetas":{},"userData":{}}
assets/Res/Model/Cars/Bus.meta deleted 100644 → 0
View file @ ef7dcfbf
{
"ver": "1.2.0",
"importer": "directory",
"imported": true,
"uuid": "f088d9f9-678a-4c74-8bb2-fc1c2a4a7fb0",
"files": [],
"subMetas": {},
"userData": {}
}
assets/Res/Model/Cars/Bus/bus_blue.glb.meta deleted 100644 → 0
View file @ ef7dcfbf
This diff is collapsed.
assets/Res/Model/Cars/Minivan.meta deleted 100644 → 0
View file @ ef7dcfbf
{
"ver": "1.2.0",
"importer": "directory",
"imported": true,
"uuid": "ec8e611a-d7f3-4860-a944-b9b9f095757a",
"files": [],
"subMetas": {},
"userData": {}
}
assets/Res/Model/Cars/Minivan/van_blue.glb.meta deleted 100644 → 0
View file @ ef7dcfbf
This diff is collapsed.
assets/Res/Model/Cars/Sedans.meta deleted 100644 → 0
View file @ ef7dcfbf
{
"ver": "1.2.0",
"importer": "directory",
"imported": true,
"uuid": "6ed93283-5d7d-4a80-bd6d-7be975040133",
"files": [],
"subMetas": {},
"userData": {}
}
assets/Res/Model/Cars/Sedans/sedan_blue.glb.meta deleted 100644 → 0
View file @ ef7dcfbf
This diff is collapsed.
assets/Res/Model/City/building_b.glb.meta deleted 100644 → 0
View file @ ef7dcfbf
{
"ver": "2.3.13",
"importer": "gltf",
"imported": true,
"uuid": "4075ea1a-f413-4178-a75d-901cf7752aeb",
"files": [],
"subMetas": {
"41ac8": {
"importer": "gltf-mesh",
"uuid": "4075ea1a-f413-4178-a75d-901cf7752aeb@41ac8",
"displayName": "",
"id": "41ac8",
"name": "Cube.001.mesh",
"userData": {
"gltfIndex": 0,
"triangleCount": 94
},
"ver": "1.1.1",
"imported": true,
"files": [
".bin",
".json"
],
"subMetas": {}
},
"d67b6": {
"importer": "gltf-mesh",
"uuid": "4075ea1a-f413-4178-a75d-901cf7752aeb@d67b6",
"displayName": "",
"id": "d67b6",
"name": "Cube.941.mesh",
"userData": {
"gltfIndex": 1,
"triangleCount": 524
},
"ver": "1.1.1",
"imported": true,
"files": [
".bin",
".json"
],
"subMetas": {}
},
"07bf1": {
"importer": "gltf-scene",
"uuid": "4075ea1a-f413-4178-a75d-901cf7752aeb@07bf1",
"displayName": "",
"id": "07bf1",
"name": "building_b.prefab",
"userData": {
"gltfIndex": 0
},
"ver": "1.0.14",
"imported": true,
"files": [
".json"
],
"subMetas": {}
}
},
"userData": {
"imageMetas": [],
"lods": {
"enable": false,
"hasBuiltinLOD": false,
"options": [
{
"screenRatio": 0.25,
"faceCount": 1
},
{
"screenRatio": 0.125,
"faceCount": 0.25
},
{
"screenRatio": 0.01,
"faceCount": 0.1
}
]
},
"assetFinder": {
"meshes": [
"4075ea1a-f413-4178-a75d-901cf7752aeb@41ac8",
"4075ea1a-f413-4178-a75d-901cf7752aeb@d67b6"
],
"skeletons": [],
"textures": [],
"materials": [],
"scenes": [
"4075ea1a-f413-4178-a75d-901cf7752aeb@07bf1"
]
}
}
}
assets/Res/Model/City/road.glb.meta deleted 100644 → 0
View file @ ef7dcfbf
This diff is collapsed.
settings/v2/packages/project.json
View file @ f9f36f54
This diff is collapsed.
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