1

assets/resources/module/authUI.meta

@@ -0,0 +1,12 @@
+{
+  "ver": "1.1.2",
+  "uuid": "6ef49986-2424-414f-a55f-4c6a4df3655f",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

assets/resources/module/authUI/authUI.prefab

@@ -191,7 +191,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 640,
-      "height": 440
+      "height": 418
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -203,7 +203,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        0,
+        102.156,
         0,
         0,
         0,
@@ -267,7 +267,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        155,
+        151,
         0,
         0,
         0,
@@ -362,7 +362,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 468,
+      "width": 576,
       "height": 50.4
     },
     "_anchorPoint": {
@@ -375,7 +375,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        28,
+        48.065,
         0,
         0,
         0,
@@ -414,8 +414,8 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "点击登录，即可提现至微信。",
-    "_N$string": "点击登录，即可提现至微信。",
+    "_string": "红包将提现至微信，登录后立即到账",
+    "_N$string": "红包将提现至微信，登录后立即到账",
     "_fontSize": 36,
     "_lineHeight": 40,
     "_enableWrapText": true,
@@ -486,7 +486,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        -156.855,
+        -135.142,
         0,
         0,
         0,
@@ -678,7 +678,7 @@
       "ctor": "Float64Array",
       "array": [
         301.701,
-        211.879,
+        206.879,
         0,
         0,
         0,
@@ -778,7 +778,7 @@
     "_spriteFrame": {
       "__uuid__": "31b9d6f4-396d-4c0b-8d97-61c26fccb8e3"
     },
-    "_type": 0,
+    "_type": 1,
     "_sizeMode": 0,
     "_fillType": 0,
     "_fillCenter": {

assets/resources/module/authUI/texture/bg5.png.meta

@@ -26,8 +26,8 @@
       "height": 380,
       "rawWidth": 640,
       "rawHeight": 380,
-      "borderTop": 0,
-      "borderBottom": 0,
+      "borderTop": 319,
+      "borderBottom": 27,
       "borderLeft": 0,
       "borderRight": 0,
       "subMetas": {}

assets/resources/module/guide/guide.prefab

@@ -1467,7 +1467,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 350,
+      "width": 360,
       "height": 63
     },
     "_anchorPoint": {
@@ -1543,7 +1543,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -165,
+        -180,
         -31.5,
         0,
         0,
@@ -1612,7 +1612,7 @@
     "asset": {
       "__uuid__": "5f53c125-7a14-4ca0-986a-0e0d2d665268"
     },
-    "fileId": "a34JFm7lRGs5qGFGrazuYw",
+    "fileId": "1eIVJLASNF8r9t1MuRoQj4",
     "sync": false
   },
   {
@@ -1642,7 +1642,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 210,
+      "width": 240,
       "height": 63
     },
     "_anchorPoint": {
@@ -1654,7 +1654,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -45,
+        -60,
         -31.5,
         0,
         0,
@@ -1695,8 +1695,8 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "《开心农乐园》",
-    "_N$string": "《开心农乐园》",
+    "_string": "《开农场当首富》",
+    "_N$string": "《开农场当首富》",
     "_fontSize": 30,
     "_lineHeight": 50,
     "_enableWrapText": true,
@@ -1723,7 +1723,7 @@
     "asset": {
       "__uuid__": "5f53c125-7a14-4ca0-986a-0e0d2d665268"
     },
-    "fileId": "00qfg2gz5EoahW2fmjuHvZ",
+    "fileId": "d64inp+DRNM5v8cbVwcY3G",
     "sync": false
   },
   {
@@ -1736,14 +1736,14 @@
     "_enabled": true,
     "_fontFamily": "Arial",
     "_isSystemFontUsed": false,
-    "_N$string": "<color=8A4312>欢迎来到<color=ff0000>《开心农乐园》</color></color>",
+    "_N$string": "<color=8A4312>欢迎来到<color=ff0000>《开农场当首富》</color></color>",
     "_N$horizontalAlign": 1,
     "_N$fontSize": 30,
     "_N$font": {
       "__uuid__": "0bc2f1e8-1dd4-45ba-8f7e-36c47dde4152"
     },
     "_N$cacheMode": 0,
-    "_N$maxWidth": 350,
+    "_N$maxWidth": 360,
     "_N$lineHeight": 50,
     "_N$imageAtlas": null,
     "_N$handleTouchEvent": false,
@@ -2374,6 +2374,7 @@
     },
     "_enabled": true,
     "isFitSpecialNode": false,
+    "offset": 80,
     "_id": ""
   },
   {

assets/resources/module/warnTip.meta

@@ -0,0 +1,12 @@
+{
+  "ver": "1.1.2",
+  "uuid": "1593abca-f91e-4f64-a7e7-33ca494d5f7b",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

assets/resources/module/warnTip/WarnTipPanel.prefab

@@ -0,0 +1,1294 @@
+[
+  {
+    "__type__": "cc.Prefab",
+    "_name": "",
+    "_objFlags": 0,
+    "_native": "",
+    "data": {
+      "__id__": 1
+    },
+    "optimizationPolicy": 0,
+    "asyncLoadAssets": false,
+    "readonly": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "WarnTipPanel",
+    "_objFlags": 0,
+    "_parent": null,
+    "_children": [
+      {
+        "__id__": 2
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 34
+      },
+      {
+        "__id__": 35
+      },
+      {
+        "__id__": 36
+      },
+      {
+        "__id__": 37
+      }
+    ],
+    "_prefab": {
+      "__id__": 38
+    },
+    "_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
+      },
+      {
+        "__id__": 6
+      },
+      {
+        "__id__": 9
+      },
+      {
+        "__id__": 18
+      },
+      {
+        "__id__": 24
+      }
+    ],
+    "_active": true,
+    "_components": [],
+    "_prefab": {
+      "__id__": 33
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 0,
+      "height": 0
+    },
+    "_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": "Img",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 2
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 4
+      }
+    ],
+    "_prefab": {
+      "__id__": 5
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 612,
+      "height": 485
+    },
+    "_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.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 3
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "5d5951b0-7033-4455-8c08-28285df66248"
+    },
+    "_type": 1,
+    "_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__": "879eb3b1-6a64-47bd-a0ce-54cc4bc8044b"
+    },
+    "fileId": "deBmk+61tMoKs3EqrzhPwK",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "title",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 2
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 7
+      }
+    ],
+    "_prefab": {
+      "__id__": 8
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 229,
+      "b": 210,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 138,
+      "height": 53
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        221.376,
+        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.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 6
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "2722f6f5-e260-46ca-8a91-e6aa86173d7d"
+    },
+    "_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.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "879eb3b1-6a64-47bd-a0ce-54cc4bc8044b"
+    },
+    "fileId": "e0Yu3MIoNGX4nTVTtDRqYe",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "txt",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 2
+    },
+    "_children": [
+      {
+        "__id__": 10
+      },
+      {
+        "__id__": 13
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 16
+      }
+    ],
+    "_prefab": {
+      "__id__": 17
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 146,
+      "g": 96,
+      "b": 72,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 580,
+      "height": 135.6
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        71.217,
+        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.PrivateNode",
+    "_name": "RICHTEXT_CHILD",
+    "_objFlags": 1024,
+    "_parent": {
+      "__id__": 9
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 11
+      }
+    ],
+    "_prefab": {
+      "__id__": 12
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 146,
+      "g": 96,
+      "b": 72,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 560,
+      "height": 75.6
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        -280,
+        -7.799999999999997,
+        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__": 10
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "系统检测到您的账号存在异常，",
+    "_N$string": "系统检测到您的账号存在异常，",
+    "_fontSize": 40,
+    "_lineHeight": 60,
+    "_enableWrapText": true,
+    "_N$file": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_batchAsBitmap": false,
+    "_styleFlags": 1,
+    "_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__": "879eb3b1-6a64-47bd-a0ce-54cc4bc8044b"
+    },
+    "fileId": "5ffP4hmhtPELq9q3TmEWF1",
+    "sync": false
+  },
+  {
+    "__type__": "cc.PrivateNode",
+    "_name": "RICHTEXT_CHILD",
+    "_objFlags": 1024,
+    "_parent": {
+      "__id__": 9
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 14
+      }
+    ],
+    "_prefab": {
+      "__id__": 15
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 146,
+      "g": 96,
+      "b": 72,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 280,
+      "height": 75.6
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        -140,
+        -67.8,
+        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__": 13
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "禁止登陆游戏！",
+    "_N$string": "禁止登陆游戏！",
+    "_fontSize": 40,
+    "_lineHeight": 60,
+    "_enableWrapText": true,
+    "_N$file": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_batchAsBitmap": false,
+    "_styleFlags": 1,
+    "_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__": "879eb3b1-6a64-47bd-a0ce-54cc4bc8044b"
+    },
+    "fileId": "b1KQ/id/9FHrjogCSPxazW",
+    "sync": false
+  },
+  {
+    "__type__": "cc.RichText",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 9
+    },
+    "_enabled": true,
+    "_fontFamily": "Arial",
+    "_isSystemFontUsed": true,
+    "_N$string": "<b>系统检测到您的账号存在异常，禁止登陆游戏！</b>",
+    "_N$horizontalAlign": 1,
+    "_N$fontSize": 40,
+    "_N$font": null,
+    "_N$cacheMode": 0,
+    "_N$maxWidth": 580,
+    "_N$lineHeight": 60,
+    "_N$imageAtlas": null,
+    "_N$handleTouchEvent": true,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "879eb3b1-6a64-47bd-a0ce-54cc4bc8044b"
+    },
+    "fileId": "a5P40aYvJKY6H67E/jTQ8/",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "关闭按钮",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 2
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 19
+      },
+      {
+        "__id__": 20
+      },
+      {
+        "__id__": 21
+      }
+    ],
+    "_prefab": {
+      "__id__": 23
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 67,
+      "height": 70
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        276.494,
+        245.647,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        0
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 18
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "a745272d-b658-4e0c-92b0-bf7b0eafa54a"
+    },
+    "_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.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 18
+    },
+    "_enabled": true,
+    "alignMode": 1,
+    "_target": null,
+    "_alignFlags": 1,
+    "_left": 0,
+    "_right": 0,
+    "_top": -280.647,
+    "_bottom": 0,
+    "_verticalCenter": 0,
+    "_horizontalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 0,
+    "_originalHeight": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cdc50kCRVVBa5gcp4XXxVO+",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 18
+    },
+    "_enabled": true,
+    "node_panel": {
+      "__id__": 1
+    },
+    "transition_type": 3,
+    "onComplete": [
+      {
+        "__id__": 22
+      }
+    ],
+    "_id": ""
+  },
+  {
+    "__type__": "cc.ClickEvent",
+    "target": {
+      "__id__": 1
+    },
+    "component": "",
+    "_componentId": "7626bHemEpG267E801XmW+W",
+    "handler": "onClickClose",
+    "customEventData": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "879eb3b1-6a64-47bd-a0ce-54cc4bc8044b"
+    },
+    "fileId": "b9vmQdzZdIEIuZc2X9hlrX",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "button",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 2
+    },
+    "_children": [
+      {
+        "__id__": 25
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 29
+      },
+      {
+        "__id__": 30
+      }
+    ],
+    "_prefab": {
+      "__id__": 32
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 328,
+      "height": 137
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        -110.522,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        0
+      ]
+    },
+    "_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__": 24
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 26
+      },
+      {
+        "__id__": 27
+      }
+    ],
+    "_prefab": {
+      "__id__": 28
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 253,
+      "g": 255,
+      "b": 229,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 104,
+      "height": 67
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        8.269,
+        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__": 25
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "确定",
+    "_N$string": "确定",
+    "_fontSize": 50,
+    "_lineHeight": 50,
+    "_enableWrapText": true,
+    "_N$file": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_batchAsBitmap": false,
+    "_styleFlags": 1,
+    "_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__": 25
+    },
+    "_enabled": true,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 109,
+      "g": 209,
+      "b": 0,
+      "a": 255
+    },
+    "_width": 2,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "879eb3b1-6a64-47bd-a0ce-54cc4bc8044b"
+    },
+    "fileId": "0eZcf37/xC07UiQy56Ebtn",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 24
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "3693dbd5-cbab-4811-b3b3-dba416a1a854"
+    },
+    "_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__": 24
+    },
+    "_enabled": true,
+    "_normalMaterial": null,
+    "_grayMaterial": null,
+    "duration": 0.1,
+    "zoomScale": 1.2,
+    "clickEvents": [
+      {
+        "__id__": 31
+      }
+    ],
+    "_N$interactable": true,
+    "_N$enableAutoGrayEffect": false,
+    "_N$transition": 3,
+    "transition": 3,
+    "_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": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.ClickEvent",
+    "target": {
+      "__id__": 1
+    },
+    "component": "",
+    "_componentId": "d28f5FCuBxNc528DnLMDbW1",
+    "handler": "onClickSure",
+    "customEventData": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "879eb3b1-6a64-47bd-a0ce-54cc4bc8044b"
+    },
+    "fileId": "f8qsed/r1LLqv7gJhbkjTD",
+    "sync": false
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "879eb3b1-6a64-47bd-a0ce-54cc4bc8044b"
+    },
+    "fileId": "60cidUleBG9LAsPLgtBy77",
+    "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": 0,
+    "_originalHeight": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "ac053zwqaRD6IJmTlQWmefZ",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "effect_par": {
+      "__id__": 2
+    },
+    "open_effect": 1,
+    "close_effect": 1,
+    "close_toPoint": "",
+    "_id": ""
+  },
+  {
+    "__type__": "58495/rJOBNGoxELFSp8G2a",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "color": {
+      "__type__": "cc.Color",
+      "r": 0,
+      "g": 0,
+      "b": 0,
+      "a": 230
+    },
+    "design_block_node": {
+      "__id__": 3
+    },
+    "bClickClose": false,
+    "onComplete": [],
+    "_id": ""
+  },
+  {
+    "__type__": "d28f5FCuBxNc528DnLMDbW1",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "labDes": {
+      "__id__": 16
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "879eb3b1-6a64-47bd-a0ce-54cc4bc8044b"
+    },
+    "fileId": "",
+    "sync": false
+  }
+]

