wuwangdong 4 anni fa
parent
commit
3e7df09129

+ 3 - 2
assets/resources/module/speedUpUI/productReward.prefab

@@ -1272,11 +1272,12 @@
     },
     "_enabled": true,
     "_defaultClip": {
-      "__uuid__": "d51cece8-b476-4297-9b9e-2e09bdd99a18"
+      "__uuid__": "1c7cfdae-7b6c-46a5-9085-2fa8aa684ac7"
     },
     "_clips": [
+      null,
       {
-        "__uuid__": "d51cece8-b476-4297-9b9e-2e09bdd99a18"
+        "__uuid__": "1c7cfdae-7b6c-46a5-9085-2fa8aa684ac7"
       }
     ],
     "playOnLoad": true,

+ 216 - 115
assets/resources/module/speedUpUI/productReward2.prefab

@@ -24,20 +24,20 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 74
+        "__id__": 77
       },
       {
-        "__id__": 75
+        "__id__": 78
       },
       {
-        "__id__": 76
+        "__id__": 79
       },
       {
-        "__id__": 77
+        "__id__": 80
       }
     ],
     "_prefab": {
-      "__id__": 78
+      "__id__": 81
     },
     "_opacity": 255,
     "_color": {
@@ -101,7 +101,7 @@
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 73
+      "__id__": 76
     },
     "_opacity": 255,
     "_color": {
@@ -171,26 +171,26 @@
         "__id__": 18
       },
       {
-        "__id__": 33
-      },
-      {
-        "__id__": 42
+        "__id__": 36
       },
       {
         "__id__": 45
       },
       {
         "__id__": 48
+      },
+      {
+        "__id__": 51
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 71
+        "__id__": 74
       }
     ],
     "_prefab": {
-      "__id__": 72
+      "__id__": 75
     },
     "_opacity": 255,
     "_color": {
@@ -705,7 +705,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "视频按钮",
+    "_name": "New Node",
     "_objFlags": 0,
     "_parent": {
       "__id__": 3
@@ -713,25 +713,93 @@
     "_children": [
       {
         "__id__": 19
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 34
+      }
+    ],
+    "_prefab": {
+      "__id__": 35
+    },
+    "_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": "视频按钮",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 18
+    },
+    "_children": [
+      {
+        "__id__": 20
       },
       {
-        "__id__": 22
+        "__id__": 23
       },
       {
-        "__id__": 26
+        "__id__": 27
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 29
+        "__id__": 30
       },
       {
-        "__id__": 30
+        "__id__": 31
       }
     ],
     "_prefab": {
-      "__id__": 32
+      "__id__": 33
     },
     "_opacity": 255,
     "_color": {
@@ -764,7 +832,7 @@
         1,
         1.2,
         1.2,
-        1
+        1.2
       ]
     },
     "_eulerAngles": {
@@ -785,17 +853,17 @@
     "_name": "video",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 18
+      "__id__": 19
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 20
+        "__id__": 21
       }
     ],
     "_prefab": {
-      "__id__": 21
+      "__id__": 22
     },
     "_opacity": 255,
     "_color": {
@@ -849,7 +917,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 19
+      "__id__": 20
     },
     "_enabled": true,
     "_materials": [
@@ -884,7 +952,7 @@
     "asset": {
       "__uuid__": "e315a4ee-0591-45b7-aac6-949ee3845f4d"
     },
-    "fileId": "83Ltg+xZtBs6DTb7gnsEf7",
+    "fileId": "3743FJLqNMRIYsqTPDJoCi",
     "sync": false
   },
   {
@@ -892,20 +960,20 @@
     "_name": "描述",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 18
+      "__id__": 19
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 23
+        "__id__": 24
       },
       {
-        "__id__": 24
+        "__id__": 25
       }
     ],
     "_prefab": {
-      "__id__": 25
+      "__id__": 26
     },
     "_opacity": 255,
     "_color": {
@@ -959,7 +1027,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 22
+      "__id__": 23
     },
     "_enabled": true,
     "_materials": [
@@ -994,7 +1062,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 22
+      "__id__": 23
     },
     "_enabled": true,
     "_color": {
@@ -1015,7 +1083,7 @@
     "asset": {
       "__uuid__": "e315a4ee-0591-45b7-aac6-949ee3845f4d"
     },
-    "fileId": "e9dGE7pNFAkYMbe9dlMs9G",
+    "fileId": "06nasHlTRNtKkDBZC4qUce",
     "sync": false
   },
   {
@@ -1023,17 +1091,17 @@
     "_name": "hb",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 18
+      "__id__": 19
     },
     "_children": [],
     "_active": false,
     "_components": [
       {
-        "__id__": 27
+        "__id__": 28
       }
     ],
     "_prefab": {
-      "__id__": 28
+      "__id__": 29
     },
     "_opacity": 255,
     "_color": {
@@ -1087,7 +1155,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 26
+      "__id__": 27
     },
     "_enabled": true,
     "_materials": [
@@ -1122,7 +1190,7 @@
     "asset": {
       "__uuid__": "e315a4ee-0591-45b7-aac6-949ee3845f4d"
     },
-    "fileId": "4ev5f9BF5FS7or7PkqNtMw",
+    "fileId": "a65ugVUqlC65rvn5kCalzS",
     "sync": false
   },
   {
@@ -1130,7 +1198,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 18
+      "__id__": 19
     },
     "_enabled": true,
     "_materials": [
@@ -1162,7 +1230,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 18
+      "__id__": 19
     },
     "_enabled": true,
     "_normalMaterial": null,
