init

assets/Bundles/MainGame/prefab/Car10.prefab

@@ -2751,13 +2751,13 @@
       "__type__": "cc.Vec3",
       "x": 0,
       "y": 0,
-      "z": -0.05
+      "z": 0
     },
     "_size": {
       "__type__": "cc.Vec3",
-      "x": 1.2,
+      "x": 1.176,
       "y": 1,
-      "z": 4
+      "z": 4.171
     },
     "_id": ""
   },
@@ -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/Bundles/MainGame/prefab/Car4.prefab

@@ -1638,13 +1638,13 @@
       "__type__": "cc.Vec3",
       "x": 0,
       "y": 0,
-      "z": 0.06
+      "z": 0
     },
     "_size": {
       "__type__": "cc.Vec3",
-      "x": 1.2,
+      "x": 1.24,
       "y": 1,
-      "z": 2.8
+      "z": 3.289
     },
     "_id": ""
   },
@@ -1724,7 +1724,7 @@
     },
     "_materials": [
       {
-        "__uuid__": "a6c4d563-2f30-4a18-9d91-80eff8639cac@ca88e",
+        "__uuid__": "0d2472bd-75d4-4674-8107-8db3d902af00",
         "__expectedType__": "cc.Material"
       }
     ],

assets/Bundles/MainGame/prefab/Car6.prefab

@@ -159,7 +159,7 @@
       "__type__": "cc.Vec3",
       "x": 0,
       "y": 0,
-      "z": 0.287
+      "z": 0.215
     }
   },
   {
@@ -1886,13 +1886,13 @@
       "__type__": "cc.Vec3",
       "x": 0,
       "y": 0,
-      "z": 0.06
+      "z": 0
     },
     "_size": {
       "__type__": "cc.Vec3",
-      "x": 1.2,
+      "x": 1.156,
       "y": 1,
-      "z": 2.8
+      "z": 2.622
     },
     "_id": ""
   },

assets/Bundles/MainGame/prefab/Car8.prefab

@@ -159,7 +159,7 @@
       "__type__": "cc.Vec3",
       "x": 0,
       "y": 0,
-      "z": 0.61
+      "z": 0.585
     }
   },
   {
@@ -2162,9 +2162,9 @@
     },
     "_size": {
       "__type__": "cc.Vec3",
-      "x": 1.2,
+      "x": 1.134,
       "y": 1,
-      "z": 3.2
+      "z": 3.222
     },
     "_id": ""
   },
@@ -2250,7 +2250,7 @@
         "__expectedType__": "cc.Material"
       },
       {
-        "__uuid__": "8e9c0e2b-bb1f-424d-bbe2-b63e83bea2db@e114f",
+        "__uuid__": "bf332ea3-76ec-4a94-81d6-bb2928080508",
         "__expectedType__": "cc.Material"
       }
     ],
@@ -2385,7 +2385,7 @@
     },
     "_materials": [
       {
-        "__uuid__": "8e9c0e2b-bb1f-424d-bbe2-b63e83bea2db@e114f",
+        "__uuid__": "bf332ea3-76ec-4a94-81d6-bb2928080508",
         "__expectedType__": "cc.Material"
       }
     ],

assets/Scripts/Scenes/MainGame/Components/CarCarColorsComponent.ts

-import { _decorator, color, Color, Component, Enum, find, Material, MeshRenderer, Node, tween, Vec3 } from 'cc';
+import {
+    _decorator,
+    BoxCollider,
+    color,
+    Color,
+    Component,
+    Enum,
+    find,
+    Material,
+    MeshRenderer,
+    Node,
+    tween,
+    Vec3
+} from 'cc';
 import { CarColors, CarTypes } from '../CarColorsGlobalTypes';
 import { RoleCarColorsComponent } from './RoleCarColorsComponent';
 import { CarColorsGlobalInstance } from '../CarColorsGlobalInstance';
