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

# Conflicts:
#	assets/script/game/data/GameData.ts
#	assets/script/game/module/gradeReward/GradeReward.ts
#	build/jsb-link/assets/main/index.jsc
#	build/jsb-link/assets/resources/config.json
#	build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/caches/build_file_checksums.ser
#	build/jsb-link/js backups (useful for debugging)/main.index.js
#	packages-hot-update/cfg.json

assets/resources/module/farmMap/farmItem.prefab

@@ -348,7 +348,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 200,
-      "height": 80.8
+      "height": 98.19999999999999
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -424,7 +424,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        15.2,
+        23.899999999999995,
         0,
         0,
         0,
@@ -519,8 +519,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 64,
-      "height": 50.4
+      "width": 211.12,
+      "height": 67.8
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -571,10 +571,10 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "种植玉米",
-    "_N$string": "种植玉米",
-    "_fontSize": 16,
-    "_lineHeight": 40,
+    "_string": "种植5次玉米胡萝卜解锁\n(0/5)",
+    "_N$string": "种植5次玉米胡萝卜解锁\n(0/5)",
+    "_fontSize": 20,
+    "_lineHeight": 30,
     "_enableWrapText": true,
     "_N$file": null,
     "_isSystemFontUsed": true,
@@ -582,7 +582,7 @@
     "_batchAsBitmap": false,
     "_styleFlags": 0,
     "_underlineHeight": 0,
-    "_N$horizontalAlign": 1,
+    "_N$horizontalAlign": 0,
     "_N$verticalAlign": 1,
     "_N$fontFamily": "Arial",
     "_N$overflow": 0,
@@ -611,7 +611,7 @@
     "_layoutSize": {
       "__type__": "cc.Size",
       "width": 200,
-      "height": 80.8
+      "height": 98.19999999999999
     },
     "_resize": 1,
     "_N$layoutType": 2,
@@ -1181,7 +1181,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 82,
+      "width": 70,
       "height": 54.4
     },
     "_anchorPoint": {
@@ -1261,9 +1261,9 @@
     "_enabled": true,
     "_color": {
       "__type__": "cc.Color",
-      "r": 123,
-      "g": 123,
-      "b": 123,
+      "r": 32,
+      "g": 7,
+      "b": 7,
       "a": 123
     },
     "_width": 2,

assets/resources/module/gradeReward/gradeRewardItem.prefab

@@ -1690,6 +1690,15 @@
     "lbl_value": {
       "__id__": 16
     },
+    "node_unGetRewad": {
+      "__id__": 18
+    },
+    "node_unluck": {
+      "__id__": 27
+    },
+    "node_getRewad": {
+      "__id__": 36
+    },
     "_id": ""
   },
   {

assets/resources/module/redBagTask/redBagTask.prefab

@@ -24,20 +24,20 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 131
+        "__id__": 140
       },
       {
-        "__id__": 132
+        "__id__": 141
       },
       {
-        "__id__": 133
+        "__id__": 142
       },
       {
-        "__id__": 134
+        "__id__": 143
       }
     ],
     "_prefab": {
-      "__id__": 135
+      "__id__": 144
     },
     "_opacity": 255,
     "_color": {
@@ -101,7 +101,7 @@
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 130
+      "__id__": 139
     },
     "_opacity": 255,
     "_color": {
@@ -180,20 +180,23 @@
         "__id__": 81
       },
       {
-        "__id__": 118
+        "__id__": 124
+      },
+      {
+        "__id__": 133
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 127
+        "__id__": 136
       },
       {
-        "__id__": 128
+        "__id__": 137
       }
     ],
     "_prefab": {
-      "__id__": 129
+      "__id__": 138
     },
     "_opacity": 255,
     "_color": {
@@ -2905,13 +2908,19 @@
         "__id__": 82
       },
       {
-        "__id__": 97
+        "__id__": 85
+      },
+      {
+        "__id__": 88
+      },
+      {
+        "__id__": 103
       }
     ],
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 117
+      "__id__": 123
     },
     "_opacity": 255,
     "_color": {
@@ -2967,28 +2976,244 @@
     "_parent": {
       "__id__": 81
     },
-    "_children": [
+    "_children": [],
+    "_active": true,
+    "_components": [
       {
         "__id__": 83
-      },
+      }
+    ],
+    "_prefab": {
+      "__id__": 84
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 247,
+      "b": 212,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 400.16,
+      "height": 50.4
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        53.182,
+        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__": 82
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "完成          次玉米，领取红包(1/10)",
+    "_N$string": "完成          次玉米，领取红包(1/10)",
+    "_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__": "82a16e23-7ade-43a5-af4f-5504bb39b61f"
+    },
+    "fileId": "219PaaZilDKqRxWWmeH9qO",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "任务数量",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 81
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
       {
         "__id__": 86
-      },
+      }
+    ],
+    "_prefab": {
+      "__id__": 87
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 218,
+      "b": 49,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 44.49,
+      "height": 50.4
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        -112.511,
+        49,
+        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__": 85
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "14",
+    "_N$string": "14",
+    "_fontSize": 40,
+    "_lineHeight": 40,
+    "_enableWrapText": true,
+    "_N$file": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_batchAsBitmap": false,
+    "_styleFlags": 0,
+    "_underlineHeight": 0,
+    "_N$horizontalAlign": 0,
+    "_N$verticalAlign": 0,
+    "_N$fontFamily": "Arial",
+    "_N$overflow": 0,
+    "_N$cacheMode": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "82a16e23-7ade-43a5-af4f-5504bb39b61f"
+    },
+    "fileId": "e8QzxjsHJEeYx7qt73Heeq",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "任务描述",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 81
+    },
+    "_children": [
       {
         "__id__": 89
       },
       {
         "__id__": 92
+      },
+      {
+        "__id__": 95
+      },
+      {
+        "__id__": 98
       }
     ],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
