1

assets/resources/game/prefab/uiPanel/ADClearSickPanel.prefab

@@ -193,8 +193,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 588,
-      "height": 679
+      "width": 586,
+      "height": 678
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -206,7 +206,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        0,
+        95,
         0,
         0,
         0,
@@ -914,7 +914,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 71,
+      "width": 69,
       "height": 68
     },
     "_anchorPoint": {

assets/resources/game/prefab/uiPanel/ADUnlockPanel.prefab

@@ -193,8 +193,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 588,
-      "height": 679
+      "width": 586,
+      "height": 678
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -206,7 +206,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        0,
+        95,
         0,
         0,
         0,
@@ -914,7 +914,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 71,
+      "width": 69,
       "height": 68
     },
     "_anchorPoint": {

assets/resources/module/newNotice/lineUpUI.prefab

@@ -24,20 +24,20 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 38
+        "__id__": 40
       },
       {
-        "__id__": 39
+        "__id__": 41
       },
       {
-        "__id__": 40
+        "__id__": 42
       },
       {
-        "__id__": 41
+        "__id__": 43
       }
     ],
     "_prefab": {
-      "__id__": 42
+      "__id__": 44
     },
     "_opacity": 255,
     "_color": {
@@ -101,7 +101,7 @@
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 37
+      "__id__": 39
     },
     "_opacity": 255,
     "_color": {
@@ -113,8 +113,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 0,
-      "height": 0
+      "width": 750,
+      "height": 1334
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -175,10 +175,16 @@
     "_components": [
       {
         "__id__": 35
+      },
+      {
+        "__id__": 36
+      },
+      {
+        "__id__": 37
       }
     ],
     "_prefab": {
-      "__id__": 36
+      "__id__": 38
     },
     "_opacity": 255,
     "_color": {
@@ -639,7 +645,7 @@
     "asset": {
       "__uuid__": "4f28d7f3-1d28-4320-bf91-516bb05e0c01"
     },
-    "fileId": "3ciAMSxttM+rSOetQ8Ub1h",
+    "fileId": "3erW1hU7lHdqLU1hVIsCsA",
     "sync": false
   },
   {
@@ -748,7 +754,7 @@
     "asset": {
       "__uuid__": "4f28d7f3-1d28-4320-bf91-516bb05e0c01"
     },
-    "fileId": "6acaBDO+hNUpBHsbA///C8",
+    "fileId": "fbCuY9QZxAQ4kWDPJHIAJA",
     "sync": false
   },
   {
@@ -857,7 +863,7 @@
     "asset": {
       "__uuid__": "4f28d7f3-1d28-4320-bf91-516bb05e0c01"
     },
-    "fileId": "39DDt0VFBEkKoUGTA+4bwT",
+    "fileId": "76X0Fb7MdCwYQkywS0OtN9",
     "sync": false
   },
   {
@@ -1364,6 +1370,46 @@
     "_id": ""
   },
   {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 3
+    },
+    "_enabled": false,
+    "alignMode": 1,
+    "_target": {
+      "__id__": 1
+    },
+    "_alignFlags": 0,
+    "_left": 0,
+    "_right": 0,
+    "_top": 417,
+    "_bottom": 0,
+    "_verticalCenter": 0,
+    "_horizontalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 0,
+    "_originalHeight": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "173866Ll/lFN6TBCxDmQuqC",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 3
+    },
+    "_enabled": false,
+    "isFitSpecialNode": true,
+    "_id": ""
+  },
+  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1
@@ -1441,14 +1487,14 @@
     },
     "_enabled": true,
     "effect_par": {
-      "__id__": 2
+      "__id__": 3
     },
     "open_effect": 1,
     "isOpenCloseEffect": true,
     "close_effect": 1,
     "close_toPoint": "",
     "close_uibg": false,
