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

# Conflicts:
#	mk_framework/assets/script/game/data/g.ts

mk_framework/assets/resources/animation.meta

@@ -0,0 +1,12 @@
+{
+  "ver": "1.1.2",
+  "uuid": "b4174694-7486-40ac-8338-42f83f3db71f",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

mk_framework/assets/resources/animation/ScaleLoop0.9To1.1.anim

@@ -0,0 +1,57 @@
+{
+  "__type__": "cc.AnimationClip",
+  "_name": "ScaleLoop0.9To1.1",
+  "_objFlags": 0,
+  "_native": "",
+  "_duration": 0.6666666666666666,
+  "sample": 60,
+  "speed": 0.5,
+  "wrapMode": 2,
+  "curveData": {
+    "props": {
+      "scale": [
+        {
+          "frame": 0,
+          "value": {
+            "__type__": "cc.Vec2",
+            "x": 1,
+            "y": 1
+          }
+        },
+        {
+          "frame": 0.16666666666666666,
+          "value": {
+            "__type__": "cc.Vec2",
+            "x": 1.1,
+            "y": 1.1
+          }
+        },
+        {
+          "frame": 0.3333333333333333,
+          "value": {
+            "__type__": "cc.Vec2",
+            "x": 1,
+            "y": 1
+          }
+        },
+        {
+          "frame": 0.5,
+          "value": {
+            "__type__": "cc.Vec2",
+            "x": 0.9,
+            "y": 0.9
+          }
+        },
+        {
+          "frame": 0.6666666666666666,
+          "value": {
+            "__type__": "cc.Vec2",
+            "x": 1,
+            "y": 1
+          }
+        }
+      ]
+    }
+  },
+  "events": []
+}

mk_framework/assets/resources/animation/ScaleLoop0.9To1.1.anim.meta

@@ -0,0 +1,5 @@
+{
+  "ver": "2.1.0",
+  "uuid": "1c7cfdae-7b6c-46a5-9085-2fa8aa684ac7",
+  "subMetas": {}
+}

mk_framework/assets/resources/module/help.meta

@@ -0,0 +1,12 @@
+{
+  "ver": "1.1.2",
+  "uuid": "4b106244-c372-40da-aef6-5151ef7bd155",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

mk_framework/assets/resources/module/help/help.prefab

@@ -0,0 +1,586 @@
+[
+  {
+    "__type__": "cc.Prefab",
+    "_name": "",
+    "_objFlags": 0,
+    "_native": "",
+    "data": {
+      "__id__": 1
+    },
+    "optimizationPolicy": 0,
+    "asyncLoadAssets": false,
+    "readonly": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "help",
+    "_objFlags": 0,
+    "_parent": null,
+    "_children": [
+      {
+        "__id__": 2
+      },
+      {
+        "__id__": 8
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 13
+      },
+      {
+        "__id__": 14
+      },
+      {
+        "__id__": 15
+      },
+      {
+        "__id__": 16
+      }
+    ],
+    "_prefab": {
+      "__id__": 17
+    },
+    "_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": [
+      {
+        "__id__": 6
+      }
+    ],
+    "_prefab": {
+      "__id__": 7
+    },
+    "_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": "文字说明",
+    "_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": 500,
+      "height": 700
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        -63.193,
+        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__": 3
+    },
+    "_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": 1,
+    "_N$verticalAlign": 1,
+    "_N$fontFamily": "Arial",
+    "_N$overflow": 2,
+    "_N$cacheMode": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "60241a57-78e1-4090-aa94-5cd17ec5ebe1"
+    },
+    "fileId": "37sN6/TKNGcY20Qa3SjGaJ",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 2
+    },
+    "_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__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "60241a57-78e1-4090-aa94-5cd17ec5ebe1"
+    },
+    "fileId": "94yiGj0RFACpXt5xGEvfHf",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "关闭按钮",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 9
+      },
+      {
+        "__id__": 10
+      },
+      {
+        "__id__": 11
+      }
+    ],
+    "_prefab": {
+      "__id__": 12
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 53,
+      "height": 49
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        303.19,
+        464.26,
+        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__": 8
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "af2a7472-1f78-414a-8307-5ac0edead809"
+    },
+    "_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__": 8
+    },
+    "_enabled": true,
+    "_normalMaterial": null,
+    "_grayMaterial": null,
+    "duration": 0.1,
+    "zoomScale": 1.2,
+    "clickEvents": [],
+    "_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__": "cdc50kCRVVBa5gcp4XXxVO+",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 8
+    },
+    "_enabled": true,
+    "node_panel": {
+      "__id__": 1
+    },
+    "onComplete": [],
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "60241a57-78e1-4090-aa94-5cd17ec5ebe1"
+    },
+    "fileId": "fa5LVaRQ1Pvo1vsCRpC3Ax",
+    "sync": false
+  },
+  {
+    "__type__": "7626bHemEpG267E801XmW+W",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "lbl_desc": {
+      "__id__": 4
+    },
+    "_id": ""
+  },
+  {
+    "__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__": "58495/rJOBNGoxELFSp8G2a",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "color": {
+      "__type__": "cc.Color",
+      "r": 0,
+      "g": 0,
+      "b": 0,
+      "a": 120
+    },
+    "bClickClose": true,
+    "_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__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "60241a57-78e1-4090-aa94-5cd17ec5ebe1"
+    },
+    "fileId": "",
+    "sync": false
+  }
+]