@@ -1171,7 +1239,7 @@
     "zoomScale": 1.2,
     "clickEvents": [
       {
-        "__id__": 31
+        "__id__": 32
       }
     ],
     "_N$interactable": true,
@@ -1227,7 +1295,7 @@
     "hoverSprite": null,
     "_N$disabledSprite": null,
     "_N$target": {
-      "__id__": 18
+      "__id__": 19
     },
     "_id": ""
   },
@@ -1249,7 +1317,40 @@
     "asset": {
       "__uuid__": "e315a4ee-0591-45b7-aac6-949ee3845f4d"
     },
-    "fileId": "20Zd0OmJdOr6j7xc7drr3q",
+    "fileId": "cavMWA9rZJrI+uOX1gmOHX",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Animation",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 18
+    },
+    "_enabled": true,
+    "_defaultClip": {
+      "__uuid__": "1c7cfdae-7b6c-46a5-9085-2fa8aa684ac7"
+    },
+    "_clips": [
+      {
+        "__uuid__": "d51cece8-b476-4297-9b9e-2e09bdd99a18"
+      },
+      {
+        "__uuid__": "1c7cfdae-7b6c-46a5-9085-2fa8aa684ac7"
+      }
+    ],
+    "playOnLoad": true,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "e315a4ee-0591-45b7-aac6-949ee3845f4d"
+    },
+    "fileId": "83uUwSExlN3rzP1Dfws3O6",
     "sync": false
   },
   {
@@ -1261,20 +1362,20 @@
     },
     "_children": [
       {
-        "__id__": 34
+        "__id__": 37
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 38
+        "__id__": 41
       },
       {
-        "__id__": 39
+        "__id__": 42
       }
     ],
     "_prefab": {
-      "__id__": 41
+      "__id__": 44
     },
     "_opacity": 255,
     "_color": {
@@ -1328,20 +1429,20 @@
     "_name": "描述",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 33
+      "__id__": 36
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 35
+        "__id__": 38
       },
       {
-        "__id__": 36
+        "__id__": 39
       }
     ],
     "_prefab": {
-      "__id__": 37
+      "__id__": 40
     },
     "_opacity": 255,
     "_color": {
@@ -1395,7 +1496,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 34
+      "__id__": 37
     },
     "_enabled": true,
     "_materials": [
@@ -1430,7 +1531,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 34
+      "__id__": 37
     },
     "_enabled": true,
     "_color": {
@@ -1459,7 +1560,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 33
+      "__id__": 36
     },
     "_enabled": true,
     "_materials": [
@@ -1491,7 +1592,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 33
+      "__id__": 36
     },
     "_enabled": true,
     "_normalMaterial": null,
