Merge commit 'd040adb565f6f18030abfafda7f1d594b74b608a'

assets/resources/prefabs/game.prefab

@@ -52,7 +52,7 @@
         "__id__": 316
       },
       {
-        "__id__": 568
+        "__id__": 570
       },
       {
         "__id__": 105
@@ -60,9 +60,6 @@
     ],
     "_active": true,
     "_components": [
-      {
-        "__id__": 580
-      },
       {
         "__id__": 582
       },
@@ -74,10 +71,13 @@
       },
       {
         "__id__": 588
+      },
+      {
+        "__id__": 590
       }
     ],
     "_prefab": {
-      "__id__": 590
+      "__id__": 592
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -6978,9 +6978,6 @@
     ],
     "_active": false,
     "_components": [
-      {
-        "__id__": 557
-      },
       {
         "__id__": 559
       },
@@ -6992,10 +6989,13 @@
       },
       {
         "__id__": 565
+      },
+      {
+        "__id__": 567
       }
     ],
     "_prefab": {
-      "__id__": 567
+      "__id__": 569
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -9180,10 +9180,13 @@
       },
       {
         "__id__": 554
+      },
+      {
+        "__id__": 556
       }
     ],
     "_prefab": {
-      "__id__": 556
+      "__id__": 558
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -12645,6 +12648,24 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "2fCst/xVNDF7WSfJCODayk"
   },
+  {
+    "__type__": "cc.BlockInputEvents",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 409
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 557
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "27NR0Q9YFNPLvQ1dtXqLUk"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -12668,7 +12689,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 558
+      "__id__": 560
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -12696,7 +12717,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 560
+      "__id__": 562
     },
     "btn_restart": {
       "__id__": 366
@@ -12783,7 +12804,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 562
+      "__id__": 564
     },
     "_alignFlags": 45,
     "_target": null,
@@ -12819,7 +12840,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 564
+      "__id__": 566
     },
     "_id": ""
   },
@@ -12837,7 +12858,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 566
+      "__id__": 568
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -12895,20 +12916,20 @@
     },
     "_children": [
       {
-        "__id__": 569
+        "__id__": 571
       }
     ],
     "_active": false,
     "_components": [
       {
-        "__id__": 575
+        "__id__": 577
       },
       {
-        "__id__": 577
+        "__id__": 579
       }
     ],
     "_prefab": {
-      "__id__": 579
+      "__id__": 581
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -12945,20 +12966,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 568
+      "__id__": 570
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 570
+        "__id__": 572
       },
       {
-        "__id__": 572
+        "__id__": 574
       }
     ],
     "_prefab": {
-      "__id__": 574
+      "__id__": 576
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -12995,11 +13016,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 569
+      "__id__": 571
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 571
+      "__id__": 573
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -13023,11 +13044,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 569
+      "__id__": 571
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 573
+      "__id__": 575
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -13107,11 +13128,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 568
+      "__id__": 570
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 576
+      "__id__": 578
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -13135,14 +13156,14 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 568
+      "__id__": 570
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 578
+      "__id__": 580
     },
     "lab_time": {
-      "__id__": 569
+      "__id__": 571
     },
     "_id": ""
   },
@@ -13173,7 +13194,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 581
+      "__id__": 583
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -13201,7 +13222,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 583
+      "__id__": 585
     },
     "_alignFlags": 45,
     "_target": null,