mk_framework/assets/resources/module/help/help.prefab.meta

@@ -0,0 +1,8 @@
+{
+  "ver": "1.2.9",
+  "uuid": "60241a57-78e1-4090-aa94-5cd17ec5ebe1",
+  "optimizationPolicy": "AUTO",
+  "asyncLoadAssets": false,
+  "readonly": false,
+  "subMetas": {}
+}

mk_framework/assets/resources/module/pigBank/spine.meta

@@ -0,0 +1,12 @@
+{
+  "ver": "1.1.2",
+  "uuid": "4bf7eaa3-d71c-45bb-88dc-d8527605cdf5",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

mk_framework/assets/resources/module/pigBank/spine/pig.atlas

@@ -0,0 +1,27 @@
+
+pig.png
+size: 427,355
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+icon_hb
+  rotate: false
+  xy: 360, 270
+  size: 65, 83
+  orig: 65, 83
+  offset: 0, 0
+  index: -1
+xing
+  rotate: false
+  xy: 360, 231
+  size: 33, 37
+  orig: 35, 39
+  offset: 1, 1
+  index: -1
+zhu
+  rotate: false
+  xy: 2, 2
+  size: 356, 351
+  orig: 356, 351
+  offset: 0, 0
+  index: -1

mk_framework/assets/resources/module/pigBank/spine/pig.atlas.meta

@@ -0,0 +1,5 @@
+{
+  "ver": "1.0.1",
+  "uuid": "97d51e7c-adeb-454b-8c93-1975eaf64dd4",
+  "subMetas": {}
+}

mk_framework/assets/resources/module/pigBank/spine/pig.json.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.2.3",
+  "uuid": "18ff1999-641d-40dc-bc3f-e4efbb12918a",
+  "textures": [
+    "c7809d04-48c8-49b4-aa64-2328c414ac7b"
+  ],
+  "scale": 1,
+  "subMetas": {}
+}

mk_framework/assets/resources/module/pigBank/texture/pig.png.meta → mk_framework/assets/resources/module/pigBank/spine/pig.png.meta

