修改bug

assets/resources/game/prefab/game.prefab

@@ -3311,8 +3311,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 100,
-      "height": 40
+      "width": 500,
+      "height": 260
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -3330,8 +3330,8 @@
         0,
         0,
         1,
-        1,
-        1,
+        0.2,
+        0.2,
         1
       ]
     },
@@ -3364,9 +3364,9 @@
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
-      "__uuid__": "f0163cdf-8674-40b3-af65-5914624e55c6"
+      "__uuid__": "f396a544-409a-4f3d-a240-b4cee09d7c22"
     },
-    "_type": 0,
+    "_type": 1,
     "_sizeMode": 0,
     "_fillType": 0,
     "_fillCenter": {
@@ -5554,7 +5554,7 @@
     "asset": {
       "__uuid__": "b4dea4a9-29c8-46bc-a50d-5754afa7a2bd"
     },
-    "fileId": "887cva5IRG7rZO0eu2vB9u",
+    "fileId": "edyBlpoZRLA6Zjm4yhDxc+",
     "sync": false
   },
   {
@@ -5766,7 +5766,7 @@
     "asset": {
       "__uuid__": "b4dea4a9-29c8-46bc-a50d-5754afa7a2bd"
     },
-    "fileId": "56N1ZVst9M4ZWemoauhYpE",
+    "fileId": "63OiVMl6RN07Qf803YkJQK",
     "sync": false
   },
   {
@@ -5875,7 +5875,7 @@
     "asset": {
       "__uuid__": "b4dea4a9-29c8-46bc-a50d-5754afa7a2bd"
     },
-    "fileId": "741rXHSydPFo4ltEndLxOW",
+    "fileId": "06OD89Y4RGxJFlp9asauv/",
     "sync": false
   },
   {
@@ -6251,8 +6251,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 100,
-      "height": 40
+      "width": 500,
+      "height": 260
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -6270,8 +6270,8 @@
         0,
         0,
         1,
-        1.1,
-        1.1,
+        0.2,
+        0.2,
         1.1
       ]
     },
@@ -6304,9 +6304,9 @@
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
-      "__uuid__": "f0163cdf-8674-40b3-af65-5914624e55c6"
+      "__uuid__": "f396a544-409a-4f3d-a240-b4cee09d7c22"
     },
