future пре 1 година
родитељ
комит
5cd393d24f
2 измењених фајлова са 238 додато и 119 уклоњено
  1. 237 119
      assets/resources/prefabs/game.prefab
  2. 1 0
      assets/script/game/results.ts

+ 237 - 119
assets/resources/prefabs/game.prefab

@@ -52,7 +52,7 @@
         "__id__": 316
       },
       {
-        "__id__": 570
+        "__id__": 574
       },
       {
         "__id__": 105
@@ -61,23 +61,23 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 582
+        "__id__": 586
       },
       {
-        "__id__": 584
+        "__id__": 588
       },
       {
-        "__id__": 586
+        "__id__": 590
       },
       {
-        "__id__": 588
+        "__id__": 592
       },
       {
-        "__id__": 590
+        "__id__": 594
       }
     ],
     "_prefab": {
-      "__id__": 592
+      "__id__": 596
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -176,7 +176,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1919.9999999999998
+      "height": 1920
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -4309,7 +4309,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1919.9999999999998
+      "height": 1920
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -4798,7 +4798,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1919.9999999999998
+      "height": 1920
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -4950,7 +4950,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1919.9999999999998
+      "height": 1920
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -5102,7 +5102,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1919.9999999999998
+      "height": 1920
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -6750,7 +6750,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1919.9999999999998
+      "height": 1920
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -6979,23 +6979,23 @@
     "_active": false,
     "_components": [
       {
-        "__id__": 559
+        "__id__": 563
       },
       {
-        "__id__": 561
+        "__id__": 565
       },
       {
-        "__id__": 563
+        "__id__": 567
       },
       {
-        "__id__": 565
+        "__id__": 569
       },
       {
-        "__id__": 567
+        "__id__": 571
       }
     ],
     "_prefab": {
-      "__id__": 569
+      "__id__": 573
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -9041,7 +9041,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1919.9999999999998
+      "height": 1920
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -9170,23 +9170,23 @@
     "_active": false,
     "_components": [
       {
-        "__id__": 548
+        "__id__": 552
       },
       {
-        "__id__": 550
+        "__id__": 554
       },
       {
-        "__id__": 552
+        "__id__": 556
       },
       {
-        "__id__": 554
+        "__id__": 558
       },
       {
-        "__id__": 556
+        "__id__": 560
       }
     ],
     "_prefab": {
-      "__id__": 558
+      "__id__": 562
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -9241,7 +9241,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 610.375,
+      "y": 681.375,
       "z": 0
     },
     "_lrot": {
@@ -9577,7 +9577,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 125.738,
-      "y": 277.268,
+      "y": 336.268,
       "z": 0
     },
     "_lrot": {
@@ -9876,7 +9876,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": -251.476,
-      "y": 248.252,
+      "y": 307.252,
       "z": 0
     },
     "_lrot": {
@@ -10411,14 +10411,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 543
+        "__id__": 547
       },
       {
-        "__id__": 545
+        "__id__": 549
       }
     ],
     "_prefab": {
-      "__id__": 547
+      "__id__": 551
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -10690,7 +10690,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 39.019000000000176,
+      "y": 39.01900000000012,
       "z": 0
     },
     "_lrot": {
@@ -11019,7 +11019,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 399.99999999999943
+      "height": 399.9999999999998
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -11164,7 +11164,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 399.99999999999943
+      "height": 399.9999999999998
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -11314,7 +11314,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 399.99999999999943
+      "height": 399.9999999999998
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -11432,20 +11432,20 @@
         "__id__": 504
       },
       {
-        "__id__": 516
+        "__id__": 518
       },
       {
-        "__id__": 528
+        "__id__": 532
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 540
+        "__id__": 544
       }
     ],
     "_prefab": {
-      "__id__": 542
+      "__id__": 546
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -11496,10 +11496,13 @@
       },
       {
         "__id__": 513
+      },
+      {
+        "__id__": 515
       }
     ],
     "_prefab": {
-      "__id__": 515
+      "__id__": 517
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -11594,7 +11597,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 120,
+      "width": 136.669921875,
       "height": 75.6
     },
     "_anchorPoint": {
@@ -11630,7 +11633,7 @@
       "b": 45,
       "a": 255
     },
-    "_string": "确定",
+    "_string": "确 定",
     "_horizontalAlign": 1,
     "_verticalAlign": 1,
     "_actualFontSize": 60,