@@ -33,6 +46,9 @@ export class CarCarColorsComponent extends Component {
     @property(MeshRenderer) bodyMesh: MeshRenderer = null
     @property(MeshRenderer) top: MeshRenderer = null
 
+    get sitNum() {
+        return this.node.getChildByName("Seets").children.length;
+    }
 
     halfLen: number = 2
 
@@ -43,12 +59,7 @@ export class CarCarColorsComponent extends Component {
 
     onLoad() {
         this.changeColor()
-        if (this.carType === CarTypes.CAR8) {
-            this.halfLen = 1.6
-        } else if (this.carType === CarTypes.CAR6) {
-            this.halfLen = 1.4
-        }
-
+        this.halfLen = this.getComponent(BoxCollider).size.z / 2;
         this.roleNum = 0
         this.isFull = false
     }
@@ -95,7 +106,7 @@ export class CarCarColorsComponent extends Component {
 
         this.tweenCount += 1
         this.roleNum += 1
-        this.isFull = this.roleNum >= this.node.getChildByName("Seets").children.length;
+        this.isFull = this.roleNum >= this.sitNum;
         return this.isFull
     }
 

assets/Scripts/Scenes/MainGame/Systerms/CarCarColorsSysterm.ts

@@ -18,28 +18,20 @@ export class CarCarColorsSysterm extends Component {
     checkBoxInter: number = 10 // 每10帧检测一次
 
     addCar(node: Node) {
-        const carBoxCom = node.getComponent(CarBoxComponent)
+        const carBoxCom = node.getComponent(CarBoxComponent);
         if (carBoxCom) {
-            this.checkBoxInter = 10
-            this.carBoxMap.push(carBoxCom)
+            this.checkBoxInter = 10;
+            this.carBoxMap.push(carBoxCom);
             node.getChildByName("cars").children.forEach((car) => {
-                car.active = false
-                this.addCar(car)
-            })
-            return
+                car.active = false;
+                this.addCar(car);
+            });
+            return;
         }
-        this.activeCar.set(node.uuid, node)
-        const color = node.getComponent(CarCarColorsComponent).carColor
-        const carType = node.getComponent(CarCarColorsComponent).carType
-        let len = 10
-        if (carType === CarTypes.CAR8) {
-            len = 8
-        } else if (carType === CarTypes.CAR6) {
-            len = 6
-        }
-
-        for (; len--;) {
-            this.carSeats.push(color)
+        this.activeCar.set(node.uuid, node);
+        let { carColor, sitNum } = node.getComponent(CarCarColorsComponent);
+        for (; sitNum--;) {
+            this.carSeats.push(carColor);
         }
     }
 
@@ -58,52 +50,65 @@ export class CarCarColorsSysterm extends Component {
     }
 
     refreshCar() {
-        const cars = find("Scene/Levels").children[0].children
+        const cars = find("Scene/Levels").children[0].children;
 
+        const car4s: { cars: Array<Node>, colors: Array<CarColors> } = {
+            cars: [],
+            colors: [],
+        };
         const miniCars: { cars: Array<Node>, colors: Array<CarColors> } = {
             cars: [],
-            colors: []
-        }
+            colors: [],
+        };
         const middleCars: { cars: Array<Node>, colors: Array<CarColors> } = {
             cars: [],
-            colors: []
-        }
+            colors: [],
+        };
         const bigCars: { cars: Array<Node>, colors: Array<CarColors> } = {
             cars: [],
-            colors: []
-        }
+            colors: [],
+        };
         cars.forEach(car => {
-            const carCom = car.getComponent(CarCarColorsComponent)
-            if (!carCom) return
+            const carCom = car.getComponent(CarCarColorsComponent);
+            if (!carCom) return;
+            if (carCom.carType === CarTypes.CAR4) {
+                car4s.cars.push(car);
+                car4s.colors.push(carCom.carColor);
+                return;
+            }
             if (carCom.carType === CarTypes.CAR6) {
-                miniCars.cars.push(car)
-                miniCars.colors.push(carCom.carColor)
-                return
+                miniCars.cars.push(car);
+                miniCars.colors.push(carCom.carColor);
+                return;
             }
             if (carCom.carType === CarTypes.CAR8) {
-                middleCars.cars.push(car)
-                middleCars.colors.push(carCom.carColor)
-                return
+                middleCars.cars.push(car);
+                middleCars.colors.push(carCom.carColor);
+                return;
             }
             if (carCom.carType === CarTypes.CAR10) {
-                bigCars.cars.push(car)
-                bigCars.colors.push(carCom.carColor)
-                return
+                bigCars.cars.push(car);
+                bigCars.colors.push(carCom.carColor);
+                return;
             }
-        })
+        });
 
+        car4s.colors.sort(() => Math.random() - 0.5);
         miniCars.colors.sort(() => Math.random() - 0.5);
         middleCars.colors.sort(() => Math.random() - 0.5);
         bigCars.colors.sort(() => Math.random() - 0.5);
+        car4s.cars.forEach((car, index) => {
+            car.getComponent(CarCarColorsComponent).carColor = car4s.colors[index];
+        });
         miniCars.cars.forEach((car, index) => {
-            car.getComponent(CarCarColorsComponent).carColor = miniCars.colors[index]
-        })
+            car.getComponent(CarCarColorsComponent).carColor = miniCars.colors[index];
+        });
         middleCars.cars.forEach((car, index) => {
-            car.getComponent(CarCarColorsComponent).carColor = middleCars.colors[index]
-        })
+            car.getComponent(CarCarColorsComponent).carColor = middleCars.colors[index];
+        });
         bigCars.cars.forEach((car, index) => {
-            car.getComponent(CarCarColorsComponent).carColor = bigCars.colors[index]
-        })
+            car.getComponent(CarCarColorsComponent).carColor = bigCars.colors[index];
+        });
     }
 
     checkCarBox() {

assets/Scripts/Scenes/MainGame/Systerms/RoleCarColorsSysterm.ts

@@ -17,7 +17,7 @@ import { CarCarColorsComponent } from '../Components/CarCarColorsComponent';
 import { AudioClipName, AudioMgr } from "db://assets/core/base/AudioMgr";
 import { showPanel } from "db://assets/core/Module/UIFast";
 import { ReviewPanel } from "db://assets/Scripts/Panels/ReviewPanel";
-import { CarColors, CarTypes } from "db://assets/Scripts/Scenes/MainGame/CarColorsGlobalTypes";
+import { CarColors } from "db://assets/Scripts/Scenes/MainGame/CarColorsGlobalTypes";
 import { CarColorsGlobalInstance } from "db://assets/Scripts/Scenes/MainGame/CarColorsGlobalInstance";
 import { MainGame } from "db://assets/Scripts/Scenes/MainGame/MainGame";
 import gameStore from "db://assets/Scripts/store/gameStore";
@@ -90,14 +90,8 @@ export class RoleCarColorsSysterm extends Component {
         for(let i = cars.length; i--;){
             const car = cars[i]
             const carComp = car.getComponent(CarCarColorsComponent)
-            let num = 10
-            if (carComp.carType === CarTypes.CAR8){
-                num = 8
-            }else if (carComp.carType === CarTypes.CAR6){
-                num = 6
-            }
+            let num = carComp.sitNum;
             num -= carComp.roleNum
-            console.log(num)
             for(;num--;){
                 // console.log(num)
                 colors.push(carComp.carColor)