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

assets/resources/animation/Main.meta

@@ -0,0 +1,12 @@
+{
+  "ver": "1.1.2",
+  "uuid": "8c65ee95-8d1e-4deb-8864-df1c7a01c9ee",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

assets/resources/game/coregame/texture/Harvest/harvest_byte_1.png.meta

@@ -1,36 +0,0 @@
-{
-  "ver": "2.3.5",
-  "uuid": "5e1170c2-6a73-4902-8ea8-e13a18a7b7e5",
-  "type": "sprite",
-  "wrapMode": "clamp",
-  "filterMode": "bilinear",
-  "premultiplyAlpha": false,
-  "genMipmaps": false,
-  "packable": true,
-  "width": 263,
-  "height": 62,
-  "platformSettings": {},
-  "subMetas": {
-    "harvest_byte_1": {
-      "ver": "1.0.4",
-      "uuid": "5e1170c2-6a73-4902-8ea8-e13a18a7b7e5@6c48a",
-      "rawTextureUuid": "5e1170c2-6a73-4902-8ea8-e13a18a7b7e5",
-      "trimType": "auto",
-      "trimThreshold": 1,
-      "rotated": false,
-      "offsetX": 1.5,
-      "offsetY": 0,
-      "trimX": 5,
-      "trimY": 0,
-      "width": 256,
-      "height": 62,
-      "rawWidth": 263,
-      "rawHeight": 62,
-      "borderTop": 0,
-      "borderBottom": 0,
-      "borderLeft": 0,
-      "borderRight": 0,
-      "subMetas": {}
-    }
-  }
-}

assets/resources/game/coregame/texture/Harvest/hav_btn_byte_2.png.meta

@@ -1,36 +0,0 @@
-{
-  "ver": "2.3.5",
-  "uuid": "c92c0ee2-1bc4-4926-a8d8-18ac0679806b",
-  "type": "sprite",
-  "wrapMode": "clamp",
-  "filterMode": "bilinear",
-  "premultiplyAlpha": false,
-  "genMipmaps": false,
-  "packable": true,
-  "width": 132,
-  "height": 17,
-  "platformSettings": {},
-  "subMetas": {
-    "hav_btn_byte_2": {
-      "ver": "1.0.4",
-      "uuid": "c92c0ee2-1bc4-4926-a8d8-18ac0679806b@6c48a",
-      "rawTextureUuid": "c92c0ee2-1bc4-4926-a8d8-18ac0679806b",
-      "trimType": "auto",
-      "trimThreshold": 1,
-      "rotated": false,
-      "offsetX": 2,
-      "offsetY": 0,
-      "trimX": 6,
-      "trimY": 0,
-      "width": 124,
-      "height": 17,
-      "rawWidth": 132,
-      "rawHeight": 17,
-      "borderTop": 0,
-      "borderBottom": 0,
-      "borderLeft": 0,
-      "borderRight": 0,
-      "subMetas": {}
-    }
-  }
-}

assets/resources/game/coregame/texture/Harvest/hav_btn_byte_3.png.meta

@@ -1,36 +0,0 @@
-{
-  "ver": "2.3.5",
-  "uuid": "14d6f54b-9e38-4fc1-978a-21a24f119bc6",
-  "type": "sprite",
-  "wrapMode": "clamp",
-  "filterMode": "bilinear",
-  "premultiplyAlpha": false,
-  "genMipmaps": false,
-  "packable": true,
-  "width": 179,
-  "height": 17,
-  "platformSettings": {},
-  "subMetas": {
-    "hav_btn_byte_3": {
-      "ver": "1.0.4",
-      "uuid": "14d6f54b-9e38-4fc1-978a-21a24f119bc6@6c48a",
-      "rawTextureUuid": "14d6f54b-9e38-4fc1-978a-21a24f119bc6",
-      "trimType": "auto",
-      "trimThreshold": 1,
-      "rotated": false,
-      "offsetX": 2,
-      "offsetY": 0,
-      "trimX": 7,
-      "trimY": 0,
-      "width": 169,
-      "height": 17,
-      "rawWidth": 179,
-      "rawHeight": 17,
-      "borderTop": 0,
-      "borderBottom": 0,
-      "borderLeft": 0,
-      "borderRight": 0,
-      "subMetas": {}
-    }
-  }
-}

assets/resources/game/prefab/uiPanel/HarvestPanel.prefab

@@ -24,17 +24,17 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 73
+        "__id__": 82
       },
       {
-        "__id__": 75
+        "__id__": 84
       },
       {
-        "__id__": 76
+        "__id__": 85
       }
     ],
     "_prefab": {
-      "__id__": 77
+      "__id__": 86
     },
     "_opacity": 255,
     "_color": {
@@ -98,7 +98,7 @@
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 72
+      "__id__": 81
     },
     "_opacity": 255,
     "_color": {
@@ -165,11 +165,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 70
+        "__id__": 79
       }
     ],
     "_prefab": {
-      "__id__": 71
+      "__id__": 80
     },
     "_opacity": 255,
     "_color": {
@@ -437,7 +437,7 @@
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 69
+      "__id__": 78
     },
     "_opacity": 255,
     "_color": {
@@ -917,15 +917,15 @@
     "_opacity": 255,
     "_color": {
       "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
+      "r": 184,
+      "g": 0,
+      "b": 0,
       "a": 255
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 256,
-      "height": 62
+      "width": 283.46,
+      "height": 90.4
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -937,7 +937,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        0,
+        -7.808,
         0,
         0,
         0,
@@ -962,7 +962,7 @@
     "_id": ""
   },
   {
-    "__type__": "cc.Sprite",
+    "__type__": "cc.Label",
     "_name": "",
     "_objFlags": 0,
     "node": {
@@ -976,21 +976,24 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_spriteFrame": {
-      "__uuid__": "5e1170c2-6a73-4902-8ea8-e13a18a7b7e5@6c48a"
-    },
-    "_type": 0,
-    "_sizeMode": 1,
-    "_fillType": 0,
-    "_fillCenter": {
-      "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 0
+    "_string": "1000红包券=0.1元\n满0.3元即可提现",
+    "_N$string": "1000红包券=0.1元\n满0.3元即可提现",
+    "_fontSize": 36,
+    "_lineHeight": 40,
+    "_enableWrapText": true,
+    "_N$file": {
+      "__uuid__": "b47819b5-a9ec-4916-8909-db422f79bbb7"
     },
-    "_fillStart": 0,
-    "_fillRange": 0,
-    "_isTrimmedMode": true,
-    "_atlas": null,
+    "_isSystemFontUsed": false,
+    "_spacingX": 0,
+    "_batchAsBitmap": false,
+    "_styleFlags": 0,
+    "_underlineHeight": 0,
+    "_N$horizontalAlign": 1,
+    "_N$verticalAlign": 0,
+    "_N$fontFamily": "Arial",
+    "_N$overflow": 0,
+    "_N$cacheMode": 0,
     "_id": ""
   },
   {
@@ -1065,11 +1068,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 67
+        "__id__": 76
       }
     ],
     "_prefab": {
-      "__id__": 68
+      "__id__": 77
     },
     "_opacity": 255,
     "_color": {
@@ -1646,15 +1649,15 @@
     "_opacity": 255,
     "_color": {
       "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
+      "r": 110,
+      "g": 28,
+      "b": 23,
       "a": 255
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 124,
-      "height": 17
+      "width": 126,
+      "height": 22.68
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1691,7 +1694,7 @@
     "_id": ""
   },
   {
-    "__type__": "cc.Sprite",
+    "__type__": "cc.Label",
     "_name": "",
     "_objFlags": 0,
     "node": {
@@ -1705,21 +1708,24 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_spriteFrame": {
-      "__uuid__": "c92c0ee2-1bc4-4926-a8d8-18ac0679806b@6c48a"
-    },
-    "_type": 0,
-    "_sizeMode": 1,
-    "_fillType": 0,
-    "_fillCenter": {
-      "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 0
+    "_string": "获得少量红包券",
+    "_N$string": "获得少量红包券",
+    "_fontSize": 18,
+    "_lineHeight": 18,
+    "_enableWrapText": true,
+    "_N$file": {
+      "__uuid__": "b47819b5-a9ec-4916-8909-db422f79bbb7"
     },
-    "_fillStart": 0,
-    "_fillRange": 0,
-    "_isTrimmedMode": true,
-    "_atlas": null,
+    "_isSystemFontUsed": false,
+    "_spacingX": 0,
+    "_batchAsBitmap": false,
+    "_styleFlags": 0,
+    "_underlineHeight": 0,
+    "_N$horizontalAlign": 0,
+    "_N$verticalAlign": 0,
+    "_N$fontFamily": "Arial",
+    "_N$overflow": 0,
+    "_N$cacheMode": 0,
     "_id": ""
   },
   {
@@ -1844,14 +1850,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 63
+        "__id__": 72
       },
       {
-        "__id__": 65
+        "__id__": 74
       }
     ],
     "_prefab": {
-      "__id__": 66
+      "__id__": 75
     },
     "_opacity": 255,
     "_color": {
@@ -2369,28 +2375,38 @@
     "_parent": {
       "__id__": 46
     },
-    "_children": [],
+    "_children": [
+      {
+        "__id__": 61
+      },
+      {
+        "__id__": 64
+      },
+      {
+        "__id__": 67
+      }
+    ],
     "_active": true,
     "_components": [
       {
-        "__id__": 61
+        "__id__": 70
       }
     ],
     "_prefab": {
-      "__id__": 62
+      "__id__": 71
     },
     "_opacity": 255,
     "_color": {
       "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
+      "r": 110,
+      "g": 28,
+      "b": 23,
       "a": 255
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 169,
-      "height": 17
+      "width": 167.03,
+      "height": 50.4
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -2427,12 +2443,188 @@
     "_id": ""
   },
   {
-    "__type__": "cc.Sprite",
+    "__type__": "cc.PrivateNode",
+    "_name": "RICHTEXT_CHILD",
+    "_objFlags": 1024,
+    "_parent": {
+      "__id__": 60
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 62
+      }
+    ],
+    "_prefab": {
+      "__id__": 63
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 110,
+      "g": 28,
+      "b": 23,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 72,
+      "height": 50.4
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        -83.515,
+        -25.2,
+        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,
+    "showInEditor": false,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Label",
     "_name": "",
     "_objFlags": 0,
     "node": {
+      "__id__": 61
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "最高获得",
+    "_N$string": "最高获得",
+    "_fontSize": 18,
+    "_lineHeight": 40,
+    "_enableWrapText": true,
+    "_N$file": {
+      "__uuid__": "b47819b5-a9ec-4916-8909-db422f79bbb7"
+    },
+    "_isSystemFontUsed": false,
+    "_spacingX": 0,
+    "_batchAsBitmap": false,
+    "_styleFlags": 0,
+    "_underlineHeight": 0,
+    "_N$horizontalAlign": 0,
+    "_N$verticalAlign": 1,
+    "_N$fontFamily": "Arial",
+    "_N$overflow": 0,
+    "_N$cacheMode": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "04dd6ff2-c365-488b-9c49-8994289ce473"
+    },
+    "fileId": "02itKElAxGKoRLBhXylZvd",
+    "sync": false
+  },
+  {
+    "__type__": "cc.PrivateNode",
+    "_name": "RICHTEXT_CHILD",
+    "_objFlags": 1024,
+    "_parent": {
       "__id__": 60
     },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 65
+      }
+    ],
+    "_prefab": {
+      "__id__": 66
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 0,
+      "b": 0,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 41.03,
+      "height": 50.4
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        -11.515,
+        -25.2,
+        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,
+    "showInEditor": false,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 64
+    },
     "_enabled": true,
     "_materials": [
       {
@@ -2441,21 +2633,169 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_spriteFrame": {
-      "__uuid__": "14d6f54b-9e38-4fc1-978a-21a24f119bc6@6c48a"
+    "_string": "3000",
+    "_N$string": "3000",
+    "_fontSize": 18,
+    "_lineHeight": 40,
+    "_enableWrapText": true,
+    "_N$file": {
+      "__uuid__": "b47819b5-a9ec-4916-8909-db422f79bbb7"
     },
-    "_type": 0,
-    "_sizeMode": 1,
-    "_fillType": 0,
-    "_fillCenter": {
+    "_isSystemFontUsed": false,
+    "_spacingX": 0,
+    "_batchAsBitmap": false,
+    "_styleFlags": 0,
+    "_underlineHeight": 0,
+    "_N$horizontalAlign": 0,
+    "_N$verticalAlign": 1,
+    "_N$fontFamily": "Arial",
+    "_N$overflow": 0,
+    "_N$cacheMode": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "04dd6ff2-c365-488b-9c49-8994289ce473"
+    },
+    "fileId": "3eNlWvGmhNxrBAjWJ8etZY",
+    "sync": false
+  },
+  {
+    "__type__": "cc.PrivateNode",
+    "_name": "RICHTEXT_CHILD",
+    "_objFlags": 1024,
+    "_parent": {
+      "__id__": 60
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 68
+      }
+    ],
+    "_prefab": {
+      "__id__": 69
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 110,
+      "g": 28,
+      "b": 23,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 54,
+      "height": 50.4
+    },
+    "_anchorPoint": {
       "__type__": "cc.Vec2",
       "x": 0,
       "y": 0
     },
-    "_fillStart": 0,
-    "_fillRange": 0,
-    "_isTrimmedMode": true,
-    "_atlas": null,
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        29.515,
+        -25.2,
+        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,
+    "showInEditor": false,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 67
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "红包券",
+    "_N$string": "红包券",
+    "_fontSize": 18,
+    "_lineHeight": 40,
+    "_enableWrapText": true,
+    "_N$file": {
+      "__uuid__": "b47819b5-a9ec-4916-8909-db422f79bbb7"
+    },
+    "_isSystemFontUsed": false,
+    "_spacingX": 0,
+    "_batchAsBitmap": false,
+    "_styleFlags": 0,
+    "_underlineHeight": 0,
+    "_N$horizontalAlign": 0,
+    "_N$verticalAlign": 1,
+    "_N$fontFamily": "Arial",
+    "_N$overflow": 0,
+    "_N$cacheMode": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "04dd6ff2-c365-488b-9c49-8994289ce473"
+    },
+    "fileId": "fc0xRk/VhL/LIFt9zy5SfW",
+    "sync": false
+  },
+  {
+    "__type__": "cc.RichText",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 60
+    },
+    "_enabled": true,
+    "_fontFamily": "Arial",
+    "_isSystemFontUsed": false,
+    "_N$string": "最高获得</c><color=#ff0000>3000</color>红包券",
+    "_N$horizontalAlign": 0,
+    "_N$fontSize": 18,
+    "_N$font": {
+      "__uuid__": "b47819b5-a9ec-4916-8909-db422f79bbb7"
+    },
+    "_N$cacheMode": 0,
+    "_N$maxWidth": 0,
+    "_N$lineHeight": 40,
+    "_N$imageAtlas": null,
+    "_N$handleTouchEvent": true,
     "_id": ""
   },
   {
@@ -2483,7 +2823,7 @@
     "zoomScale": 1.2,
     "clickEvents": [
       {
-        "__id__": 64
+        "__id__": 73
       }
     ],
     "_N$interactable": true,
@@ -2710,7 +3050,7 @@
     "bClickClose": true,
     "onComplete": [
       {
-        "__id__": 74
+        "__id__": 83
       }
     ],
     "_id": ""
@@ -2733,6 +3073,12 @@
       "__id__": 1
     },
     "_enabled": true,