assets/resources/module/warnTip/WarnTipPanel.prefab.meta

@@ -0,0 +1,8 @@
+{
+  "ver": "1.2.9",
+  "uuid": "879eb3b1-6a64-47bd-a0ce-54cc4bc8044b",
+  "optimizationPolicy": "AUTO",
+  "asyncLoadAssets": false,
+  "readonly": false,
+  "subMetas": {}
+}

assets/resources/module/warnTip/texture.meta

@@ -0,0 +1,12 @@
+{
+  "ver": "1.1.2",
+  "uuid": "c9546de7-d626-44da-b880-0f4683628ddf",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

assets/resources/module/warnTip/texture/button.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "e7297ffa-e561-405e-a045-61fc0ea2e653",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 328,
+  "height": 137,
+  "platformSettings": {},
+  "subMetas": {
+    "button": {
+      "ver": "1.0.4",
+      "uuid": "3693dbd5-cbab-4811-b3b3-dba416a1a854",
+      "rawTextureUuid": "e7297ffa-e561-405e-a045-61fc0ea2e653",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 328,
+      "height": 137,
+      "rawWidth": 328,
+      "rawHeight": 137,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/module/warnTip/texture/close.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "da40028e-67be-4614-a957-4c4c9199cab9",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 67,
+  "height": 70,
+  "platformSettings": {},
+  "subMetas": {
+    "close": {
+      "ver": "1.0.4",
+      "uuid": "961aee74-19f5-4ac8-9479-785297f2b0fd",
+      "rawTextureUuid": "da40028e-67be-4614-a957-4c4c9199cab9",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 67,
+      "height": 70,
+      "rawWidth": 67,
+      "rawHeight": 70,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/module/warnTip/texture/popup.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "9f6db71b-517e-4be1-8d33-c57450c5785e",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 612,
+  "height": 692,
+  "platformSettings": {},
+  "subMetas": {
+    "popup": {
+      "ver": "1.0.4",
+      "uuid": "aca0beb2-7170-4e1b-b53e-eca19466e9e9",
+      "rawTextureUuid": "9f6db71b-517e-4be1-8d33-c57450c5785e",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 612,
+      "height": 692,
+      "rawWidth": 612,
+      "rawHeight": 692,
+      "borderTop": 143,
+      "borderBottom": 74,
+      "borderLeft": 79,
+      "borderRight": 84,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/module/warnTip/texture/tishi.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "a607612b-4600-4865-868a-69b498038ee6",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 138,
+  "height": 53,
+  "platformSettings": {},
+  "subMetas": {
+    "tishi": {
+      "ver": "1.0.4",
+      "uuid": "1c766b80-5b04-4013-8a3a-7cf76d14343b",
+      "rawTextureUuid": "a607612b-4600-4865-868a-69b498038ee6",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 138,
+      "height": 53,
+      "rawWidth": 138,
+      "rawHeight": 53,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/script/game/data/AdData.ts

@@ -156,7 +156,7 @@ export class AdData {
      * 8:插屏-全屏视频 完播、9:插屏-全屏视频 展示、10:插屏-全屏视频 加载失败、11:插屏加载失败、12:信息流加载失败、13:开屏加载失败、14:banner加载失败、
      * 51:激励视频点击、52:插屏点击、53:信息流点击、54:开屏点击、55:banner点击、56:插屏-全屏视频点击
      */
-    public updateADLog(type, placementId, data = null) {
+    public async updateADLog(type, placementId, data = null) {
         let sData = null
         if (!data) {
             sData = {
@@ -205,7 +205,14 @@ export class AdData {
             }
         }
 
-        mk.http.sendData('updateADLog', sData);
+        let response = await mk.http.sendData('updateADLog', sData);
+        if (response && response.errcode == 0) {
+            if (response.data) {
+                mk.console.logSingle('solution  ', response);
+                //0-无处理;1-警告;2-封广告30分钟;3-封广告12小时;4-用户拉黑
+                gData.warnTipData.setSolution(response.data.solution);
+            }
+        }
     }
 
     /** 初始化ecpm及弹出广告相关数据 */

assets/script/game/data/GData.ts

@@ -32,9 +32,9 @@ import PastureSystem from "../../before/main/PastureSystem";
 import FactorySystem from "../../before/main/FactorySystem";
 import { FarmMapData } from "./module/FarmMapData";
 import { GradeRewardData } from "./module/GradeRewardData";
-import WalletCashOut from "../module/newCashUI/WalletCashOut";
 import { WalletCashOutData } from "./module/WalletCashOutData";
 import { LineUpUIData } from "./module/LineUpUIData";
+import WarnTipData from "./module/WarnTipData";
 
 /**
  * 数据集合全局类
@@ -92,7 +92,8 @@ class GData {
     public farmGradeData: GradeRewardData;
     public walletCashOutData: WalletCashOutData;
     public lineUpUIData: LineUpUIData;
-
+    public warnTipData: WarnTipData;
+    
     public moduleData: Map<number, Data>;
 
     init() {
@@ -134,6 +135,7 @@ class GData {
         this.farmGradeData = new GradeRewardData();
         this.walletCashOutData = new WalletCashOutData();
         this.lineUpUIData = new LineUpUIData();
+        this.warnTipData = new WarnTipData();
 
         this.moduleData = new Map<number, Data>();
         this.moduleData.set(Fun.moreGame, this.moreGame);

assets/script/game/data/LoginData.ts

@@ -234,9 +234,9 @@ export class LoginData {
         }
         let response = await mk.http.sendRequest('checklogin', 'POST', JSON.stringify(data));
         if (response.errcode != 0) {
-            // if (response.errcode == 403) {
-            //     mk.ui.openPanel('module/newNotice/warmPrompt');
-            // }
+            if (response.errcode == 403) {
+                gData.warnTipData.setSolution(4);
+            }
             return;
         }
         let decryptData;

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

@@ -0,0 +1,24 @@
+
+const { ccclass } = cc._decorator;
+
+@ccclass
+export default class WarnTipData {
+    //当前状态 0-无处理;1-警告;2-封广告30分钟;3-封广告12小时;4-用户拉黑
+    curSolution = 0;
+    tipArr = ['',
+        '<b>您点击广告太频繁了，请降低点击广告频率以免被封！</b>',
+        '<b>您点击广告太频繁了，封禁广告30分钟！</b>',
+        '<b>您点击广告太频繁了，封禁广告12小时！</b>',
+        '<b>系统检测到您的账号存在异常，禁止登陆游戏！</b>']
+
+    setSolution(solution) {
+        if (this.curSolution != solution) {
+            this.curSolution = solution;
+            mk.storage.setStorage('solution', this.curSolution);
+        }
+
+        if (this.curSolution >= 1) {
+            mk.ui.openPanel('module/warnTip/WarnTipPanel');
+        }
+    }
+}

assets/script/game/data/module/WarnTipData.ts.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.8",
+  "uuid": "c7e3e042-78e0-4c47-97c4-90eff2673bb5",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

assets/script/game/module/authUI.meta

@@ -0,0 +1,12 @@
+{
+  "ver": "1.1.2",
+  "uuid": "4c6c3689-1787-4aa9-a73e-be7774de5053",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

assets/script/game/module/authUI/AuthUI.ts

@@ -14,4 +14,12 @@ export default class AuthUI extends cc.Component {
         mk.audio.playEffect('button');
         JsbSystem.WxAuth();
     }
+
+    onEnable() {
+        mk.ad.showNative();
+    }
+
+    onDisable() {
+        mk.ad.destroyNativeAd();
+    }
 }

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

@@ -199,15 +199,15 @@ export default class BlessingBag extends cc.Component {
     Click_AdProgressBtn() {
 
         mk.audio.playEffect("button");
-        if (cc.sys.isNative && !gData.loginData.isAuth) {
-            // JsbSystem.WxAuth();
-            mk.ui.openPanel('module/authUI/authUI');
-            return;
-        }
         if (gData.blessingBag.videoRbData.isVideo == 1) {
             //免费加进度
             gData.blessingBag.addProgress();
         } else {
+            if (cc.sys.isNative && !gData.loginData.isAuth) {
+                // JsbSystem.WxAuth();
+                mk.ui.openPanel('module/authUI/authUI');
+                return;
+            }
             //if (gData.blessingBag.videoRbData.leftVideoTimes > 0) {
             mk.ad.videoAdType = VideoAdType.video_init_15;
             mk.ad.watchAd(async (success: boolean) => {

assets/script/game/module/reward/Reward.ts

@@ -97,12 +97,6 @@ export default class Reward extends cc.Component {
                 rewardNum = Math.round(rewardNum / 100);
                 this.lbl_des.string = '红包币'
             } else {
-
-                let com = gData.gameData.playerProp.userFarmTaskInfo.completeCount;
-                let count = gData.gameData.playerProp.userFarmTaskInfo.taskCount;
-                let curDes = `<color=8A4312>继续生产，还有<color=ff0000>${count - com}次</color>即可\n提现<color=ff0000>！</color></color>`;
-                mk.guide.open(3, curDes);
-
                 this.lbl_des.string = '生产次数'
             }
             this.lbl_reward_num.string = `+${rewardNum}`;
@@ -119,6 +113,13 @@ export default class Reward extends cc.Component {
      */
     private clickGetReward() {
         // cc.log('获取奖励：', gData.reward.data);
+        if (gData.reward.data[0].rewardType == RewardType.productTimes) {
+            let com = gData.gameData.playerProp.userFarmTaskInfo.completeCount;
+            let count = gData.gameData.playerProp.userFarmTaskInfo.taskCount;
+            let curDes = `<color=8A4312>继续生产，还有<color=ff0000>${count - com}次</color>即可\n提现<color=ff0000>！</color></color>`;
+            mk.guide.open(3, curDes);
+        }
+
         let world_Pos = this.node_hb.node.parent.convertToWorldSpaceAR(this.node_hb.node.getPosition());
         gData.reward.flyCoinAnim(world_Pos);
         if (gData.reward.callback) {

assets/script/game/module/warnTip.meta

@@ -0,0 +1,12 @@
+{
+  "ver": "1.1.2",
+  "uuid": "518ae898-8550-4f88-a2ca-a1c69f6df3ab",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

assets/script/game/module/warnTip/WarnTipPanel.ts

@@ -0,0 +1,24 @@
+/** 提示框 */
+
+const { ccclass, property } = cc._decorator;
+
+@ccclass
+export default class WarnTipPanel extends cc.Component {
+
+    @property(cc.RichText)
+    labDes: cc.RichText = null;
+
+    onEnable() {
+        this.labDes.string = gData.warnTipData.tipArr[gData.warnTipData.curSolution];
+    }
+
+    onClickSure() {
+        mk.audio.playEffect('button');
+        if (gData.warnTipData.curSolution == 4) {
+            cc.game.end();
+        }
+        else {
+            mk.ui.closePanel(this.node.name);
+        }
+    }
+}

assets/script/game/module/warnTip/WarnTipPanel.ts.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.8",
+  "uuid": "d28f5142-b81c-4d73-9dbc-0e72cc0db5b5",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

assets/script/mk/system/HttpSystem.ts

@@ -107,11 +107,11 @@ export default class HttpSystem {
 
         response.data = data;
 
-        // if (response.errcode != 0) {
-        //     if (response.errcode == -10003 || response.errcode == -20003) {
-        //         mk.ui.openPanel('module/newNotice/warmPrompt');
-        //     }
-        // }
+        if (response.errcode != 0) {
+            if (response.errcode == -10003 || response.errcode == -20003) {
+                gData.warnTipData.setSolution(4);
+            }
+        }
 
         return response;
     }

assets/script/mk/utils/TimeUtil.ts

@@ -79,11 +79,11 @@ export default class TimeUtil {
     }
 
     /**
-     * 倒计时转换为时间格式，带中文单位 ，可过滤
-     * @param   t     时间（秒）
-     * @param   f     格式，默认"天时分秒"，可以过滤，如 "分秒"
-     * @returns       规定格式的字符串 如“2天13时11分05秒”
-     */
+      * 倒计时转换为时间格式，带中文单位 ，可过滤
+      * @param   t     时间（秒）
+      * @param   f     格式，默认"天时分秒"，可以过滤，如 "分秒"
+      * @returns       规定格式的字符串 如“2天13时11分05秒”
+      */
     public formatWithUnit(t: number, f: string = "天时分秒"): string {
         let d: number = Math.floor(t / 24 / 3600);
         let h: number = Math.floor((t / 3600) % 24);
@@ -101,28 +101,37 @@ export default class TimeUtil {
         let str = '';
 
         if (f.indexOf("天") != -1) {
-            str += d + "天";
+            if (d > 0) {
+                str += d + "天";
+            }
         }
         else {
             h += d * 24;
         }
 
         if (f.indexOf("时") != -1) {
-            str += parse_format(h, "时");
+            if (h > 0) {
+                // str += parse_format(h, "时");
+                str += h + "时";
+            }
         }
         else {
             m += h * 60;
         }
 
         if (f.indexOf("分") != -1) {
-            str += parse_format(m, "分");
+            if (m > 0) {
+                // str += parse_format(m, "分");
+                str += m + "分";
+            }
         }
         else {
             s += m * 60;
         }
 
         if (f.indexOf("秒") != -1) {
-            str += parse_format(s, "秒");
+            // str += parse_format(s, "秒");
+            str += s + "秒";
         }
         return str;
     }
@@ -181,7 +190,7 @@ export default class TimeUtil {
      * @returns            当前时间字符串
      */
 
-    public getNowDayStringExtend(data?:number, replace: string = '-'): string {
+    public getNowDayStringExtend(data?: number, replace: string = '-'): string {
         function parse_format(t: number): string {
             let s: string = t.toString();
             if (t < 10) {
@@ -190,8 +199,8 @@ export default class TimeUtil {
             return s;
         }
 
-        let date = data?new Date(data):new Date();   
-        return date.getFullYear() + replace + (parse_format(date.getMonth()+1)) + replace + parse_format(date.getDate()) + '  ' + parse_format(date.getHours()) + ':' + parse_format(date.getMinutes()) + ':' + parse_format(date.getSeconds());
+        let date = data ? new Date(data) : new Date();
+        return date.getFullYear() + replace + (parse_format(date.getMonth() + 1)) + replace + parse_format(date.getDate()) + '  ' + parse_format(date.getHours()) + ':' + parse_format(date.getMinutes()) + ':' + parse_format(date.getSeconds());
     }
 
     //等待seconds时间戳

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

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

packages-hot-update/cfg.json

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