@@ -13237,7 +13258,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 585
+      "__id__": 587
     },
     "sfList": [
       {
@@ -13327,7 +13348,7 @@
       "__id__": 308
     },
     "count_time": {
-      "__id__": 568
+      "__id__": 570
     },
     "mWeiqiManager": {
       "__id__": 205
@@ -13357,7 +13378,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 587
+      "__id__": 589
     },
     "_type": 0,
     "_inverted": false,
@@ -13379,7 +13400,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 589
+      "__id__": 591
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,

assets/scene/main.scene

@@ -105,7 +105,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 540,
-      "y": 960,
+      "y": 960.0000000000002,
       "z": 0
     },
     "_lrot": {
@@ -192,7 +192,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1920
+      "height": 1920.0000000000002
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -290,7 +290,7 @@
     "_priority": 0,
     "_fov": 45,
     "_fovAxis": 0,
-    "_orthoHeight": 960,
+    "_orthoHeight": 960.0000000000001,
     "_near": 0,
     "_far": 1000,
     "_color": {
@@ -561,7 +561,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1920
+      "height": 1920.0000000000002
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -867,7 +867,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1920
+      "height": 1920.0000000000002
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",

assets/script/game/car.ts

@@ -301,7 +301,7 @@ export class car extends Component {
         // Tween.stopAllByTarget(this.game_manager.getBuffShowView().getBuffXi())
         // this.cancelScheduleBuffXi()
         // tween(this.game_manager.getBuffShowView().getBuffXi()).delay(tools.game_config.buff_xi).call(this.cancelScheduleBuffXi.bind(this)).start()
-        this.game_manager.getBuffShowView().showBuffXi(this.cancelScheduleBuffXi.bind(this),tools.game_config.buff_xi)
+        this.game_manager.getBuffShowView().showBuffXi(this.cancelScheduleBuffXi.bind(this),tools.game_config.buff_xi+this.mCarData.attribute.n_magnet_cd)
         audioManager.Instance().playSound(config.AUDIO.buff_xi)
         this.spr.getComponent(buff_manager).updateStatus(config.SHOW_BUFF_STATUS.XI)
         this.buff_xi_status = true;
@@ -316,11 +316,11 @@ export class car extends Component {
     }
 
     public buff_xing(){
-        this.addSpeedNum(tools.game_config.buff_xi_add_speed+this.mCarData.attribute.n_star_cd)
+        this.addSpeedNum(tools.game_config.buff_xi_add_speed)
         // Tween.stopAllByTarget(this.game_manager.getBuffShowView().getBuffXing())
         // this.cancelScheduleBuffXing()
         // tween(this.game_manager.getBuffShowView().getBuffXing()).delay(tools.game_config.buff_xing).call(this.cancelScheduleBuffXing.bind(this)).start()
-        this.game_manager.getBuffShowView().showBuffXing(this.cancelScheduleBuffXing.bind(this),tools.game_config.buff_xing)
+        this.game_manager.getBuffShowView().showBuffXing(this.cancelScheduleBuffXing.bind(this),tools.game_config.buff_xing+this.mCarData.attribute.n_star_cd)
         audioManager.Instance().playSound(config.AUDIO.buff_xing)
         this.spr.getComponent(buff_manager).updateStatus(config.SHOW_BUFF_STATUS.XING)
         this.buff_xing_status = true;
@@ -336,12 +336,12 @@ export class car extends Component {
     }
 
     public buff_dun(time:number =null){
-        this.addSpeedNum(tools.game_config.buff_dun_add_speed+this.mCarData.attribute.n_shield_cd)
+        this.addSpeedNum(tools.game_config.buff_dun_add_speed)
         // Tween.stopAllByTarget(this.game_manager.getBuffShowView().getBuffDun())
         // this.cancelScheduleBuffDun()
         // tween(this.game_manager.getBuffShowView().getBuffDun()).delay(tools.game_config.buff_dun).call(this.cancelScheduleBuffDun.bind(this)).start()
         // this.scheduleOnce(this.cancelScheduleBuffDun.bind(this),tools.game_config.buff_dun)
-        this.game_manager.getBuffShowView().showBuffDun(this.cancelScheduleBuffDun.bind(this),time!=null?time:tools.game_config.buff_dun)  
+        this.game_manager.getBuffShowView().showBuffDun(this.cancelScheduleBuffDun.bind(this),time!=null?time:(tools.game_config.buff_dun+this.mCarData.attribute.n_shield_cd))  
         audioManager.Instance().playSound(config.AUDIO.buff_dun)
         this.spr.getComponent(buff_manager).updateStatus(config.SHOW_BUFF_STATUS.DUN)
         this.buff_dun_status = true;