-        "__id__": 95
+        "__id__": 101
       }
     ],
     "_prefab": {
-      "__id__": 96
+      "__id__": 102
     },
     "_opacity": 255,
     "_color": {
@@ -3042,17 +3267,17 @@
     "_name": "RICHTEXT_CHILD",
     "_objFlags": 1024,
     "_parent": {
-      "__id__": 82
+      "__id__": 88
     },
     "_children": [],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
-        "__id__": 84
+        "__id__": 90
       }
     ],
     "_prefab": {
-      "__id__": 85
+      "__id__": 91
     },
     "_opacity": 255,
     "_color": {
@@ -3107,7 +3332,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 83
+      "__id__": 89
     },
     "_enabled": true,
     "_materials": [
@@ -3143,7 +3368,7 @@
     "asset": {
       "__uuid__": "82a16e23-7ade-43a5-af4f-5504bb39b61f"
     },
-    "fileId": "b6LNIhD0tNa4ZxcNUBpLkf",
+    "fileId": "ada/qAnghBLJjO2px0ldfO",
     "sync": false
   },
   {
@@ -3151,17 +3376,17 @@
     "_name": "RICHTEXT_CHILD",
     "_objFlags": 1024,
     "_parent": {
-      "__id__": 82
+      "__id__": 88
     },
     "_children": [],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
-        "__id__": 87
+        "__id__": 93
       }
     ],
     "_prefab": {
-      "__id__": 88
+      "__id__": 94
     },
     "_opacity": 255,
     "_color": {
@@ -3216,7 +3441,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 86
+      "__id__": 92
     },
     "_enabled": true,
     "_materials": [
@@ -3252,7 +3477,7 @@
     "asset": {
       "__uuid__": "82a16e23-7ade-43a5-af4f-5504bb39b61f"
     },
-    "fileId": "b9rck/H9JPp58JNgPSPlgW",
+    "fileId": "33VOnngbFJcbvA2M4ZmAoI",
     "sync": false
   },
   {
@@ -3260,17 +3485,17 @@
     "_name": "RICHTEXT_CHILD",
     "_objFlags": 1024,
     "_parent": {
-      "__id__": 82
+      "__id__": 88
     },
     "_children": [],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
-        "__id__": 90
+        "__id__": 96
       }
     ],
     "_prefab": {
-      "__id__": 91
+      "__id__": 97
     },
     "_opacity": 255,
     "_color": {
@@ -3325,7 +3550,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 89
+      "__id__": 95
     },
     "_enabled": true,
     "_materials": [
@@ -3361,7 +3586,7 @@
     "asset": {
       "__uuid__": "82a16e23-7ade-43a5-af4f-5504bb39b61f"
     },
-    "fileId": "cdcirXGitMer96p+AxXfQ2",
+    "fileId": "13eWFwET1E26yIdFu6FIwD",
     "sync": false
   },
   {
@@ -3369,17 +3594,17 @@
     "_name": "RICHTEXT_CHILD",
     "_objFlags": 1024,
     "_parent": {
-      "__id__": 82
+      "__id__": 88
     },
     "_children": [],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
-        "__id__": 93
+        "__id__": 99
       }
     ],
     "_prefab": {
-      "__id__": 94
+      "__id__": 100
     },
     "_opacity": 255,
     "_color": {
@@ -3434,7 +3659,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 92
+      "__id__": 98
     },
     "_enabled": true,
     "_materials": [
@@ -3470,7 +3695,7 @@
     "asset": {
       "__uuid__": "82a16e23-7ade-43a5-af4f-5504bb39b61f"
     },
-    "fileId": "f1szdp3PtB3Z5pCU69jdIA",
+    "fileId": "55yWguaGRAbJV2GaOAECrP",
     "sync": false
   },
   {
@@ -3478,7 +3703,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 82
+      "__id__": 88
     },
     "_enabled": true,
     "_fontFamily": "Arial",