-    "_type": 0,
+    "_type": 1,
     "_sizeMode": 0,
     "_fillType": 0,
     "_fillCenter": {

assets/resources/module/speedUpUI/productReward.prefab

@@ -24,20 +24,20 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 100
+        "__id__": 103
       },
       {
-        "__id__": 101
+        "__id__": 104
       },
       {
-        "__id__": 102
+        "__id__": 105
       },
       {
-        "__id__": 103
+        "__id__": 106
       }
     ],
     "_prefab": {
-      "__id__": 104
+      "__id__": 107
     },
     "_opacity": 255,
     "_color": {
@@ -101,7 +101,7 @@
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 99
+      "__id__": 102
     },
     "_opacity": 255,
     "_color": {
@@ -165,23 +165,23 @@
         "__id__": 10
       },
       {
-        "__id__": 62
+        "__id__": 65
       },
       {
-        "__id__": 76
+        "__id__": 79
       },
       {
-        "__id__": 93
+        "__id__": 96
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 97
+        "__id__": 100
       }
     ],
     "_prefab": {
-      "__id__": 98
+      "__id__": 101
     },
     "_opacity": 255,
     "_color": {
@@ -472,7 +472,7 @@
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 61
+      "__id__": 64
     },
     "_opacity": 255,
     "_color": {
@@ -966,16 +966,16 @@
         "__id__": 24
       },
       {
-        "__id__": 37
+        "__id__": 40
       },
       {
-        "__id__": 47
+        "__id__": 50
       }
     ],
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 60
+      "__id__": 63
     },
     "_opacity": 255,
     "_color": {
@@ -1040,19 +1040,22 @@
       },
       {
         "__id__": 31
+      },
+      {
+        "__id__": 34
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 34
+        "__id__": 37
       },
       {
-        "__id__": 35
+        "__id__": 38
       }
     ],
     "_prefab": {
-      "__id__": 36
+      "__id__": 39
     },
     "_opacity": 255,
     "_color": {
@@ -1064,7 +1067,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 380.28,
+      "width": 385.28,
       "height": 50
     },
     "_anchorPoint": {
@@ -1140,7 +1143,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -151.14,
+        -153.64,
         0,
         0,
         0,
@@ -1248,7 +1251,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -84.89499999999998,
+        -87.39499999999998,
         -5,
         0,
         0,
@@ -1344,7 +1347,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 247.79,
+      "width": 104,
       "height": 50.4
     },
     "_anchorPoint": {
@@ -1356,7 +1359,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        66.24500000000002,
+        -8.149999999999977,
         0,
         0,
         0,
@@ -1396,8 +1399,8 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "次，立即提现0.3~3元",
-    "_N$string": "次，立即提现0.3~3元",
+    "_string": "次，立即",
+    "_N$string": "次，立即",
     "_fontSize": 26,
     "_lineHeight": 40,
     "_enableWrapText": true,
@@ -1426,16 +1429,124 @@
     "sync": false
   },
   {
+    "__type__": "cc.Node",
+    "_name": "任务描述",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 24
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 35
+      }
+    ],
+    "_prefab": {
+      "__id__": 36
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 0,
+      "b": 0,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 143.79,
+      "height": 50.4
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        114.74500000000002,
+        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.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 34
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "提现0.3~3元",
+    "_N$string": "提现0.3~3元",
+    "_fontSize": 26,
+    "_lineHeight": 40,
+    "_enableWrapText": true,
+    "_N$file": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_batchAsBitmap": false,
+    "_styleFlags": 0,
+    "_underlineHeight": 0,
+    "_N$horizontalAlign": 1,
+    "_N$verticalAlign": 1,
+    "_N$fontFamily": "Arial",
+    "_N$overflow": 0,
+    "_N$cacheMode": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "a2f8ad6a-6054-4b3e-8202-7e9e1975fad9"
+    },
+    "fileId": "906ubky/hBB6wDygrV1ZgZ",
+    "sync": false
+  },
+  {
     "__type__": "cc.Layout",
     "_name": "",
     "_objFlags": 0,
     "node": {
       "__id__": 24
     },
-    "_enabled": true,
+    "_enabled": false,
     "_layoutSize": {
       "__type__": "cc.Size",
-      "width": 380.28,
+      "width": 385.28,
       "height": 50
     },
     "_resize": 1,
@@ -1496,20 +1607,20 @@
     },
     "_children": [
       {
-        "__id__": 38
+        "__id__": 41
       },
       {
-        "__id__": 41
+        "__id__": 44
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 45
+        "__id__": 48
       }
     ],
     "_prefab": {
-      "__id__": 46
+      "__id__": 49
     },
     "_opacity": 255,
     "_color": {
@@ -1563,17 +1674,17 @@
     "_name": "进度条",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 37
+      "__id__": 40
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 39
+        "__id__": 42
       }
     ],
     "_prefab": {
-      "__id__": 40
+      "__id__": 43
     },
     "_opacity": 255,
     "_color": {
@@ -1627,7 +1738,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 38
+      "__id__": 41
     },
     "_enabled": true,
     "_materials": [
@@ -1670,20 +1781,20 @@
     "_name": "进度文本",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 37
+      "__id__": 40
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 42
+        "__id__": 45
       },
       {
-        "__id__": 43
+        "__id__": 46
       }
     ],
     "_prefab": {
-      "__id__": 44
+      "__id__": 47
     },
     "_opacity": 255,
     "_color": {
@@ -1737,7 +1848,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 41
+      "__id__": 44
     },
     "_enabled": true,
     "_materials": [
@@ -1770,7 +1881,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 41
+      "__id__": 44
     },
     "_enabled": true,
     "_color": {
@@ -1799,7 +1910,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 37
+      "__id__": 40
     },
     "_enabled": true,
     "_materials": [
@@ -1846,16 +1957,16 @@
     },
     "_children": [
       {
-        "__id__": 48
+        "__id__": 51
       },
       {
-        "__id__": 51
+        "__id__": 54
       }
     ],
     "_active": false,
     "_components": [],
     "_prefab": {
-      "__id__": 59
+      "__id__": 62
     },
     "_opacity": 255,
     "_color": {
@@ -1909,17 +2020,17 @@
     "_name": "描述2",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 47
+      "__id__": 50
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 49
+        "__id__": 52
       }
     ],
     "_prefab": {
-      "__id__": 50
+      "__id__": 53
     },
     "_opacity": 255,
     "_color": {
@@ -1973,7 +2084,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 48
+      "__id__": 51
     },
     "_enabled": true,
     "_materials": [
@@ -2017,27 +2128,27 @@
     "_name": "New Sprite",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 47
+      "__id__": 50
     },
     "_children": [
       {
-        "__id__": 52
+        "__id__": 55
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 55
+        "__id__": 58
       },
       {
-        "__id__": 56
+        "__id__": 59
       },
       {
-        "__id__": 57
+        "__id__": 60
       }
     ],
     "_prefab": {
-      "__id__": 58
+      "__id__": 61
     },
     "_opacity": 255,
     "_color": {
@@ -2091,17 +2202,17 @@
     "_name": "New Sprite",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 51
+      "__id__": 54
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 53
+        "__id__": 56
       }
     ],
     "_prefab": {
-      "__id__": 54
+      "__id__": 57
     },
     "_opacity": 255,
     "_color": {
@@ -2155,7 +2266,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 52
+      "__id__": 55
     },
     "_enabled": true,
     "_materials": [
@@ -2198,7 +2309,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 51
+      "__id__": 54
     },
     "_enabled": true,
     "_materials": [
@@ -2230,7 +2341,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 51
+      "__id__": 54
     },
     "_enabled": true,
     "_defaultClip": {
@@ -2249,7 +2360,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 51
+      "__id__": 54
     },
     "_enabled": true,
     "panel_name": "module/redBagTask/redBagTask",
