wuwangdong 4 年之前
父節點
當前提交
a8dc8293ca

+ 31 - 31
assets/resources/game/prefab/game.prefab

@@ -6625,7 +6625,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 133.8,
+      "width": 139.8,
       "height": 50.4
     },
     "_anchorPoint": {
@@ -6704,8 +6704,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -66.9,
-        -26.2,
+        -69.9,
+        -27.2,
         0,
         0,
         0,
@@ -6789,7 +6789,7 @@
     "asset": {
       "__uuid__": "b4dea4a9-29c8-46bc-a50d-5754afa7a2bd"
     },
-    "fileId": "77KCfOx8FPWYHFuEhjAOb2",
+    "fileId": "d383DxOX1N7p+lBSIAp2//",
     "sync": false
   },
   {
@@ -6834,8 +6834,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -24.900000000000006,
-        -26.2,
+        -25.900000000000006,
+        -27.2,
         0,
         0,
         0,
@@ -6919,7 +6919,7 @@
     "asset": {
       "__uuid__": "b4dea4a9-29c8-46bc-a50d-5754afa7a2bd"
     },
-    "fileId": "295pEwFk1I8r6cL05Ijawa",
+    "fileId": "ads3UaxhJNmbMZVUyQxUaH",
     "sync": false
   },
   {
@@ -6964,8 +6964,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        24.89999999999999,
-        -26.2,
+        25.89999999999999,
+        -27.2,
         0,
         0,
         0,
@@ -7049,7 +7049,7 @@
     "asset": {
       "__uuid__": "b4dea4a9-29c8-46bc-a50d-5754afa7a2bd"
     },
-    "fileId": "b57sFB/j1KaYxmFRDvlRsD",
+    "fileId": "41eKvXIA9DMbk3p8p2/rPL",
     "sync": false
   },
   {
@@ -7118,7 +7118,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 178.5,
+      "width": 182.5,
       "height": 50.4
     },
     "_anchorPoint": {
@@ -7197,8 +7197,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -89.25,
-        -26.2,
+        -91.25,
+        -27.2,
         0,
         0,
         0,
@@ -7282,7 +7282,7 @@
     "asset": {
       "__uuid__": "b4dea4a9-29c8-46bc-a50d-5754afa7a2bd"
     },
-    "fileId": "142cOZHytL+4n/6G9sQlBK",
+    "fileId": "491p2EBbtMb6xz8sZ3wdB0",
     "sync": false
   },
   {
@@ -7328,7 +7328,7 @@
       "ctor": "Float64Array",
       "array": [
         35,
-        -26.2,
+        -27.2,
         0,
         0,
         0,
@@ -7412,7 +7412,7 @@
     "asset": {
       "__uuid__": "b4dea4a9-29c8-46bc-a50d-5754afa7a2bd"
     },
-    "fileId": "39NLeh+JpMtZbQjpEsZSpP",
+    "fileId": "05iatHcDpCfZLEJYGUo9mH",
     "sync": false
   },
   {
@@ -8846,7 +8846,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 266,
+      "width": 270,
       "height": 78
     },
     "_anchorPoint": {
@@ -8858,7 +8858,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -84.86,
+        -79.585,
         100,
         0,
         0,
@@ -9594,7 +9594,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 220,
+      "width": 270,
       "height": 60
     },
     "_anchorPoint": {
@@ -9606,7 +9606,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        192.94,
+        219.315,
         100,
         0,
         0,
@@ -9670,7 +9670,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        15.353,
+        -12.78,
         -1,
         0,
         0,
@@ -9784,7 +9784,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        18.119,
+        -10.014,
         0,
         0,
         0,
@@ -10179,7 +10179,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -81.067,
+        -109.2,
         0,
         0,
         0,
@@ -10290,7 +10290,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        124.739,
+        96.606,
         -1.647,
         0,
         0,
@@ -10592,7 +10592,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        19.87,
+        5.803,
         -1,
         0,
         0,
@@ -10705,7 +10705,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -10.931,
+        -24.998,
         0,
         0,
         0,
@@ -10843,7 +10843,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -75.779,
+        -89.846,
         0,
         0,
         0,
@@ -10954,7 +10954,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        112.744,
+        98.677,
         -1.647,
         0,
         0,
@@ -11166,7 +11166,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        115.069,
+        101.002,
         25,
         0,
         0,
@@ -11236,7 +11236,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        9.48,
+        -4.587,
         23.976,
         0,
         0,
@@ -11350,7 +11350,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        10.161,
+        -3.906,
         -5.927,
         0,
         0,

File diff suppressed because it is too large
+ 334 - 115
assets/resources/module/newCashUI/walletCashOut.prefab


+ 105 - 63
assets/resources/module/speedUpUI/completeImmediately.prefab

@@ -24,17 +24,20 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 47
+        "__id__": 49
       },
       {
-        "__id__": 48
+        "__id__": 50
       },
       {
-        "__id__": 49
+        "__id__": 51
+      },
+      {
+        "__id__": 52
       }
     ],
     "_prefab": {
-      "__id__": 50
+      "__id__": 53
     },
     "_opacity": 255,
     "_color": {
@@ -98,7 +101,7 @@
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 46
+      "__id__": 48
     },
     "_opacity": 255,
     "_color": {
@@ -162,26 +165,26 @@
         "__id__": 7
       },
       {
-        "__id__": 11
+        "__id__": 12
       },
       {
-        "__id__": 17
+        "__id__": 18
       },
       {
-        "__id__": 31
+        "__id__": 33
       },
       {
-        "__id__": 34
+        "__id__": 36
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 44
+        "__id__": 46
       }
     ],
     "_prefab": {
-      "__id__": 45
+      "__id__": 47
     },
     "_opacity": 255,
     "_color": {
@@ -355,7 +358,7 @@
       }
     ],
     "_prefab": {
-      "__id__": 10
+      "__id__": 11
     },
     "_opacity": 255,
     "_color": {
@@ -448,10 +451,24 @@
       "__id__": 1
     },
     "transition_type": 0,
