Merge branch 'master' of http://git.mokasz.com/zouyong/team1_nc

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/game/texture/public/bg.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "d3cc55b2-bf60-4a48-a16c-24ccf54d8a4a",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 244,
+  "height": 211,
+  "platformSettings": {},
+  "subMetas": {
+    "bg": {
+      "ver": "1.0.4",
+      "uuid": "f396a544-409a-4f3d-a240-b4cee09d7c22",
+      "rawTextureUuid": "d3cc55b2-bf60-4a48-a16c-24ccf54d8a4a",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 244,
+      "height": 211,
+      "rawWidth": 244,
+      "rawHeight": 211,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 121,
+      "borderRight": 116,
+      "subMetas": {}
+    }
+  }
+}

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": {
@@ -1045,14 +1045,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 34
+        "__id__": 37
       },
       {
-        "__id__": 35
+        "__id__": 38
       }
     ],
     "_prefab": {
-      "__id__": 36
+      "__id__": 39
     },
     "_opacity": 255,
     "_color": {
@@ -1064,7 +1064,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 380.28,
+      "width": 236.49,
       "height": 50
     },
     "_anchorPoint": {
@@ -1076,7 +1076,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        0,
+        -70,
         53,
         0,
         0,
@@ -1140,7 +1140,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -151.14,
+        -79.245,
         0,
         0,
         0,
@@ -1248,7 +1248,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -84.89499999999998,
+        -13.000000000000004,
         -5,
         0,
         0,
@@ -1324,15 +1324,19 @@
     "_parent": {
       "__id__": 24
     },
-    "_children": [],
+    "_children": [
+      {
+        "__id__": 32
+      }
+    ],
     "_active": true,
     "_components": [
       {
-        "__id__": 32
+        "__id__": 35
       }
     ],
     "_prefab": {
-      "__id__": 33
+      "__id__": 36
     },
     "_opacity": 255,
     "_color": {
@@ -1344,7 +1348,71 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 247.79,
+      "width": 104,
+      "height": 50.4
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        66.245,
+        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__": 31
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 33
+      }
+    ],
+    "_prefab": {
+      "__id__": 34
+    },
+    "_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": {
@@ -1356,7 +1424,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        66.24500000000002,
+        122.895,
         0,
         0,
         0,
@@ -1386,6 +1454,50 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
+      "__id__": 32
+    },
+    "_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": "f7Jr0yRdNNtb0Jxu6fTL43",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
       "__id__": 31
     },
     "_enabled": true,
@@ -1396,8 +1508,8 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "次，立即提现0.3~3元",
-    "_N$string": "次，立即提现0.3~3元",
+    "_string": "次，立即",
+    "_N$string": "次，立即",
     "_fontSize": 26,
     "_lineHeight": 40,
     "_enableWrapText": true,
@@ -1435,7 +1547,7 @@
     "_enabled": true,
     "_layoutSize": {
       "__type__": "cc.Size",
-      "width": 380.28,
+      "width": 236.49,
       "height": 50
     },
     "_resize": 1,
@@ -1496,20 +1608,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 +1675,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 +1739,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 38
+      "__id__": 41
     },
     "_enabled": true,
     "_materials": [
@@ -1670,20 +1782,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 +1849,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 41
+      "__id__": 44
     },
     "_enabled": true,
     "_materials": [
@@ -1770,7 +1882,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 41
+      "__id__": 44
     },
     "_enabled": true,
     "_color": {
@@ -1799,7 +1911,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 37
+      "__id__": 40
     },
     "_enabled": true,
     "_materials": [
@@ -1846,16 +1958,16 @@
     },
     "_children": [
       {
-        "__id__": 48
+        "__id__": 51
       },
       {
-        "__id__": 51
+        "__id__": 54
       }
     ],
     "_active": false,
     "_components": [],
     "_prefab": {
-      "__id__": 59
+      "__id__": 62
     },
     "_opacity": 255,
     "_color": {
@@ -1909,17 +2021,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 +2085,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 48
+      "__id__": 51
     },
     "_enabled": true,
     "_materials": [
@@ -2017,27 +2129,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 +2203,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 +2267,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 52
+      "__id__": 55
     },
     "_enabled": true,
     "_materials": [
@@ -2198,7 +2310,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 51
+      "__id__": 54
     },
     "_enabled": true,
     "_materials": [
@@ -2230,7 +2342,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 51
+      "__id__": 54
     },
     "_enabled": true,
     "_defaultClip": {
@@ -2249,7 +2361,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 51
+      "__id__": 54
     },
     "_enabled": true,
     "panel_name": "module/redBagTask/redBagTask",
