123

assets/resources/prefabs/game.prefab

@@ -7136,6 +7136,15 @@
       {
         "__id__": 329
       },
+      {
+        "__id__": 341
+      },
+      {
+        "__id__": 347
+      },
+      {
+        "__id__": 353
+      },
       {
         "__id__": 381
       },
@@ -7354,7 +7363,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "layout",
+    "_name": "1001",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
@@ -7363,43 +7372,31 @@
     "_children": [
       {
         "__id__": 330
-      },
-      {
-        "__id__": 336
-      },
-      {
-        "__id__": 342
-      },
-      {
-        "__id__": 354
-      },
-      {
-        "__id__": 368
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 376
+        "__id__": 336
       },
       {
-        "__id__": 378
+        "__id__": 338
       }
     ],
     "_prefab": {
-      "__id__": 380
+      "__id__": 340
     },
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": -1183.895,
+      "y": -639.8949999999999,
       "z": 0
     },
     "_lrot": {
       "__type__": "cc.Quat",
       "x": 0,
       "y": 0,
-      "z": 0,
+      "z": -8.673617379884035e-19,
       "w": 1
     },
     "_lscale": {
@@ -7414,13 +7411,13 @@
       "__type__": "cc.Vec3",
       "x": 0,
       "y": 0,
-      "z": 0
+      "z": -9.93923337957349e-17
     },
     "_id": ""
   },
   {
     "__type__": "cc.Node",
-    "_name": "Label",
+    "_name": "img_gong_xi_jie_suo",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
@@ -7442,7 +7439,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 934.8000000000001,
+      "y": 0,
       "z": 0
     },
     "_lrot": {
@@ -7482,8 +7479,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 222.4609375,
-      "height": 100.8
+      "width": 634,
+      "height": 632
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -7494,10 +7491,10 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "09Vq0pA4xBW6ef2aQY6f5r"
+    "fileId": "49T5QBqORNo6PkqpYTcJP3"
   },
   {
-    "__type__": "cc.Label",
+    "__type__": "cc.Sprite",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -7514,55 +7511,91 @@
     "_color": {
       "__type__": "cc.Color",
       "r": 255,
-      "g": 199,
-      "b": 102,
+      "g": 255,
+      "b": 255,
       "a": 255
     },
-    "_string": "10000",
-    "_horizontalAlign": 1,
-    "_verticalAlign": 1,
-    "_actualFontSize": 80,
-    "_fontSize": 80,
-    "_fontFamily": "Arial",
-    "_lineHeight": 80,
-    "_overflow": 0,
-    "_enableWrapText": true,
-    "_font": null,
-    "_isSystemFontUsed": true,
-    "_spacingX": 0,
-    "_isItalic": false,
-    "_isBold": true,
-    "_isUnderline": false,
-    "_underlineHeight": 2,
-    "_cacheMode": 0,
-    "_enableOutline": false,
-    "_outlineColor": {
-      "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
-      "a": 255
+    "_spriteFrame": null,
+    "_type": 0,
+    "_fillType": 0,
+    "_sizeMode": 1,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
     },
-    "_outlineWidth": 2,
-    "_enableShadow": false,
-    "_shadowColor": {
-      "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
-      "a": 255
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_useGrayscale": false,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "b1VGDO3HpJDphmm/rW1nMH"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
     },
-    "_shadowOffset": {
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "3f9WVW0a9McJzsDvMzy9kj",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 329
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 337
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 500,
+      "height": 500
+    },
+    "_anchorPoint": {
       "__type__": "cc.Vec2",
-      "x": 2,
-      "y": 2
+      "x": 0.5,
+      "y": 0.5
     },
-    "_shadowBlur": 2,
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "f2wvhz28NJnrsw2Oo7f0+d"
+    "fileId": "4a1NphtJVN5KaqQ5pIttPB"
+  },
+  {
+    "__type__": "0d55dbBT+1Iy4AKubXgt7ws",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 329
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 339
+    },
+    "spr_car": {
+      "__id__": 330
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "b3Hyb963hDipX/8dKIC0KL"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -7572,36 +7605,36 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "ddEpyjlJREMbFP2b7Gkz4H",
+    "fileId": "144yoIlbJERrFi+wtr0djK",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {
     "__type__": "cc.Node",
-    "_name": "Label-001",
+    "_name": "Label",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 329
+      "__id__": 320
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 337
+        "__id__": 342
       },
       {
-        "__id__": 339
+        "__id__": 344
       }
     ],
     "_prefab": {
-      "__id__": 341
+      "__id__": 346
     },
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 839.2,
+      "y": -249.0949999999998,
       "z": 0
     },
     "_lrot": {
@@ -7633,16 +7666,16 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 336
+      "__id__": 341
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 338
+      "__id__": 343
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 400.05859375,
-      "height": 50.4
+      "width": 222.4609375,
+      "height": 100.8
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -7653,7 +7686,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "72TxZJ0+9ENLIE+JHfXcrh"
+    "fileId": "09Vq0pA4xBW6ef2aQY6f5r"
   },
   {
     "__type__": "cc.Label",
@@ -7661,36 +7694,36 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 336
+      "__id__": 341
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 340
+      "__id__": 345
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
     "_dstBlendFactor": 4,
     "_color": {
       "__type__": "cc.Color",
-      "r": 156,
-      "g": 154,
-      "b": 154,
+      "r": 255,
+      "g": 199,
+      "b": 102,
       "a": 255
     },
-    "_string": "已超过全国80%的司机",
+    "_string": "10000",
     "_horizontalAlign": 1,
     "_verticalAlign": 1,
-    "_actualFontSize": 40,
-    "_fontSize": 40,
+    "_actualFontSize": 80,
+    "_fontSize": 80,
     "_fontFamily": "Arial",
-    "_lineHeight": 40,
+    "_lineHeight": 80,
     "_overflow": 0,
     "_enableWrapText": true,
     "_font": null,
     "_isSystemFontUsed": true,
     "_spacingX": 0,
     "_isItalic": false,
-    "_isBold": false,
+    "_isBold": true,
     "_isUnderline": false,
     "_underlineHeight": 2,
     "_cacheMode": 0,
@@ -7721,7 +7754,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "4d3+u3nEhAELu6xvHNVBWa"
+    "fileId": "f2wvhz28NJnrsw2Oo7f0+d"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -7731,90 +7764,36 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "99+BLcMy1IG6MRJ0bcIuZW",
+    "fileId": "ddEpyjlJREMbFP2b7Gkz4H",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {
     "__type__": "cc.Node",
-    "_name": "1001",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "_parent": {
-      "__id__": 329
-    },
-    "_children": [
-      {
-        "__id__": 343
-      }
-    ],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 349
-      },
-      {
-        "__id__": 351
-      }
-    ],
-    "_prefab": {
-      "__id__": 353
-    },
-    "_lpos": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 544,
-      "z": 0
-    },
-    "_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": 33554432,
-    "_euler": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.Node",
-    "_name": "img_gong_xi_jie_suo",
+    "_name": "Label-001",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 342
+      "__id__": 320
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 344
+        "__id__": 348
       },
       {
-        "__id__": 346
+        "__id__": 350
       }
     ],
     "_prefab": {
-      "__id__": 348
+      "__id__": 352
     },
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 0,
+      "y": -344.69500000000005,
       "z": 0
     },
     "_lrot": {
@@ -7846,16 +7825,16 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 343
+      "__id__": 347
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 345
+      "__id__": 349
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 634,
-      "height": 632
+      "width": 400.05859375,
+      "height": 50.4
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -7866,49 +7845,75 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "49T5QBqORNo6PkqpYTcJP3"
+    "fileId": "72TxZJ0+9ENLIE+JHfXcrh"
   },
   {
-    "__type__": "cc.Sprite",
+    "__type__": "cc.Label",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 343
+      "__id__": 347
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 347
+      "__id__": 351
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
     "_dstBlendFactor": 4,
     "_color": {
       "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
+      "r": 156,
+      "g": 154,
+      "b": 154,
       "a": 255
     },
-    "_spriteFrame": null,
-    "_type": 0,
-    "_fillType": 0,
-    "_sizeMode": 1,
-    "_fillCenter": {
+    "_string": "已超过全国80%的司机",
+    "_horizontalAlign": 1,
+    "_verticalAlign": 1,
+    "_actualFontSize": 40,
+    "_fontSize": 40,
+    "_fontFamily": "Arial",
+    "_lineHeight": 40,
+    "_overflow": 0,
+    "_enableWrapText": true,
+    "_font": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_isItalic": false,
+    "_isBold": false,
+    "_isUnderline": false,
+    "_underlineHeight": 2,
+    "_cacheMode": 0,
+    "_enableOutline": false,
+    "_outlineColor": {
+      "__type__": "cc.Color",
+      "r": 0,
+      "g": 0,
+      "b": 0,
+      "a": 255
+    },
+    "_outlineWidth": 2,
+    "_enableShadow": false,
+    "_shadowColor": {
+      "__type__": "cc.Color",
+      "r": 0,
+      "g": 0,
+      "b": 0,
+      "a": 255
+    },
+    "_shadowOffset": {
       "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 0
+      "x": 2,
+      "y": 2
     },
-    "_fillStart": 0,
-    "_fillRange": 0,
-    "_isTrimmedMode": true,
-    "_useGrayscale": false,
-    "_atlas": null,
+    "_shadowBlur": 2,
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "b1VGDO3HpJDphmm/rW1nMH"
+    "fileId": "4d3+u3nEhAELu6xvHNVBWa"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -7918,80 +7923,75 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "3f9WVW0a9McJzsDvMzy9kj",
+    "fileId": "99+BLcMy1IG6MRJ0bcIuZW",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {
-    "__type__": "cc.UITransform",
-    "_name": "",
+    "__type__": "cc.Node",
+    "_name": "layout",
     "_objFlags": 0,
     "__editorExtras__": {},
-    "node": {
-      "__id__": 342
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 350
+    "_parent": {
+      "__id__": 320
     },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 500,
-      "height": 500
+    "_children": [
+      {
+        "__id__": 354
+      },
+      {
+        "__id__": 368
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 376
+      },
+      {
+        "__id__": 378
+      }
+    ],
+    "_prefab": {
+      "__id__": 380
     },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": -1183.895,
+      "z": 0
     },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "4a1NphtJVN5KaqQ5pIttPB"
-  },
-  {
-    "__type__": "0d55dbBT+1Iy4AKubXgt7ws",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 342
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
     },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 352
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
     },
-    "spr_car": {
-      "__id__": 343
+    "_mobility": 0,
+    "_layer": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
     },
     "_id": ""
   },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "b3Hyb963hDipX/8dKIC0KL"
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__id__": 0
-    },
-    "fileId": "144yoIlbJERrFi+wtr0djK",
-    "instance": null,
-    "targetOverrides": null,
-    "nestedPrefabInstanceRoots": null
-  },
   {
     "__type__": "cc.Node",
     "_name": "btn_relife",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 329
+      "__id__": 353
     },
     "_children": [
       {
@@ -8299,7 +8299,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 329
+      "__id__": 353
     },
     "_children": [],
     "_active": true,
@@ -8494,7 +8494,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 329
+      "__id__": 353
     },
     "_enabled": true,
     "__prefab": {
@@ -8503,7 +8503,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 100,
-      "height": 985.2
+      "height": 274
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -8522,7 +8522,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 329
+      "__id__": 353
     },
     "_enabled": true,
     "__prefab": {
@@ -9091,7 +9091,7 @@
       "__id__": 368
     },
     "lab_scores": {
-      "__id__": 330
+      "__id__": 341
     },
     "btn_back_home": {
       "__id__": 387
@@ -9100,13 +9100,13 @@
       "__id__": 354
     },
     "unlock_car": {
-      "__id__": 342
+      "__id__": 329
     },
     "btn_share": {
       "__id__": 381
     },
     "lab_des": {
-      "__id__": 336
+      "__id__": 347
     },
     "_id": ""
   },

assets/script/game/buff/buff_active_effect_item.ts

@@ -10,6 +10,9 @@ export class buff_active_effect_item extends Component {
         this.node.position = pos
         this.mDis = dis;
         this.mFinishCb = cb
+        if(this.mFinishCb!=null){
+            this.mFinishCb()
+        }
         switch (type) {
             case config.SHOW_BUFF_STATUS.DUN:
                 this.node.getComponent(Animation).play("active_dun")
@@ -25,10 +28,7 @@ export class buff_active_effect_item extends Component {
 
     public buff_free(){
         tween(this.node).to(0.5,{position:this.mDis}).call(()=>{
-            if(this.mFinishCb!=null){
-                this.mFinishCb()
-                this.node.removeFromParent()
-            }
+            this.node.removeFromParent()
         }).start()
     }
 }