@@ -2312,19 +2423,19 @@
     },
     "_children": [
       {
-        "__id__": 63
-      },
-      {
         "__id__": 66
       },
       {
         "__id__": 69
+      },
+      {
+        "__id__": 72
       }
     ],
     "_active": false,
     "_components": [],
     "_prefab": {
-      "__id__": 75
+      "__id__": 78
     },
     "_opacity": 255,
     "_color": {
@@ -2378,17 +2489,17 @@
     "_name": "框",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 62
+      "__id__": 65
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 64
+        "__id__": 67
       }
     ],
     "_prefab": {
-      "__id__": 65
+      "__id__": 68
     },
     "_opacity": 255,
     "_color": {
@@ -2442,7 +2553,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 63
+      "__id__": 66
     },
     "_enabled": true,
     "_materials": [
@@ -2485,17 +2596,17 @@
     "_name": "tip",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 62
+      "__id__": 65
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 67
+        "__id__": 70
       }
     ],
     "_prefab": {
-      "__id__": 68
+      "__id__": 71
     },
     "_opacity": 255,
     "_color": {
@@ -2549,7 +2660,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 66
+      "__id__": 69
     },
     "_enabled": true,
     "_materials": [
@@ -2593,21 +2704,21 @@
     "_name": "影子背景",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 62
+      "__id__": 65
     },
     "_children": [
       {
-        "__id__": 70
+        "__id__": 73
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 73
+        "__id__": 76
       }
     ],
     "_prefab": {
-      "__id__": 74
+      "__id__": 77
     },
     "_opacity": 255,
     "_color": {
@@ -2661,17 +2772,17 @@
     "_name": "人",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 69
+      "__id__": 72
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 71
+        "__id__": 74
       }
     ],
     "_prefab": {
-      "__id__": 72
+      "__id__": 75
     },
     "_opacity": 255,
     "_color": {
@@ -2725,7 +2836,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 70
+      "__id__": 73
     },
     "_enabled": true,
     "_materials": [
@@ -2768,7 +2879,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 69
+      "__id__": 72
     },
     "_enabled": true,
     "_materials": [
@@ -2826,29 +2937,29 @@
     },
     "_children": [
       {
-        "__id__": 77
+        "__id__": 80
       },
       {
-        "__id__": 80
+        "__id__": 83
       },
       {
-        "__id__": 84
+        "__id__": 87
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 88
+        "__id__": 91
       },
       {
-        "__id__": 89
+        "__id__": 92
       },
       {
-        "__id__": 91
+        "__id__": 94
       }
     ],
     "_prefab": {
-      "__id__": 92
+      "__id__": 95
     },
     "_opacity": 255,
     "_color": {
@@ -2902,17 +3013,17 @@
     "_name": "video",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 76
+      "__id__": 79
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 78
+        "__id__": 81
       }
     ],
     "_prefab": {
-      "__id__": 79
+      "__id__": 82
     },
     "_opacity": 255,
     "_color": {
@@ -2966,7 +3077,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 77
+      "__id__": 80
     },
     "_enabled": true,
     "_materials": [
@@ -3009,20 +3120,20 @@
     "_name": "描述",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 76
+      "__id__": 79
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 81
+        "__id__": 84
       },
       {
-        "__id__": 82
+        "__id__": 85
       }
     ],
     "_prefab": {
-      "__id__": 83
+      "__id__": 86
     },
     "_opacity": 255,
     "_color": {
@@ -3076,7 +3187,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 80
+      "__id__": 83
     },
     "_enabled": true,
     "_materials": [
@@ -3111,7 +3222,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 80
+      "__id__": 83
     },
     "_enabled": true,
     "_color": {
@@ -3140,20 +3251,20 @@
     "_name": "hb",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 76
+      "__id__": 79
     },
     "_children": [],
     "_active": false,
     "_components": [
       {
-        "__id__": 85
+        "__id__": 88
       },
       {
-        "__id__": 86
+        "__id__": 89
       }
     ],
     "_prefab": {
-      "__id__": 87
+      "__id__": 90
     },
     "_opacity": 255,
     "_color": {
@@ -3207,7 +3318,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 84
+      "__id__": 87
     },
     "_enabled": true,
     "_materials": [
@@ -3239,7 +3350,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 84
+      "__id__": 87
     },
     "_enabled": true,
     "_defaultClip": {
@@ -3269,7 +3380,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 76
+      "__id__": 79
     },
     "_enabled": true,
     "_materials": [
@@ -3301,7 +3412,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 76
+      "__id__": 79
     },
     "_enabled": true,
     "_normalMaterial": null,
@@ -3310,7 +3421,7 @@
     "zoomScale": 1.2,
     "clickEvents": [
       {
-        "__id__": 90
+        "__id__": 93
       }
     ],
     "_N$interactable": true,
@@ -3366,7 +3477,7 @@
     "hoverSprite": null,
     "_N$disabledSprite": null,
     "_N$target": {
-      "__id__": 76
+      "__id__": 79
     },
     "_id": ""
   },
@@ -3385,7 +3496,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 76
+      "__id__": 79
     },
     "_enabled": true,
     "_defaultClip": {
@@ -3422,14 +3533,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 94
+        "__id__": 97
       },
       {
-        "__id__": 95
+        "__id__": 98
       }
     ],
     "_prefab": {
-      "__id__": 96
+      "__id__": 99
     },
     "_opacity": 255,
     "_color": {
@@ -3483,7 +3594,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 93
+      "__id__": 96
     },
     "_enabled": true,
     "_materials": [
@@ -3515,7 +3626,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 93
+      "__id__": 96
     },
     "_enabled": true,
     "node_panel": {
@@ -3668,19 +3779,19 @@
       "__id__": 15
     },
     "lbl_times2": {
-      "__id__": 67
+      "__id__": 70
     },
     "lbl_taskTimes": {
       "__id__": 29
     },
     "lbl_progress": {
-      "__id__": 42
+      "__id__": 45
     },
     "sp_taskProgress": {
-      "__id__": 39
+      "__id__": 42
     },
     "node_complete": {
-      "__id__": 47
+      "__id__": 50
     },
     "node_Uncomplete": {
       "__id__": 24
@@ -3689,7 +3800,7 @@
       "__id__": 10
     },
     "node_2": {
-      "__id__": 62
+      "__id__": 65
     },
     "_id": ""
   },

assets/script/before/main/FactoryIcon.ts