@@ -2312,19 +2424,19 @@
     },
     "_children": [
       {
-        "__id__": 63
-      },
-      {
         "__id__": 66
       },
       {
         "__id__": 69
+      },
+      {
+        "__id__": 72
       }
     ],
     "_active": false,
     "_components": [],
     "_prefab": {
-      "__id__": 75
+      "__id__": 78
     },
     "_opacity": 255,
     "_color": {
@@ -2378,17 +2490,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 +2554,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 63
+      "__id__": 66
     },
     "_enabled": true,
     "_materials": [
@@ -2485,17 +2597,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 +2661,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 66
+      "__id__": 69
     },
     "_enabled": true,
     "_materials": [
@@ -2593,21 +2705,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 +2773,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 +2837,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 70
+      "__id__": 73
     },
     "_enabled": true,
     "_materials": [
@@ -2768,7 +2880,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 69
+      "__id__": 72
     },
     "_enabled": true,
     "_materials": [
@@ -2826,29 +2938,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 +3014,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 +3078,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 77
+      "__id__": 80
     },
     "_enabled": true,
     "_materials": [
@@ -3009,20 +3121,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 +3188,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 80
+      "__id__": 83
     },
     "_enabled": true,
     "_materials": [
@@ -3111,7 +3223,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 80
+      "__id__": 83
     },
     "_enabled": true,
     "_color": {
@@ -3140,20 +3252,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 +3319,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 84
+      "__id__": 87
     },
     "_enabled": true,
     "_materials": [
@@ -3239,7 +3351,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 84
+      "__id__": 87
     },
     "_enabled": true,
     "_defaultClip": {
@@ -3269,7 +3381,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 76
+      "__id__": 79
     },
     "_enabled": true,
     "_materials": [
@@ -3301,7 +3413,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 76
+      "__id__": 79
     },
     "_enabled": true,
     "_normalMaterial": null,
@@ -3310,7 +3422,7 @@
     "zoomScale": 1.2,
     "clickEvents": [
       {
-        "__id__": 90
+        "__id__": 93
       }
     ],
     "_N$interactable": true,
@@ -3366,7 +3478,7 @@
     "hoverSprite": null,
     "_N$disabledSprite": null,
     "_N$target": {
-      "__id__": 76
+      "__id__": 79
     },
     "_id": ""
   },