@@ -3514,23 +3739,23 @@
     },
     "_children": [
       {
-        "__id__": 98
+        "__id__": 104
       },
       {
-        "__id__": 101
+        "__id__": 107
       },
       {
-        "__id__": 104
+        "__id__": 110
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 115
+        "__id__": 121
       }
     ],
     "_prefab": {
-      "__id__": 116
+      "__id__": 122
     },
     "_opacity": 255,
     "_color": {
@@ -3542,7 +3767,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 400,
+      "width": 450,
       "height": 33
     },
     "_anchorPoint": {
@@ -3584,17 +3809,17 @@
     "_name": "进度条",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 97
+      "__id__": 103
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 99
+        "__id__": 105
       }
     ],
     "_prefab": {
-      "__id__": 100
+      "__id__": 106
     },
     "_opacity": 255,
     "_color": {
@@ -3606,7 +3831,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 400,
+      "width": 450,
       "height": 33
     },
     "_anchorPoint": {
@@ -3648,7 +3873,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 98
+      "__id__": 104
     },
     "_enabled": true,
     "_materials": [
@@ -3691,17 +3916,17 @@
     "_name": "进度文本",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 97
+      "__id__": 103
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 102
+        "__id__": 108
       }
     ],
     "_prefab": {
-      "__id__": 103
+      "__id__": 109
     },
     "_opacity": 255,
     "_color": {
@@ -3755,7 +3980,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 101
+      "__id__": 107
     },
     "_enabled": true,
     "_materials": [
@@ -3799,27 +4024,27 @@
     "_name": "按钮",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 97
+      "__id__": 103
     },
     "_children": [
       {
-        "__id__": 105
+        "__id__": 111
       },
       {
-        "__id__": 109
+        "__id__": 115
       }
     ],
     "_active": false,
     "_components": [
       {
-        "__id__": 112
+        "__id__": 118
       },
       {
-        "__id__": 113
+        "__id__": 119
       }
     ],
     "_prefab": {
-      "__id__": 114
+      "__id__": 120
     },
     "_opacity": 255,
     "_color": {
@@ -3873,20 +4098,20 @@
     "_name": "描述",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 104
+      "__id__": 110
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 106
+        "__id__": 112
       },
       {
-        "__id__": 107
+        "__id__": 113
       }
     ],
     "_prefab": {
-      "__id__": 108
+      "__id__": 114
     },
     "_opacity": 255,
     "_color": {
@@ -3940,7 +4165,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 105
+      "__id__": 111
     },
     "_enabled": true,
     "_materials": [
@@ -3973,7 +4198,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 105
+      "__id__": 111
     },
     "_enabled": true,
     "_color": {
@@ -4002,17 +4227,17 @@
     "_name": "video",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 104
+      "__id__": 110
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 110
+        "__id__": 116
       }
     ],
     "_prefab": {
-      "__id__": 111
+      "__id__": 117
     },
     "_opacity": 255,
     "_color": {
@@ -4066,7 +4291,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 109
+      "__id__": 115
     },
     "_enabled": true,
     "_materials": [
@@ -4109,7 +4334,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 104
+      "__id__": 110
     },
     "_enabled": true,
     "_materials": [
@@ -4141,7 +4366,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 104
+      "__id__": 110
     },
     "_enabled": true,
     "_defaultClip": {
@@ -4171,7 +4396,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 97
+      "__id__": 103
     },
     "_enabled": true,
     "_materials": [
@@ -4229,20 +4454,20 @@
     },
     "_children": [
       {
-        "__id__": 119
+        "__id__": 125
       },
       {
-        "__id__": 122
+        "__id__": 128
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 125
+        "__id__": 131
       }
     ],
     "_prefab": {
-      "__id__": 126
+      "__id__": 132
     },
     "_opacity": 255,
     "_color": {
@@ -4296,17 +4521,17 @@
     "_name": "wechat",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 118
+      "__id__": 124
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 120
+        "__id__": 126
       }
     ],
     "_prefab": {
-      "__id__": 121
+      "__id__": 127
     },
     "_opacity": 255,
     "_color": {
@@ -4360,7 +4585,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 119
+      "__id__": 125
     },
     "_enabled": true,
     "_materials": [
@@ -4403,17 +4628,17 @@
     "_name": "描述",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 118
+      "__id__": 124
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 123
+        "__id__": 129
       }
     ],
     "_prefab": {
-      "__id__": 124
+      "__id__": 130
     },
     "_opacity": 255,
     "_color": {
@@ -4467,7 +4692,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 122
+      "__id__": 128
     },
     "_enabled": true,
     "_materials": [
@@ -4511,7 +4736,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 118
+      "__id__": 124
     },
     "_enabled": true,
     "_materials": [
@@ -4550,6 +4775,114 @@
     "sync": false
   },
   {
+    "__type__": "cc.Node",
+    "_name": "动画显示文字",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 3
+    },
+    "_children": [],
+    "_active": false,
+    "_components": [
+      {
+        "__id__": 134
+      }
+    ],
+    "_prefab": {
+      "__id__": 135
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 235,
+      "b": 201,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 166.85,
+      "height": 126
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        130,
+        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__": 133
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "???",
+    "_N$string": "???",
+    "_fontSize": 100,
+    "_lineHeight": 100,
+    "_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__": "82a16e23-7ade-43a5-af4f-5504bb39b61f"
+    },
+    "fileId": "2aCN/R4ctJ5ZRnnCcP2cmH",
+    "sync": false
+  },
+  {
     "__type__": "cc.Sprite",
     "_name": "",
     "_objFlags": 0,
@@ -4715,14 +5048,11 @@
         "__id__": 42
       }
     ],