@@ -11643,7 +11646,7 @@
     "_isSystemFontUsed": true,
     "_spacingX": 0,
     "_isItalic": false,
-    "_isBold": true,
+    "_isBold": false,
     "_isUnderline": false,
     "_underlineHeight": 2,
     "_cacheMode": 0,
@@ -11762,6 +11765,62 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "adTvxC1QtEt6jFzRzdrvIt"
   },
+  {
+    "__type__": "cc.Button",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 504
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 516
+    },
+    "clickEvents": [],
+    "_interactable": true,
+    "_transition": 3,
+    "_normalColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_hoverColor": {
+      "__type__": "cc.Color",
+      "r": 211,
+      "g": 211,
+      "b": 211,
+      "a": 255
+    },
+    "_pressedColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_disabledColor": {
+      "__type__": "cc.Color",
+      "r": 124,
+      "g": 124,
+      "b": 124,
+      "a": 255
+    },
+    "_normalSprite": null,
+    "_hoverSprite": null,
+    "_pressedSprite": null,
+    "_disabledSprite": null,
+    "_duration": 0.1,
+    "_zoomScale": 0.9,
+    "_target": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "b4TRwsDK5Ls7mOggBN6Xs+"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -11785,20 +11844,23 @@
     },
     "_children": [
       {
-        "__id__": 517
+        "__id__": 519
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 523
+        "__id__": 525
       },
       {
-        "__id__": 525
+        "__id__": 527
+      },
+      {
+        "__id__": 529
       }
     ],
     "_prefab": {
-      "__id__": 527
+      "__id__": 531
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -11835,20 +11897,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 516
+      "__id__": 518
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 518
+        "__id__": 520
       },
       {
-        "__id__": 520
+        "__id__": 522
       }
     ],
     "_prefab": {
-      "__id__": 522
+      "__id__": 524
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -11885,11 +11947,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 517
+      "__id__": 519
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 519
+      "__id__": 521
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -11913,11 +11975,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 517
+      "__id__": 519
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 521
+      "__id__": 523
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -11942,7 +12004,7 @@
     "_isSystemFontUsed": true,
     "_spacingX": 0,
     "_isItalic": false,
-    "_isBold": true,
+    "_isBold": false,
     "_isUnderline": false,
     "_underlineHeight": 2,
     "_cacheMode": 0,
@@ -11994,11 +12056,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 516
+      "__id__": 518
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 524
+      "__id__": 526
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -12022,11 +12084,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 516
+      "__id__": 518
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 526
+      "__id__": 528
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -12061,6 +12123,62 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "36Mgg46Z5Bz471YfwgczM8"
   },
+  {
+    "__type__": "cc.Button",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 518
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 530
+    },
+    "clickEvents": [],
+    "_interactable": true,
+    "_transition": 3,
+    "_normalColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_hoverColor": {
+      "__type__": "cc.Color",
+      "r": 211,
+      "g": 211,
+      "b": 211,
+      "a": 255
+    },
+    "_pressedColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_disabledColor": {
+      "__type__": "cc.Color",
+      "r": 124,
+      "g": 124,
+      "b": 124,
+      "a": 255
+    },
+    "_normalSprite": null,
+    "_hoverSprite": null,
+    "_pressedSprite": null,
+    "_disabledSprite": null,
+    "_duration": 0.1,
+    "_zoomScale": 0.9,
+    "_target": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "25mTbigl1H05h12qvg5CJJ"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -12084,20 +12202,20 @@
     },
     "_children": [
       {
-        "__id__": 529
+        "__id__": 533
       }
     ],
     "_active": false,
     "_components": [
       {
-        "__id__": 535
+        "__id__": 539
       },
       {
-        "__id__": 537
+        "__id__": 541
       }
     ],
     "_prefab": {
-      "__id__": 539
+      "__id__": 543
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -12134,20 +12252,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 528
+      "__id__": 532
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 530
+        "__id__": 534
       },
       {
-        "__id__": 532
+        "__id__": 536
       }
     ],
     "_prefab": {
-      "__id__": 534
+      "__id__": 538
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -12184,11 +12302,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 529
+      "__id__": 533
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 531
+      "__id__": 535
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -12212,11 +12330,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 529
+      "__id__": 533
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 533
+      "__id__": 537
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -12293,11 +12411,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 528
+      "__id__": 532
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 536
+      "__id__": 540
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -12321,11 +12439,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 528
+      "__id__": 532
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 538
+      "__id__": 542
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -12383,7 +12501,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 541
+      "__id__": 545
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -12424,7 +12542,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 544
+      "__id__": 548
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -12452,7 +12570,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 546
+      "__id__": 550
     },
     "_resizeMode": 1,
     "_layoutType": 2,