-    "onComplete": [],
+    "onComplete": [
+      {
+        "__id__": 10
+      }
+    ],
     "_id": ""
   },
   {
+    "__type__": "cc.ClickEvent",
+    "target": {
+      "__id__": 1
+    },
+    "component": "",
+    "_componentId": "1e456ZmhMhLUaH/Hl9ODoC6",
+    "handler": "clickCloseBtn",
+    "customEventData": ""
+  },
+  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1
@@ -471,17 +488,17 @@
     },
     "_children": [
       {
-        "__id__": 12
+        "__id__": 13
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 15
+        "__id__": 16
       }
     ],
     "_prefab": {
-      "__id__": 16
+      "__id__": 17
     },
     "_opacity": 255,
     "_color": {
@@ -535,17 +552,17 @@
     "_name": "title",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 11
+      "__id__": 12
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 13
+        "__id__": 14
       }
     ],
     "_prefab": {
-      "__id__": 14
+      "__id__": 15
     },
     "_opacity": 255,
     "_color": {
@@ -599,7 +616,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 12
+      "__id__": 13
     },
     "_enabled": true,
     "_materials": [
@@ -642,7 +659,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 11
+      "__id__": 12
     },
     "_enabled": true,
     "_materials": [
@@ -689,26 +706,26 @@
     },
     "_children": [
       {
-        "__id__": 18
+        "__id__": 19
       },
       {
-        "__id__": 21
+        "__id__": 22
       },
       {
-        "__id__": 25
+        "__id__": 26
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 28
+        "__id__": 29
       },
       {
-        "__id__": 29
+        "__id__": 30
       }
     ],
     "_prefab": {
-      "__id__": 30
+      "__id__": 32
     },
     "_opacity": 255,
     "_color": {
@@ -762,17 +779,17 @@
     "_name": "video",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 17
+      "__id__": 18
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 19
+        "__id__": 20
       }
     ],
     "_prefab": {
-      "__id__": 20
+      "__id__": 21
     },
     "_opacity": 255,
     "_color": {
@@ -826,7 +843,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 18
+      "__id__": 19
     },
     "_enabled": true,
     "_materials": [
@@ -869,20 +886,20 @@
     "_name": "描述",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 17
+      "__id__": 18
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 22
+        "__id__": 23
       },
       {
-        "__id__": 23
+        "__id__": 24
       }
     ],
     "_prefab": {
-      "__id__": 24
+      "__id__": 25
     },
     "_opacity": 255,
     "_color": {
@@ -936,7 +953,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 21
+      "__id__": 22
     },
     "_enabled": true,
     "_materials": [
@@ -969,7 +986,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 21
+      "__id__": 22
     },
     "_enabled": true,
     "_color": {
@@ -998,17 +1015,17 @@
     "_name": "hb",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 17
+      "__id__": 18
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 26
+        "__id__": 27
       }
     ],
     "_prefab": {
-      "__id__": 27
+      "__id__": 28
     },
     "_opacity": 255,
     "_color": {
@@ -1062,7 +1079,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 25
+      "__id__": 26
     },
     "_enabled": true,
     "_materials": [
@@ -1105,7 +1122,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 17
+      "__id__": 18
     },
     "_enabled": true,
     "_materials": [
@@ -1137,14 +1154,18 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 17
+      "__id__": 18
     },
     "_enabled": true,
     "_normalMaterial": null,
     "_grayMaterial": null,
     "duration": 0.1,
     "zoomScale": 1.2,