@@ -1500,7 +1601,7 @@
     "zoomScale": 1.2,
     "clickEvents": [
       {
-        "__id__": 40
+        "__id__": 43
       }
     ],
     "_N$interactable": true,
@@ -1556,7 +1657,7 @@
     "hoverSprite": null,
     "_N$disabledSprite": null,
     "_N$target": {
-      "__id__": 33
+      "__id__": 36
     },
     "_id": ""
   },
@@ -1592,11 +1693,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 43
+        "__id__": 46
       }
     ],
     "_prefab": {
-      "__id__": 44
+      "__id__": 47
     },
     "_opacity": 255,
     "_color": {
@@ -1650,7 +1751,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 42
+      "__id__": 45
     },
     "_enabled": true,
     "_materials": [
@@ -1700,11 +1801,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 46
+        "__id__": 49
       }
     ],
     "_prefab": {
-      "__id__": 47
+      "__id__": 50
     },
     "_opacity": 255,
     "_color": {
@@ -1758,7 +1859,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 45
+      "__id__": 48
     },
     "_enabled": true,
     "_materials": [
@@ -1806,29 +1907,29 @@
     },
     "_children": [
       {
-        "__id__": 49
+        "__id__": 52
       },
       {
-        "__id__": 53
+        "__id__": 56
       },
       {
-        "__id__": 57
+        "__id__": 60
       },
       {
-        "__id__": 61
+        "__id__": 64
       },
       {
-        "__id__": 65
+        "__id__": 68
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 69
+        "__id__": 72
       }
     ],
     "_prefab": {
-      "__id__": 70
+      "__id__": 73
     },
     "_opacity": 255,
     "_color": {
@@ -1852,7 +1953,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -37.787,
+        -18,
         53.29900000000001,
         0,
         0,
@@ -1882,20 +1983,20 @@
     "_name": "New Label",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 48
+      "__id__": 51
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 50
+        "__id__": 53
       },
       {
-        "__id__": 51
+        "__id__": 54
       }
     ],
     "_prefab": {
-      "__id__": 52
+      "__id__": 55
     },
     "_opacity": 255,
     "_color": {
@@ -1949,7 +2050,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 49
+      "__id__": 52
     },
     "_enabled": true,
     "_materials": [
@@ -1982,7 +2083,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 49
+      "__id__": 52
     },
     "_enabled": false,
     "_color": {
@@ -2011,20 +2112,20 @@
     "_name": "New Label",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 48
+      "__id__": 51
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 54
+        "__id__": 57
       },
       {
-        "__id__": 55
+        "__id__": 58
       }
     ],
     "_prefab": {
-      "__id__": 56
+      "__id__": 59
     },
     "_opacity": 255,
     "_color": {
@@ -2036,7 +2137,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 61.18,
+      "width": 55.62,
       "height": 151.2
     },
     "_anchorPoint": {
@@ -2048,7 +2149,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -11.630000000000003,
+        -17.19,
         0,
         0,
         0,
@@ -2078,7 +2179,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 53
+      "__id__": 56
     },
     "_enabled": true,
     "_materials": [
@@ -2090,14 +2191,14 @@
     "_dstBlendFactor": 771,
     "_string": "8",
     "_N$string": "8",
-    "_fontSize": 110,
+    "_fontSize": 100,
     "_lineHeight": 120,
     "_enableWrapText": true,
     "_N$file": null,
     "_isSystemFontUsed": true,
     "_spacingX": 0,
     "_batchAsBitmap": false,
-    "_styleFlags": 1,
+    "_styleFlags": 0,
     "_underlineHeight": 0,
     "_N$horizontalAlign": 1,
     "_N$verticalAlign": 1,
@@ -2111,7 +2212,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 53
+      "__id__": 56
     },
     "_enabled": false,
     "_color": {
@@ -2140,20 +2241,20 @@
     "_name": "New Label",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 48
+      "__id__": 51
     },
     "_children": [],
     "_active": false,
     "_components": [
       {
-        "__id__": 58
+        "__id__": 61
       },
       {
-        "__id__": 59
+        "__id__": 62
       }
     ],
     "_prefab": {
-      "__id__": 60
+      "__id__": 63
     },
     "_opacity": 255,
     "_color": {
@@ -2207,7 +2308,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 57
+      "__id__": 60
     },
     "_enabled": true,
     "_materials": [
@@ -2240,7 +2341,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 57
+      "__id__": 60
     },
     "_enabled": false,
     "_color": {
@@ -2269,20 +2370,20 @@
     "_name": "New Label",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 48
+      "__id__": 51
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 62
+        "__id__": 65
       },
       {
-        "__id__": 63
+        "__id__": 66
       }
     ],
     "_prefab": {
-      "__id__": 64
+      "__id__": 67
     },
     "_opacity": 255,
     "_color": {
@@ -2294,7 +2395,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 61.18,
+      "width": 55.62,
       "height": 151.2
     },
     "_anchorPoint": {
@@ -2306,7 +2407,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        60.10999999999999,
+        43.42999999999999,
         0,
         0,
         0,
@@ -2336,7 +2437,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 61
+      "__id__": 64
     },
     "_enabled": true,
     "_materials": [
@@ -2348,14 +2449,14 @@
     "_dstBlendFactor": 771,
     "_string": "8",
     "_N$string": "8",
-    "_fontSize": 110,
+    "_fontSize": 100,
     "_lineHeight": 120,
     "_enableWrapText": true,
     "_N$file": null,
     "_isSystemFontUsed": true,
     "_spacingX": 0,
     "_batchAsBitmap": false,
-    "_styleFlags": 1,
+    "_styleFlags": 0,
     "_underlineHeight": 0,
     "_N$horizontalAlign": 1,
     "_N$verticalAlign": 1,
@@ -2369,7 +2470,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 61
+      "__id__": 64
     },
     "_enabled": false,
     "_color": {
@@ -2398,20 +2499,20 @@
     "_name": "New Label",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 48
+      "__id__": 51
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 66
+        "__id__": 69
       },
       {
-        "__id__": 67
+        "__id__": 70
       }
     ],
     "_prefab": {
-      "__id__": 68
+      "__id__": 71
     },
     "_opacity": 255,
     "_color": {
@@ -2423,7 +2524,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 61.18,
+      "width": 55.62,
       "height": 151.2
     },
     "_anchorPoint": {
@@ -2435,7 +2536,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        131.85,
+        104.05,
         0,
         0,
         0,
@@ -2465,7 +2566,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 65
+      "__id__": 68
     },
     "_enabled": true,
     "_materials": [
@@ -2477,14 +2578,14 @@
     "_dstBlendFactor": 771,
     "_string": "8",
     "_N$string": "8",
-    "_fontSize": 110,
+    "_fontSize": 100,
     "_lineHeight": 120,
     "_enableWrapText": true,
     "_N$file": null,
     "_isSystemFontUsed": true,
     "_spacingX": 0,
     "_batchAsBitmap": false,
-    "_styleFlags": 1,
+    "_styleFlags": 0,
     "_underlineHeight": 0,
     "_N$horizontalAlign": 1,
     "_N$verticalAlign": 1,
@@ -2498,7 +2599,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 65
+      "__id__": 68
     },
     "_enabled": false,
     "_color": {
@@ -2527,7 +2628,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 48
+      "__id__": 51
     },
     "_enabled": false,
     "_layoutSize": {
@@ -2695,13 +2796,13 @@
     "_enabled": true,
     "lbl_value": [
       {
-        "__id__": 54
+        "__id__": 57
       },
       {
-        "__id__": 62
+        "__id__": 65
       },
       {
-        "__id__": 66
+        "__id__": 69
       }
     ],
     "_id": ""

+ 37 - 12
assets/resources/module/turnable/turnable.prefab

@@ -24,17 +24,17 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 116
-      },
-      {
         "__id__": 117
       },
       {
         "__id__": 118
+      },
+      {
+        "__id__": 119
       }
     ],
     "_prefab": {
-      "__id__": 119
+      "__id__": 120
     },
     "_opacity": 255,
     "_color": {
@@ -134,7 +134,7 @@
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 115
+      "__id__": 116
     },
     "_opacity": 255,
     "_color": {
@@ -2285,7 +2285,7 @@
     "asset": {
       "__uuid__": "18e0b7f8-059f-4a52-9e57-690fe778a31a"
     },
-    "fileId": "023gDjWE5CwYs70dZkaI4s",
+    "fileId": "15SHYrmMREgKwlHoFf/Ivn",
     "sync": false
   },
   {
@@ -2417,7 +2417,7 @@
     "asset": {
       "__uuid__": "18e0b7f8-059f-4a52-9e57-690fe778a31a"
     },
-    "fileId": "5fY4/YQ3pL86WZfaK+mfRl",
+    "fileId": "47fao6Xk9HHqxEH8VH3oRd",
     "sync": false
   },
   {
@@ -2549,7 +2549,7 @@
     "asset": {
       "__uuid__": "18e0b7f8-059f-4a52-9e57-690fe778a31a"
     },
-    "fileId": "52XSzFA41Ir6SVXqiyEoe5",
+    "fileId": "a6LSL0xA9NEIKB0GSeZMDM",
     "sync": false
   },
   {
@@ -2765,7 +2765,7 @@
     "asset": {
       "__uuid__": "18e0b7f8-059f-4a52-9e57-690fe778a31a"
     },
-    "fileId": "3anizeioRJ6p6gvL75d3Qh",
+    "fileId": "27V7fkOcpBm7ngwh/FkhnW",
     "sync": false
   },
   {
@@ -2876,7 +2876,7 @@
     "asset": {
       "__uuid__": "18e0b7f8-059f-4a52-9e57-690fe778a31a"
     },
-    "fileId": "acZoVQnGpEQ4B6SZf1EFvw",
+    "fileId": "81AklLFb5InJQdJg9ftwma",
     "sync": false
   },
   {
@@ -3374,7 +3374,7 @@
     "asset": {
       "__uuid__": "18e0b7f8-059f-4a52-9e57-690fe778a31a"
     },
-    "fileId": "7fQO8T+5dOwqzSvPVOmBeY",
+    "fileId": "28Ls7C9HxCLKkJPSWhDQ5n",
     "sync": false
   },
   {
@@ -3439,10 +3439,13 @@
       },
       {
         "__id__": 113
+      },
+      {
+        "__id__": 114
       }
     ],
     "_prefab": {
-      "__id__": 114
+      "__id__": 115
     },
     "_opacity": 255,
     "_color": {
@@ -3970,6 +3973,28 @@
     "_id": ""
   },
   {
+    "__type__": "cc.Animation",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 99
+    },
+    "_enabled": true,
+    "_defaultClip": {
+      "__uuid__": "1c7cfdae-7b6c-46a5-9085-2fa8aa684ac7"
+    },
+    "_clips": [
+      {
+        "__uuid__": "d51cece8-b476-4297-9b9e-2e09bdd99a18"
+      },
+      {
+        "__uuid__": "1c7cfdae-7b6c-46a5-9085-2fa8aa684ac7"
+      }
+    ],
+    "playOnLoad": true,
+    "_id": ""
+  },
+  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1

