greg 4 年 前
コミット
d7fc29c69f

+ 129 - 54
assets/res/cars/Car_102.prefab

@@ -22,15 +22,12 @@
       },
       {
         "__id__": 41
-      },
-      {
-        "__id__": 55
       }
     ],
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 82
+      "__id__": 84
     },
     "_opacity": 255,
     "_color": {
@@ -1381,20 +1378,87 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "Particle_102_2",
+    "_name": "ParticleRoot",
     "_objFlags": 0,
     "_parent": {
       "__id__": 1
     },
+    "_children": [
+      {
+        "__id__": 42
+      },
+      {
+        "__id__": 56
+      }
+    ],
+    "_active": true,
+    "_components": [],
+    "_prefab": {
+      "__id__": 83
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 0,
+      "height": 0
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "Particle_102_2",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 41
+    },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 42
+        "__id__": 43
       }
     ],
     "_prefab": {
-      "__id__": 54
+      "__id__": 55
     },
     "_opacity": 255,
     "_color": {
@@ -1448,7 +1512,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 41
+      "__id__": 42
     },
     "_enabled": true,
     "_materials": [
@@ -1464,36 +1528,36 @@
     "_simulationSpace": 1,
     "simulationSpeed": 1,
     "startDelay": {
-      "__id__": 43
+      "__id__": 44
     },
     "startLifetime": {
-      "__id__": 44
+      "__id__": 45
     },
     "startColor": {
-      "__id__": 45
+      "__id__": 46
     },
     "scaleSpace": 1,
     "startSize": {
-      "__id__": 46
+      "__id__": 47
     },
     "startSpeed": {
-      "__id__": 47
+      "__id__": 48
     },
     "startRotation": {
-      "__id__": 48
+      "__id__": 49
     },
     "gravityModifier": {
-      "__id__": 49
+      "__id__": 50
     },
     "rateOverTime": {
-      "__id__": 50
+      "__id__": 51
     },
     "rateOverDistance": {
-      "__id__": 51
+      "__id__": 52
     },
     "bursts": [],
     "_shapeModule": {
-      "__id__": 52
+      "__id__": 53
     },
     "_renderMode": 0,
     "_velocityScale": 1,
@@ -1573,7 +1637,7 @@
     "arcMode": 0,
     "arcSpread": 0,
     "arcSpeed": {
-      "__id__": 53
+      "__id__": 54
     },
     "length": 2,
     "boxThickness": {
@@ -1614,12 +1678,12 @@
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 41
+      "__id__": 1
     },
     "asset": {
-      "__uuid__": "744dee1f-3bbf-4b41-9094-39ef6f8af209"
+      "__uuid__": "08579ea4-f7eb-4b92-ac6e-a3b657ca7d81"
     },
-    "fileId": "c5hncQuCpDoonUF1G2ckxo",
+    "fileId": "36Bj5AuzVKRZK/CAKckEab",
     "sync": false
   },
   {
@@ -1627,17 +1691,17 @@
     "_name": "Particle_102",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 1
+      "__id__": 41
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 56
+        "__id__": 57
       }
     ],
     "_prefab": {
-      "__id__": 81
+      "__id__": 82
     },
     "_opacity": 255,
     "_color": {
@@ -1668,9 +1732,9 @@
         0.9999646152399649,
         0,
         0.008412387769767512,
-        4.9300068800000005,
-        4.9300068800000005,
-        4.9300068800000005
+        4.93001,
+        4.93001,
+        4.93001
       ]
     },
     "_eulerAngles": {
@@ -1691,7 +1755,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 55
+      "__id__": 56
     },
     "_enabled": true,
     "_materials": [
@@ -1707,39 +1771,39 @@
     "_simulationSpace": 1,
     "simulationSpeed": 1,
     "startDelay": {
-      "__id__": 57
+      "__id__": 58
     },
     "startLifetime": {
-      "__id__": 58
+      "__id__": 59
     },
     "startColor": {
-      "__id__": 59
+      "__id__": 60
     },
     "scaleSpace": 1,
     "startSize": {
-      "__id__": 67
+      "__id__": 68
     },
     "startSpeed": {
-      "__id__": 68
+      "__id__": 69
     },
     "startRotation": {
-      "__id__": 69
+      "__id__": 70
     },
     "gravityModifier": {
-      "__id__": 70
+      "__id__": 71
     },
     "rateOverTime": {
-      "__id__": 71
+      "__id__": 72
     },
     "rateOverDistance": {
-      "__id__": 72
+      "__id__": 73
     },
     "bursts": [],
     "_shapeModule": {
-      "__id__": 73
+      "__id__": 74
     },
     "_textureAnimationModule": {
-      "__id__": 75
+      "__id__": 76
     },
     "_renderMode": 0,
     "_velocityScale": 1,
@@ -1763,31 +1827,31 @@
     "__type__": "cc.GradientRange",
     "_mode": 4,
     "gradient": {
-      "__id__": 60
+      "__id__": 61
     }
   },
   {
     "__type__": "cc.Gradient",
     "colorKeys": [
-      {
-        "__id__": 61
-      },
       {
         "__id__": 62
       },
       {
         "__id__": 63
+      },
+      {
+        "__id__": 64
       }
     ],
     "alphaKeys": [
-      {
-        "__id__": 64
-      },
       {
         "__id__": 65
       },
       {
         "__id__": 66
+      },
+      {
+        "__id__": 67
       }
     ],
     "mode": 0
@@ -1889,7 +1953,7 @@
     "arcMode": 0,
     "arcSpread": 0,
     "arcSpeed": {
-      "__id__": 74
+      "__id__": 75
     },
     "length": 2,
     "boxThickness": {
@@ -1937,10 +2001,10 @@
     "randomRow": false,
     "rowIndex": 0,
     "frameOverTime": {
-      "__id__": 76
+      "__id__": 77
     },
     "startFrame": {
-      "__id__": 80
+      "__id__": 81
     },
     "cycleCount": 1
   },
@@ -1948,7 +2012,7 @@
     "__type__": "cc.CurveRange",
     "mode": 1,
     "curve": {
-      "__id__": 77
+      "__id__": 78
     },
     "multiplier": 1
   },