-    "clickEvents": [],
+    "clickEvents": [
+      {
+        "__id__": 31
+      }
+    ],
     "_N$interactable": true,
     "_N$enableAutoGrayEffect": false,
     "_N$transition": 0,
@@ -1198,11 +1219,21 @@
     "hoverSprite": null,
     "_N$disabledSprite": null,
     "_N$target": {
-      "__id__": 17
+      "__id__": 18
     },
     "_id": ""
   },
   {
+    "__type__": "cc.ClickEvent",
+    "target": {
+      "__id__": 1
+    },
+    "component": "",
+    "_componentId": "1e456ZmhMhLUaH/Hl9ODoC6",
+    "handler": "clickVideoBtn",
+    "customEventData": ""
+  },
+  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1
@@ -1224,11 +1255,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 32
+        "__id__": 34
       }
     ],
     "_prefab": {
-      "__id__": 33
+      "__id__": 35
     },
     "_opacity": 255,
     "_color": {
@@ -1282,7 +1313,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 31
+      "__id__": 33
     },
     "_enabled": true,
     "_materials": [
@@ -1330,20 +1361,20 @@
     },
     "_children": [
       {
-        "__id__": 35
+        "__id__": 37
       },
       {
-        "__id__": 38
+        "__id__": 40
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 42
+        "__id__": 44
       }
     ],
     "_prefab": {
-      "__id__": 43
+      "__id__": 45
     },
     "_opacity": 255,
     "_color": {
@@ -1397,17 +1428,17 @@
     "_name": "植物",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 34
+      "__id__": 36
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 36
+        "__id__": 38
       }
     ],
     "_prefab": {
-      "__id__": 37
+      "__id__": 39
     },
     "_opacity": 255,
     "_color": {
@@ -1461,7 +1492,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 35
+      "__id__": 37
     },
     "_enabled": true,
     "_materials": [
@@ -1504,20 +1535,20 @@
     "_name": "植物名字",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 34
+      "__id__": 36
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 39
+        "__id__": 41
       },
       {
-        "__id__": 40
+        "__id__": 42
       }
     ],
     "_prefab": {
-      "__id__": 41
+      "__id__": 43
     },
     "_opacity": 255,
     "_color": {
@@ -1571,7 +1602,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 38
+      "__id__": 40
     },
     "_enabled": true,
     "_materials": [
@@ -1604,7 +1635,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 38
+      "__id__": 40
     },
     "_enabled": true,
     "_color": {
@@ -1633,7 +1664,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 34
+      "__id__": 36
     },
     "_enabled": true,
     "_materials": [
@@ -1789,6 +1820,17 @@
     "_id": ""
   },
   {
+    "__type__": "1e456ZmhMhLUaH/Hl9ODoC6",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "sp_icon": null,
+    "_id": ""
+  },
+  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1

+ 97 - 56
assets/resources/module/speedUpUI/productReward.prefab

@@ -24,17 +24,20 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 43
+        "__id__": 45
       },
       {
-        "__id__": 44
+        "__id__": 46
       },
       {
-        "__id__": 45
+        "__id__": 47
+      },
+      {
+        "__id__": 48
       }
     ],
     "_prefab": {
-      "__id__": 46
+      "__id__": 49
     },
     "_opacity": 255,
     "_color": {
@@ -98,7 +101,7 @@
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 42
+      "__id__": 44
     },
     "_opacity": 255,
     "_color": {
@@ -162,26 +165,26 @@
         "__id__": 7
       },
       {
-        "__id__": 11
+        "__id__": 12
       },
       {
-        "__id__": 17
+        "__id__": 18
       },
       {
-        "__id__": 31
+        "__id__": 33
       },
       {
-        "__id__": 34
+        "__id__": 36
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 40
+        "__id__": 42
       }
     ],
     "_prefab": {
-      "__id__": 41
+      "__id__": 43
     },
     "_opacity": 255,
     "_color": {
@@ -355,7 +358,7 @@
       }
     ],
     "_prefab": {
-      "__id__": 10
+      "__id__": 11
     },
     "_opacity": 255,
     "_color": {
@@ -448,10 +451,24 @@
       "__id__": 1
     },
     "transition_type": 0,