-    "rt_task_des": {
-      "__id__": 95
-    },
     "sp_taskProgress": {
-      "__id__": 99
+      "__id__": 105
     },
     "lbl_taskProgress": {
-      "__id__": 102
+      "__id__": 108
     },
     "openBtn_ani": {
       "__id__": 21
@@ -4739,6 +5069,21 @@
     "node_cash": {
       "__id__": 64
     },
+    "node_value": {
+      "__id__": 24
+    },
+    "node_task": {
+      "__id__": 81
+    },
+    "lbl_Ani": {
+      "__id__": 134
+    },
+    "lbl_taskNum": {
+      "__id__": 86
+    },
+    "lbl_taskDes": {
+      "__id__": 83
+    },
     "_id": ""
   },
   {

assets/script/game/data/GData.ts

@@ -33,6 +33,7 @@ import ADClearSickData from "../../before/view/data/ADClearSickData";
 import PastureSystem from "../../before/main/PastureSystem";
 import FactorySystem from "../../before/main/FactorySystem";
 import { FarmMapData } from "./module/FarmMapData";
+import { GradeRewardData } from "./module/GradeRewardData";
 
 /**
  * 数据集合全局类
@@ -90,6 +91,7 @@ class GData {
     public pastureSystem: PastureSystem;
     public factorySystem: FactorySystem;
     public farmMapData: FarmMapData;
+    public farmGradeData: GradeRewardData;
 
     public moduleData: Map<number, Data>;
 
@@ -131,6 +133,7 @@ class GData {
 
         this.farmSystem = new FarmSystem();
         this.farmMapData = new FarmMapData();
+        this.farmGradeData = new GradeRewardData();
 
         this.moduleData = new Map<number, Data>();
         this.moduleData.set(Fun.moreGame, this.moreGame);

assets/script/game/data/GameData.ts

@@ -109,13 +109,13 @@ export class GameData {
         mk.console.logSingle("user/adShowConfig", response.data);
         gData.adData.initEcpmData();
 
-        data = {};
-        response = await mk.http.sendData('welFare/getUserWelFareTaskInfo', data);
-        if (response.errcode != 0) {
-            return;
-        }
-        this.gameData.userTuCaoInfo = response.data.userWelFareTaskInfo;
-        mk.console.logSingle("welFare/getUserWelFareTaskInfo", response.data);
+        // data = {};
+        // response = await mk.http.sendData('welFare/getUserWelFareTaskInfo', data);
+        // if (response.errcode != 0) {
+        //     return;
+        // }
+        // this.gameData.userTuCaoInfo = response.data.userWelFareTaskInfo;
+        // mk.console.logSingle("welFare/getUserWelFareTaskInfo", response.data);
         gData.guideData.init();
         gData.guideWeakData.init();
         gData.moduleData.forEach(element => {
@@ -151,10 +151,13 @@ export class GameData {
         this.gameData.signInDay = res_data.signInDay;
         this.gameData.totalPiggyBankCashTimes = res_data.totalPiggyBankCashTimes;
         this.gameData.turntableTimes = res_data.turntableTimes;
-        this.gameData.userTuCaoInfo = res_data.userTuCaoInfo;
         this.gameData.versioncfg = res_data.versioncfg;
         this.gameData.isFirstRedMoney = res_data.isFirstRedMoney;
         gData.adData.watchNumToday = res_data.dayVideoTimesForRedMoney == null ? 0 : res_data.dayVideoTimesForRedMoney;
+        
+        this.gameData.userTuCaoInfo = res_data.userWelFareTaskInfo;
+        this.gameData.farmExpValue = res_data.userExp;
+        this.gameData.farmGradeData = res_data.userFarmGrageRewardInfo;
 
         mk.data.setTAUserID(gData.loginData.uin);
 
@@ -1036,6 +1039,19 @@ class PlayerProp {
     //农场等级
     gradeLevel = 6;
 
+    //农场等级奖励数据
+    farmGradeData:any = {};
+
+    //农场经验
+    private farmExp = 0;
+
+    set farmExpValue(value: number) {
+        this.farmExp = value;
+    }
+    get farmExpValue(): number {
+        return this.farmExp;
+    }
+
     /** ABTest分组id */
     groupCode = 0;
 }
