Commit 8ff2941f authored by haiyoucuv's avatar haiyoucuv

init

parent 5f7fbf4b
...@@ -3495,9 +3495,9 @@ ...@@ -3495,9 +3495,9 @@
"value": { "value": {
"__type__": "cc.Quat", "__type__": "cc.Quat",
"x": 0, "x": 0,
"y": -0.8660254037844386, "y": 0.49999999999999994,
"z": 0, "z": 0,
"w": 0.5000000000000001 "w": 0.8660254037844387
} }
}, },
{ {
...@@ -3511,7 +3511,7 @@ ...@@ -3511,7 +3511,7 @@
"value": { "value": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0, "x": 0,
"y": -120, "y": 60,
"z": 0 "z": 0
} }
}, },
......
...@@ -28,23 +28,23 @@ ...@@ -28,23 +28,23 @@
"__id__": 71 "__id__": 71
}, },
{ {
"__id__": 103 "__id__": 113
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 108 "__id__": 118
}, },
{ {
"__id__": 110 "__id__": 120
}, },
{ {
"__id__": 112 "__id__": 122
} }
], ],
"_prefab": { "_prefab": {
"__id__": 124 "__id__": 134
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
...@@ -959,12 +959,18 @@ ...@@ -959,12 +959,18 @@
}, },
{ {
"__id__": 97 "__id__": 97
},
{
"__id__": 102
},
{
"__id__": 107
} }
], ],
"_active": true, "_active": true,
"_components": [], "_components": [],
"_prefab": { "_prefab": {
"__id__": 102 "__id__": 112
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
...@@ -1721,6 +1727,248 @@ ...@@ -1721,6 +1727,248 @@
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
}, },
{
"__type__": "cc.Node",
"_name": "Cube-006",
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 71
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 103
}
],
"_prefab": {
"__id__": 106
},
"_lpos": {
"__type__": "cc.Vec3",
"x": 0.25,
"y": 0.859,
"z": 1.16
},
"_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.MeshRenderer",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 102
},
"_enabled": true,
"__prefab": {
"__id__": 104
},
"_materials": [
{
"__uuid__": "087d3ec0-23db-4b57-88c8-12e83b579ddc",
"__expectedType__": "cc.Material"
}
],
"_visFlags": 0,
"bakeSettings": {
"__id__": 105
},
"_mesh": {
"__uuid__": "c8349573-cd69-452d-acda-15354882576c@bc06f",
"__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": "66jvpCTrNON45yQaw27xmY"
},
{
"__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",
"root": {
"__id__": 1
},
"asset": {
"__id__": 0
},
"fileId": "f3thH0Mz5IXZthzMqgtQqH",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
},
{
"__type__": "cc.Node",
"_name": "Cube-007",
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 71
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 108
}
],
"_prefab": {
"__id__": 111
},
"_lpos": {
"__type__": "cc.Vec3",
"x": -0.25,
"y": 0.859,
"z": 1.16
},
"_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.MeshRenderer",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 107
},
"_enabled": true,
"__prefab": {
"__id__": 109
},
"_materials": [
{
"__uuid__": "087d3ec0-23db-4b57-88c8-12e83b579ddc",
"__expectedType__": "cc.Material"
}
],
"_visFlags": 0,
"bakeSettings": {
"__id__": 110
},
"_mesh": {
"__uuid__": "c8349573-cd69-452d-acda-15354882576c@bc06f",
"__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": "05yB7N43lLc6opUBnXERQr"
},
{
"__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",
"root": {
"__id__": 1
},
"asset": {
"__id__": 0
},
"fileId": "cem5hE7e9IEZTImmrN7J2q",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
},
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
...@@ -1746,11 +1994,11 @@ ...@@ -1746,11 +1994,11 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 104 "__id__": 114
} }
], ],
"_prefab": { "_prefab": {
"__id__": 107 "__id__": 117
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
...@@ -1787,11 +2035,11 @@ ...@@ -1787,11 +2035,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 103 "__id__": 113
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 105 "__id__": 115
}, },
"_materials": [ "_materials": [
{ {
...@@ -1801,7 +2049,7 @@ ...@@ -1801,7 +2049,7 @@
], ],
"_visFlags": 0, "_visFlags": 0,
"bakeSettings": { "bakeSettings": {
"__id__": 106 "__id__": 116
}, },
"_mesh": { "_mesh": {
"__uuid__": "1263d74c-8167-4928-91a6-4e2672411f47@2e76e", "__uuid__": "1263d74c-8167-4928-91a6-4e2672411f47@2e76e",
...@@ -1865,7 +2113,7 @@ ...@@ -1865,7 +2113,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 109 "__id__": 119
}, },
"_group": 2, "_group": 2,
"_type": 4, "_type": 4,
...@@ -1902,7 +2150,7 @@ ...@@ -1902,7 +2150,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 111 "__id__": 121
}, },
"_material": null, "_material": null,
"_isTrigger": true, "_isTrigger": true,
...@@ -1934,7 +2182,7 @@ ...@@ -1934,7 +2182,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 113 "__id__": 123
}, },
"carType": 2, "carType": 2,
"_carColor": 5, "_carColor": 5,
...@@ -1973,10 +2221,10 @@ ...@@ -1973,10 +2221,10 @@
} }
], ],
"bodyMesh": { "bodyMesh": {
"__id__": 114 "__id__": 124
}, },
"top": { "top": {
"__id__": 117 "__id__": 127
}, },
"_id": "" "_id": ""
}, },
...@@ -1990,11 +2238,11 @@ ...@@ -1990,11 +2238,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 115 "__id__": 125
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 122 "__id__": 132
}, },
"_materials": [ "_materials": [
{ {
...@@ -2008,7 +2256,7 @@ ...@@ -2008,7 +2256,7 @@
], ],
"_visFlags": 0, "_visFlags": 0,
"bakeSettings": { "bakeSettings": {
"__id__": 123 "__id__": 133
}, },
"_mesh": { "_mesh": {
"__uuid__": "8e9c0e2b-bb1f-424d-bbe2-b63e83bea2db@fe082", "__uuid__": "8e9c0e2b-bb1f-424d-bbe2-b63e83bea2db@fe082",
...@@ -2035,17 +2283,17 @@ ...@@ -2035,17 +2283,17 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 116 "__id__": 126
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 114 "__id__": 124
} }
], ],
"_prefab": { "_prefab": {
"__id__": 121 "__id__": 131
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
...@@ -2082,17 +2330,17 @@ ...@@ -2082,17 +2330,17 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": { "_parent": {
"__id__": 115 "__id__": 125
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 117 "__id__": 127
} }
], ],
"_prefab": { "_prefab": {
"__id__": 120 "__id__": 130
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
...@@ -2129,11 +2377,11 @@ ...@@ -2129,11 +2377,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 116 "__id__": 126
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 118 "__id__": 128
}, },
"_materials": [ "_materials": [
{ {
...@@ -2143,7 +2391,7 @@ ...@@ -2143,7 +2391,7 @@
], ],
"_visFlags": 0, "_visFlags": 0,
"bakeSettings": { "bakeSettings": {
"__id__": 119 "__id__": 129
}, },
"_mesh": { "_mesh": {
"__uuid__": "8e9c0e2b-bb1f-424d-bbe2-b63e83bea2db@b4725", "__uuid__": "8e9c0e2b-bb1f-424d-bbe2-b63e83bea2db@b4725",
...@@ -2246,10 +2494,10 @@ ...@@ -2246,10 +2494,10 @@
"instance": null, "instance": null,
"targetOverrides": [ "targetOverrides": [
{ {
"__id__": 125 "__id__": 135
}, },
{ {
"__id__": 127 "__id__": 137
} }
], ],
"nestedPrefabInstanceRoots": [ "nestedPrefabInstanceRoots": [
...@@ -2273,7 +2521,7 @@ ...@@ -2273,7 +2521,7 @@
{ {
"__type__": "cc.TargetOverrideInfo", "__type__": "cc.TargetOverrideInfo",
"source": { "source": {
"__id__": 112 "__id__": 122
}, },
"sourceInfo": null, "sourceInfo": null,
"propertyPath": [ "propertyPath": [
...@@ -2283,7 +2531,7 @@ ...@@ -2283,7 +2531,7 @@
"__id__": 2 "__id__": 2
}, },
"targetInfo": { "targetInfo": {
"__id__": 126 "__id__": 136
} }
}, },
{ {
...@@ -2295,7 +2543,7 @@ ...@@ -2295,7 +2543,7 @@
{ {
"__type__": "cc.TargetOverrideInfo", "__type__": "cc.TargetOverrideInfo",
"source": { "source": {
"__id__": 112 "__id__": 122
}, },
"sourceInfo": null, "sourceInfo": null,
"propertyPath": [ "propertyPath": [
...@@ -2305,7 +2553,7 @@ ...@@ -2305,7 +2553,7 @@
"__id__": 2 "__id__": 2
}, },
"targetInfo": { "targetInfo": {
"__id__": 128 "__id__": 138
} }
}, },
{ {
......
...@@ -95,14 +95,7 @@ export class CarCarColorsComponent extends Component { ...@@ -95,14 +95,7 @@ export class CarCarColorsComponent extends Component {
this.tweenCount += 1 this.tweenCount += 1
this.roleNum += 1 this.roleNum += 1
if (this.carType === CarTypes.CAR8) { this.isFull = this.roleNum >= this.node.getChildByName("Seets").children.length;
this.isFull = this.roleNum >= 8
} else if (this.carType === CarTypes.CAR6) {
this.isFull = this.roleNum >= 6
} else if (this.carType === CarTypes.CAR10) {
this.isFull = this.roleNum >= 10
}
return this.isFull return this.isFull
} }
......
...@@ -45,7 +45,7 @@ export class RoleCarColorsComponent extends Component { ...@@ -45,7 +45,7 @@ export class RoleCarColorsComponent extends Component {
playWalk() { playWalk() {
if (this.status === "walk") return; if (this.status === "walk") return;
this.node.children[0].setScale(10, 10, 10); this.node.children[0].setScale(12, 12, 12);
this.status = "walk"; this.status = "walk";
this.animation.play("run"); this.animation.play("run");
} }
...@@ -58,7 +58,7 @@ export class RoleCarColorsComponent extends Component { ...@@ -58,7 +58,7 @@ export class RoleCarColorsComponent extends Component {
playIdle() { playIdle() {
if (this.status === "idle") return if (this.status === "idle") return
this.node.children[0].setScale(10, 10, 10); this.node.children[0].setScale(12, 12, 12);
this.status = "idle"; this.status = "idle";
const names = ["idel_1", "idel_2", "idel_3"]; const names = ["idel_1", "idel_2", "idel_3"];
this.animation.play(names[randomRangeInt(0, 4)]); this.animation.play(names[randomRangeInt(0, 4)]);
......
...@@ -39,6 +39,7 @@ export class CarCarColorsSysterm extends Component { ...@@ -39,6 +39,7 @@ export class CarCarColorsSysterm extends Component {
} }
for (; len--;) { for (; len--;) {
console.log(`添加车座 ${color} ${len}`)
this.carSeats.push(color) this.carSeats.push(color)
} }
} }
......
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