-    "onComplete": [],
+    "onComplete": [
+      {
+        "__id__": 10
+      }
+    ],
     "_id": ""
   },
   {
+    "__type__": "cc.ClickEvent",
+    "target": {
+      "__id__": 1
+    },
+    "component": "",
+    "_componentId": "55189x5p0tEzImKka7Ch6fC",
+    "handler": "clickCloseBtn",
+    "customEventData": ""
+  },
+  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1
@@ -471,17 +488,17 @@
     },
     "_children": [
       {
-        "__id__": 12
+        "__id__": 13
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 15
+        "__id__": 16
       }
     ],
     "_prefab": {
-      "__id__": 16
+      "__id__": 17
     },
     "_opacity": 255,
     "_color": {
@@ -535,17 +552,17 @@
     "_name": "title",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 11
+      "__id__": 12
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 13
+        "__id__": 14
       }
     ],
     "_prefab": {
-      "__id__": 14
+      "__id__": 15
     },
     "_opacity": 255,
     "_color": {
@@ -599,7 +616,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 12
+      "__id__": 13
     },
     "_enabled": true,
     "_materials": [
@@ -642,7 +659,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 11
+      "__id__": 12
     },
     "_enabled": true,
     "_materials": [
@@ -689,26 +706,26 @@
     },
     "_children": [
       {
-        "__id__": 18
+        "__id__": 19
       },
       {
-        "__id__": 21
+        "__id__": 22
       },
       {
-        "__id__": 25
+        "__id__": 26
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 28
+        "__id__": 29
       },
       {
-        "__id__": 29
+        "__id__": 30
       }
     ],
     "_prefab": {
-      "__id__": 30
+      "__id__": 32
     },
     "_opacity": 255,
     "_color": {
@@ -762,17 +779,17 @@
     "_name": "video",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 17
+      "__id__": 18
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 19
+        "__id__": 20
       }
     ],
     "_prefab": {
-      "__id__": 20
+      "__id__": 21
     },
     "_opacity": 255,
     "_color": {
@@ -826,7 +843,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 18
+      "__id__": 19
     },
     "_enabled": true,
     "_materials": [
@@ -869,20 +886,20 @@
     "_name": "描述",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 17
+      "__id__": 18
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 22
+        "__id__": 23
       },
       {
-        "__id__": 23
+        "__id__": 24
       }
     ],
     "_prefab": {
-      "__id__": 24
+      "__id__": 25
     },
     "_opacity": 255,
     "_color": {
@@ -936,7 +953,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 21
+      "__id__": 22
     },
     "_enabled": true,
     "_materials": [
@@ -969,7 +986,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 21
+      "__id__": 22
     },
     "_enabled": true,
     "_color": {
@@ -998,17 +1015,17 @@
     "_name": "hb",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 17
+      "__id__": 18
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 26
+        "__id__": 27
       }
     ],
     "_prefab": {
-      "__id__": 27
+      "__id__": 28
     },
     "_opacity": 255,
     "_color": {
@@ -1062,7 +1079,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 25
+      "__id__": 26
     },
     "_enabled": true,
     "_materials": [
@@ -1105,7 +1122,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 17
+      "__id__": 18
     },
     "_enabled": true,
     "_materials": [
@@ -1137,14 +1154,18 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 17
+      "__id__": 18
     },
     "_enabled": true,
     "_normalMaterial": null,
     "_grayMaterial": null,
     "duration": 0.1,
     "zoomScale": 1.2,
-    "clickEvents": [],
+    "clickEvents": [
+      {
+        "__id__": 31
+      }
+    ],
     "_N$interactable": true,
     "_N$enableAutoGrayEffect": false,
     "_N$transition": 0,