-    "isDelayOneFrame": false,
+    "isDelayOneFrame": true,
     "_id": ""
   },
   {

assets/resources/module/newNotice/newNotice.prefab

@@ -24,20 +24,20 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 64
+        "__id__": 66
       },
       {
-        "__id__": 65
+        "__id__": 67
       },
       {
-        "__id__": 66
+        "__id__": 68
       },
       {
-        "__id__": 67
+        "__id__": 69
       }
     ],
     "_prefab": {
-      "__id__": 68
+      "__id__": 70
     },
     "_opacity": 255,
     "_color": {
@@ -126,10 +126,16 @@
     "_components": [
       {
         "__id__": 62
+      },
+      {
+        "__id__": 63
+      },
+      {
+        "__id__": 64
       }
     ],
     "_prefab": {
-      "__id__": 63
+      "__id__": 65
     },
     "_opacity": 255,
     "_color": {
@@ -154,7 +160,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        0,
+        259,
         0,
         0,
         0,
@@ -2376,6 +2382,45 @@
     "_id": ""
   },
   {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": false,
+    "alignMode": 1,
+    "_target": null,
+    "_alignFlags": 1,
+    "_left": 0,
+    "_right": 0,
+    "_top": 118,
+    "_bottom": 0,
+    "_verticalCenter": 0,
+    "_horizontalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 0,
+    "_originalHeight": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "173866Ll/lFN6TBCxDmQuqC",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": false,
+    "isFitSpecialNode": true,
+    "offset": 100,
+    "_id": ""
+  },
+  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1

assets/resources/module/newNotice/warmPrompt.prefab

@@ -0,0 +1,913 @@
+[
+  {
+    "__type__": "cc.Prefab",
+    "_name": "",
+    "_objFlags": 0,
+    "_native": "",
+    "data": {
+      "__id__": 1
+    },
+    "optimizationPolicy": 0,
+    "asyncLoadAssets": false,
+    "readonly": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "warmPrompt",
+    "_objFlags": 0,
+    "_parent": null,
+    "_children": [
+      {
+        "__id__": 2
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 22
+      },
+      {
+        "__id__": 23
+      },
+      {
+        "__id__": 24
+      },
+      {
+        "__id__": 25
+      }
+    ],
+    "_prefab": {
+      "__id__": 26
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 750,
+      "height": 1334
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        375,
+        667,
+        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__": 1
+    },
+    "_children": [
+      {
+        "__id__": 3
+      }
+    ],
+    "_active": true,
+    "_components": [],
+    "_prefab": {
+      "__id__": 21
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 750,
+      "height": 1334
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "bg",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 2
+    },
+    "_children": [
+      {
+        "__id__": 4
+      },
+      {
+        "__id__": 7
+      },
+      {
+        "__id__": 10
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 19
+      }
+    ],
+    "_prefab": {
+      "__id__": 20
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 640,
+      "height": 440
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "title",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 3
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 5
+      }
+    ],
+    "_prefab": {
+      "__id__": 6
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 148,
+      "g": 82,
+      "b": 37,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 160,
+      "height": 50.4
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        155,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1.2,
+        1.2,
+        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__": 4
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "温馨提示",
+    "_N$string": "温馨提示",
+    "_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__": "dfae673b-58f8-4120-89e8-10c9892eb0a6"
+    },
+    "fileId": "deIpL6YWRHnYefCM861K/1",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "New Label",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 3
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 8
+      }
+    ],
+    "_prefab": {
+      "__id__": 9
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 138,
+      "g": 67,
+      "b": 18,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 546,
+      "height": 50.4
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        28,
+        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__": 7
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "系统检测到您的账号存在异常，禁止登陆游戏！",
+    "_N$string": "系统检测到您的账号存在异常，禁止登陆游戏！",
+    "_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__": "dfae673b-58f8-4120-89e8-10c9892eb0a6"
+    },
+    "fileId": "13bO3TzK5FnplZDyblQpFo",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "确定按钮",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 3
+    },
+    "_children": [
+      {
+        "__id__": 11
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 15
+      },
+      {
+        "__id__": 16
+      }
+    ],
+    "_prefab": {
+      "__id__": 18
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 283,
+      "height": 112
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        -3.882,
+        -156.759,
+        0,
+        0,
+        0,
+        0,
+        1,
+        0.8,
+        0.8,
+        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": "New Label",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 10
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 12
+      },
+      {
+        "__id__": 13
+      }
+    ],
+    "_prefab": {
+      "__id__": 14
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 251,
+      "b": 237,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 106,
+      "height": 69
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        5,
+        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__": 11
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "确定",
+    "_N$string": "确定",
+    "_fontSize": 50,
+    "_lineHeight": 50,
+    "_enableWrapText": true,
+    "_N$file": {
+      "__uuid__": "b47819b5-a9ec-4916-8909-db422f79bbb7"
+    },
+    "_isSystemFontUsed": false,
+    "_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.LabelOutline",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 11
+    },
+    "_enabled": true,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 178,
+      "g": 77,
+      "b": 18,
+      "a": 255
+    },
+    "_width": 3,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "dfae673b-58f8-4120-89e8-10c9892eb0a6"
+    },
+    "fileId": "f6grT9x6hHPIc9GCx/5TOZ",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 10
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "c3f3ce70-5592-4b5a-bb79-363c0338d77f"
+    },
+    "_type": 0,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Button",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 10
+    },
+    "_enabled": true,
+    "_normalMaterial": null,
+    "_grayMaterial": null,
+    "duration": 0.1,
+    "zoomScale": 1.2,
+    "clickEvents": [
+      {
+        "__id__": 17
+      }
+    ],
+    "_N$interactable": true,
+    "_N$enableAutoGrayEffect": false,
+    "_N$transition": 0,
+    "transition": 0,
+    "_N$normalColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_N$pressedColor": {
+      "__type__": "cc.Color",
+      "r": 211,
+      "g": 211,
+      "b": 211,
+      "a": 255
+    },
+    "pressedColor": {
+      "__type__": "cc.Color",
+      "r": 211,
+      "g": 211,
+      "b": 211,
+      "a": 255
+    },
+    "_N$hoverColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "hoverColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_N$disabledColor": {
+      "__type__": "cc.Color",
+      "r": 124,
+      "g": 124,
+      "b": 124,
+      "a": 255
+    },
+    "_N$normalSprite": null,
+    "_N$pressedSprite": null,
+    "pressedSprite": null,
+    "_N$hoverSprite": null,
+    "hoverSprite": null,
+    "_N$disabledSprite": null,
+    "_N$target": {
+      "__id__": 10
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.ClickEvent",
+    "target": {
+      "__id__": 1
+    },
+    "component": "",
+    "_componentId": "a5bcaCzubxMQY4TM7dSW6q5",
+    "handler": "clickSureBtn",
+    "customEventData": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "dfae673b-58f8-4120-89e8-10c9892eb0a6"
+    },
+    "fileId": "c914LvBORBc4nuXxpErCzN",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 3
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "583e8dba-cff4-4047-b497-9a963c4f8f8c"
+    },
+    "_type": 0,
+    "_sizeMode": 0,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "dfae673b-58f8-4120-89e8-10c9892eb0a6"
+    },
+    "fileId": "3aDHUWdXdFsqUq8Pt8TbfW",
+    "sync": false
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "dfae673b-58f8-4120-89e8-10c9892eb0a6"
+    },
+    "fileId": "bfZmc8NhZLmqu8BJnFLEvm",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "alignMode": 1,
+    "_target": null,
+    "_alignFlags": 45,
+    "_left": 0,
+    "_right": 0,
+    "_top": 0,
+    "_bottom": 0,
+    "_verticalCenter": 0,
+    "_horizontalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 750,
+    "_originalHeight": 1334,
+    "_id": ""
+  },
+  {
+    "__type__": "58495/rJOBNGoxELFSp8G2a",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "color": {
+      "__type__": "cc.Color",
+      "r": 0,
+      "g": 0,
+      "b": 0,
+      "a": 180
+    },
+    "design_block_node": null,
+    "bClickClose": false,
+    "onComplete": [],
+    "_id": ""
+  },
+  {
+    "__type__": "ac053zwqaRD6IJmTlQWmefZ",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "effect_par": {
+      "__id__": 3
+    },
+    "open_effect": 1,
+    "isOpenCloseEffect": true,
+    "close_effect": 1,
+    "close_toPoint": "",
+    "close_uibg": false,
+    "isDelayOneFrame": true,
+    "_id": ""
+  },
+  {
+    "__type__": "a5bcaCzubxMQY4TM7dSW6q5",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "dfae673b-58f8-4120-89e8-10c9892eb0a6"
+    },
+    "fileId": "",
+    "sync": false
+  }
+]

assets/resources/module/newNotice/warmPrompt.prefab.meta

@@ -0,0 +1,8 @@
+{
+  "ver": "1.2.9",
+  "uuid": "dfae673b-58f8-4120-89e8-10c9892eb0a6",
+  "optimizationPolicy": "AUTO",
+  "asyncLoadAssets": false,
+  "readonly": false,
+  "subMetas": {}
+}

assets/resources/module/newOpenRedBag/newOpenRedBag.prefab

@@ -266,8 +266,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 610,
-      "height": 190
+      "width": 593,
+      "height": 164
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -912,7 +912,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 57,
+      "width": 56,
       "height": 62
     },
     "_anchorPoint": {
@@ -3761,6 +3761,9 @@
     "node_getBtn": {
       "__id__": 30
     },
+    "node_cashOut": {
+      "__id__": 68
+    },
     "_id": ""
   },
   {

assets/resources/module/redBagTask/redBagTask.prefab

@@ -379,8 +379,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 610,
-      "height": 190
+      "width": 593,
+      "height": 164
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -2437,7 +2437,7 @@
         "__id__": 68
       }
     ],