@@ -1956,10 +2020,10 @@
     "__type__": "cc.AnimationCurve",
     "keyFrames": [
       {
-        "__id__": 78
+        "__id__": 79
       },
       {
-        "__id__": 79
+        "__id__": 80
       }
     ],
     "preWrapMode": 2,
@@ -1993,7 +2057,18 @@
     "asset": {
       "__uuid__": "08579ea4-f7eb-4b92-ac6e-a3b657ca7d81"
     },
-    "fileId": "9d/syP6MhFlLxGRKePWS1B",
+    "fileId": "d6UT2fMgFMa5uC3sVpNvKf",
+    "sync": false
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "08579ea4-f7eb-4b92-ac6e-a3b657ca7d81"
+    },
+    "fileId": "3bcLYnn+xB4bB+rzUglhBT",
     "sync": false
   },
   {

+ 3 - 3
assets/res/mainPackage/configs/Car.json

@@ -11,7 +11,7 @@
         "width": 2,
         "height": 2,
         "packageName": "cars",
-        "prefab": "car001/Car001"
+        "prefab": "Car_101"
     },
     {
         "id": 10102,
@@ -25,7 +25,7 @@
         "width": 2,
         "height": 2,
         "packageName": "cars",
-        "prefab": "car001/Car001"
+        "prefab": "Car_101"
     },
     {
         "id": 10103,
@@ -39,6 +39,6 @@
         "width": 2,
         "height": 2,
         "packageName": "cars",
-        "prefab": "car001/Car001"
+        "prefab": "Car_101"
     }
 ]

+ 1 - 1
assets/script/game/modules/fightings/GameController.ts

@@ -160,7 +160,7 @@ export default class GameController extends cc.Component {
             pos=this.camera.position;
             pos.x=this.player.logicPosition.x;
             pos.y=this.inCirclePolygon.center.y;
-            pos.z=-this.player.logicPosition.z+50;
+            pos.z=-this.player.logicPosition.z+60;
             this.camera.position=pos;
             // cc.log("摄像机位置:",pos.x,pos.y,pos.z);
         }