@@ -3385,7 +3497,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 76
+      "__id__": 79
     },
     "_enabled": true,
     "_defaultClip": {
@@ -3422,14 +3534,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 94
+        "__id__": 97
       },
       {
-        "__id__": 95
+        "__id__": 98
       }
     ],
     "_prefab": {
-      "__id__": 96
+      "__id__": 99
     },
     "_opacity": 255,
     "_color": {
@@ -3483,7 +3595,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 93
+      "__id__": 96
     },
     "_enabled": true,
     "_materials": [
@@ -3515,7 +3627,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 93
+      "__id__": 96
     },
     "_enabled": true,
     "node_panel": {
@@ -3668,19 +3780,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 +3801,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 +1 @@
-{"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}
+{"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","60AwGqM1dKELCGhPAR+jK6","02delMVqdBD70a/HSD99FK"],"scenes":{},"redirect":[],"deps":[],"packs":{"0b6c4470e":[20,3,1,4,18,6,0,11,15,16,19,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/resources/import/03/03da7a42-fa05-4ce3-8a5c-038039fa915d.json

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

build/jsb-link/assets/resources/import/05/051a6f1a-5fe9-409f-85ea-8b92d1898886.json

@@ -0,0 +1 @@
+[1,["87mAkY529C1LvkukmT6PwS"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"hb2","rect":[0,0,566,805],"offset":[0,0],"originalSize":[566,805],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/12/127d999e-d257-48e2-9f64-227bc5a939cc.json

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

build/jsb-link/assets/resources/import/13/1381979c-6a6d-470d-946c-50b3e2118eb0.json

@@ -0,0 +1 @@
+[1,["49e/J8DvlB+reR9n366jmt"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"bg1","rect":[0,0,453,537],"offset":[0,0],"originalSize":[453,537],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/15/15c9bd8a-5fd2-4000-b71d-f899921d8cdc.json

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

build/jsb-link/assets/resources/import/1b/1ba76e16-1471-432a-a7f2-9a536eaa6704.json

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

build/jsb-link/assets/resources/import/1c/1cfc4445-d10f-4abd-b5fd-101745ff46b6.json

@@ -0,0 +1 @@
+[1,["d2UYnV93VHtpvzEvpjzJGv"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"hb1","rect":[0,0,538,821],"offset":[0,0],"originalSize":[538,821],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/23/23afec8d-bfa3-44ae-9464-fe1261f9311e.json

@@ -0,0 +1 @@
+[1,["519pLXe19DxLcNBeKDKwhw"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"close","rect":[0,0,67,70],"offset":[0,0],"originalSize":[67,70],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/27/2708fccb-354a-44d0-90a5-815c34758136.json

@@ -0,0 +1 @@
+[1,["3erl66m8hE4aJrReUql0T0"],["pre_icon","root","node","data"],[["cc.Node",["_name","_prefab","_contentSize","_anchorPoint","_children","_components","_parent","_trs"],2,4,5,5,2,9,1,7],["cc.PrefabInfo",["fileId","root"],2,1],["cc.Prefab",["_name"],2],["777094CVPBF+Y6ExDutUHl8",["node","sign_icon_pos","pre_icon"],3,1,2,6]],[[0,0,6,1,2,3,7,2],[1,0,1,2],[2,0,2],[0,0,4,5,1,2,3,2],[1,1,1],[3,0,1,2,1]],[[2,"friendsIconGroup"],[3,"friendsIconGroup",[-7,-8,-9,-10],[[5,-6,[-2,-3,-4,-5],0]],[4,-1],[5,530,170],[0,0.5,1]],[0,"iconItem",1,[1,"557SiXxOJLGaNjGw2Y/wDA",1],[5,120,170],[0,0.5,1],[-195,0,0,0,0,0,1,1,1,1]],[0,"iconItem",1,[1,"d5ujq2ASpMyp7Dwn2AtDBz",1],[5,120,170],[0,0.5,1],[-65,0,0,0,0,0,1,1,1,1]],[0,"iconItem",1,[1,"baNNC0bgdA8513Osvu+aTV",1],[5,120,170],[0,0.5,1],[65,0,0,0,0,0,1,1,1,1]],[0,"iconItem",1,[1,"13ZJLKT4VORZ9f9pcuWCpC",1],[5,120,170],[0,0.5,1],[195,0,0,0,0,0,1,1,1,1]]],0,[0,1,1,0,-1,2,0,-2,3,0,-3,4,0,-4,5,0,2,1,0,-1,2,0,-2,3,0,-3,4,0,-4,5,0,3,1,10],[0],[0],[0]]

build/jsb-link/assets/resources/import/28/28b9fa39-ba61-4154-ba31-39d51a594892.json

@@ -0,0 +1 @@
+[1,["62q+6i31ZONJdZ3MlY/USh"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"title1","rect":[0,0,278,45],"offset":[0,0],"originalSize":[278,45],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/31/313e4e6d-cd41-4b68-ae3a-bbac549d2abf.json

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

build/jsb-link/assets/resources/import/31/31b9d6f4-396d-4c0b-8d97-61c26fccb8e3.json

@@ -0,0 +1 @@
+[1,["032npC+gVM44pcA4A5+pFd"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"bg5","rect":[0,0,640,380],"offset":[0,0],"originalSize":[640,380],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/37/3747b94d-4703-4574-9ba0-f2f0380ac2ea.json

@@ -0,0 +1 @@
+[1,["12fZme0ldI4p9kInvFqTnM"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"button1","rect":[0,0,248,101],"offset":[0,0],"originalSize":[248,101],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/3e/3eae5eba-9bc8-44e1-a26b-45e52a9744f4.json

@@ -0,0 +1 @@
+[1,["ecpdLyjvZBwrvm+cedCcQy","3b245vMiJFjq2KqWw4Siax","17LZv6KlJGv62cVuRt57VV"],["node","_spriteFrame","root","lbl_nick","sp_icon","_N$target","data"],[["cc.Node",["_name","_children","_components","_prefab","_contentSize","_parent","_anchorPoint","_trs"],2,2,9,4,5,1,5,7],["cc.Node",["_name","_parent","_components","_prefab","_contentSize","_trs"],2,1,2,4,5,7],["cc.Sprite",["node","_materials","_spriteFrame"],3,1,3,6],["cc.PrefabInfo",["fileId","root"],2,1],["cc.Prefab",["_name"],2],["cc.Mask",["_type","_N$alphaThreshold","node","_materials"],1,1,3],["cc.Button",["node","clickEvents","_N$target"],3,1,9,1],["cc.ClickEvent",["_componentId","handler"],1],["cc.Label",["_string","_fontSize","_N$horizontalAlign","_N$verticalAlign","node","_materials"],-1,1,3],["d8581IbuQtIc7VLC05cY7YC",["node","sp_icon","lbl_nick"],3,1,1,1]],[[3,0,1,2],[4,0,2],[0,0,1,2,3,4,6,2],[0,0,5,1,2,3,4,7,2],[0,0,5,1,2,3,4,2],[1,0,1,2,3,4,2],[1,0,1,2,3,4,5,2],[2,0,1,1],[2,0,1,2,1],[3,1,1],[5,0,1,2,3,3],[6,0,1,2,1],[7,0,1,3],[8,0,1,2,3,4,5,5],[9,0,1,2,1]],[[1,"friendsIcon"],[2,"friendsIcon",[-5,-6],[[14,-4,-3,-2]],[9,-1],[5,120,160],[0,0.5,1]],[3,"bg",1,[-10],[[8,-7,[2],3],[11,-9,[[12,"f4a8c2FYURJfKFw59J1Vxlt","clickHeadPhotoBtn"]],-8]],[0,"canWDLNvhNYoD9frBjZUaz",1],[5,112,113],[0,-63,0,0,0,0,1,1,1,1]],[4,"遮罩",2,[-12],[[10,1,0,-11,[1]]],[0,"eel1BTQwJJ7YTnLPHL1/y/",1],[5,70,70]],[5,"头像",3,[-13],[0,"a0SZ7nLGtBXohkujjW1dSc",1],[5,63,63]],[7,4,[0]],[6,"name",1,[-14],[0,"0ajwSC/NZBpr6V8W+Q4Xts",1],[5,60,50.4],[0,-135,0,0,0,0,1,1,1,1]],[13,"昵称",30,1,1,6,[4]]],0,[0,2,1,0,3,7,0,4,5,0,0,1,0,-1,2,0,-2,6,0,0,2,0,5,2,0,0,2,0,-1,3,0,0,3,0,-1,4,0,-1,5,0,-1,7,0,6,1,14],[0,0,0,0,0,5],[-1,-1,-1,1,-1,1],[0,0,0,1,0,2]]

build/jsb-link/assets/resources/import/48/48b895bb-eac4-4629-bc25-8cbe415c0538.json

@@ -0,0 +1 @@
+[1,["1bp24WFHFDKqfymlNuqmcE"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"wechatButton","rect":[0,0,343,128],"offset":[0,0],"originalSize":[343,128],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/49/4952f17e-faff-44b4-8a20-80fd56e24f7c.json

@@ -0,0 +1 @@
+[1,["72qbhAasZMPq87sB6ctUEp"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"share","rect":[0,0,44,42],"offset":[0,0],"originalSize":[44,42],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/49/497bf27c-0ef9-41fa-b791-f67dfaea39ad.json

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

build/jsb-link/assets/resources/import/51/51f692d7-7b5f-43c4-b70d-05e2832b0870.json

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

build/jsb-link/assets/resources/import/52/524f73af-53df-4aa9-8157-cd8fec8908a2.json

@@ -0,0 +1 @@
+[1,["a9xjn594xJCL72OUuY8NnA"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"button","rect":[0,0,169,178],"offset":[0,0],"originalSize":[169,178],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/58/5854d8aa-bce7-430d-ab91-98444b9b35d8.json

@@ -0,0 +1 @@
+[1,["a3Z4ZSzsdHlYGoRFZavNgQ"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"hb3","rect":[0,0,575,226],"offset":[0,0],"originalSize":[575,226],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/5b/5b7644dd-b550-4bb7-b0ca-f37ac1438977.json

@@ -0,0 +1 @@
+[1,["15yb2KX9JAALcd+JmSHYzc"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"yizhang","rect":[0,0,151,158],"offset":[0,0],"originalSize":[151,158],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/5d/5d416fff-1c12-4a57-ac2d-151958bafd5b.json

@@ -0,0 +1 @@
+[1,["f18F/L42FBeZWT8Av0Zcdm"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"icon","rect":[0,0,124,155],"offset":[0,0],"originalSize":[124,155],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/61/61cea9a0-63a0-4e05-a11b-81ef399fa013.json

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

build/jsb-link/assets/resources/import/62/62abeea2-df56-4e34-9759-dcc958fd44a1.json

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

build/jsb-link/assets/resources/import/71/71f05877-fd25-403f-868a-aeba8acbf6c3.json

@@ -0,0 +1 @@
+[1,["61zqmgY6BOBaEbge85n6AT"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"title","rect":[0,0,348,61],"offset":[0,0],"originalSize":[348,61],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/72/72a9b840-6ac6-4c3e-af3b-b01e9cb54129.json

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

build/jsb-link/assets/resources/import/7e/7e34468c-9f55-46c7-8075-28b88c99bf8f.json

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

build/jsb-link/assets/resources/import/87/87980918-e76f-42d4-bbe4-ba4993e8fc12.json

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

build/jsb-link/assets/resources/import/91/91c0cb32-7f24-42cd-a042-2471689eb884.json

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

build/jsb-link/assets/resources/import/95/956cc5df-353e-433a-97b0-9127e379aeb4.json

@@ -0,0 +1 @@
+[1,["a8krVCls1JZrpE/NQjuxL2"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"button2","rect":[0,0,247,101],"offset":[0,0],"originalSize":[247,101],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/97/976ae4e8-d659-4475-b86b-48ac11a6c416.json

@@ -0,0 +1 @@
+[1,["ff0NwNqXZLApzUEMvbCYNy"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"tv","rect":[0,0,47,57],"offset":[0,0],"originalSize":[47,57],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/a3/a3678652-cec7-4795-81a8-44565abcd810.json

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

build/jsb-link/assets/resources/import/a8/a892b542-96cd-4966-ba44-fcd423bb12f6.json

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

build/jsb-link/assets/resources/import/a8/a89ab286-e909-43d7-b220-c22e0ada2140.json

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

build/jsb-link/assets/resources/import/a9/a9c639f9-f78c-4908-bef6-394b98f0d9c0.json

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

build/jsb-link/assets/resources/import/ae/ae95d4ec-5c17-4c94-935c-4459c87819da.json

@@ -0,0 +1 @@
+[1,["a8mrKG6QlD17Igwi4K2iFA"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"title2","rect":[0,0,161,50],"offset":[0,0],"originalSize":[161,50],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/b6/b6a8f0ab-b79c-4b30-aa7e-da0c9b9b176d.json

@@ -0,0 +1 @@
+[1,["91wMsyfyRCzaBCJHFonriE"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"bg","rect":[0,0,435,127],"offset":[0,0],"originalSize":[435,127],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/d2/d25189d5-f775-47b6-9bf3-12fa63cc91af.json

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

build/jsb-link/assets/resources/import/d3/d3cc55b2-bf60-4a48-a16c-24ccf54d8a4a.json

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

build/jsb-link/assets/resources/import/d5/d5f78ad9-7e76-4197-a42f-ea0c577ba879.json

@@ -0,0 +1 @@
+[1,["31Pk5tzUFLaK46u6xUnSq/"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"tiaoma","rect":[0,0,158,73],"offset":[0,0],"originalSize":[158,73],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/da/dad660d2-6bd2-48cd-a222-2df51d27e53c.json

@@ -0,0 +1 @@
+[1,["7eNEaMn1VGx4B1KLiMmb+P"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"more","rect":[0,0,36,27],"offset":[0,0],"originalSize":[36,27],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/f1/f1f05fcb-e361-4179-9593-f00bf465c766.json

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

build/jsb-link/assets/resources/import/f3/f396a544-409a-4f3d-a240-b4cee09d7c22.json

@@ -0,0 +1 @@
+[1,["d3zFWyv2BKSKFsJMz1TYpK"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"bg","rect":[0,0,244,211],"offset":[0,0],"originalSize":[244,211],"capInsets":[121,0,116,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/ff/ffd0dc0d-a976-4b02-9cd4-10cbdb098372.json

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

build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/modules.xml

@@ -5,6 +5,7 @@
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/-1735865685/android-libcocos2dx.iml" filepath="$PROJECT_DIR$/.idea/modules/-1735865685/android-libcocos2dx.iml" group="proj.android-studio/libcocos2dx" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/app-kxnly.iml" filepath="$PROJECT_DIR$/.idea/modules/app/app-kxnly.iml" group="proj.android-studio/kxnly" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/kxnly.iml" filepath="$PROJECT_DIR$/.idea/modules/app/kxnly.iml" group="proj.android-studio/kxnly" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/-1735865685/libcocos2dx.iml" filepath="$PROJECT_DIR$/.idea/modules/-1735865685/libcocos2dx.iml" group="proj.android-studio/libcocos2dx" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/proj.android-studio.iml" filepath="$PROJECT_DIR$/.idea/modules/proj.android-studio.iml" group="proj.android-studio" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/-52358525/proj.android-studio-libcocos2dx.iml" filepath="$PROJECT_DIR$/.idea/modules/-52358525/proj.android-studio-libcocos2dx.iml" group="proj.android-studio/libcocos2dx" />
     </modules>

build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/modules/-1735865685/libcocos2dx.iml

@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id=":libcocos2dx" external.linked.project.path="C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="proj.android-studio" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="android-gradle" name="Android-Gradle">
+      <configuration>
+        <option name="GRADLE_PROJECT_PATH" value=":libcocos2dx" />
+        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="3.3.3" />
+        <option name="LAST_KNOWN_AGP_VERSION" value="3.3.3" />
+      </configuration>
+    </facet>
+    <facet type="android" name="Android">
+      <configuration>
+        <option name="SELECTED_BUILD_VARIANT" value="debug" />
+        <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
+        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
+        <afterSyncTasks>
+          <task>generateDebugSources</task>
+        </afterSyncTasks>
+        <option name="ALLOW_USER_CONFIGURATION" value="false" />
+        <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
+        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/main/res;file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/debug/res;file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/res/rs/debug;file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/res/resValues/debug" />
+        <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTest/res;file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/test/res;file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTestDebug/res;file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/testDebug/res;file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/res/rs/androidTest/debug;file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/res/resValues/androidTest/debug" />
+        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
+        <option name="PROJECT_TYPE" value="1" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes" />
+    <output-test url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/intermediates/javac/debugUnitTest/compileDebugUnitTestJavaWithJavac/classes" />
+    <exclude-output />
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/java/src">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/java/src" isTestSource="false" />
+    </content>
+    <content url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx">
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/source/apt/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/res/rs/debug" type="java-resource" generated="true" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/res/resValues/debug" type="java-resource" generated="true" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/res/resValues/androidTest/debug" type="java-test-resource" generated="true" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/debug/res" type="java-resource" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/debug/resources" type="java-resource" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/debug/assets" type="java-resource" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/debug/aidl" isTestSource="false" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/debug/java" isTestSource="false" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/debug/rs" isTestSource="false" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/debug/shaders" isTestSource="false" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTestDebug/res" type="java-test-resource" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTestDebug/resources" type="java-test-resource" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTestDebug/assets" type="java-test-resource" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTestDebug/aidl" isTestSource="true" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTestDebug/java" isTestSource="true" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTestDebug/rs" isTestSource="true" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTestDebug/shaders" isTestSource="true" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/testDebug/res" type="java-test-resource" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/testDebug/resources" type="java-test-resource" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/testDebug/assets" type="java-test-resource" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/testDebug/aidl" isTestSource="true" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/testDebug/java" isTestSource="true" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/testDebug/rs" isTestSource="true" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/testDebug/shaders" isTestSource="true" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/main/res" type="java-resource" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/main/assets" type="java-resource" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/main/aidl" isTestSource="false" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/main/rs" isTestSource="false" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/main/shaders" isTestSource="false" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTest/res" type="java-test-resource" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTest/resources" type="java-test-resource" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTest/assets" type="java-test-resource" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTest/aidl" isTestSource="true" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTest/java" isTestSource="true" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTest/rs" isTestSource="true" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/androidTest/shaders" isTestSource="true" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/test/res" type="java-test-resource" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/test/resources" type="java-test-resource" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/test/assets" type="java-test-resource" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/test/aidl" isTestSource="true" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/test/rs" isTestSource="true" />
+      <sourceFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/src/test/shaders" isTestSource="true" />
+      <excludeFolder url="file://C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build" />
+    </content>
+    <orderEntry type="jdk" jdkName="Android API 29 Platform" jdkType="Android SDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Gradle: C./CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/java/libs/com.android.vending.expansion.zipfile.jar" level="project" />
+    <orderEntry type="library" name="Gradle: C./CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/java/libs/okhttp-3.12.7.jar" level="project" />
+    <orderEntry type="library" name="Gradle: C./CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/java/libs/okio-1.15.0.jar" level="project" />
+  </component>
+</module>

build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/modules/app/app-kxnly.iml

@@ -349,6 +349,6 @@
     <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.arch.core:core-runtime:2.0.0@aar" level="project" />
-    <orderEntry type="module" module-name="android-libcocos2dx" />
+    <orderEntry type="module" module-name="libcocos2dx" />
   </component>
 </module>

build/jsb-link/frameworks/runtime-src/proj.android-studio/app/keystore/mokakey_README.md

@@ -1,3 +1,3 @@
 文件名：kncdsf.keystore
-别名：mokakey
+别名：kncdsf.keystore
 密码：szmoka

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

@@ -8146,7 +8146,7 @@ break;
 
 case s.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 s.FactroyState.Sick:
@@ -8216,7 +8216,7 @@ gData.gameData.setNextProduct(!1);
 e.prototype.canHarvest = function() {
 this.getComponent(l.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);
 };
 e.prototype.canClearSick = function() {
 this.getComponent(l.MoveToCenter).move();
@@ -9314,7 +9314,7 @@ break;
 
 case s.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 s.FarmState.Sick:
@@ -9411,7 +9411,7 @@ this.process.cleanProcess();
 };
 e.prototype.canHarvest = function() {
 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);
 };
 e.prototype.canClearSick = function() {
 gData.farmSystem.currSelectFarm = this;
@@ -12056,7 +12056,14 @@ for (var t = gData.gameData.funOpenData, e = 0; e < t.length; e++) {
 var o = this["btn" + (e + 1)];
 o && (o.active = "1" == t[e]);
 }
-this.btn8.active && (this.btn8.active = gData.gameData.playerProp.completeFarmTaskTimes >= parseInt(gData.gameData.configs.ServerConfig.FlyRedMoney));
+if (this.btn8.active) {
+var n = gData.gameData.playerProp.completeFarmTaskTimes >= parseInt(gData.gameData.configs.ServerConfig.FlyRedMoney);
+this.btn8.active = n;
+n || mk.event.register("refreshBubble", this.refreshStatus.bind(this), this);
+}
+};
+e.prototype.refreshStatus = function() {
+this.btn8.active = gData.gameData.playerProp.completeFarmTaskTimes >= parseInt(gData.gameData.configs.ServerConfig.FlyRedMoney);
 };
 i([ s({
 type: cc.Node,
@@ -12861,8 +12868,7 @@ gData.gameData.init_task = !0;
 this.playerProp.userFarmTaskInfo = n.data.userFarmTaskInfo;
 if (this.playerProp.userFarmTaskInfo.completeCount >= this.playerProp.userFarmTaskInfo.taskCount) {
 mk.ui.closeAllUI();
-mk.guide.curDes = "";
-mk.guide.open(3);
+mk.guide.open(4);
 }
 return [ 2, !0 ];
 }
@@ -13955,7 +13961,7 @@ scale: 1
 this.lbl_redMoney.string = gData.gameData.playerProp.redMoney / 100 + "";
 gData.gameData.init_coin = !1;
 if (gData.gameData.addHb > 0) {
-var e = gData.gameData.addHb / 100;
+var e = Math.round(gData.gameData.addHb / 100);
 this.lbl_addHb.string = "+" + e.toString();
 gData.gameData.addHb = 0;
 cc.Tween.stopAllByTarget(this.node_addHb);
@@ -13963,7 +13969,7 @@ this.node_addHb.active = !0;
 this.node_addHb.scale = 0;
 cc.tween(this.node_addHb).to(.1, {
 scale: 1
-}).delay(1).call(function() {
+}).delay(1.5).call(function() {
 t.node_addHb.active = !1;
 }).start();
 }
@@ -14219,7 +14225,7 @@ this.node_addExp.scale = 0;
 this.lbl_addExp.string = "+" + t;
 cc.tween(this.node_addExp).to(.1, {
 scale: 1
-}).delay(1).call(function() {
+}).delay(1.5).call(function() {
 o.node_addExp.active = !1;
 }).start();
 } else {
@@ -15306,8 +15312,10 @@ var n = t("../../game/data/GameData"), a = t("./UISystem"), i = function() {
 function t() {
 this.curDes = "";
 }
-t.prototype.open = function(t) {
+t.prototype.open = function(t, e) {
+void 0 === e && (e = "");
 if ("0" != gData.gameData.configs.ServerConfig.NewUserGuide) {
+this.curDes = e;
 this.crtGuideID = gData.gameData.getProp(n.GameProp.guideID);
 null == this.crtGuideID && (this.crtGuideID = 0);
 if (this.crtGuideID >= 9999) mk.console.log("新手引导已做完"); else if (t <= this.crtGuideID && this.crtGuideID > 0) mk.console.log("当前引导已做过：" + t); else {
@@ -15319,7 +15327,7 @@ this.setGuideID(this.crtGuideID++);
 }
 };
 t.prototype.setGuideID = function(t) {
-if (5 == t) {
+if (4 == t) {
 t = 9999;
 mk.data.sendXYEvent("guide_end", "新手引导结束");
 }
@@ -15664,10 +15672,6 @@ this.nextStep();
 e.prototype.nextStep = function() {
 this.crtStep++;
 this.crtGuide = this.guides[this.crtStep];
-if (2 == gData.guideData.crtID && 1 == this.crtStep) {
-var t = gData.gameData.playerProp.userFarmTaskInfo.completeCount, e = gData.gameData.playerProp.userFarmTaskInfo.taskCount;
-mk.guide.curDes = "<color=8A4312>继续生产，还有<color=ff0000>" + (e - t) + "次</color>即可\n提现<color=ff0000>！</color></color>";
-}
 mk.data.sendDataEvent(s.DataEventId.guide, "新手引导第" + gData.guideData.crtID + "_" + this.crtStep + "步完成");
 this.updateGuide();
 };
@@ -15945,13 +15949,14 @@ e.config = null;
 e.call = null;
 e.getType = 0;
 e.init_reward = !1;
-e.worldPos = null;
+e.node_fly = null;
 return e;
 }
-e.prototype.openPanel = function(t, e, o) {
+e.prototype.openPanel = function(t, e, o, n) {
 this.configID = t;
 this.plantID = e;
 this.call = o;
+this.node_fly = n;
 this.config = gData.gameData.getProductMap(this.plantID);
 mk.ui.openPanel("game/prefab/uiPanel/HarvestPanel");
 };
@@ -15960,7 +15965,8 @@ mk.console.logSingle("HarvestData  addata ", this.adData);
 t.prototype.setAdData.call(this, e);
 gData.reward.data = gData.harvestData.adData.videoRedMoney.videoRewardList;
 gData.reward.callback = gData.harvestData.call;
-gData.reward.getReward(this.worldPos);
+var o = this.node_fly.parent.convertToWorldSpaceAR(this.node_fly.getPosition());
+gData.reward.getReward(o);
 gData.harvestData.call = null;
 };
 return i([ c ], e);
@@ -16144,7 +16150,7 @@ rewardNum: e.data.redMoneyAddition
 } ];
 gData.reward.data = o;
 gData.reward.callback = gData.harvestData.call;
-n = this.node_hb.parent.convertToWorldSpaceAR(this.node_hb.getPosition());
+n = gData.harvestData.node_fly.parent.convertToWorldSpaceAR(gData.harvestData.node_fly.getPosition());
 gData.reward.getReward(n);
 }
 mk.ui.closePanel("HarvestPanel");
@@ -16158,7 +16164,6 @@ return r(this, void 0, void 0, function() {
 var t = this;
 return c(this, function() {
 mk.audio.playEffect("button");
-gData.harvestData.worldPos = this.node_hb.parent.convertToWorldSpaceAR(this.node_hb.getPosition());
 mk.ui.closePanel("HarvestPanel");
 mk.ad.videoAdType = l.VideoAdType.video_init_12;
 gData.harvestData.getType = 1;
@@ -21523,7 +21528,7 @@ mk.ui.openPanel("module/speedUpUI/speedUp");
 break;
 
 case s.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 s.PastureState.Sick:
@@ -21625,7 +21630,7 @@ gData.gameData.setNextProduct(!1);
 };
 e.prototype.canHarvest = function() {
 this.getComponent(l.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);
 };
 e.prototype.canClearSick = function() {
 this.getComponent(l.MoveToCenter).move();
@@ -22911,8 +22916,8 @@ this.node_Uncomplete.active = !0;
 this.node_complete.active = !1;
 e = !0;
 this.scheduleOnce(function() {
-mk.guide.curDes = "<color=8A4312>再<color=ff0000>生产" + (n - o) + "次</color>，即可<color=ff0000>提现</color>，\n快领取次数吧！</color>";
-mk.guide.open(2);
+var t = "<color=8A4312>再<color=ff0000>生产" + (n - o) + "次</color>，即可<color=ff0000>提现</color>，\n快领取次数吧！</color>";
+mk.guide.open(2, t);
 }, .5);
 } else {
 this.node_Uncomplete.active = !1;
@@ -24123,6 +24128,7 @@ mk.console.logSingle("redBagTask=>", e);
 if (0 != e.errcode) return [ 2, null ];
 gData.gameData.playerProp.userFarmTaskInfo = e.data.userFarmTaskInfo;
 gData.gameData.playerProp.completeFarmTaskTimes = e.data.completeFarmTaskTimes;
+mk.event.emit("refreshBubble");
 mk.data.setTAEventUser(0, "Cumulative_task", gData.gameData.playerProp.completeFarmTaskTimes);
 gData.gameData.checkTaskFinishUnLock();
 gData.gameData.init_task = !0;
@@ -24718,9 +24724,9 @@ gData.reward.adData = null;
 };
 e.prototype.watchVideoCall = function() {
 return r(this, void 0, void 0, function() {
-var t, e, o, n, a;
-return c(this, function(i) {
-switch (i.label) {
+var t, e, o, n, a, i, r, p;
+return c(this, function(c) {
+switch (c.label) {
 case 0:
 gData.reward.adData && (gData.reward.data = gData.reward.adData.videoRedMoney.videoRewardList);
 if (!gData.reward.data || !gData.reward.data.length) return [ 2 ];
@@ -24734,14 +24740,20 @@ n = this.node_hb;
 return [ 4, mk.loader.load("game/texture/coin/" + gData.reward.data[0].rewardType, cc.SpriteFrame) ];
 
 case 1:
-n.spriteFrame = i.sent();
+n.spriteFrame = c.sent();
 gData.reward.data[0].rewardType === l.RewardType.productTimes ? this.node_hb.node.scale = .5 : this.node_hb.node.scale = 1;
 a = gData.reward.data[0].rewardNum || 0;
 if (gData.reward.data[0].rewardType === l.RewardType.pigRmb) ; else {
 if (gData.reward.data[0].rewardType != l.RewardType.productTimes) {
 a = Math.round(a / 100);
 this.lbl_des.string = "红包币";
-} else this.lbl_des.string = "生产次数";
+} else {
+i = gData.gameData.playerProp.userFarmTaskInfo.completeCount;
+r = gData.gameData.playerProp.userFarmTaskInfo.taskCount;
+p = "<color=8A4312>继续生产，还有<color=ff0000>" + (r - i) + "次</color>即可\n提现<color=ff0000>！</color></color>";
+mk.guide.open(3, p);
+this.lbl_des.string = "生产次数";
+}
 this.lbl_reward_num.string = "+" + a;
 }
 gData.reward.data[0].rewardType === l.RewardType.redBag && (gData.reward.add_redbag_value = gData.reward.data[0].rewardNum);

packages-hot-update/cfg.json

@@ -10,7 +10,7 @@
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kxnlyTest/baseRemote/",
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kxnlyJsb/baseRemote/"
     ],
-    "buildTime": 1633936568454,
-    "genTime": 1633936568454,
+    "buildTime": 1633944320537,
+    "genTime": 1633944320537,
     "genVersion": null
 }