-    "_active": true,
+    "_active": false,
     "_components": [],
     "_prefab": {
       "__id__": 100

assets/resources/module/speedUpUI/productReward.prefab

@@ -193,8 +193,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 588,
-      "height": 603
+      "width": 586,
+      "height": 601
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -2924,7 +2924,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 57,
+      "width": 56,
       "height": 62
     },
     "_anchorPoint": {
@@ -3667,6 +3667,9 @@
     "lbl_times": {
       "__id__": 15
     },
+    "lbl_times2": {
+      "__id__": 67
+    },
     "lbl_taskTimes": {
       "__id__": 29
     },

assets/script/before/main/FactoryIcon.ts

@@ -100,7 +100,7 @@ export class FactoryIcon extends cc.Component {
         switch (this.data.state) {
             case FactroyState.Lock:
                 let arr = gData.gameData.getProductArrByType(this.tab);
-                let lv = arr[0].value;
+                let lv = arr[0].value - gData.gameData.playerProp.completeFarmTaskTimes;
                 mk.tip.pop(`完成${lv}次任务红包后解锁`);
                 break;
             case FactroyState.Empty:

assets/script/before/main/PastureIcon.ts

@@ -151,7 +151,8 @@ export default class PastureIcon extends cc.Component {
             case PastureState.Lock:
                 let config = gData.gameData.getProductMap(this.data.productID);
                 if (config.unlock == 2) {
-                    mk.tip.pop(`完成${config.value}次任务红包后解锁`);
+                    let times =config.value - gData.gameData.playerProp.completeFarmTaskTimes;
+                    mk.tip.pop(`完成${times}次任务红包后解锁`);
                 }
                 else if (config.unlock == 1) {
                     mk.tip.pop(`喂食${config.name}${config.value}次解锁`)

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

@@ -37,11 +37,13 @@ export default class ADClearSickPanel extends cc.Component {
     onEnable() {
         gData.adData.checkPopInter(InterAdType.interstitial1_click_3);
 
-        mk.ad.showBanner(BannerAdType.banner_click_8);
+        //mk.ad.showBanner(BannerAdType.banner_click_8);
+        mk.ad.showNative();
     }
 
     onDisable() {
-        mk.ad.destoryBanner();
+        //mk.ad.destoryBanner();
+        mk.ad.destroyNativeAd();
     }
 
     clickWatchVideo() {

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

@@ -23,10 +23,12 @@ export default class ADUnlockPanel extends cc.Component {
     }
 
     onEnable() {
-        mk.ad.showBanner(BannerAdType.banner_click_7);
+        //mk.ad.showBanner(BannerAdType.banner_click_7);
+        mk.ad.showNative();
     }
 
     onDisable() {
-        mk.ad.destoryBanner();
+        //mk.ad.destoryBanner();
+        mk.ad.destroyNativeAd();
     }
 }

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

@@ -61,11 +61,13 @@ export default class HarvestPanel extends cc.Component {
     }
 
     onEnable() {
-        mk.ad.showBanner(BannerAdType.banner_click_6);
+        //mk.ad.showBanner(BannerAdType.banner_click_6);
+        mk.ad.showNative();
     }
 
     onDisable() {
-        mk.ad.destoryBanner();
+        //mk.ad.destoryBanner();
+        mk.ad.destroyNativeAd();
     }
 
     clickClose() {

assets/script/game/component/BangsFit.ts

@@ -2,7 +2,6 @@
 const {ccclass, property} = cc._decorator;
 const LeftPadding = 65;
 const RightPadding = 65;
-const topOffset = 80;
 
 /**
  * 刘海屏适配
@@ -13,13 +12,14 @@ export default class BangsFit extends cc.Component {
 
     @property({displayName: '是否适配特殊节点'})
     private isFitSpecialNode = false;
+    @property({displayName: '是否适配特殊节点', visible(){return this.isFitSpecialNode}})
+    private offset = 80;
 
     onLoad() {
         this._AdaptLeftAndRight();
     }
     start()
     {
-
     }
 
     /*============================================================================================================*/
@@ -36,12 +36,12 @@ export default class BangsFit extends cc.Component {
             {
                 if(widget.isAlignTop)
                 {
-                    let add = Math.round((this.GetWinHeightWidthRatio() * topOffset)/1.86);
+                    let add = Math.round((this.GetWinHeightWidthRatio() * this.offset)/1.86);
                     widget.top = widget.top + add;
                 }
                 if(widget.isAlignBottom)
                 {
-                    let add = Math.round((this.GetWinHeightWidthRatio() * topOffset)/1.86);
+                    let add = Math.round((this.GetWinHeightWidthRatio() * this.offset)/1.86);
                     widget.bottom = widget.bottom + add;
                 }
                 

assets/script/game/data/AdData.ts

@@ -353,6 +353,7 @@ export class AdData {
         if (this.timeAd >= span) {
             this.timeAd = 0;
             mk.ad.videoAdType = VideoAdType.video_init_19;
+            gData.gameData.init_hideRedBag = true;
             mk.ui.openPanel('module/newOpenRedBag/newOpenRedBag');
         }
     }

assets/script/game/data/GameData.ts

@@ -88,6 +88,9 @@ export class GameData {
 
     public init_speedup = false;
 
+    标志位
+    public init_hideRedBag = false;
+
     public shareUrl = '';
     public shareTitle = '';
     public shareDes = '';
@@ -200,7 +203,7 @@ export class GameData {
         //mk.console.logSingle('redMoneyCashPayRecordList==>', res_data.redMoneyCashPayRecordList);
         this.playerProp.userFarmTaskInfo = res_data.userFarmTaskInfo;
         this.playerProp.speedUpLeftTimes = res_data.speedUpLeftTimes;
-        this.playerProp.completeFarmTaskTimes = 3;//res_data.completeFarmTaskTimes;
+        this.playerProp.completeFarmTaskTimes = res_data.completeFarmTaskTimes;
 
         mk.data.setTAUserID(gData.loginData.uin);
         mk.data.setTAEventUser(0, 'logindays_total', this.playerProp.loginDays);
@@ -534,6 +537,7 @@ export class GameData {
         if (response.errcode != 0) {
             return false;
         }
+
         gData.gameData.init_task = true;
         this.playerProp.userFarmTaskInfo = response.data.userFarmTaskInfo;
         if (this.playerProp.userFarmTaskInfo.completeCount >= this.playerProp.userFarmTaskInfo.taskCount) {
@@ -707,6 +711,9 @@ export class GameData {
         if (nextConfig) {
             if (nextConfig.tab == curConfig.tab && nextID > this.getMaxProduct(curConfig.tab)) {
                 if (nextConfig.unlock == 1 && nextConfig.value <= times) {
+                    this._productMakeTimesMap.set(nextID, 0);
+                    let data = { 'id': nextID, 'times': 0 };
+                    this._productMakeTimesData.push(data);
                     this.setMaxProduct(nextID);
                     let nConfig = this.getProductMap(nextID + 1);
                     if (nConfig) {
@@ -870,7 +877,7 @@ export class GameData {
                     sickTimes++;
                 }
 
-                if (this.playerProp.completeFarmTaskTimes < arr[0].value) {
+                if (this.playerProp.completeFarmTaskTimes >= arr[0].value) {
                     //更新最大可购买商品
                     this.setMaxProduct(arr[0].picture, true);
                 }
@@ -992,6 +999,8 @@ export class GameData {
         if (!has && unlock) {
             data = { tab: config.tab, productID: id };
             this._maxProduct.push(data);
+
+            gData.farmMapData.isStateChange = true;
         }
     }
 
@@ -1058,8 +1067,6 @@ export class GameData {
                     break;
             }
         }
-
-        gData.farmMapData.isInit = true;
     }
 
     checkCanSpeedUp(pop = false) {

assets/script/game/game/TouchListener.ts

@@ -20,6 +20,8 @@ const { ccclass, property } = cc._decorator;
         if(!gData.gameData.isTouchScreen)
         {
             gData.gameData.isTouchScreen = true;
-        }        
+        }  
+        
+        //mk.ui.openPanel('module/newNotice/warmPrompt');
     }
  }

assets/script/game/module/cashPro/CashPro.ts

@@ -19,6 +19,11 @@ export default class CashPro extends cc.Component {
     @property(cc.Label)
     labMoney: cc.Label = null;
 
+    start()
+    {
+        mk.ad.destroyNativeAd();
+    }
+    
     update() {
         if (gData.cashPro.init_load) {
             gData.cashPro.init_load = false;

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

@@ -44,7 +44,8 @@ export default class ItemName extends cc.Component{
         let data = gData.gameData.getProductArrByType(this.pt);
         if(data && data.length> 0 && data[0].unlock == 2)
         {
-            mk.tip.pop(`完成${data[0].value}次任务红包后解锁`);
+            let times = data[0].value - gData.gameData.playerProp.completeFarmTaskTimes;
+            mk.tip.pop(`完成${times}次任务红包后解锁`);
         }
     }
 }

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

@@ -48,7 +48,7 @@ export default class WalletCashOut extends cc.Component {
 
     start() {
         // mk.ad.showNative(4);
-        this.initNoviceUI();
+        this.initNoviceUI(true);
         this.initCashOutUI();
 
         // let data = [{}, {}, {}, {}, {}, {}];
@@ -78,7 +78,7 @@ export default class WalletCashOut extends cc.Component {
             }
             if(!isInit)
             {
-                cc.tween(this.lbl_noviceValue.node).to(0.2, {scale: 1.2}).to(0.2, {scale: 1}).start();
+                cc.tween(this.lbl_noviceValue.node).to(0.1, {scale: 1.2}).to(0.1, {scale: 1}).start();
             }
 
             this.intV = Math.round(value);
@@ -130,7 +130,7 @@ export default class WalletCashOut extends cc.Component {
     private initTip() {
 
         this.lbl_redMoney.string = (gData.gameData.playerProp.redMoney/100).toString();
-        this.lbl_value.string = (gData.gameData.playerProp.redMoney / 1000000).toFixed(3) + '元';
+        this.lbl_value.string = (gData.gameData.playerProp.redMoney / 1000000).toFixed(3);
 
         if (this.curChooseIndex != -1) {
             let data = gData.gameData.configs.CashCfg[this.curChooseIndex];
@@ -164,7 +164,7 @@ export default class WalletCashOut extends cc.Component {
 
     update(dt) {
         if (gData.walletCashOutData.init_novice) {
-            this.initNoviceUI(true);
+            this.initNoviceUI();
             gData.walletCashOutData.init_novice = false;
         }
 

assets/script/game/module/newNotice/LineUpUI.ts

@@ -1,3 +1,4 @@
+import AdSystem from "../../../mk/system/AdSystem";
 import { VideoAdType } from "../../data/GameData";
 
 
@@ -14,6 +15,11 @@ export default class LineUpUI extends cc.Component {
         this.lbl_tip.string = `<color=#8A4312>提现排队中，你前面还有</c><color=#EF2417>${gData.lineUpUIData.personCount}</color><color=#8A4312>人</color>`;
     }
 
+    onEnable()
+    {
+        mk.ad.showNative();
+    }
+
     update(dt) {
         if (gData.lineUpUIData.refresh) {
             console.log('lineUp=====>', gData.lineUpUIData.personCount);
@@ -41,6 +47,10 @@ export default class LineUpUI extends cc.Component {
 
 
     }
+
+    onDisable(){
+        mk.ad.destroyNativeAd();
+    }
     private clickCloseBtn() {
 
         mk.audio.playEffect("button");

assets/script/game/module/newNotice/WarmPrompt.ts

@@ -0,0 +1,18 @@
+import JsbSystem from "../../../mk/system/JsbSystem";
+
+const { ccclass, property } = cc._decorator;
+@ccclass
+export default class WarmPrompt extends cc.Component {
+
+
+    start(){
+
+    }
+
+    clickSureBtn()
+    {
+        mk.audio.playEffect("button");
+
+        JsbSystem.systemExit();
+    }
+}

assets/script/game/module/newNotice/WarmPrompt.ts.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.8",
+  "uuid": "a5bca0b3-b9bc-4c41-8e13-33b7525baab9",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

assets/script/game/module/newOpenRedBag/NewOpenRedBag.ts

@@ -27,7 +27,15 @@ export default class NewOpenRedBag extends cc.Component {
     @property(cc.Node)
     private node_getBtn: cc.Node = null;
 
+    @property(cc.Node)
+    private node_cashOut: cc.Node = null;
+
     data = null
+
+    private showNativeAd = false;
+    onLoad(){
+        this.showNativeAd = gData.gameData.init_hideRedBag;
+    }
     start() {
         
         if (gData.moreGame.init_newOpenRedBag) {
@@ -70,18 +78,39 @@ export default class NewOpenRedBag extends cc.Component {
     onEnable() {
         gData.adData.checkPopInter(InterAdType.interstitial1_click_1);
 
-        mk.ad.showBanner(BannerAdType.banner_click_3);
+        if(this.showNativeAd)
+        {
+            mk.ad.showNative();
+        }else{
+            mk.ad.showBanner(BannerAdType.banner_click_3);
+        }
+        
     }
 
     onDisable() {
         mk.ui.removeRefreshEvent(this);
-        mk.ad.destoryBanner();
+        if(this.showNativeAd)
+        {
+            mk.ad.destroyNativeAd();
+        }else{
+            mk.ad.destoryBanner();
+        }
+        
     }
 
     /**
      * 底部提现相关样式
      */
     private initCashOutStyle(redMoney: number = 0) {
+
+        if(gData.gameData.init_hideRedBag)
+        {
+            this.node_cashOut.active = false;
+            gData.gameData.init_hideRedBag = false;
+            return;
+
+        }
+
         if(redMoney == 0)
         {
             redMoney = gData.gameData.playerProp.redMoney;

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

@@ -89,12 +89,14 @@ export default class RedBagTask extends cc.Component {
     }
 
     onEnable() {
-        mk.ad.showBanner(BannerAdType.banner_click_2);
+        //mk.ad.showBanner(BannerAdType.banner_click_2);
+        mk.ad.showNative();
     }
 
     onDisable() {
         mk.ui.removeRefreshEvent(this);
-        mk.ad.destoryBanner();
+        //mk.ad.destoryBanner();
+        mk.ad.destroyNativeAd();
     }
 
     update(dt) {

assets/script/game/module/speedUpUI/ProductReward.ts

@@ -7,6 +7,8 @@ const { ccclass, property } = cc._decorator;
 export default class ProductReward extends cc.Component {
     @property({ type: cc.Label, displayName: "文本" })
     lbl_times: cc.Label = null;
+    @property({ type: cc.Label, displayName: "文本2" })
+    lbl_times2: cc.Label = null;
 
     @property({ type: cc.Label, displayName: '任务次数' })
     lbl_taskTimes: cc.Label = null;
@@ -25,8 +27,10 @@ export default class ProductReward extends cc.Component {
     node_2: cc.Node = null;
 
     onEnable() {
-        this.lbl_times.string = `生产次数+${gData.gameData.configs.ServerConfig.ProductionAd}`;
+        mk.ad.showNative();
 
+        this.lbl_times.string = `生产次数+${gData.gameData.configs.ServerConfig.ProductionAd}`;
+        this.lbl_times2.string = `生产次数+${gData.gameData.configs.ServerConfig.ProductionAd}`;
         gData.gameData.init_productTask = false;
         if (gData.gameData.playerProp.userFarmTaskInfo) {
             let com = gData.gameData.playerProp.userFarmTaskInfo.completeCount;
@@ -110,6 +114,10 @@ export default class ProductReward extends cc.Component {
         gData.gameData.gameStyle.playAdd(add, 2);
     }
 
+    onDisable(){
+        mk.ad.destroyNativeAd();
+    }
+
     private clickCloseBtn() {
         mk.audio.playEffect("button");
         mk.ui.closePanel(this.node.name);

assets/script/mk/system/AdSystem.ts

@@ -165,8 +165,8 @@ export default class AdSystem {
         let new_date = new Date();
         let new_time_stamp = new_date.getTime();
         let gap_time_stamp = new_time_stamp - this.last_time_stamp;
-        if (gap_time_stamp <= 4000) {
-            const time = 5 - Math.ceil(gap_time_stamp / 1000);
+        if (gap_time_stamp <= 3000) {
+            const time = 4 - Math.ceil(gap_time_stamp / 1000);
             mk.tip.pop('当前看视频太频繁了，请' + time + '秒后再试');
             return true;
         }

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/js backups (useful for debugging)/main.index.js

@@ -2707,6 +2707,7 @@ var e = this.AutoRedMoneyMap.get(this.ecpmLevel);
 if (this.timeAd >= e) {
 this.timeAd = 0;
 mk.ad.videoAdType = c.VideoAdType.video_init_19;
+gData.gameData.init_hideRedBag = !0;
 mk.ui.openPanel("module/newOpenRedBag/newOpenRedBag");
 }
 }
@@ -2815,8 +2816,8 @@ this.last_time_stamp = t.getTime();
 };
 t.prototype.isAdCooling = function() {
 var t = new Date().getTime() - this.last_time_stamp;
-if (t <= 5e3) {
-var e = 6 - Math.ceil(t / 1e3);
+if (t <= 3e3) {
+var e = 4 - Math.ceil(t / 1e3);
 mk.tip.pop("当前看视频太频繁了，请" + e + "秒后再试");
 return !0;
 }
@@ -6325,6 +6326,9 @@ e.cashPro = null;
 e.labMoney = null;
 return e;
 }
+e.prototype.start = function() {
+mk.ad.destroyNativeAd();
+};
 e.prototype.update = function() {
 if (gData.cashPro.init_load) {
 gData.cashPro.init_load = !1;
@@ -8031,7 +8035,7 @@ return c(this, function() {
 switch (this.data.state) {
 case s.FactroyState.Lock:
 t = gData.gameData.getProductArrByType(this.tab);
-e = t[0].value;
+e = t[0].value - gData.gameData.playerProp.completeFarmTaskTimes;
 mk.tip.pop("完成" + e + "次任务红包后解锁");
 break;
 
@@ -8075,6 +8079,7 @@ gData.gameData.setFactoryDataMap(this.configID, this.data);
 this.getComponent(l.MoveToCenter).move();
 gData.gameData.changeLeftTimes(-1);
 gData.adData.checkPopRed();
+gData.gameData.addProductMakeTimesById(this.data.productID);
 gData.gameData.isProducting = !1;
 gData.gameData.nextMake = null;
 gData.gameData.setNextProduct(!1);
@@ -8097,7 +8102,6 @@ mk.ui.openPanel("module/speedUpUI/speedUp");
 e.prototype.onRipe = function(t) {
 this.data.state = s.FactroyState.Ripe;
 gData.gameData.setFactoryDataMap(this.configID, this.data, t);
-gData.gameData.addProductMakeTimesById(this.data.productID);
 };
 e.prototype.onSick = function(t) {
 this.data.state = s.FactroyState.Sick;
@@ -9766,6 +9770,7 @@ function e() {
 var e = null !== t && t.apply(this, arguments) || this;
 e.chooseType = r.ProductType.nzw;
 e.isStateChange = !1;
+e.isInit = !1;
 e.init_award = !1;
 return e;
 }
@@ -11773,7 +11778,7 @@ Object.defineProperty(o, "__esModule", {
 value: !0
 });
 o.Fun = void 0;
-var n, a = t("./AppData"), i = t("./GameData"), r = t("./HttpData"), c = t("./LoginData"), s = t("./StorageData"), l = t("./WechatData"), p = t("./module/HelpData"), u = t("./module/TurnableData"), d = t("./module/SignData"), h = t("./module/FissionData"), f = t("./AdData"), y = t("./module/RewardData"), g = t("./module/CashNormalData"), m = t("./module/ReceiptNoticeData"), _ = t("./module/BlessingBagData"), v = t("./module/CashProData"), b = t("./module/RedBagCashData"), D = t("./module/RedCodeData"), w = t("./module/MoreGameData"), S = t("./module/SettingData"), A = t("./module/GuideData"), k = t("./module/GuideWeakData"), P = t("./ConfigData"), O = t("./module/NewCashUIData"), I = t("../../before/view/data/ADUnlockData"), T = t("../../before/view/data/PlantData"), R = t("../../before/main/FarmSystem"), C = t("../../before/view/data/HarvestData"), x = t("../../before/view/data/ADClearSickData"), F = t("../../before/main/PastureSystem"), N = t("../../before/main/FactorySystem"), M = t("./module/FarmMapData"), j = t("./module/GradeRewardData"), B = t("./module/WalletCashOutData"), E = t("./module/LineUpUIData"), L = function() {
+var n, a = t("./AppData"), i = t("./GameData"), r = t("./HttpData"), c = t("./LoginData"), s = t("./StorageData"), l = t("./WechatData"), p = t("./module/HelpData"), u = t("./module/TurnableData"), d = t("./module/SignData"), h = t("./module/FissionData"), f = t("./AdData"), y = t("./module/RewardData"), g = t("./module/CashNormalData"), m = t("./module/ReceiptNoticeData"), _ = t("./module/BlessingBagData"), v = t("./module/CashProData"), b = t("./module/RedBagCashData"), D = t("./module/RedCodeData"), w = t("./module/MoreGameData"), S = t("./module/SettingData"), A = t("./module/GuideData"), k = t("./module/GuideWeakData"), P = t("./ConfigData"), O = t("./module/NewCashUIData"), I = t("../../before/view/data/ADUnlockData"), T = t("../../before/view/data/PlantData"), R = t("../../before/main/FarmSystem"), C = t("../../before/view/data/HarvestData"), F = t("../../before/view/data/ADClearSickData"), N = t("../../before/main/PastureSystem"), x = t("../../before/main/FactorySystem"), M = t("./module/FarmMapData"), j = t("./module/GradeRewardData"), B = t("./module/WalletCashOutData"), E = t("./module/LineUpUIData"), L = function() {
 function t() {
 this.init();
 }
@@ -11805,9 +11810,9 @@ this.newCashUiData = new O.NewCashUIData();
 this.adUnlockData = new I.default();
 this.plantData = new T.default();
 this.harvestData = new C.default();
-this.adClearSickData = new x.default();
-this.pastureSystem = new F.default();
-this.factorySystem = new N.default();
+this.adClearSickData = new F.default();
+this.pastureSystem = new N.default();
+this.factorySystem = new x.default();
 this.farmSystem = new R.FarmSystem();
 this.farmMapData = new M.FarmMapData();
 this.farmGradeData = new j.GradeRewardData();
@@ -12154,6 +12159,7 @@ this.init_expLevel = !1;
 this.init_redBagTask = !1;
 this.init_productTask = !1;
 this.init_speedup = !1;
+this.init_hideRedBag = !1;
 this.shareUrl = "";
 this.shareTitle = "";
 this.shareDes = "";
@@ -12510,6 +12516,7 @@ case 1:
 n = a.sent();
 mk.console.logSingle("refrehTask=>", n);
 if (0 != n.errcode) return [ 2, !1 ];
+gData.gameData.init_task = !0;
 this.playerProp.userFarmTaskInfo = n.data.userFarmTaskInfo;
 if (this.playerProp.userFarmTaskInfo.completeCount >= this.playerProp.userFarmTaskInfo.taskCount) {
 mk.ui.closeAllUI();
@@ -12570,6 +12577,7 @@ this._farmData[n].state == s.Sick && a++;
 }
 this.RawInsectCurArr[0] = a;
 }
+this.setMaxProduct(10003, !0);
 };
 t.prototype.setProductMapFromJson = function() {
 for (var t = this.configs.Product, e = t.length, o = null, n = "", a = [], i = 0; i < e; i++) {
@@ -12617,6 +12625,12 @@ this._productMakeTimesData.push(r);
 var c = t + 1, s = this.getProductMap(t), l = this.getProductMap(c);
 t == this.getMaxProduct(s.tab) && l && (gData.plantData.init_itemIndex = c);
 if (l && l.tab == s.tab && c > this.getMaxProduct(s.tab) && 1 == l.unlock && l.value <= e) {
+this._productMakeTimesMap.set(c, 0);
+r = {
+id: c,
+times: 0
+};
+this._productMakeTimesData.push(r);
 this.setMaxProduct(c);
 this.getProductMap(c + 1) && (gData.plantData.init_lock = c + 1);
 }
@@ -12648,7 +12662,7 @@ this._pastureData || (this._pastureData = []);
 var t = this._pastureData.length;
 if (t < 3) {
 for (var e = this.getProductArrByType(p.dw), o = e.length, n = 30001, a = null, r = 0; r < o; r++) {
-a = this.playerProp.gradeLevel < e[r].value ? {
+a = this.playerProp.completeFarmTaskTimes < e[r].value ? {
 id: n,
 state: l.Lock,
 productID: e[r].picture,
@@ -12696,17 +12710,20 @@ if (t < 6) {
 for (var e = 30004, o = null, n = null, a = 0; a < 6; a++) {
 n = this.getTabByConfigID(e);
 var r = this.getProductArrByType(n);
-o = this.playerProp.completeFarmTaskTimes < r[0].value ? {
+if (this.playerProp.completeFarmTaskTimes < r[0].value) o = {
 id: e,
 state: u.Lock,
 productID: 0,
 growSpan: 0
-} : {
+}; else {
+o = {
 id: e,
 state: u.Empty,
 productID: 0,
 growSpan: 0
 };
+this.setMaxProduct(r[0].picture, !0);
+}
 this._factoryData.push(o);
 this._factoryDataMap.set(e, o);
 e++;
@@ -12714,9 +12731,13 @@ e++;
 this.setProp(i.factoryData, this._factoryData);
 } else {
 var c = 0;
-for (a = 0; a < t; a++) {
+for (e = 30004, n = null, a = 0; a < t; a++) {
+n = this.getTabByConfigID(e);
+r = this.getProductArrByType(n);
 this._factoryDataMap.set(this._factoryData[a].id, this._factoryData[a]);
 this._factoryData[a].state == u.Sick && c++;
+this.playerProp.completeFarmTaskTimes >= r[0].value && this.setMaxProduct(r[0].picture, !0);
+e++;
 }
 this.RawInsectCurArr[2] = c;
 }
@@ -12817,7 +12838,6 @@ for (var t in p) {
 var e = p[t], o = this.getProductArrByType(e), n = o.length, a = null, r = !1;
 switch (e) {
 case p.nzw:
-this.setMaxProduct(10003, !0);
 break;
 
 case p.dw:
@@ -13491,6 +13511,7 @@ e.ani_add3 = null;
 e.posY = 0;
 e.lastTimeSpan = 0;
 e.span = 0;
+e.isRefreshTask = !1;
 return e;
 }
 e.prototype.onLoad = function() {
@@ -13571,16 +13592,21 @@ return [ 2 ];
 });
 };
 e.prototype.changeTaskUI = function() {
-cc.tween(this.lbl_task.node).to(.1, {
+var t = this;
+if (!this.isRefreshTask) {
+this.isRefreshTask = !0;
+cc.tween(this.lbl_task.node).delay(.6).to(.1, {
 scale: 1.2
 }).to(.1, {
 scale: 1
-}).start();
+}).call(function() {
 if (gData.gameData.playerProp.userFarmTaskInfo) {
-var t = gData.gameData.playerProp.userFarmTaskInfo.completeCount, e = gData.gameData.playerProp.userFarmTaskInfo.taskCount;
-this.lbl_task.string = "<b><color=#8D4D32>进行" + e + "次生产</c><color=#D73D25>(" + t + "/" + e + ")</color></b>";
-this.node_hand.active = t >= e;
-gData.gameData.playerProp.completeFarmTaskTimes;
+var e = gData.gameData.playerProp.userFarmTaskInfo.completeCount, o = gData.gameData.playerProp.userFarmTaskInfo.taskCount;
+t.lbl_task.string = "<b><color=#8D4D32>进行" + o + "次生产</c><color=#D73D25>(" + e + "/" + o + ")</color></b>";
+t.node_hand.active = e >= o;
+t.isRefreshTask = !1;
+}
+}).start();
 }
 gData.gameData.init_task = !1;
 };
@@ -13769,14 +13795,14 @@ void 0 === t && (t = null);
 if (t) if (this.node_taskHb && this.node_taskHb.parent) {
 var e = this.node_taskHb.parent.convertToWorldSpaceAR(this.node_taskHb.getPosition());
 mk.fly.PlayCoinAnim(1, 5, t, e, function() {
-gData.gameData.init_task = !0;
+console.log("dpFlyRedAni delay1-----");
 }, .8);
-} else gData.gameData.init_task = !0; else if (this.node_taskHb && this.node_taskHb.parent && this.btn_product) {
+} else console.log("dpFlyRedAni1-----"); else if (this.node_taskHb && this.node_taskHb.parent && this.btn_product) {
 e = this.node_taskHb.parent.convertToWorldSpaceAR(this.node_taskHb.getPosition());
 mk.fly.PlayCoinAnim(1, 5, this.btn_product, e, function() {
-gData.gameData.init_task = !0;
+console.log("dpFlyRedAni delay2-----");
 }, .8);
-} else gData.gameData.init_task = !0;
+} else console.log("dpFlyRedAni2-----");
 };
 e.prototype.doFlyExpAni = function(t, e, o) {
 var n = this, a = this.lbl_farmLevel.node.parent.convertToWorldSpaceAR(this.lbl_farmLevel.node.getPosition());
@@ -15745,10 +15771,10 @@ return [ 2 ];
 });
 };
 e.prototype.onEnable = function() {
-mk.ad.showBanner(l.BannerAdType.banner_click_6);
+mk.ad.showNative();
 };
 e.prototype.onDisable = function() {
-mk.ad.destoryBanner();
+mk.ad.destroyNativeAd();
 };
 e.prototype.clickClose = function() {
 mk.audio.playEffect("button");
@@ -16656,7 +16682,10 @@ this.pt = o;
 };
 e.prototype.clickLuckBtn = function() {
 var t = gData.gameData.getProductArrByType(this.pt);
-t && t.length > 0 && 2 == t[0].unlock && mk.tip.pop("完成" + t[0].value + "次任务红包后解锁");
+if (t && t.length > 0 && 2 == t[0].unlock) {
+var e = t[0].value - gData.gameData.playerProp.completeFarmTaskTimes;
+mk.tip.pop("完成" + e + "次任务红包后解锁");
+}
 };
 i([ l({
 displayName: "复选组件",
@@ -17092,6 +17121,9 @@ e.prototype.start = function() {
 gData.lineUpUIData.refresh = !1;
 this.lbl_tip.string = "<color=#8A4312>提现排队中，你前面还有</c><color=#EF2417>" + gData.lineUpUIData.personCount + "</color><color=#8A4312>人</color>";
 };
+e.prototype.onEnable = function() {
+mk.ad.showNative();
+};
 e.prototype.update = function() {
 if (gData.lineUpUIData.refresh) {
 console.log("lineUp=====>", gData.lineUpUIData.personCount);
@@ -17131,6 +17163,9 @@ return [ 2 ];
 });
 });
 };
+e.prototype.onDisable = function() {
+mk.ad.destroyNativeAd();
+};
 e.prototype.clickCloseBtn = function() {
 mk.audio.playEffect("button");
 };
@@ -20323,6 +20358,7 @@ e.node_cash = null;
 e.sp_icon = null;
 e.node_openBtn = null;
 e.node_getBtn = null;
+e.node_cashOut = null;
 e.data = null;
 e.cool = !1;
 return e;
@@ -20369,6 +20405,10 @@ mk.ad.destoryBanner();
 };
 e.prototype.initCashOutStyle = function(t) {
 void 0 === t && (t = 0);
+if (gData.gameData.init_hideRedBag) {
+this.node_cashOut.active = !1;
+gData.gameData.init_hideRedBag = !1;
+} else {
 0 == t && (t = gData.gameData.playerProp.redMoney);
 t /= 100;
 var e = gData.redBagCash.cash_bar, o = gData.redBagCash.getItemDataByIndex(e);
@@ -20382,6 +20422,7 @@ fillRange: a
 }).start();
 t >= o.redMoney ? this.node_cash.play() : this.node_cash.stop();
 }
+}
 };
 e.prototype.showWatchAdReward = function() {
 if (gData.reward.adData) {
@@ -20450,6 +20491,7 @@ i([ f(cc.Animation) ], e.prototype, "node_cash", void 0);
 i([ f(cc.Sprite) ], e.prototype, "sp_icon", void 0);
 i([ f(cc.Node) ], e.prototype, "node_openBtn", void 0);
 i([ f(cc.Node) ], e.prototype, "node_getBtn", void 0);
+i([ f(cc.Node) ], e.prototype, "node_cashOut", void 0);
 return i([ h ], e);
 }(cc.Component);
 o.default = y;
@@ -20965,11 +21007,14 @@ this.showGroup.removeAllChildren();
 };
 e.prototype.onTouch = function() {
 return r(this, void 0, void 0, function() {
-var t;
+var t, e;
 return c(this, function() {
 switch (this.data.state) {
 case s.PastureState.Lock:
-2 == (t = gData.gameData.getProductMap(this.data.productID)).unlock ? mk.tip.pop("完成" + t.value + "次任务红包后解锁") : 1 == t.unlock && mk.tip.pop("喂食" + t.name + t.value + "次解锁");
+if (2 == (t = gData.gameData.getProductMap(this.data.productID)).unlock) {
+e = t.value - gData.gameData.playerProp.completeFarmTaskTimes;
+mk.tip.pop("完成" + e + "次任务红包后解锁");
+} else 1 == t.unlock && mk.tip.pop("喂食" + t.name + t.value + "次解锁");
 break;
 
 case s.PastureState.Empty:
@@ -22351,6 +22396,7 @@ a(e, t);
 function e() {
 var e = null !== t && t.apply(this, arguments) || this;
 e.lbl_times = null;
+e.lbl_times2 = null;
 e.lbl_taskTimes = null;
 e.lbl_progress = null;
 e.sp_taskProgress = null;
@@ -22362,11 +22408,13 @@ return e;
 }
 e.prototype.onEnable = function() {
 var t = this;
+mk.ad.showNative();
 this.lbl_times.string = "生产次数+" + gData.gameData.configs.ServerConfig.ProductionAd;
+this.lbl_times2.string = "生产次数+" + gData.gameData.configs.ServerConfig.ProductionAd;
 gData.gameData.init_productTask = !1;
 if (gData.gameData.playerProp.userFarmTaskInfo) {
 var e = gData.gameData.playerProp.userFarmTaskInfo.completeCount, o = gData.gameData.playerProp.userFarmTaskInfo.taskCount;
-if (o <= 10) {
+if (o - e <= 10) {
 if (o > e) {
 this.lbl_taskTimes.string = (o - e).toString();
 this.node_Uncomplete.active = !0;
@@ -22442,6 +22490,9 @@ var t = parseInt(gData.gameData.configs.ServerConfig.ProductionAd);
 gData.gameData.changeLeftTimes(t);
 gData.gameData.gameStyle.playAdd(t, 2);
 };
+e.prototype.onDisable = function() {
+mk.ad.destroyNativeAd();
+};
 e.prototype.clickCloseBtn = function() {
 mk.audio.playEffect("button");
 mk.ui.closePanel(this.node.name);
@@ -22452,6 +22503,10 @@ displayName: "文本"
 }) ], e.prototype, "lbl_times", void 0);
 i([ l({
 type: cc.Label,
+displayName: "文本2"
+}) ], e.prototype, "lbl_times2", void 0);
+i([ l({
+type: cc.Label,
 displayName: "任务次数"
 }) ], e.prototype, "lbl_taskTimes", void 0);
 i([ l({
@@ -23418,11 +23473,11 @@ gData.gameData.init_task = !0;
 this.node_hand.active = !1;
 };
 e.prototype.onEnable = function() {
-mk.ad.showBanner(u.BannerAdType.banner_click_2);
+mk.ad.showNative();
 };
 e.prototype.onDisable = function() {
 mk.ui.removeRefreshEvent(this);
-mk.ad.destoryBanner();
+mk.ad.destroyNativeAd();
 };
 e.prototype.update = function(t) {
 var e = this;
@@ -23817,11 +23872,13 @@ var e = null !== t && t.apply(this, arguments) || this;
 e.node_redPoint = null;
 return e;
 }
-e.prototype.start = function() {
-this.changeStatus();
-};
+e.prototype.start = function() {};
 e.prototype.update = function() {
 gData.farmMapData.isStateChange && this.changeStatus();
+if (gData.farmMapData.isInit) {
+gData.farmMapData.isInit = !1;
+this.changeStatus();
+}
 };
 e.prototype.changeStatus = function() {
 for (var t in r.ProductType) {
@@ -27737,6 +27794,7 @@ this.node._touchListener.swallowTouches = !1;
 };
 e.prototype.onTouchStart = function() {
 gData.gameData.isTouchScreen || (gData.gameData.isTouchScreen = !0);
+mk.ui.openPanel("module/newNotice/lineUpUI");
 };
 i([ s({
 displayName: "是否注册触摸事件"
@@ -29749,7 +29807,7 @@ mk.ui.openPanel("module/newNotice/lineUpUI");
 }
 return [ 2 ];
 }
-mk.ui.closePanel("module/newNotice/lineUpUI");
+mk.ui.closePanel("lineUpUI");
 gData.gameData.playerProp.redMoneyCashPayRecordList = o.data.redMoneyCashPayRecordList;
 this.init_cashOut = !0;
 if (n = gData.gameData.configs.CashCfg) {
@@ -29818,22 +29876,28 @@ e.isCanCash = !1;
 return e;
 }
 e.prototype.start = function() {
-this.initNoviceUI();
+this.initNoviceUI(!0);
 this.initCashOutUI();
 };
-e.prototype.initNoviceUI = function() {
-var t = gData.gameData.playerProp.userNoviceWeFareInfo;
-if (t) {
-this.lbl_noviceTitle.string = t.name + ":";
-this.sp_progress.fillRange = t.progressRate;
-var e = t.cashmoney / 100, o = this.multiply(e, t.progressRate);
-mk.console.logSingle("initNoviceUI=>", o);
-var n = o.toString().split(".");
-n.length >= 2 && n[1].length > 4 ? this.lbl_noviceValue.string = o.toFixed(4) + "元" : this.lbl_noviceValue.string = o.toString() + "元";
-this.intV = Math.round(e);
+e.prototype.initNoviceUI = function(t) {
+void 0 === t && (t = !1);
+var e = gData.gameData.playerProp.userNoviceWeFareInfo;
+if (e) {
+this.lbl_noviceTitle.string = e.name + ":";
+this.sp_progress.fillRange = e.progressRate;
+var o = e.cashmoney / 100, n = this.multiply(o, e.progressRate);
+mk.console.logSingle("initNoviceUI=>", n);
+var a = n.toString().split(".");
+a.length >= 2 && a[1].length > 4 ? this.lbl_noviceValue.string = n.toFixed(4) + "元" : this.lbl_noviceValue.string = n.toString() + "元";
+t || cc.tween(this.lbl_noviceValue.node).to(.1, {
+scale: 1.2
+}).to(.1, {
+scale: 1
+}).start();
+this.intV = Math.round(o);
 this.lbl_tipUp.string = "进度加满后必得" + this.intV + "元现金";
 this.lbl_cashOut.string = "满" + this.intV + "元提现";
-t.progressRate >= 1 ? this.btn_addProgress.setGray(!0, !0) : this.btn_addProgress.setGray(!1, !0);
+e.progressRate >= 1 ? this.btn_addProgress.setGray(!0, !0) : this.btn_addProgress.setGray(!1, !0);
 }
 };
 e.prototype.multiply = function(t, e) {
@@ -29857,7 +29921,7 @@ this.initTip();
 };
 e.prototype.initTip = function() {
 this.lbl_redMoney.string = (gData.gameData.playerProp.redMoney / 100).toString();
-this.lbl_value.string = (gData.gameData.playerProp.redMoney / 1e6).toFixed(3) + "元";
+this.lbl_value.string = (gData.gameData.playerProp.redMoney / 1e6).toFixed(3);
 if (-1 != this.curChooseIndex) {
 var t = gData.gameData.configs.CashCfg[this.curChooseIndex];
 if (gData.gameData.playerProp.redMoney - t.redMoney >= 0) {

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": 1631959432382,
-    "genTime": 1631959432382,
+    "buildTime": 1632359385896,
+    "genTime": 1632359385896,
     "genVersion": null
 }