BIN
build/jsb-link/assets/main/index.jsc


File diff suppressed because it is too large
+ 0 - 0
build/jsb-link/assets/resources/config.json


File diff suppressed because it is too large
+ 0 - 0
build/jsb-link/assets/resources/import/4f/4f28d7f3-1d28-4320-bf91-516bb05e0c01.json


File diff suppressed because it is too large
+ 0 - 0
build/jsb-link/assets/resources/import/82/82a16e23-7ade-43a5-af4f-5504bb39b61f.json


File diff suppressed because it is too large
+ 0 - 0
build/jsb-link/assets/resources/import/a2/a2f8ad6a-6054-4b3e-8202-7e9e1975fad9.json


BIN
build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/caches/build_file_checksums.ser


+ 11 - 16
build/jsb-link/js backups (useful for debugging)/main.index.js

@@ -11688,8 +11688,6 @@ this.initSetMaxProduct();
 this.initProductTimes();
 this.initLeftTimes();
 this.initFarmMapGetRewardData();
-var o = this.getProp(i.redBagTaskRefresh);
-null != o && (this.init_redBagTask = o);
 }
 };
 t.prototype.initLeftTimes = function() {
@@ -11826,7 +11824,6 @@ var t, e, o, n;
 return a(this, function(a) {
 switch (a.label) {
 case 0:
-if (gData.gameData.init_redBagTask) return [ 2 ];
 if (gData.gameData.gameData.userFarmTaskInfo) {
 t = gData.gameData.gameData.userFarmTaskInfo.completeCount;
 e = gData.gameData.gameData.userFarmTaskInfo.taskCount;
@@ -11840,7 +11837,6 @@ n = a.sent();
 mk.console.logSingle("refrehTask=>", n);
 if (0 != n.errcode) return [ 2, null ];
 gData.gameData.gameData.userFarmTaskInfo = n.data.userFarmTaskInfo;
-gData.gameData.init_task = !0;
 return [ 2 ];
 }
 });
@@ -19103,8 +19099,6 @@ mk.tip.pop("复制成功");
 e.prototype.clickCloseBtn = function() {
 mk.audio.playEffect("closeButton");
 mk.audio.setResumeMusic();
-gData.gameData.init_redBagTask = !0;
-gData.gameData.init_productTask = !0;
 };
 e.prototype.onDestroy = function() {};
 i([ l({
@@ -22838,7 +22832,6 @@ e.node_value = null;
 e.node_task = null;
 e.lbl_Ani = null;
 e.lbl_taskNum = null;
-e.lbl_taskDes = null;
 e.node_videoIcon = null;
 e.isShowNewTask = !1;
 e.num = 0;
@@ -22846,6 +22839,7 @@ e.delayTime = 0;
 e.times = 0;
 e.maxNum = 14;
 e.isCanCash = !1;
+e.isRefreshTask = !1;
 return e;
 }
 e.prototype.start = function() {
@@ -22928,6 +22922,8 @@ e.showChangePart();
 }
 if (gData.gameData.init_redBagTask) {
 gData.gameData.init_redBagTask = !1;
+gData.gameData.init_productTask = !0;
+this.isRefreshTask = !0;
 this.showNewTaskUI();
 this.isShowNewTask = !0;
 }
@@ -22936,17 +22932,20 @@ e.prototype.initTaskProgressUI = function() {
 var t = this;
 if (gData.gameData.gameData.userFarmTaskInfo) {
 var e = gData.gameData.gameData.userFarmTaskInfo.completeCount, o = gData.gameData.gameData.userFarmTaskInfo.taskCount, n = e / o;
-cc.tween(this.sp_taskProgress).delay(.2).to(.2, {
+if (this.isRefreshTask) {
+this.sp_taskProgress.fillRange = n;
+this.lbl_taskProgress.string = e + "/" + o;
+} else cc.tween(this.sp_taskProgress).delay(.2).to(.2, {
 fillRange: n
 }, {
 onUpdate: function() {
-var e = 100 * t.sp_taskProgress.fillRange;
-t.lbl_taskProgress.string = e.toFixed(0) + "%";
+var e = Math.round(t.sp_taskProgress.fillRange * o);
+t.lbl_taskProgress.string = e + "/" + o;
 }
+}).call(function() {
+t.lbl_taskProgress.string = e + "/" + o;
 }).start();
-cc.tween(this);
 this.lbl_taskNum.string = o.toString();
-this.lbl_taskDes.string = "(" + e + "/" + o + ")";
 var a = this.openBtn_ani.getComponent(l.default);
 if (a && e < o) {
 a.setGray(!0);
@@ -23055,10 +23054,6 @@ i([ h({
 type: cc.Label,
 displayName: "任务数量"
 }) ], e.prototype, "lbl_taskNum", void 0);
-i([ h({
-type: cc.Label,
-displayName: "任务描述"
-}) ], e.prototype, "lbl_taskDes", void 0);
 i([ h(cc.Node) ], e.prototype, "node_videoIcon", void 0);
 return i([ d ], e);
 }(cc.Component);

+ 2 - 2
packages-hot-update/cfg.json

@@ -9,7 +9,7 @@
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote/",
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kxnlyTest/baseRemote/"
     ],
-    "buildTime": 1631262149881,
-    "genTime": 1631262149881,
+    "buildTime": 1631266832945,
+    "genTime": 1631266832945,
     "genVersion": null
 }

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