@@ -12503,12 +12621,12 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 549
+      "__id__": 553
     },
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1919.9999999999998
+      "height": 1920
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -12531,7 +12649,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 551
+      "__id__": 555
     },
     "_alignFlags": 45,
     "_target": null,
@@ -12567,7 +12685,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 553
+      "__id__": 557
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -12612,16 +12730,16 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 555
+      "__id__": 559
     },
     "btn_sure": {
       "__id__": 504
     },
     "btn_go_lib": {
-      "__id__": 516
+      "__id__": 518
     },
     "btn_use_car": {
-      "__id__": 528
+      "__id__": 532
     },
     "content": {
       "__id__": 469
@@ -12658,7 +12776,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 557
+      "__id__": 561
     },
     "_id": ""
   },
@@ -12689,12 +12807,12 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 560
+      "__id__": 564
     },
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1919.9999999999998
+      "height": 1920
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -12717,7 +12835,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 562
+      "__id__": 566
     },
     "btn_restart": {
       "__id__": 366
@@ -12744,7 +12862,7 @@
       "__id__": 391
     },
     "res_new_car": {
-      "__id__": 554
+      "__id__": 558
     },
     "TITLE_SF_LIST": [
       {
@@ -12804,7 +12922,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 564
+      "__id__": 568
     },
     "_alignFlags": 45,
     "_target": null,
@@ -12840,7 +12958,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 566
+      "__id__": 570
     },
     "_id": ""
   },
@@ -12858,7 +12976,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 568
+      "__id__": 572
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -12916,20 +13034,20 @@
     },
     "_children": [
       {
-        "__id__": 571
+        "__id__": 575
       }
     ],
     "_active": false,
     "_components": [
       {
-        "__id__": 577
+        "__id__": 581
       },
       {
-        "__id__": 579
+        "__id__": 583
       }
     ],
     "_prefab": {
-      "__id__": 581
+      "__id__": 585
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -12966,20 +13084,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 570
+      "__id__": 574
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 572
+        "__id__": 576
       },
       {
-        "__id__": 574
+        "__id__": 578
       }
     ],
     "_prefab": {
-      "__id__": 576
+      "__id__": 580
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -13016,11 +13134,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 571
+      "__id__": 575
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 573
+      "__id__": 577
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -13044,11 +13162,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 571
+      "__id__": 575
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 575
+      "__id__": 579
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -13128,11 +13246,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 570
+      "__id__": 574
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 578
+      "__id__": 582
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -13156,14 +13274,14 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 570
+      "__id__": 574
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 580
+      "__id__": 584
     },
     "lab_time": {
-      "__id__": 571
+      "__id__": 575
     },
     "_id": ""
   },
@@ -13194,12 +13312,12 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 583
+      "__id__": 587
     },
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1080,
-      "height": 1919.9999999999998
+      "height": 1920
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -13222,7 +13340,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 585
+      "__id__": 589
     },
     "_alignFlags": 45,
     "_target": null,
@@ -13258,7 +13376,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 587
+      "__id__": 591
     },
     "sfList": [
       {
@@ -13348,7 +13466,7 @@
       "__id__": 308
     },
     "count_time": {
-      "__id__": 570
+      "__id__": 574
     },
     "mWeiqiManager": {
       "__id__": 205
@@ -13378,7 +13496,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 589
+      "__id__": 593
     },
     "_type": 0,
     "_inverted": false,
@@ -13400,7 +13518,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 591
+      "__id__": 595
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,

+ 1 - 0
assets/script/game/results.ts

@@ -71,6 +71,7 @@ export class results extends base_ui {
     public show(scores:number,jiesuan_finish_cb,call,back_home_cb,isReLife:boolean){
         this.back_home_cb = back_home_cb
         this.btn_video_reLife.active = isReLife
+        scores = 20001
         this.setTitleSpr(scores)
         http.post(config.API.sync_integral,{"integral":scores},(err,data)=>{
             if(!err){