@@ -1219,7 +1235,16 @@ export enum VideoAdType {
     //钱包提现新手视频
     CashOutNoviceWelfare = "钱包提现新手视频",
     //钱包提现加现金视频
-    CashOutAddCash = "钱包提现加现金视频"
+    CashOutAddCash = "钱包提现加现金视频",
+    //农场等级加经验视频
+    farmGradeAddExp = "农场等级加经验视频",
+    //农场等级提现视频
+    farmGradeCashOut = "农场等级提现视频",
+}
+
+export enum ExpAddType{
+    EAT_video = 1,
+    EAT_harvest = 2,
 }
 
 export enum FarmState {

assets/script/game/data/module/GradeRewardData.ts

@@ -2,35 +2,53 @@
  * @description 等级奖励数据
  */
 
- import { Data } from "../../../mk/data/Data";
+import { Data } from "../../../mk/data/Data";
+import { ExpAddType, GameProp } from "../GameData";
 
- const { ccclass } = cc._decorator;
- @ccclass
- export class GradeRewardData extends Data{
+const { ccclass } = cc._decorator;
+@ccclass
+export class GradeRewardData extends Data {
 
     //提现id
     private cashId: number;
-
-    public setCashId(id:number)
-    {
-        this.cashId = id;
-    }
+    public changeExp = false;
 
     /**
     * 等级奖励提现
     * @param cb 提现回调
    */
-    public async HttpCashTask() {
-       let data = { redMoneyId: this.cashId };
-       let response = await mk.http.sendData('tuCaoRedMoney/gearCash', data);
-
-       if (response.errcode != 0) {
-           return null;
-       }
-       const rewardNum = Math.round(gData.blessingBag.taskRbNum * 100);
-       gData.receiptNotice.receip_rmb = rewardNum;
-       gData.cashNormal.receip_total_rmb += gData.receiptNotice.receip_rmb;
-       mk.ui.openPanel('module/newNotice/newNotice');      
-       return response
-   }
- }
+    public async HttpCashOut(id: number) {
+        this.cashId = id;
+        let data = { id: this.cashId };
+        
+        let response = await mk.http.sendData('farmGrade/farmGradeCash', data);
+
+        if (response.errcode != 0) {
+            return null;
+        }
+
+        gData.gameData.gameData.farmGradeData = response.data.userFarmGrageRewardInfo
+        //const rewardNum = Math.round(gData.blessingBag.taskRbNum * 100);
+        gData.receiptNotice.receip_rmb = 30;
+        mk.ui.openPanel('module/newNotice/newNotice');
+        return response
+    }
+
+    /**
+    * 加进度
+    */
+    async addGradeExp() {
+        let data = { "expAddType": ExpAddType.EAT_video };
+        let response = await mk.http.sendData('farmGrade/updateFarmGrageInfo', data);
+
+        if (response.errcode != 0) {
+            return;
+        }
+
+        this.changeExp = true; 
+        gData.gameData.gameData.gradeLevel = response.data.farmLevel;
+        gData.gameData.gameData.farmExpValue = response.data.userExp;
+        gData.gameData.gameData.farmGradeData = response.data.userFarmGrageRewardInfo;
+
+    }
+}

assets/script/game/module/blessingBag/BlessingBag.ts

@@ -255,8 +255,7 @@ export default class BlessingBag extends cc.Component {
             //mk.tip.pop('今日观看次数已用完');
             //}
         }
-        mk.audio.playEffect('button');
-
+    
         console.log("--->You Click AdProgressBtn  ", gData.blessingBag.videoRbData);
     }
 