@@ -1198,11 +1219,21 @@
     "hoverSprite": null,
     "_N$disabledSprite": null,
     "_N$target": {
-      "__id__": 17
+      "__id__": 18
     },
     "_id": ""
   },
   {
+    "__type__": "cc.ClickEvent",
+    "target": {
+      "__id__": 1
+    },
+    "component": "",
+    "_componentId": "55189x5p0tEzImKka7Ch6fC",
+    "handler": "clickVideoBtn",
+    "customEventData": ""
+  },
+  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1
@@ -1224,11 +1255,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 32
+        "__id__": 34
       }
     ],
     "_prefab": {
-      "__id__": 33
+      "__id__": 35
     },
     "_opacity": 255,
     "_color": {
@@ -1282,7 +1313,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 31
+      "__id__": 33
     },
     "_enabled": true,
     "_materials": [
@@ -1330,17 +1361,17 @@
     },
     "_children": [
       {
-        "__id__": 35
+        "__id__": 37
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 38
+        "__id__": 40
       }
     ],
     "_prefab": {
-      "__id__": 39
+      "__id__": 41
     },
     "_opacity": 255,
     "_color": {
@@ -1394,17 +1425,17 @@
     "_name": "人",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 34
+      "__id__": 36
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 36
+        "__id__": 38
       }
     ],
     "_prefab": {
-      "__id__": 37
+      "__id__": 39
     },
     "_opacity": 255,
     "_color": {
@@ -1458,7 +1489,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 35
+      "__id__": 37
     },
     "_enabled": true,
     "_materials": [
@@ -1501,7 +1532,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 34
+      "__id__": 36
     },
     "_enabled": true,
     "_materials": [
@@ -1657,6 +1688,16 @@
     "_id": ""
   },
   {
+    "__type__": "55189x5p0tEzImKka7Ch6fC",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "_id": ""
+  },
+  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1

+ 7 - 1
assets/script/game/component/tween/TweenCast.ts

@@ -22,6 +22,7 @@ export default class TweenCast extends cc.Component {
         "一种矜持", "哼,涐呸", "贪婪", "一败涂地", "美如此多娇", "暧昧已落幕", "地平线"];
     private moneys: number[] = [0.5, 0.8, 1.0, 2, 5, 10, 20, 100];
     private weights: number[] = [40, 20, 10, 10, 10, 5, 3, 2];
+    private times: number[] = [5, 7, 8, 9, 10, 20, 30, 15, 16, 24, 26];
     /**
      * 随机生成一个世界公告
      */
@@ -32,7 +33,12 @@ export default class TweenCast extends cc.Component {
         len = this.moneys.length;
         i = mk.math.randomByWeight(this.weights, 100, false);
         let money = this.moneys[i];
-        return `<outline color=#000000 width=1><color=#19F7FF>${name}</color>成功提现了<color=#FCE300>${money}元</color></outline>`;
+
+        len = this.times.length;
+        i = Math.floor(mk.math.random(0, len, false));
+        let t = this.times[i];
+        //return `<outline color=#000000 width=1><color=#19F7FF>${name}</color>成功提现了<color=#FCE300>${money}元</color></outline>`;
+        return `<color=#945438>${name} ${t}秒前成功提现${money}元</c>`
     }
 
     onLoad() {

+ 1 - 1
assets/script/game/data/HttpData.ts

@@ -25,7 +25,7 @@ export class HttpData {
 
 
 export enum ServerUrl {
-    test = 'https://cutfruitage-test.duiweize.com/', //测试服地址
+    test = 'https://hf-test.duiweize.com/',//'https://cutfruitage-test.duiweize.com/', //测试服地址
     formal = 'https://cutfruitage.duiweize.com/',    //正式服地址
     liyang = 'http://172.16.15.231:9162/',  //李杨服地址
     hanguo = 'http://172.16.15.167:9162/',  //悍国服地址

+ 22 - 0
assets/script/game/module/speedUpUI/CompleteImmediately.ts

@@ -0,0 +1,22 @@
+
+const { ccclass, property } = cc._decorator;
+
+@ccclass
+export default class CompleteIMmediately extends cc.Component {
+
+    @property({displayName: '植物图标', type: cc.Sprite})
+    private sp_icon: cc.Sprite = null;
+
+    @property({displayName: '植物名字', type: cc.Label})
+    private lbl_name: cc.Label = null;
+
+    private clickVideoBtn()
+    {
+        mk.audio.playEffect("button");
+    }
+
+    private clickCloseBtn()
+    {
+        mk.audio.playEffect("closeButton");
+    }
+}

+ 9 - 0
assets/script/game/module/speedUpUI/CompleteImmediately.ts.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.8",
+  "uuid": "1e456666-84c8-4b51-a1ff-1e5f4e0e80ba",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

+ 18 - 0
assets/script/game/module/speedUpUI/ProductReward.ts

@@ -0,0 +1,18 @@
+
+
+const { ccclass, property } = cc._decorator;
+
+@ccclass
+export default class ProductReward extends cc.Component {
+
+    
+    private clickVideoBtn()
+    {
+        mk.audio.playEffect("button");
+    }
+
+    private clickCloseBtn()
+    {
+        mk.audio.playEffect("closeButton");
+    }
+}

+ 9 - 0
assets/script/game/module/speedUpUI/ProductReward.ts.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.8",
+  "uuid": "55189c79-a74b-44cc-898a-91aec287a7c2",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

Some files were not shown because too many files changed in this diff