@@ -1,31 +1,31 @@
 {
   "ver": "2.3.5",
-  "uuid": "774b460c-56e6-4c9f-8ea4-4a15b56cc5f3",
+  "uuid": "c7809d04-48c8-49b4-aa64-2328c414ac7b",
   "type": "sprite",
   "wrapMode": "clamp",
   "filterMode": "bilinear",
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 311,
-  "height": 305,
+  "width": 427,
+  "height": 355,
   "platformSettings": {},
   "subMetas": {
     "pig": {
       "ver": "1.0.4",
-      "uuid": "1c3e7e01-c4be-4b3c-b1a7-097da5e36458",
-      "rawTextureUuid": "774b460c-56e6-4c9f-8ea4-4a15b56cc5f3",
+      "uuid": "d40fb5e7-2ff6-484e-afef-30d1e3b133d9",
+      "rawTextureUuid": "c7809d04-48c8-49b4-aa64-2328c414ac7b",
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 0,
-      "trimY": 0,
-      "width": 311,
-      "height": 305,
-      "rawWidth": 311,
-      "rawHeight": 305,
+      "trimX": 2,
+      "trimY": 2,
+      "width": 423,
+      "height": 351,
+      "rawWidth": 427,
+      "rawHeight": 355,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

mk_framework/assets/resources/module/pigBank/texture/icon_zhubi.png.meta

@@ -1,36 +0,0 @@
-{
-  "ver": "2.3.5",
-  "uuid": "be83bd27-ad99-4bb3-9264-8589677a60d4",
-  "type": "sprite",
-  "wrapMode": "clamp",
-  "filterMode": "bilinear",
-  "premultiplyAlpha": false,
-  "genMipmaps": false,
-  "packable": true,
-  "width": 67,
-  "height": 69,
-  "platformSettings": {},
-  "subMetas": {
-    "icon_zhubi": {
-      "ver": "1.0.4",
-      "uuid": "e96518d9-bc84-454d-b976-1079e3fe676b",
-      "rawTextureUuid": "be83bd27-ad99-4bb3-9264-8589677a60d4",
-      "trimType": "auto",
-      "trimThreshold": 1,
-      "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 0,
-      "trimY": 0,
-      "width": 67,
-      "height": 69,
-      "rawWidth": 67,
-      "rawHeight": 69,
-      "borderTop": 0,
-      "borderBottom": 0,
-      "borderLeft": 0,
-      "borderRight": 0,
-      "subMetas": {}
-    }
-  }
-}

mk_framework/assets/resources/module/pigBank/texture/star.png.meta

@@ -1,36 +0,0 @@
-{
-  "ver": "2.3.5",
-  "uuid": "3b9dfff4-aefd-4ebf-af62-5a0fef6a1be9",
-  "type": "sprite",
-  "wrapMode": "clamp",
-  "filterMode": "bilinear",
-  "premultiplyAlpha": false,
-  "genMipmaps": false,
-  "packable": true,
-  "width": 30,
-  "height": 34,
-  "platformSettings": {},
-  "subMetas": {
-    "star": {
-      "ver": "1.0.4",
-      "uuid": "30c5418f-5ec4-4f2d-826d-9ef390cd6a46",
-      "rawTextureUuid": "3b9dfff4-aefd-4ebf-af62-5a0fef6a1be9",
-      "trimType": "auto",
-      "trimThreshold": 1,
-      "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 0,
-      "trimY": 0,
-      "width": 30,
-      "height": 34,
-      "rawWidth": 30,
-      "rawHeight": 34,
-      "borderTop": 0,
-      "borderBottom": 0,
-      "borderLeft": 0,
-      "borderRight": 0,
-      "subMetas": {}
-    }
-  }
-}

mk_framework/assets/script/game/component/tween/UIOpenAndClose.ts

@@ -60,6 +60,7 @@ export default class UIOpenAndClose extends cc.Component {
     }
 
     start() {
+        if (CC_EDITOR) return;
         this.showEffect();
     }
 

mk_framework/assets/script/game/data/g.ts

@@ -6,6 +6,8 @@ import { HttpData } from "./HttpData";
 import { LoginData } from "./LoginData";
 import { StorageData } from "./StorageData";
 import { WechatData } from "./WechatData";
+import { HelpData } from "./module/HelpData";
+import { PigBankData } from "./module/PigBankData";
 
 /**
  * 数据集合全局类
@@ -24,8 +26,10 @@ class g {
     public httpData:HttpData;
     public adData:AdData;
     public storageData:StorageData;
+    public help:HelpData;
+    public pigbank:PigBankData;
 
-    private moduleDataMap:Map<string,Data>;
+    public moduleDataMap:Map<string,Data>;
 
     init() {
         this.appData = new AppData();
@@ -35,11 +39,15 @@ class g {
         this.httpData = new HttpData();
         this.adData = new AdData();
         this.storageData = new StorageData();
+
+        this.help = new HelpData();
+        this.pigbank = new PigBankData();
     } 
 
     public initModuleData(data){
         this.moduleDataMap = new Map<string,Data>();
         
+        // for
         
     }
     

mk_framework/assets/script/game/data/module/HelpData.ts

@@ -0,0 +1,18 @@
+
+/**
+ * 帮助说明数据
+ * @author
+ */
+export class HelpData {
+    /**
+     * 要初始化的界面key
+     */
+    public init_desc_name: string = '';
+
+    /** 获取描述内容 */
+    public getDescContent(panel_name: string): string {
+        let content = '';
+        content = '唧唧歪歪唧唧歪歪';
+        return content
+    }
+}

mk_framework/assets/script/game/data/module/HelpData.ts.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.8",
+  "uuid": "aaac0b77-fe26-48b9-8e21-b9832159424b",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

mk_framework/assets/script/game/data/module/PigBankData.ts

@@ -1,7 +1,34 @@
 /**
  * 存钱罐数据
+ * - 提现描述显示：
+ * 1.判断是否可提，
+ *  可提显示“直接提现”
+ *  不可提判断存款是否满足提现最低限制
+ *      满足显示：“明日提现”，
+ *      不满足显示：“满x可提”
  * @author 
  */
 export class PigBankData {
-    
+    /** 是否可提现 */
+    public cash_enable: boolean = true;
+    /** 当前存款 */
+    public cur_cash_count: number = 0.36;
+
+    /** 提现最低限制 */
+    public cash_min_limit: number = 0.3;
+    /** 存款最高限制 */
+    public cash_max_limit: number = 0.45;
+    /** 
+     * 视频数最低限制 
+     * 存钱罐提现次数*10【配置】，未满足视频数要求则不打款
+    */
+    public ad_count_min_limit: number = 0;
+
+    /** 
+     * 提现操作
+     * - 此处需要对接服务端数据
+     */
+    public cashOP() {
+        this.cash_enable = false;
+    }
 }

mk_framework/assets/script/game/module/module/help.meta

@@ -0,0 +1,12 @@
+{
+  "ver": "1.1.2",
+  "uuid": "e6591f5c-356b-4464-97b1-06c597005169",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

mk_framework/assets/script/game/module/module/help/Help.ts

@@ -0,0 +1,31 @@
+
+/**
+ * 帮助说明数据
+ * @author
+ */
+const { ccclass, property } = cc._decorator;
+
+@ccclass
+export default class NewClass extends cc.Component {
+
+    @property({ type: cc.Label, displayName: '文字说明' })
+    private lbl_desc: cc.Label = null;
+
+    onLoad() {
+
+    }
+
+    start() {
+
+    }
+
+    update(dt) {
+        if (g.help.init_desc_name) {
+            this.initDesc();
+            g.help.init_desc_name = '';
+        }
+    }
+    private initDesc() {
+        this.lbl_desc.string = g.help.getDescContent(g.help.init_desc_name);
+    }
+}

mk_framework/assets/script/game/module/module/help/Help.ts.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.8",
+  "uuid": "7626b1de-984a-46db-aec4-f34d57996f96",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

mk_framework/assets/script/game/module/module/pigBank/PigBank.ts

@@ -11,32 +11,41 @@ export default class PigBank extends cc.Component {
     private lbl_get_desc: cc.Label = null!;
     @property({ type: cc.Label, displayName: '存款数量' })
     private lbl_deposit: cc.Label = null!;
+    @property({ type: cc.Node, displayName: '提示动画' })
+    private node_tip_anim: cc.Node = null!;
+    @property({ type: cc.Animation, displayName: '提现动画' })
+    private anim_btn_cash: cc.Animation = null!;
+
     onLoad() {
 
     }
 
     start() {
-        this.initGetDesc();
+        this.initCashDesc();
     }
 
-    update(dt) {
-
-    }
+    // update(dt) {
+    // }
 
-    /** 按钮描述展示 */
-    private initGetDesc() {
-        if (false) {
-            this.lbl_get_desc.string = '明日可提现';
+    /** 
+     * 提现描述展示
+     */
+    private initCashDesc() {
+        if (g.pigbank.cash_enable) {
+            this.lbl_get_desc.string = '直接提现';
+            this.node_tip_anim.active = false;
+            this.anim_btn_cash.play();
         } else {
-            this.lbl_get_desc.string = '满' + 0.3 + '元可提现';
+            if (g.pigbank.cur_cash_count >= g.pigbank.cash_min_limit) {
+                this.lbl_get_desc.string = '明日可提现';
+            } else {
+                this.lbl_get_desc.string = '满' + g.pigbank.cash_min_limit + '元可提';
+            }
+            this.node_tip_anim.active = true;
+            this.anim_btn_cash.stop();
+            this.anim_btn_cash.node.scale = 1;
         }
-    }
-
-    /**
-     * 提现操作
-     */
-    private cashOP() {
-
+        this.initDeposit()
     }
 
     /** 
@@ -44,14 +53,24 @@ export default class PigBank extends cc.Component {
      * - 精确到分
      */
     private initDeposit() {
-        const count = 0
-        this.lbl_deposit.string = 0 + '元';
+        const new_count = g.pigbank.cur_cash_count.toFixed(2)
+        this.lbl_deposit.string = new_count + '元';
     }
 
     /**
-     * 打开帮助界面
+     * 提现操作
      */
-    private openHelpPanel() {
+    private clickCashOP() {
+        g.pigbank.cashOP();
+        mk.ui.closePanel(this.node.name);
+    }
 
+    /**
+     * 打开帮助界面完成回调
+     */
+    private async clickOpenHelpCall() {
+        g.help.init_desc_name = this.node.name;
     }
+
+
 }