assets/script/game/module/farmMap/FarmItem.ts

@@ -74,7 +74,7 @@ export default class FarmItem extends cc.Component{
             let times = gData.gameData.getProductMakeTimesById(data.picture - 1);
             let plantName = gData.gameData.getProductMap(data.picture - 1).name;
             let des = this.getDesByType();
-            this.lbl_des.string = `${des}${this.data.value}次${plantName}后解锁(${times}/${data.value})`;;
+            this.lbl_des.string = `${des}${this.data.value}次${plantName}后解锁\n(${times}/${data.value})`;;
 
             this.node_getBtn.active =false;
             this.node_ungetBtn.active = false;

assets/script/game/module/gradeReward/GradeReward.ts

@@ -1,4 +1,6 @@
+import JsbSystem from "../../../mk/system/JsbSystem";
 import { UITween } from "../../component/tween/UITween";
+import { VideoAdType } from "../../data/GameData";
 import { GradeRewardItem } from "./GradeRewardItem";
 
 
@@ -18,29 +20,69 @@ export class GradeReward extends cc.Component {
     @property({ displayName: '进度文本', type: cc.Label })
     private lbl_progress: cc.Label[] = [];
 
-    private gradeExp: number[] = [100, 200, 400, 700, 900];
+    private gradeExp: number[] = [];
     private curExp: number = 0;
 
     private gradeOffset: number[] = [0.11, 0.33, 0.56, 0.78, 1];
 
-    onLoad() {
+    private gradeItemArr: GradeRewardItem[] = [];
 
+    onLoad(){
 
+
+    }
+
+    start(){
+
+        if(gData.gameData.gameData.farmGradeData)
+        {
+            let len = gData.gameData.gameData.farmGradeData.farmGradeRewardList.length;
+            for(let i = len; i != 0; --i)
+            {
+                let data = gData.gameData.gameData.farmGradeData.farmGradeRewardList[i-1];
+                let child = cc.instantiate(this.node_child);
+                let item = child.getComponent(GradeRewardItem); 
+                item.setData(data);
+                this.node_content.addChild(child);
+                this.gradeItemArr.push(item);               
+            }
+        }
+        // for(let i = 5; i != 0; --i)
+        // {
+        //     let child = cc.instantiate(this.node_child);
+        //     let item = child.getComponent(GradeRewardItem);    
+        //     item.id = i;
+        //     item.lbl_value.string = "0.3元";
+        //     item.lbl_grade.string = "LV:12";
+        //     this.node_content.addChild(child);
+        // }
+        this.calulateExpAndShowUI2();
+    }
+
+    update(dt)
+    {
+        if(gData.farmGradeData.changeExp)
+        {
+            this.calulateExpAndShowUI2();
+            this.freshFramGradeData();
+            gData.farmGradeData.changeExp = false;
+        }
     }
 
-    start() {
-        for (let i = 5; i != 0; --i) {
-            let child = cc.instantiate(this.node_child);
-            let item = child.getComponent(GradeRewardItem);
-            item.id = i;
-            item.lbl_value.string = "0.3元";
-            item.lbl_grade.string = "LV:12";
-            this.node_content.addChild(child);
+    private freshFramGradeData()
+    {
+        let len = this.gradeItemArr.length;
+        for(let i = 0 ; i != len; ++i)
+        {
+            let data = gData.gameData.gameData.farmGradeData.farmGradeRewardList[len-1-i];
+            this.gradeItemArr[i].setData(data);
+            this.gradeItemArr[i].changeBtnState();
         }
-        this.calulateExpAndShowUI();
     }
 
-    private calulateExpAndShowUI() {
+    private calulateExpAndShowUI()
+    {
+        this.curExp = gData.gameData.gameData.farmExpValue;
         let curIndex = -1;
         for (let i = 0; i != this.gradeExp.length; ++i) {
             if (this.curExp < this.gradeExp[i]) {
@@ -78,14 +120,68 @@ export class GradeReward extends cc.Component {
         } else {
             this.sp_slider.fillRange = 1;
         }
+    }
 
+    private calulateExpAndShowUI2()
+    {
+        let curIndex = -1;
+        let curPer = 0;
+        let len = gData.gameData.gameData.farmGradeData.farmGradeRewardList.length;
+        for(let i = 0; i != len; ++i)
+        {
+            let per = gData.gameData.gameData.farmGradeData.farmGradeRewardList[i].progressRate;   
+            this.lbl_progress[i].string = per * 100 + '%';
+            if(curIndex == -1)
+            {
+                if(per < 1)
+                {
+                    curIndex = i;  
+                    curPer = per;          
+                }
+            }
+        }
+
+        if(curIndex != -1)
+        {
+            let lastIndex = -1
+            let lastPro = 0;
+            if(curIndex > 0)
+            {
+                lastIndex = curIndex-1;           
+            }
+            
+            let offset = this.gradeOffset[curIndex];
+            if(lastIndex != -1)
+            {
+                offset = offset - this.gradeOffset[lastIndex];
+                lastPro = this.gradeOffset[lastIndex];
+            }
+            let pro = offset * curPer;        
+
+            this.sp_slider.fillRange = lastPro + pro;
+
+        }else
+        {
+            this.sp_slider.fillRange = 1;
+        }
     }
 
     private clickVideoBtn() {
         mk.audio.playEffect("button");
 
-        this.curExp += 30;
-        this.calulateExpAndShowUI();
+        if (cc.sys.isNative && !gData.loginData.isAuth) {
+            JsbSystem.WxAuth();
+            return;
+        }
+        mk.ad.videoAdType = VideoAdType.farmGradeAddExp;
+        mk.ad.watchAd((success: boolean) => {
+            mk.console.log("watchAD:" + success);
+            if (success) {
+                gData.farmGradeData.addGradeExp();            
+            }
+        });
+
+        //this.calulateExpAndShowUI();
     }
 
     private clickCloseBtn() {

assets/script/game/module/gradeReward/GradeRewardItem.ts

@@ -1,4 +1,6 @@
+import JsbSystem from "../../../mk/system/JsbSystem";
 import { UITween } from "../../component/tween/UITween";
+import { VideoAdType } from "../../data/GameData";
 
 
 const { ccclass, property } = cc._decorator;
@@ -9,41 +11,88 @@ export class GradeRewardItem extends cc.Component{
     private sp_name: cc.Sprite = null;
 
     @property({displayName:"等级", type: cc.Label})
-    public lbl_grade: cc.Label = null;
+    private lbl_grade: cc.Label = null;
 
     @property({displayName:"金额",type: cc.Label})
-    public lbl_value: cc.Label = null;
+    private lbl_value: cc.Label = null;
+
+    @property({type: cc.Node})
+    private node_unGetRewad: cc.Node = null;
+    @property({type: cc.Node})
+    private node_unluck: cc.Node = null;
+    @property({type: cc.Node})
+    private node_getRewad: cc.Node = null;
 
     public id: number;
 
+    private data:any = {};
+
     onLoad(){
 
 
     }
 
     async start(){
-         let p = this.node.position;
-        this.node.position = cc.v3(540, p.y, 0);
-        cc.tween(this.node).delay(0.9 - this.id * 0.1).call(()=>{
-            this.node.active = true;   
-            //let p = this.node.position;
-            //this.node.position = cc.v3(540, p.y, 0);
-        }).to(0.2, {x: 0}).start();
+
+        this.id = this.data.id;
+        this.lbl_value.string = this.data.showMoney;
+        this.lbl_grade.string = `LV:${this.data.level}`;
+        this.sp_name.spriteFrame = await mk.loader.load('module/gradeReward/texture/name' + this.id, cc.SpriteFrame); 
+        
+        this.changeBtnState();
+        
+        this.showUIAct();
+    }
+
+    changeBtnState()
+    {
+        if( this.data.status == 1)
+        {       
+            this.node_unGetRewad.active = true;
+            this.node_unluck.active = false;
+            this.node_getRewad.active = false;
         
-        //this.showUI();
+        }else if (this.data.status == 0){
+            this.node_unGetRewad.active = false;
+            this.node_unluck.active = true;
+            this.node_getRewad.active = false;
+           
+        }
+        else{
+            this.node_unGetRewad.active = false;
+            this.node_unluck.active = false;
+            this.node_getRewad.active = true;
+        }
+    }
 
-        this.sp_name.spriteFrame = await mk.loader.load('module/gradeReward/texture/name' + this.id, cc.SpriteFrame);    
+    setData(data)
+    {
+        this.data = data;
     }
 
-    public showUI()
+    public showUIAct()
     {
         let p = this.node.position;
-        this.node.position = cc.v3(200, p.y, p.z);
+        this.node.position = cc.v3(540, p.y, 0);
+        cc.tween(this.node).delay(0.9 - this.id * 0.1).call(()=>{
+            this.node.active = true;   
+        }).to(0.2, {x: 0}).start();
     }
 
     private clickUnGetRewardBtn(){
         mk.audio.playEffect("button");
-
+        
+        if (cc.sys.isNative && !gData.loginData.isAuth) {
+            JsbSystem.WxAuth();
+            return;
+        }
+        mk.ad.videoAdType = VideoAdType.farmGradeCashOut;
+        mk.ad.watchAd((success: boolean) => {
+            mk.console.log("watchAD:" + success);
+            if (success) {     
+                gData.farmGradeData.HttpCashOut(this.data.id);            
+            }
+        });
     }
 
     private clickNoReachBtn(){

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

@@ -7,9 +7,6 @@ export default class RedBagTask extends cc.Component {
     @property({ displayName: '数字组', type: cc.Label })
     private lbl_value: cc.Label[] = [];
 
-    @property({ displayName: '任务描述', type: cc.RichText })
-    private rt_task_des: cc.RichText = null;
-
     @property({ displayName: '任务进度条', type: cc.Sprite })
     private sp_taskProgress: cc.Sprite = null;
 
@@ -28,14 +25,45 @@ export default class RedBagTask extends cc.Component {
     @property(cc.Animation)
     private node_cash: cc.Animation = null;
 
+    @property({type: cc.Node, displayName: '显示金额节点'})
+    private node_value: cc.Node = null;
+    @property({type: cc.Node, displayName: '任务节点'})
+    private node_task: cc.Node = null;
+    @property({type: cc.Label, displayName: '动画显示文字'})
+    private lbl_Ani: cc.Label = null;
+    @property({type: cc.Label, displayName: '任务数量'})
+    private lbl_taskNum: cc.Label = null;
+    @property({type: cc.Label, displayName: '任务描述'})
+    private lbl_taskDes: cc.Label = null;
+
+    private isShowNewTask = false;
+    private num = 0;
+    private delayTime = 0;
+    private times = 0;
+
+
 
     start() {
         mk.ad.showBanner();
 
-        this.initTaskProgressUI();
-        this.initCashOutStyle(gData.gameData.gameData.redMoney);
-        this.showChangePart();
+        if(this.isShowNewTask)
+        {
+            this.node_value.active = false;
+            this.node_task.active = false;
+            this.node_cash.node.active = false;
+            this.lbl_Ani.node.active = true;
+            
+        }else{
+            //this.node_value.active = true;
+            //this.node_task.active = true;
+            //this.node_cash.node.active = true;
+            this.initTaskProgressUI();
+            this.showChangePart();
+        }
 
+       
+        this.initCashOutStyle(gData.gameData.gameData.redMoney);
+    
     }
 
     onEnable() {
@@ -51,6 +79,48 @@ export default class RedBagTask extends cc.Component {
         if (gData.reward.add_redbag_value) {
             this.initCashOutStyle(gData.gameData.gameData.redMoney + gData.reward.add_redbag_value);
         }
+
+        if(this.isShowNewTask)
+        {
+            if(this.delayTime <= 0.6)
+            {
+                this.delayTime += dt;
+            }else
+            {
+                this.times +=1;
+                if(this.times == 2)
+                {
+                    this.times = 0;
+                    this.num +=1;
+                this.lbl_Ani.string = this.num.toString();
+                
+                if(this.num == 14)
+                {              
+                    this.isShowNewTask = false;
+
+                    this.lbl_Ani.node.color = new cc.Color(255, 218, 49);
+                    let clone = cc.instantiate(this.lbl_Ani.node);
+                    clone.parent = this.lbl_Ani.node.parent;
+                    cc.tween(clone).to(1.2, {scale: 4.0, opacity: 0}).call(()=>{
+                        clone.active = false;
+                        let worldPos = this.lbl_taskNum.node.parent.convertToWorldSpaceAR(this.lbl_taskNum.node.position);
+                        let pos = this.lbl_taskNum.node.parent.parent.convertToNodeSpaceAR(worldPos);
+                        cc.tween(this.lbl_Ani).to(0.6, {fontSize: 40}).start();
+                        cc.tween(this.lbl_Ani.node).to(0.6,{position: pos}, cc.easeSineOut()).call(()=>{
+                            this.lbl_Ani.node.active = false;
+                            this.node_task.active = true;         
+                            cc.tween(this.node_task).by(0.16, {y: -6}).by(0.1, {y: 6}).start();            
+                        }).start();
+
+                        this.node_value.active = true;
+                        this.node_value.scale = 0;
+                        cc.tween(this.node_value).to(0.76, {scale: 1.3}, cc.easeSineOut()).to(0.1, {scale: 1}).start();
+                    }).start();
+                }
+                }            
+            }
+            
+        }
     }
 
     private initTaskProgressUI() {

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","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}
+{"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}

packages-hot-update/cfg.json

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