+    "lbl_des": {
+      "__id__": 22
+    },
+    "lbl_max": {
+      "__id__": 70
+    },
     "_id": ""
   },
   {

assets/resources/module/speedUpUI/speedUp.prefab

@@ -523,7 +523,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 223.36,
+      "width": 180,
       "height": 50.4
     },
     "_anchorPoint": {
@@ -575,8 +575,8 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "等待时间-10分钟",
-    "_N$string": "等待时间-10分钟",
+    "_string": "加速等待时间",
+    "_N$string": "加速等待时间",
     "_fontSize": 30,
     "_lineHeight": 40,
     "_enableWrapText": true,
@@ -631,7 +631,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 480,
+      "width": 420,
       "height": 50.4
     },
     "_anchorPoint": {
@@ -683,8 +683,8 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "减少农作物、动物、商铺的等待时间",
-    "_N$string": "减少农作物、动物、商铺的等待时间",
+    "_string": "农作物、动物、商品进入收获期",
+    "_N$string": "农作物、动物、商品进入收获期",
     "_fontSize": 30,
     "_lineHeight": 40,
     "_enableWrapText": true,
@@ -2549,7 +2549,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "New Label",
+    "_name": "剩余次数文本",
     "_objFlags": 0,
     "_parent": {
       "__id__": 3
@@ -3364,7 +3364,9 @@
     "node_cash": {
       "__id__": 64
     },
-    "lbl_remainTimes": null,
+    "lbl_remainTimes": {
+      "__id__": 71
+    },
     "_id": ""
   },
   {

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

@@ -9,6 +9,17 @@ const { ccclass, property } = cc._decorator;
 
 @ccclass
 export default class HarvestPanel extends cc.Component {
+    @property({ type: cc.Label }) lbl_des: cc.Label = null;
+    @property({ type: cc.RichText }) lbl_max: cc.RichText = null;
+
+    start() {
+        let data = gData.gameData.configs.CashCfg[0];
+        let money = data.money * 0.01;
+        this.lbl_des.string = `1000红包券=0.1元\n满${money}元即可提现`;
+
+        this.lbl_max.string = `最高获得</c><color=#ff0000>${gData.harvestData.config.menuRedBagCoin}</color>红包券`;
+    }
+
     public async clickNormalBtn() {
         // gData.harvestData.config.picture
         //调用收获红包币接口

assets/script/game/module/newCashUI/WalletCashOut.ts

@@ -71,22 +71,19 @@ export default class WalletCashOut extends cc.Component {
             mk.console.logSingle('initNoviceUI=>', v);
             let str = v.toString().split('.');
 
-            if(str.length >= 2 && str[1].length >4)
-            {
+            if (str.length >= 2 && str[1].length > 4) {
                 this.lbl_noviceValue.string = v.toFixed(4) + '元';
-            }else{
+            } else {
                 this.lbl_noviceValue.string = v.toString() + '元';
             }
-            
+
             this.intV = Math.round(value);
             this.lbl_tipUp.string = `进度加满后必得${this.intV}元现金`;
             this.lbl_cashOut.string = `满${this.intV}元提现`;
 
-            if(data.progressRate >= 1)
-            {
+            if (data.progressRate >= 1) {
                 this.btn_addProgress.setGray(true);
-            }else
-            {
+            } else {
                 this.btn_addProgress.setGray(false);
             }
         }
@@ -102,7 +99,7 @@ export default class WalletCashOut extends cc.Component {
     private digitLength(num) {
         const eSplit = num.toString().split(/[eE]/);
         const len = (eSplit[0].split('.')[1] || '').length - (+(eSplit[1] || 0));
-        return len > 0 ? len : 0;       
+        return len > 0 ? len : 0;
     }
 
     private initCashOutUI() {
@@ -128,8 +125,8 @@ export default class WalletCashOut extends cc.Component {
 
     private initTip() {
 
-        this.lbl_redMoney.string =  gData.gameData.playerProp.redMoney.toString();
-        this.lbl_value.string = (gData.gameData.playerProp.redMoney/10000) + '元';
+        this.lbl_redMoney.string = gData.gameData.playerProp.redMoney.toString();
+        this.lbl_value.string = (gData.gameData.playerProp.redMoney / 10000) + '元';
 
         if (this.curChooseIndex != -1) {
             let data = gData.gameData.configs.CashCfg[this.curChooseIndex];
@@ -223,32 +220,28 @@ export default class WalletCashOut extends cc.Component {
         console.log('=========>', this.isCanCash);
         if (this.isCanCash) {
 
-            if(this.checkShowTip())
-            {
+            if (this.checkShowTip()) {
                 mk.tip.pop('请先提现完前一档次数');
-            }else{
+            } else {
                 gData.adData.checkPopCashFull();
                 //this.check_button[this.curChooseIndex].setIsCanNotChoose();
                 gData.walletCashOutData.HttpCashOut2(this.curChooseIndex + 1);
             }
-            
+
         }
     }
 
-    private checkShowTip()
-    {
-        if(this.curChooseIndex >=1)
-        {
-            let data = gData.gameData.configs.CashCfg[this.curChooseIndex -1];
+    private checkShowTip() {
+        if (this.curChooseIndex >= 1) {
+            let data = gData.gameData.configs.CashCfg[this.curChooseIndex - 1];
             let haveTimes = gData.gameData.playerProp.getRedMoneyCashOutTimesByIndex(data.index);
-            if(data.cashFrequency > haveTimes)
-            {
+            if (data.cashFrequency > haveTimes) {
                 return true;
             }
             return false;
         }
         return false;
-        
+
     }
 
     private clickAddProgressBtn() {
@@ -294,7 +287,6 @@ export default class WalletCashOut extends cc.Component {
             } else {
                 mk.tip.pop(`满${this.intV}元提现`);
             }
-
         }
     }
 

build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/util/NetWorkStateMgr.java

@@ -1,6 +1,5 @@
 package org.cocos2dx.javascript.util;
 
-import android.app.Activity;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -8,7 +7,6 @@ import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 
 import org.cocos2dx.javascript.thirdSdk.ThirdSdkMgr;
-import org.cocos2dx.javascript.thirdSdk.thinkingdata.TDSDKMgr;
 
 public class NetWorkStateMgr extends BroadcastReceiver {
     private boolean netConnect = true;