@@ -112,7 +112,7 @@ export class FactoryIcon extends cc.Component {
                 break;
             case FactroyState.Ripe:
                 gData.factorySystem.currSelectFactory = this;
-                gData.harvestData.openPanel(this.configID, this.data.productID, this.onHarvest.bind(this));
+                gData.harvestData.openPanel(this.configID, this.data.productID, this.onHarvest.bind(this), this.node);
                 break;
             case FactroyState.Sick:
                 // mk.tip.pop(`生虫了！`);
@@ -197,7 +197,7 @@ export class FactoryIcon extends cc.Component {
     public canHarvest() {
         this.getComponent(MoveToCenter).move();
         gData.factorySystem.currSelectFactory = this;
-        gData.harvestData.openPanel(this.configID, this.data.productID, this.onHarvest.bind(this));
+        gData.harvestData.openPanel(this.configID, this.data.productID, this.onHarvest.bind(this), this.node);
     }
 
     public canClearSick() {

assets/script/before/main/FarmIcon.ts

@@ -133,7 +133,7 @@ export class FarmIcon extends cc.Component {
                 break;
             case FarmState.Ripe:
                 gData.farmSystem.currSelectFarm = this;
-                gData.harvestData.openPanel(this.configID, this.plantID, this.onHarvest.bind(this));
+                gData.harvestData.openPanel(this.configID, this.plantID, this.onHarvest.bind(this), this.node);
                 break;
             case FarmState.Sick:
                 // mk.tip.pop(`生虫了！`);
@@ -231,7 +231,7 @@ export class FarmIcon extends cc.Component {
 
     public canHarvest() {
         gData.farmSystem.currSelectFarm = this;
-        gData.harvestData.openPanel(this.configID, this.plantID, this.onHarvest.bind(this));
+        gData.harvestData.openPanel(this.configID, this.plantID, this.onHarvest.bind(this), this.node);
     }
 
     public canClearSick() {

assets/script/before/main/PastureIcon.ts

@@ -174,7 +174,7 @@ export default class PastureIcon extends cc.Component {
                 mk.ui.openPanel('module/speedUpUI/speedUp');
                 break;
             case PastureState.Ripe:
-                gData.harvestData.openPanel(this.configID, this.data.productID, this.onHarvest.bind(this));
+                gData.harvestData.openPanel(this.configID, this.data.productID, this.onHarvest.bind(this), this.node);
                 break;
             case PastureState.Sick:
                 // mk.tip.pop(`生虫了！`);
@@ -291,7 +291,7 @@ export default class PastureIcon extends cc.Component {
 
     public canHarvest() {
         this.getComponent(MoveToCenter).move();
-        gData.harvestData.openPanel(this.configID, this.data.productID, this.onHarvest.bind(this));
+        gData.harvestData.openPanel(this.configID, this.data.productID, this.onHarvest.bind(this), this.node);
     }
 
     public canClearSick() {

assets/script/before/view/data/HarvestData.ts

@@ -13,11 +13,12 @@ export default class HarvestData extends Data {
     //领取类型  0 普通领取 1 超级加倍
     getType = 0;
     init_reward = false;
-    worldPos:cc.Vec2 = null;
-    openPanel(configID, plantID, call) {
+    node_fly: cc.Node = null;
+    openPanel(configID, plantID, call, node) {
         this.configID = configID;
         this.plantID = plantID;
         this.call = call;
+        this.node_fly = node;
         this.config = gData.gameData.getProductMap(this.plantID);
 
         mk.ui.openPanel('game/prefab/uiPanel/HarvestPanel');
@@ -32,7 +33,8 @@ export default class HarvestData extends Data {
         gData.reward.data = gData.harvestData.adData.videoRedMoney.videoRewardList;
         gData.reward.callback = gData.harvestData.call;
 
-        gData.reward.getReward(this.worldPos);
+        let world_Pos = this.node_fly.parent.convertToWorldSpaceAR(this.node_fly.getPosition());
+        gData.reward.getReward(world_Pos);
         //mk.ui.openPanel('module/reward/reward');
         gData.harvestData.call = null;
     }

assets/script/before/view/ui/HarvestPanel.ts

@@ -45,7 +45,8 @@ export default class HarvestPanel extends cc.Component {
             gData.reward.data = rewardData;
             gData.reward.callback = gData.harvestData.call;
 
-            let world_Pos = this.node_hb.parent.convertToWorldSpaceAR(this.node_hb.getPosition());
+
+            let world_Pos = gData.harvestData.node_fly.parent.convertToWorldSpaceAR(gData.harvestData.node_fly.getPosition());
             gData.reward.getReward(world_Pos);
             //mk.ui.openPanel('module/reward/reward');
         }
@@ -54,7 +55,7 @@ export default class HarvestPanel extends cc.Component {
 
     public async clickSuperBtn() {
         mk.audio.playEffect("button");
-        gData.harvestData.worldPos = this.node_hb.parent.convertToWorldSpaceAR(this.node_hb.getPosition());
+        //gData.harvestData.worldPos = gData.farmSystem.currSelectFarm.node.parent.convertToWorldSpaceAR(gData.farmSystem.currSelectFarm.node.getPosition());
         mk.ui.closePanel('HarvestPanel');
         mk.ad.videoAdType = VideoAdType.video_init_12;
         gData.harvestData.getType = 1;

assets/script/game/game/FunBtns.ts

@@ -40,8 +40,19 @@ export default class FunBtns extends cc.Component {
 
         if(this.btn8.active)
         {
-            this.btn8.active = gData.gameData.playerProp.completeFarmTaskTimes >= parseInt(gData.gameData.configs.ServerConfig.FlyRedMoney);
+            let isShow = gData.gameData.playerProp.completeFarmTaskTimes >= parseInt(gData.gameData.configs.ServerConfig.FlyRedMoney);
+            this.btn8.active = isShow;
+
+            if(!isShow)
+            {
+                mk.event.register("refreshBubble", this.refreshStatus.bind(this), this);
+            }
         }
     }
+
+    refreshStatus()
+    {
+        this.btn8.active = gData.gameData.playerProp.completeFarmTaskTimes >= parseInt(gData.gameData.configs.ServerConfig.FlyRedMoney);
+    }
 }
 

assets/script/game/game/Game.ts

@@ -216,7 +216,7 @@ export default class Game extends cc.Component {
         gData.gameData.init_coin = false;
 
         if (gData.gameData.addHb > 0) {
-            let add =  gData.gameData.addHb / 100;
+            let add =  Math.round(gData.gameData.addHb / 100);
             this.lbl_addHb.string = "+" + add.toString();
             gData.gameData.addHb = 0;
 
@@ -224,7 +224,7 @@ export default class Game extends cc.Component {
                 cc.Tween.stopAllByTarget(this.node_addHb);
                 this.node_addHb.active = true;
                 this.node_addHb.scale = 0;
-                cc.tween(this.node_addHb).to(0.1, { scale: 1 }).delay(1).call(() => {
+                cc.tween(this.node_addHb).to(0.1, { scale: 1 }).delay(1.5).call(() => {
                     this.node_addHb.active = false;
                 }).start();
             }
@@ -537,7 +537,7 @@ export default class Game extends cc.Component {
             this.node_addExp.active = true;
             this.node_addExp.scale = 0;
             this.lbl_addExp.string = `+${exp}`;
-            cc.tween(this.node_addExp).to(0.1, { scale: 1 }).delay(1).call(() => {
+            cc.tween(this.node_addExp).to(0.1, { scale: 1 }).delay(1.5).call(() => {
                 this.node_addExp.active = false;
             }).start();
         } else {

assets/script/game/module/redBagTask/RedBagTask.ts

@@ -289,6 +289,8 @@ export default class RedBagTask extends cc.Component {
         gData.gameData.playerProp.userFarmTaskInfo = response.data.userFarmTaskInfo;
         gData.gameData.playerProp.completeFarmTaskTimes = response.data.completeFarmTaskTimes;
 
+        mk.event.emit("refreshBubble");
+        
         mk.data.setTAEventUser(0, 'Cumulative_task', gData.gameData.playerProp.completeFarmTaskTimes);
         //gData.gameData.init_redBagTask = true;
         gData.gameData.checkTaskFinishUnLock();

build/jsb-link/assets/internal/config.json

@@ -1 +0,0 @@
-{"paths":{"0":["effects/builtin-2d-graphics",0],"1":["effects/builtin-2d-gray-sprite",0],"2":["effects/builtin-2d-label",0],"3":["effects/builtin-2d-spine",0],"4":["effects/builtin-2d-sprite",0],"5":["effects/builtin-3d-particle",0],"6":["effects/builtin-3d-trail",0],"7":["effects/builtin-clear-stencil",0],"8":["effects/builtin-unlit",0],"9":["materials/builtin-2d-base",1],"10":["materials/builtin-2d-graphics",1],"11":["materials/builtin-2d-gray-sprite",1],"12":["materials/builtin-2d-label",1],"13":["materials/builtin-2d-spine",1],"14":["materials/builtin-2d-sprite",1],"15":["materials/builtin-3d-particle",1],"16":["materials/builtin-3d-trail",1],"17":["materials/builtin-clear-stencil",1],"18":["materials/builtin-unlit",1]},"types":["cc.EffectAsset","cc.Material"],"uuids":["30aC+Hnw1PF4pEcoY3kUYb","14TDKXr2NJ6LjvHPops74o","f1h0LXVtJOta5JLZ1xCzfI","0ek66qC1NOQLjgYmi04HvX","28dPjdQWxEQIG3VVl1Qm6T","82migssElAGb04Ws6NimQX","2afAA24LNP4YmYiaVLiivs","c0BAyVxX9JzZy8EjFrc9DU","6dkeWRTOBGXICfYQ7JUBnG","6fgBCSDDdPMInvyNlggls2","a1U5RdJRFMFL57BdJC9H1X","3ae7efMv1CLq2ilvUY/tQi","e0LYfU5ZlNFoAB4UiRrGUG","7a/QZLET9IDreTiBfRn2PD","ecpdLyjvZBwrvm+cedCcQy","43L6CczwNM/6GGmCYEQIoH","46bU+b5fROqIXVPG6aZWWK","cffgu4qBxEqa150o1DmRAy","2aKWBXJHxKHLvrBUi2yYZQ","02delMVqdBD70a/HSD99FK","60AwGqM1dKELCGhPAR+jK6"],"scenes":{},"redirect":[],"deps":[],"packs":{"0b6c4470e":[19,3,1,4,18,6,0,11,15,16,20,8,9,13,5,10,7,17,12,14,2]},"name":"internal","importBase":"import","nativeBase":"native","debug":false,"isZip":false,"encrypted":true}

build/jsb-link/assets/main/config.json

@@ -1 +0,0 @@
-{"paths":{},"types":[],"uuids":["6fUipUPg5ATaBsvsi0MHyV","baLjOyWmRCS4sIJH/tS+Dw"],"scenes":{"db://assets/scene/MainScene.fire":0},"redirect":[1,0],"deps":["resources"],"packs":{},"name":"main","importBase":"import","nativeBase":"native","debug":false,"isZip":false,"encrypted":true}

build/jsb-link/assets/resources/import/00/00220b88-1f47-4efe-b465-ebd263bb4e31.json

@@ -1 +0,0 @@
-[1,["dbREqIA8xIwrla9lMfxWAI"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"bg","rect":[0,0,630,669],"offset":[0,0],"originalSize":[630,669],"capInsets":[0,140,0,16]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/00/002bf5f3-495e-48f3-8fa8-b1edf01489ea.json

@@ -1 +0,0 @@
-[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/00/003d8a2f-3565-4eb8-8ac3-39efcf689fa4.json

@@ -1 +0,0 @@
-[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/00/003d8a2f-3565-4eb8-8ac3-39efcf689fa4@6c48a.json

@@ -1 +0,0 @@
-[1,["00PYovNWVOuIrDOe/PaJ+k"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"f_w_5","rect":[65,32,126,208],"offset":[29,8],"originalSize":[198,288],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/00/0098e181-e641-4463-9e22-b3eae2c4ec00.json

@@ -1 +0,0 @@
-[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/00/00b220af-8a30-411e-a455-2b710fbdcb82.json

@@ -1 +0,0 @@
-[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/00/00d3e399-535c-4a0f-9b8f-8704b672b049.json

@@ -1 +0,0 @@
-[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/00/00e83988-d506-4dc8-83c9-a355fc698a6b.json

@@ -1 +0,0 @@
-[1,["b691rGpQxO4Ii4VJ68W6YC"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"2","rect":[0,0,33,42],"offset":[0,0],"originalSize":[33,42],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/00/00ec2723-1153-4b4a-9bfb-22cc5c7784d0.json

@@ -1 +0,0 @@
-[1,["32uB5n6bZGs5W6CEIX7U+6"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"bg","rect":[0,1,750,337],"offset":[0,-0.5],"originalSize":[750,338],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/01/0105edf5-75a1-46f2-a008-148e4f338eab.json

@@ -1 +0,0 @@
-[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/01/0105edf5-75a1-46f2-a008-148e4f338eab@6c48a.json

@@ -1 +0,0 @@
-[1,["01Be31daFG8qAIFI5PM46r"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"30002_0_5","rect":[24,85,151,146],"offset":[0.5,-14],"originalSize":[198,288],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/01/010a66eb-3b83-4995-9dd1-e3589bda3c6a.json

@@ -1 +0,0 @@
-[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/01/010c7f93-d02f-4812-a23d-331822ac6426.json

@@ -1 +0,0 @@
-[1,["231ByFqZZFGbtXI+YTCuIK"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"button","rect":[0,0,123,45],"offset":[0,0],"originalSize":[123,45],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/01/012eeb3f-6c75-4c52-b31a-82e14a4ac60f.json

@@ -1 +0,0 @@
-[1,0,0,[["cc.JsonAsset",["_name","json"],1]],[[0,0,1,3]],[[0,"lvlreward",[{"id":1,"lvl":10,"des":"农场萌新","value":3000},{"id":2,"lvl":20,"des":"农场小主","value":5000},{"id":3,"lvl":25,"des":"农场明星","value":10000},{"id":4,"lvl":55,"des":"农场大亨","value":580000},{"id":5,"lvl":65,"des":"农场财阀","value":1300000}]]],0,0,[],[],[]]

build/jsb-link/assets/resources/import/01/015f4345-4a22-44e8-909d-72df6944df66.json

@@ -1 +0,0 @@
-[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/01/01636377-fc06-4822-8444-7183e0cb3b42.json

@@ -1 +0,0 @@
-[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/01/01636377-fc06-4822-8444-7183e0cb3b42@6c48a.json

@@ -1 +0,0 @@
-[1,["01Y2N3/AZIIoREcYPgyztC"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"f_w_b_7","rect":[14,40,159,204],"offset":[-5.5,2],"originalSize":[198,288],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/01/019e5965-fcb5-4de3-b40b-eaea24e49da0.json

@@ -1 +0,0 @@
-[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/01/019e5965-fcb5-4de3-b40b-eaea24e49da0@6c48a.json

@@ -1 +0,0 @@
-[1,["01nlll/LVN47QL6uok5J2g"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"seedIcon_10003","rect":[0,0,92,54],"offset":[0,0],"originalSize":[92,54],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/01/01e24959-8f77-4a3e-b573-e9f09afedd4f.json

@@ -1 +0,0 @@
-[1,["f8pKJ1Px5EFIoTTRQjMZ7I"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"2008_1r_08","rect":[0,0,71,62],"offset":[0,0],"originalSize":[71,62],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/01/01ff5f11-65d1-4c6e-a330-48083a8114f9.json

@@ -1 +0,0 @@
-[1,["52nzrDMIFFoq86bDTq0KFI"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"moreGame_btn_green","rect":[0,0,120,60],"offset":[0,0],"originalSize":[120,60],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/02/0210e398-c0b6-4a7a-8295-c6217bf2cc02.json

@@ -1 +0,0 @@
-[1,["0deXeX+bZNTLJlHxS0roty"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"2008_1r_05","rect":[0,0,57,74],"offset":[0,0],"originalSize":[57,74],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/02/0214e697-1850-41f0-b28e-3f527952de01.json

@@ -1 +0,0 @@
-[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/02/0214e697-1850-41f0-b28e-3f527952de01@6c48a.json

@@ -1 +0,0 @@
-[1,["02FOaXGFBB8LKOP1J5Ut4B"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"5","rect":[0,0,31,41],"offset":[0,0],"originalSize":[31,41],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/02/023b2442-b37d-40b5-8879-d43f9ae13782.json

@@ -1 +0,0 @@
-[1,["1eG8mXwhxDeJlF2I0TFrV5"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"8","rect":[0,0,19,27],"offset":[0,0],"originalSize":[19,27],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/02/027f8066-20cb-4359-9666-a610c31b0137.json

@@ -1 +0,0 @@
-[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/02/027f8066-20cb-4359-9666-a610c31b0137@6c48a.json

@@ -1 +0,0 @@
-[1,["02f4BmIMtDWZZmphDDGwE3"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"f_w_8","rect":[62,26,122,204],"offset":[24,16],"originalSize":[198,288],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/02/02ac97a8-302b-4710-b295-b1af6f94421e.json

@@ -1 +0,0 @@
-[1,["23DWrWK2ROE5yGrtwdrvvE"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"on","rect":[4,2,150,52],"offset":[1.5,2],"originalSize":[155,60],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/02/02bb5811-db79-4575-a0eb-3e4981932168.json

@@ -1 +0,0 @@
-[1,["81FqTK+yxJAqh7uboxROoo"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"factory_name_icon_20001","rect":[0,0,48,23],"offset":[0,0],"originalSize":[48,23],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/02/02f50643-fa7d-4da2-bde3-28df89271fab.json

@@ -1 +0,0 @@
-[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/02/02f50643-fa7d-4da2-bde3-28df89271fab@6c48a.json

@@ -1 +0,0 @@
-[1,["029QZD+n1Nor3jKN+JJx+r"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"mapIcon_5","rect":[0,0,160,137],"offset":[0,0],"originalSize":[160,137],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/02/02f6d756-a1df-4158-9353-cfd97d9ce6d0.json

@@ -1 +0,0 @@
-[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/02/02f6d756-a1df-4158-9353-cfd97d9ce6d0@6c48a.json

@@ -1 +0,0 @@
-[1,["029tdWod9BWJNTz9l9nObQ"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"factory_20014","rect":[0,0,191,135],"offset":[0,0],"originalSize":[191,135],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/03/03225c46-195c-49ac-b8a1-4b68fee5b4a9.json

@@ -1 +0,0 @@
-[1,["a75JAPAr1DKrz7ni20MGse"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"laba","rect":[0,0,33,27],"offset":[0,0],"originalSize":[33,27],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/03/035bb797-3ebc-420b-8449-4c763c1cc7ba.json

@@ -1 +0,0 @@
-[1,["61zKaoB9BCebGJSUiZLiWK","994/zIPvNPO6OMLRdAPntd","70RqvPPqxBaZaOnDXAGQ2N","b2aSShqiVIEaqSuMjHiovW","aaYewDV1ROMKueRqKqrRNd","ffV4EF2jBICqLFrdQ3dSpO","39JGmsroxHyJPmrKSkTmXy","72lDJDRGpA2qDBQlPMcPQc"],["value"],[["cc.AnimationClip",["_name","_duration","sample","wrapMode","curveData"],-1,11]],[[0,0,1,2,3,4,5]],[[0,"sheepMove_2",1.6,5,2,[{},"comps",11,[{},"cc.Sprite",11,[{},"spriteFrame",12,[[[{"frame":0},"value",6,0],[{"frame":0.2},"value",6,1],[{"frame":0.4},"value",6,2],[{"frame":0.6},"value",6,3],[{"frame":0.8},"value",6,4],[{"frame":1},"value",6,5],[{"frame":1.2},"value",6,6],[{"frame":1.4},"value",6,7]],11,11,11,11,11,11,11,11]]]]]],0,0,[0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0],[0,1,2,3,4,5,6,7]]

build/jsb-link/assets/resources/import/03/0391ef3f-8d62-49f3-85a9-556bd80c53d6.json

@@ -1 +0,0 @@
-[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/03/0391ef3f-8d62-49f3-85a9-556bd80c53d6@6c48a.json

@@ -1 +0,0 @@
-[1,["03ke8/jWJJ84WpVWvYDFPW"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"cz_10012","rect":[0,0,33,30],"offset":[0,0],"originalSize":[33,30],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/03/03b2bcf3-03fe-4fa2-9936-0bdcd1abe621.json

@@ -1 +0,0 @@
-[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/03/03bba11e-0c27-45bb-86ae-71a6c5e12a45.json

@@ -1 +0,0 @@
-[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/03/03bba11e-0c27-45bb-86ae-71a6c5e12a45@6c48a.json

@@ -1 +0,0 @@
-[1,["03u6EeDCdFu4aucabF4SpF"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"fountain_5","rect":[110,87,234,200],"offset":[35,-26],"originalSize":[384,322],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/03/03cbaa38-c830-4190-a0b1-977deefb038e.json

@@ -1 +0,0 @@
-[1,["3a/2sMg/dMXbPv3TlSIfco"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"2005_3s_01","rect":[0,0,105,109],"offset":[0,0],"originalSize":[105,109],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/04/040714fd-86ce-4e51-9440-b46698292cbf.json

@@ -1 +0,0 @@
-[1,["85U+6heRRJ6aUubgEY4aqY"],["_effectAsset"],[["cc.Material",["_name","_techniqueData"],1]],[[0,0,1,3]],[[0,"sprite-water_wave",{"0":{"defines":{"USE_TEXTURE":true},"props":{"offset":0.6,"frequency":6,"angularVelocity":6}}}]],0,0,[0],[0],[0]]

build/jsb-link/assets/resources/import/04/041ce03e-8666-4d0f-af63-3fb40ef021c9.json

@@ -1 +0,0 @@
-[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/04/043b085e-aa0a-4f3e-9902-7c92ab5784f4.json

@@ -1 +0,0 @@
-[1,0,["node","root","data"],[["cc.Prefab",["_name"],2],["cc.Node",["_name","_components","_prefab","_contentSize"],2,9,4,5],["cc.Layout",["_resize","_N$layoutType","node","_layoutSize"],1,1,5],["b818cn3ZlhCA589MCaalmqs",["artNum","node"],2,1],["cc.PrefabInfo",["fileId","root"],2,1]],[[0,0,2],[1,0,1,2,3,2],[2,0,1,2,3,3],[3,0,1,2],[4,0,1,2]],[[0,"TargetScoreArtNum"],[1,"ArtNum",[[2,1,1,-2,[5,44,80]],[3,1,-3]],[4,"0bRgHyHaREPrM9sZzwGsSW",-1],[5,44,80]]],0,[0,1,1,0,0,1,0,0,1,0,2,1,3],[],[],[]]

build/jsb-link/assets/resources/import/04/044cca51-5604-4be5-8d8e-5c57e1ed09c7.json

@@ -1 +0,0 @@
-[1,["acTkQnAqlKVacq1ViYQdcS"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"8","rect":[0,0,23,32],"offset":[0,0],"originalSize":[23,32],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/04/0450350f-cf40-448e-9c92-9a6dff727b46.json

@@ -1 +0,0 @@
-[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/04/049eb58e-d7f7-40f4-85df-1234d2ceb026.json

@@ -1 +0,0 @@
-[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/04/049eb58e-d7f7-40f4-85df-1234d2ceb026@6c48a.json

@@ -1 +0,0 @@
-[1,["04nrWO1/dA9IXfEjTSzrAm"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"ripe_10015","rect":[0,0,40,31],"offset":[0,0],"originalSize":[40,31],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/04/04a89c66-ba3e-498b-b326-6964f1fe2d02.json

@@ -1 +0,0 @@
-[1,["68xcYGaBxGqbzFH7QQa9ej"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"2008_1r_06","rect":[0,0,53,67],"offset":[0,0],"originalSize":[53,67],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/04/04c3a24a-66b6-488c-b5b9-771433b5dc38.json

@@ -1 +0,0 @@
-[1,["cb5HdZYWhEN48htiRz/Y+j"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"2008_1r_01","rect":[0,0,79,71],"offset":[0,0],"originalSize":[79,71],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/04/04d53e45-1269-4c52-8b8f-f870143219af.json

@@ -1 +0,0 @@
-[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/04/04d53e45-1269-4c52-8b8f-f870143219af@6c48a.json

@@ -1 +0,0 @@
-[1,["041T5FEmlMUouP+HAUMhmv"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"30003_1_4","rect":[18,72,162,150],"offset":[0,-3],"originalSize":[198,288],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/05/0503ab32-8ad1-48a9-8a4d-26fefbef9fb6.json

@@ -1 +0,0 @@
-[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/05/0503ab32-8ad1-48a9-8a4d-26fefbef9fb6@6c48a.json

@@ -1 +0,0 @@
-[1,["05A6syitFIqYpNJv7775+2"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"factory_name_icon_20015","rect":[1,1,70,23],"offset":[0.5,0],"originalSize":[71,25],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/05/05073b59-66e4-4cf2-b066-d7e9084467d6.json

@@ -1 +0,0 @@
-[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/05/0512ec48-730d-4eed-a1f6-7e0cf558ec59.json

@@ -1 +0,0 @@
-[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/05/0512ec48-730d-4eed-a1f6-7e0cf558ec59@6c48a.json

@@ -1 +0,0 @@
-[1,["05EuxIcw1O7aH2fgz1WOxZ"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"f_w_3","rect":[60,24,123,212],"offset":[22.5,14],"originalSize":[198,288],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/05/0520738b-5680-43af-9bb1-932236caaf16.json

@@ -1 +0,0 @@
-[1,["abPX6q6uJG26G1ZwyjCFJg"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"yonghu","rect":[8,7,148,32],"offset":[-1,0],"originalSize":[166,46],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/05/052c36b6-572f-44cd-a740-dd8e74ba4940.json

@@ -1 +0,0 @@
-[1,["6dxePErwRPrJU47RoYzGyd"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"button","rect":[0,0,263,111],"offset":[0,0],"originalSize":[263,111],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/05/053fc643-1488-4a50-8845-afdc72d8f9d4.json

@@ -1 +0,0 @@
-[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/05/053fc643-1488-4a50-8845-afdc72d8f9d4@6c48a.json

@@ -1 +0,0 @@
-[1,["05P8ZDFIhKUIhFr9xy2PnU"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"5","rect":[1,1,10,13],"offset":[0.5,-0.5],"originalSize":[11,14],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/05/05565799-27b4-4aa4-9b5e-fd0bf33284ae.json

@@ -1 +0,0 @@
-[1,["57UACfcFlB1K5TIPXZX/WO"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"moreGame_bg_redbg","rect":[0,0,93,36],"offset":[0,0],"originalSize":[93,36],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/05/0593a7f1-7028-426b-8bba-96e03d6757f6.json

@@ -1 +0,0 @@
-[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/05/05b3009c-6410-49af-8aca-83b2567bf926.json

@@ -1 +0,0 @@
-[1,["09niFbGOhIq4crviNilxDU"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"moreGame_bg_2","rect":[0,0,686,656],"offset":[0,0],"originalSize":[686,656],"capInsets":[179,159,106,143]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/06/06086830-afd8-418d-9e51-5783abba235b.json

@@ -1 +0,0 @@
-[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/06/06086830-afd8-418d-9e51-5783abba235b@6c48a.json

@@ -1 +0,0 @@
-[1,["06CGgwr9hBjZ5RV4OruiNb"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"seedIcon_10015","rect":[0,0,94,53],"offset":[0,0],"originalSize":[94,53],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/06/0626d9b1-1d7a-491a-8b9c-2b105ba5a9e7.json

@@ -1 +0,0 @@
-[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/06/06354f8b-8ba1-4e3e-965f-752ab9af8370.json

@@ -1 +0,0 @@
-[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/06/06354f8b-8ba1-4e3e-965f-752ab9af8370@6c48a.json

@@ -1 +0,0 @@
-[1,["06NU+Li6FOPpZfdSq5r4Nw"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"斜","rect":[0,0,27,43],"offset":[0,0],"originalSize":[27,43],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/06/069fc611-c839-4040-8c81-e0da49b3507b.json

@@ -1 +0,0 @@
-[1,["5b3LPVtH1N0oOTZ9KilPv8"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"btn7","rect":[0,0,57,34],"offset":[0,0],"originalSize":[57,34],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/06/06c36147-a316-4cfe-9781-f9e825a3d41a.json

@@ -1 +0,0 @@
-[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/06/06c37b98-dcb9-4a50-829d-ac9a1ef41179.json

@@ -1 +0,0 @@
-[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/06/06c37b98-dcb9-4a50-829d-ac9a1ef41179@6c48a.json

@@ -1 +0,0 @@
-[1,["06w3uY3LlKUIKdrJoe9BF5"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"mapIcon_0","rect":[0,0,235,210],"offset":[0,0],"originalSize":[235,210],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/07/071f2810-b92c-46df-a744-1937e0256f62.json

@@ -1 +0,0 @@
-[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/07/076f5ccc-3375-4547-9f7f-b207e47ba77a.json

@@ -1 +0,0 @@
-[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/07/076f5ccc-3375-4547-9f7f-b207e47ba77a@6c48a.json

@@ -1 +0,0 @@
-[1,["07b1zMM3VFR59/sgfke6d6"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"factory_20017","rect":[0,0,195,169],"offset":[0,0],"originalSize":[195,169],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/07/078e25ac-4e2d-4a51-a0b1-87699ae2d306.json

@@ -1 +0,0 @@
-[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/07/078e25ac-4e2d-4a51-a0b1-87699ae2d306@6c48a.json

@@ -1 +0,0 @@
-[1,["07jiWsTi1KUaCxh2ma4tMG"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"bule_btn","rect":[0,0,172,62],"offset":[0,0],"originalSize":[172,62],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/07/07978e5a-ffe3-4fba-a4f8-83dc61c42188.json

@@ -1 +0,0 @@
-[1,["f3UyYIyV5ApIr9TnZrIGGn"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"f_w_8","rect":[62,26,122,204],"offset":[24,16],"originalSize":[198,288],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/07/079b89cf-9a76-4383-9038-81d4955ffbd5.json

@@ -1 +0,0 @@
-[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]