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

# Conflicts:
#	assets/script/game/data/GData.ts

assets/resources/module/cashOutRecord/texture.meta → assets/resources/game/prefab/texture.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.2",
-  "uuid": "138a08a6-686c-48d4-bbb8-218c3dbfde91",
+  "uuid": "9a1cfc78-9e3b-482f-b382-886a5b8402b4",
   "isBundle": false,
   "bundleName": "",
   "priority": 1,

assets/resources/game/prefab/texture/tishi.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "b0303b98-2bf5-4326-9d06-07512f85e341",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 750,
+  "height": 110,
+  "platformSettings": {},
+  "subMetas": {
+    "tishi": {
+      "ver": "1.0.4",
+      "uuid": "e861f3aa-d305-4983-a24a-a23db83aae98",
+      "rawTextureUuid": "b0303b98-2bf5-4326-9d06-07512f85e341",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 750,
+      "height": 110,
+      "rawWidth": 750,
+      "rawHeight": 110,
+      "borderTop": 42,
+      "borderBottom": 44,
+      "borderLeft": 359,
+      "borderRight": 357,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/game/prefab/tips.prefab

@@ -96,15 +96,15 @@
     "_opacity": 255,
     "_color": {
       "__type__": "cc.Color",
-      "r": 77,
-      "g": 80,
-      "b": 215,
+      "r": 255,
+      "g": 255,
+      "b": 255,
       "a": 255
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 300,
-      "height": 52
+      "width": 750,
+      "height": 110
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -156,10 +156,10 @@
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
-      "__uuid__": "a23235d1-15db-4b95-8439-a2e005bfff91"
+      "__uuid__": "e861f3aa-d305-4983-a24a-a23db83aae98"
     },
     "_type": 0,
-    "_sizeMode": 0,
+    "_sizeMode": 1,
     "_fillType": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
@@ -206,15 +206,15 @@
     "_opacity": 255,
     "_color": {
       "__type__": "cc.Color",
-      "r": 227,
-      "g": 218,
-      "b": 80,
+      "r": 180,
+      "g": 102,
+      "b": 38,
       "a": 255
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 258,
-      "height": 42.32
+      "width": 256,
+      "height": 40.32
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -265,13 +265,15 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "按时发放按时发放",
-    "_N$string": "按时发放按时发放",
+    "_string": "一二三四五六七八",
+    "_N$string": "一二三四五六七八",
     "_fontSize": 32,
     "_lineHeight": 32,
     "_enableWrapText": true,
-    "_N$file": null,
-    "_isSystemFontUsed": true,
+    "_N$file": {
+      "__uuid__": "0bc2f1e8-1dd4-45ba-8f7e-36c47dde4152"
+    },
+    "_isSystemFontUsed": false,
     "_spacingX": 0,
     "_batchAsBitmap": false,
     "_styleFlags": 0,
@@ -290,7 +292,7 @@
     "node": {
       "__id__": 5
     },
-    "_enabled": true,
+    "_enabled": false,
     "_color": {
       "__type__": "cc.Color",
       "r": 0,

assets/resources/module/cashOutRecord/texture/bg.png.meta → assets/resources/game/texture/btn/bg.png.meta

@@ -1,20 +1,20 @@
 {
   "ver": "2.3.5",
-  "uuid": "83f239af-8ceb-4fdc-954a-1456903387bd",
+  "uuid": "3e50b68c-33fb-4eb9-9105-806cd6e929a3",
   "type": "sprite",
   "wrapMode": "clamp",
   "filterMode": "bilinear",
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 717,
-  "height": 140,
+  "width": 501,
+  "height": 38,
   "platformSettings": {},
   "subMetas": {
     "bg": {
       "ver": "1.0.4",
-      "uuid": "e31ff06b-209c-45d8-bb57-50406be9a9ab",
-      "rawTextureUuid": "83f239af-8ceb-4fdc-954a-1456903387bd",
+      "uuid": "e7f21add-0901-45f9-ba08-7bef0c31b0bb",
+      "rawTextureUuid": "3e50b68c-33fb-4eb9-9105-806cd6e929a3",
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
@@ -22,10 +22,10 @@
       "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 717,
-      "height": 140,
-      "rawWidth": 717,
-      "rawHeight": 140,
+      "width": 501,
+      "height": 38,
+      "rawWidth": 501,
+      "rawHeight": 38,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

assets/resources/game/texture/btn/btn1.png.meta

@@ -7,8 +7,8 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 84,
-  "height": 84,
+  "width": 95,
+  "height": 118,
   "platformSettings": {},
   "subMetas": {
     "btn1": {
@@ -19,13 +19,13 @@
       "trimThreshold": 1,
       "rotated": false,
       "offsetX": 0,
-      "offsetY": -0.5,
-      "trimX": 2,
-      "trimY": 3,
-      "width": 80,
-      "height": 79,
-      "rawWidth": 84,
-      "rawHeight": 84,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 95,
+      "height": 118,
+      "rawWidth": 95,
+      "rawHeight": 118,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

assets/resources/game/texture/btn/btn2.png.meta

@@ -7,8 +7,8 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 84,
-  "height": 84,
+  "width": 97,
+  "height": 101,
   "platformSettings": {},
   "subMetas": {
     "btn2": {
@@ -19,13 +19,13 @@
       "trimThreshold": 1,
       "rotated": false,
       "offsetX": 0,
-      "offsetY": -0.5,
-      "trimX": 2,
-      "trimY": 3,
-      "width": 80,
-      "height": 79,
-      "rawWidth": 84,
-      "rawHeight": 84,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 97,
+      "height": 101,
+      "rawWidth": 97,
+      "rawHeight": 101,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

assets/resources/game/texture/btn/btn3.png.meta

@@ -7,8 +7,8 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 84,
-  "height": 84,
+  "width": 97,
+  "height": 101,
   "platformSettings": {},
   "subMetas": {
     "btn3": {
@@ -19,13 +19,13 @@
       "trimThreshold": 1,
       "rotated": false,
       "offsetX": 0,
-      "offsetY": -0.5,
-      "trimX": 2,
-      "trimY": 3,
-      "width": 80,
-      "height": 79,
-      "rawWidth": 84,
-      "rawHeight": 84,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 97,
+      "height": 101,
+      "rawWidth": 97,
+      "rawHeight": 101,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

assets/resources/game/texture/btn/btn4.png.meta

@@ -7,8 +7,8 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 84,
-  "height": 84,
+  "width": 97,
+  "height": 101,
   "platformSettings": {},
   "subMetas": {
     "btn4": {
@@ -19,13 +19,13 @@
       "trimThreshold": 1,
       "rotated": false,
       "offsetX": 0,
-      "offsetY": -0.5,
-      "trimX": 2,
-      "trimY": 3,
-      "width": 80,
-      "height": 79,
-      "rawWidth": 84,
-      "rawHeight": 84,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 97,
+      "height": 101,
+      "rawWidth": 97,
+      "rawHeight": 101,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

assets/resources/game/texture/btn/btn5.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "5ba08832-e5ab-416b-95e1-870f402be644",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 97,
+  "height": 101,
+  "platformSettings": {},
+  "subMetas": {
+    "btn5": {
+      "ver": "1.0.4",
+      "uuid": "6fb3d9ec-e23b-4107-a96e-32bb6cf560d6",
+      "rawTextureUuid": "5ba08832-e5ab-416b-95e1-870f402be644",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 97,
+      "height": 101,
+      "rawWidth": 97,
+      "rawHeight": 101,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/game/texture/btn/btn6.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "cab19400-8268-4196-9a31-cec8689bbc87",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 97,
+  "height": 101,
+  "platformSettings": {},
+  "subMetas": {
+    "btn6": {
+      "ver": "1.0.4",
+      "uuid": "b5eec45e-c57a-4d89-97c4-c776cd2145a6",
+      "rawTextureUuid": "cab19400-8268-4196-9a31-cec8689bbc87",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 97,
+      "height": 101,
+      "rawWidth": 97,
+      "rawHeight": 101,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/game/texture/btn/btn7.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "5bdcb3d5-b47d-4dd2-8393-67d2a294fbfc",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 57,
+  "height": 34,
+  "platformSettings": {},
+  "subMetas": {
+    "btn7": {
+      "ver": "1.0.4",
+      "uuid": "069fc611-c839-4040-8c81-e0da49b3507b",
+      "rawTextureUuid": "5bdcb3d5-b47d-4dd2-8393-67d2a294fbfc",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 57,
+      "height": 34,
+      "rawWidth": 57,
+      "rawHeight": 34,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/game/texture/btn/button.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "be3e2064-46a5-4e7e-addd-03598fbe0a7d",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 343,
+  "height": 127,
+  "platformSettings": {},
+  "subMetas": {
+    "button": {
+      "ver": "1.0.4",
+      "uuid": "af1f5888-985e-490b-9942-6d933bb8f95f",
+      "rawTextureUuid": "be3e2064-46a5-4e7e-addd-03598fbe0a7d",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 343,
+      "height": 127,
+      "rawWidth": 343,
+      "rawHeight": 127,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/game/texture/btn/laba.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "a7e4900f-02bd-432a-bcfb-9e2db4306b1e",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 33,
+  "height": 27,
+  "platformSettings": {},
+  "subMetas": {
+    "laba": {
+      "ver": "1.0.4",
+      "uuid": "03225c46-195c-49ac-b8a1-4b68fee5b4a9",
+      "rawTextureUuid": "a7e4900f-02bd-432a-bcfb-9e2db4306b1e",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 33,
+      "height": 27,
+      "rawWidth": 33,
+      "rawHeight": 27,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/module/cashNormal.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.2",
-  "uuid": "e1dd1a1f-2745-498d-9398-b080a5f3f4ba",
+  "uuid": "77c0c02b-e1b3-4c2b-bdf1-928dc52af043",
   "isBundle": false,
   "bundleName": "",
   "priority": 1,

assets/resources/module/cashNormal/cashNormal.prefab.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.2.9",
-  "uuid": "0d6e8f52-d995-4831-a8cc-2f1ed873243f",
+  "uuid": "18ca563c-e8dc-4633-bf04-5fdd65113bb0",
   "optimizationPolicy": "AUTO",
   "asyncLoadAssets": false,
   "readonly": false,

assets/resources/module/cashOutRecord/cashOutItem.prefab → assets/resources/module/cashNormal/cashNormalItem.prefab

@@ -13,7 +13,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "cashOutItem",
+    "_name": "cashNormalItem",
     "_objFlags": 0,
     "_parent": null,
     "_children": [
@@ -443,19 +443,19 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 127.25,
+      "width": 159.06,
       "height": 50.4
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
-      "x": 0.5,
+      "x": 1,
       "y": 0.5
     },
     "_trs": {
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        281.342,
+        337.388,
         -82,
         0,
         0,
@@ -497,7 +497,7 @@
     "_dstBlendFactor": 771,
     "_string": "￥0.30元",
     "_N$string": "￥0.30元",
-    "_fontSize": 32,
+    "_fontSize": 40,
     "_lineHeight": 40,
     "_enableWrapText": true,
     "_N$file": {

assets/resources/module/cashNormal/texture.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.2",
-  "uuid": "2f209724-f34f-43be-8187-187bd749b58d",
+  "uuid": "138a08a6-686c-48d4-bbb8-218c3dbfde91",
   "isBundle": false,
   "bundleName": "",
   "priority": 1,

assets/resources/module/cashNormal/texture/back.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "b7cb96bb-093e-46de-92b7-68b3c7fd811c",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 22,
+  "height": 36,
+  "platformSettings": {},
+  "subMetas": {
+    "back": {
+      "ver": "1.0.4",
+      "uuid": "96791d9f-b2a7-406c-84c0-d63af62e60ea",
+      "rawTextureUuid": "b7cb96bb-093e-46de-92b7-68b3c7fd811c",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 22,
+      "height": 36,
+      "rawWidth": 22,
+      "rawHeight": 36,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/module/cashNormal/texture/bg.png.meta

@@ -1,20 +1,20 @@
 {
   "ver": "2.3.5",
-  "uuid": "327ec290-13fd-46f6-9101-a41d5b75abc0",
+  "uuid": "83f239af-8ceb-4fdc-954a-1456903387bd",
   "type": "sprite",
   "wrapMode": "clamp",
   "filterMode": "bilinear",
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 750,
-  "height": 1700,
+  "width": 717,
+  "height": 140,
   "platformSettings": {},
   "subMetas": {
     "bg": {
       "ver": "1.0.4",
-      "uuid": "644b06fc-7d3a-45bc-b5f5-2955e3d25ab8",
-      "rawTextureUuid": "327ec290-13fd-46f6-9101-a41d5b75abc0",
+      "uuid": "e31ff06b-209c-45d8-bb57-50406be9a9ab",
+      "rawTextureUuid": "83f239af-8ceb-4fdc-954a-1456903387bd",
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
@@ -22,10 +22,10 @@
       "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 750,
-      "height": 1700,
-      "rawWidth": 750,
-      "rawHeight": 1700,
+      "width": 717,
+      "height": 140,
+      "rawWidth": 717,
+      "rawHeight": 140,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

assets/resources/module/cashNormal/texture/bg1.png.meta

@@ -1,20 +1,20 @@
 {
   "ver": "2.3.5",
-  "uuid": "2c237cd5-9d2b-4e7a-9100-a922f4b235db",
+  "uuid": "c08ab98f-eac4-4706-825c-03908ccae9ad",
   "type": "sprite",
   "wrapMode": "clamp",
   "filterMode": "bilinear",
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 678,
-  "height": 153,
+  "width": 720,
+  "height": 1,
   "platformSettings": {},
   "subMetas": {
     "bg1": {
       "ver": "1.0.4",
-      "uuid": "1b979527-4ef6-4c3a-aee2-975c2ee696b6",
-      "rawTextureUuid": "2c237cd5-9d2b-4e7a-9100-a922f4b235db",
+      "uuid": "26758cc8-0442-4c35-b41a-e6c6812db258",
+      "rawTextureUuid": "c08ab98f-eac4-4706-825c-03908ccae9ad",
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
@@ -22,10 +22,10 @@
       "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 678,
-      "height": 153,
-      "rawWidth": 678,
-      "rawHeight": 153,
+      "width": 720,
+      "height": 1,
+      "rawWidth": 720,
+      "rawHeight": 1,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

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

@@ -1,20 +1,20 @@
 {
   "ver": "2.3.5",
-  "uuid": "c4588afd-f46d-48c4-819c-7fb745bdb246",
+  "uuid": "510e5833-96e9-43ff-86ed-67775bcf6854",
   "type": "sprite",
   "wrapMode": "clamp",
   "filterMode": "bilinear",
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 53,
-  "height": 49,
+  "width": 26,
+  "height": 28,
   "platformSettings": {},
   "subMetas": {
     "close": {
       "ver": "1.0.4",
-      "uuid": "b4206a15-49d3-44ee-abdf-9f76c13ed88a",
-      "rawTextureUuid": "c4588afd-f46d-48c4-819c-7fb745bdb246",
+      "uuid": "fa5301d9-95e8-4f3a-9ca3-a3c714bc574b",
+      "rawTextureUuid": "510e5833-96e9-43ff-86ed-67775bcf6854",
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
@@ -22,10 +22,10 @@
       "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 53,
-      "height": 49,
-      "rawWidth": 53,
-      "rawHeight": 49,
+      "width": 26,
+      "height": 28,
+      "rawWidth": 26,
+      "rawHeight": 28,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

assets/resources/module/receiptNotice/receiptNotice.prefab

@@ -1835,7 +1835,7 @@
   {
     "__type__": "cc.Node",
     "_name": "lbl提现记录",
-    "_objFlags": 0,
+    "_objFlags": 512,
     "_parent": {
       "__id__": 47
     },
@@ -1950,7 +1950,7 @@
       "__id__": 47
     },
     "_enabled": true,
-    "panel_name": "",
+    "panel_name": "module/cashNormal/cashNormal",
     "open_type": 0,
     "transition_type": 3,
     "onComplete": [],
@@ -2353,9 +2353,6 @@
     "lbl_rmb_total": {
       "__id__": 45
     },
-    "lbl_game_name": {
-      "__id__": 39
-    },
     "lbl_user_name": {
       "__id__": 33
     },

assets/resources/module/cashNormal/prefab.meta → assets/resources/module/redBagCash.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.2",
-  "uuid": "f0cb5162-b02c-470e-9290-10a386d0b0cb",
+  "uuid": "e1dd1a1f-2745-498d-9398-b080a5f3f4ba",
   "isBundle": false,
   "bundleName": "",
   "priority": 1,

assets/resources/module/cashOutRecord/cashOutRecord.prefab.meta → assets/resources/module/redBagCash/redBagCash.prefab.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.2.9",
-  "uuid": "18ca563c-e8dc-4633-bf04-5fdd65113bb0",
+  "uuid": "0d6e8f52-d995-4831-a8cc-2f1ed873243f",
   "optimizationPolicy": "AUTO",
   "asyncLoadAssets": false,
   "readonly": false,

assets/resources/module/cashNormal/prefab/cashNormalItem.prefab → assets/resources/module/redBagCash/redBagCashItem.prefab

@@ -13,7 +13,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "redBagItem",
+    "_name": "redBagCashItem",
     "_objFlags": 0,
     "_parent": null,
     "_children": [
@@ -27,29 +27,29 @@
         "__id__": 12
       },
       {
-        "__id__": 20
+        "__id__": 21
       },
       {
-        "__id__": 23
+        "__id__": 24
       },
       {
-        "__id__": 32
+        "__id__": 33
       },
       {
-        "__id__": 47
+        "__id__": 48
       },
       {
-        "__id__": 50
+        "__id__": 51
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 53
+        "__id__": 54
       }
     ],
     "_prefab": {
-      "__id__": 54
+      "__id__": 55
     },
     "_opacity": 255,
     "_color": {
@@ -469,7 +469,7 @@
       }
     ],
     "_prefab": {
-      "__id__": 19
+      "__id__": 20
     },
     "_opacity": 255,
     "_color": {
@@ -502,7 +502,7 @@
         1,
         1,
         1,
-        1
+        0
       ]
     },
     "_eulerAngles": {
@@ -693,11 +693,15 @@
     "_grayMaterial": null,
     "duration": 0.1,
     "zoomScale": 1.2,
-    "clickEvents": [],
+    "clickEvents": [
+      {
+        "__id__": 19
+      }
+    ],
     "_N$interactable": true,
     "_N$enableAutoGrayEffect": false,
-    "_N$transition": 0,
-    "transition": 0,
+    "_N$transition": 3,
+    "transition": 3,
     "_N$normalColor": {
       "__type__": "cc.Color",
       "r": 255,
@@ -752,6 +756,16 @@
     "_id": ""
   },
   {
+    "__type__": "cc.ClickEvent",
+    "target": {
+      "__id__": 1
+    },
+    "component": "",
+    "_componentId": "822d4j21VlIxbq9rYxSGSQQ",
+    "handler": "clickCashOP",
+    "customEventData": ""
+  },
+  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1
@@ -773,11 +787,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 21
+        "__id__": 22
       }
     ],
     "_prefab": {
-      "__id__": 22
+      "__id__": 23
     },
     "_opacity": 255,
     "_color": {
@@ -831,7 +845,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 20
+      "__id__": 21
     },
     "_enabled": true,
     "_materials": [
@@ -878,20 +892,20 @@
     },
     "_children": [
       {
-        "__id__": 24
+        "__id__": 25
       },
       {
-        "__id__": 27
+        "__id__": 28
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 30
+        "__id__": 31
       }
     ],
     "_prefab": {
-      "__id__": 31
+      "__id__": 32
     },
     "_opacity": 255,
     "_color": {
@@ -945,17 +959,17 @@
     "_name": "毛币框",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 23
+      "__id__": 24
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 25
+        "__id__": 26
       }
     ],
     "_prefab": {
-      "__id__": 26
+      "__id__": 27
     },
     "_opacity": 255,
     "_color": {
@@ -1009,7 +1023,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 24
+      "__id__": 25
     },
     "_enabled": true,
     "_materials": [
@@ -1052,17 +1066,17 @@
     "_name": "毛币数量",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 23
+      "__id__": 24
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 28
+        "__id__": 29
       }
     ],
     "_prefab": {
-      "__id__": 29
+      "__id__": 30
     },
     "_opacity": 255,
     "_color": {
@@ -1116,7 +1130,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 27
+      "__id__": 28
     },
     "_enabled": true,
     "_materials": [
@@ -1162,7 +1176,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 23
+      "__id__": 24
     },
     "_enabled": true,
     "_materials": [
@@ -1209,23 +1223,23 @@
     },
     "_children": [
       {
-        "__id__": 33
+        "__id__": 34
       },
       {
-        "__id__": 37
+        "__id__": 38
       },
       {
-        "__id__": 41
+        "__id__": 42
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 45
+        "__id__": 46
       }
     ],
     "_prefab": {
-      "__id__": 46
+      "__id__": 47
     },
     "_opacity": 255,
     "_color": {
@@ -1249,7 +1263,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -54.633,
+        -40,
         -49.34,
         0,
         0,
@@ -1279,20 +1293,20 @@
     "_name": "消耗",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 32
+      "__id__": 33
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 34
+        "__id__": 35
       },
       {
-        "__id__": 35
+        "__id__": 36
       }
     ],
     "_prefab": {
-      "__id__": 36
+      "__id__": 37
     },
     "_opacity": 255,
     "_color": {
@@ -1346,7 +1360,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 33
+      "__id__": 34
     },
     "_enabled": true,
     "_materials": [
@@ -1381,7 +1395,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 33
+      "__id__": 34
     },
     "_enabled": true,
     "_color": {
@@ -1410,20 +1424,20 @@
     "_name": "红包数量",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 32
+      "__id__": 33
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 38
+        "__id__": 39
       },
       {
-        "__id__": 39
+        "__id__": 40
       }
     ],
     "_prefab": {
-      "__id__": 40
+      "__id__": 41
     },
     "_opacity": 255,
     "_color": {
@@ -1477,7 +1491,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 37
+      "__id__": 38
     },
     "_enabled": true,
     "_materials": [
@@ -1512,7 +1526,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 37
+      "__id__": 38
     },
     "_enabled": true,
     "_color": {
@@ -1541,20 +1555,20 @@
     "_name": "红包券",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 32
+      "__id__": 33
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 42
+        "__id__": 43
       },
       {
-        "__id__": 43
+        "__id__": 44
       }
     ],
     "_prefab": {
-      "__id__": 44
+      "__id__": 45
     },
     "_opacity": 255,
     "_color": {
@@ -1608,7 +1622,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 41
+      "__id__": 42
     },
     "_enabled": true,
     "_materials": [
@@ -1643,7 +1657,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 41
+      "__id__": 42
     },
     "_enabled": true,
     "_color": {
@@ -1672,7 +1686,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 32
+      "__id__": 33
     },
     "_enabled": true,
     "_layoutSize": {
@@ -1721,11 +1735,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 48
+        "__id__": 49
       }
     ],
     "_prefab": {
-      "__id__": 49
+      "__id__": 50
     },
     "_opacity": 255,
     "_color": {
@@ -1749,7 +1763,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -41.211,
+        -40,
         -102.007,
         0,
         0,
@@ -1779,7 +1793,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 47
+      "__id__": 48
     },
     "_enabled": true,
     "_materials": [
@@ -1828,11 +1842,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 51
+        "__id__": 52
       }
     ],
     "_prefab": {
-      "__id__": 52
+      "__id__": 53
     },
     "_opacity": 255,
     "_color": {
@@ -1856,7 +1870,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -39.93,
+        -40,
         -100.375,
         0,
         0,
@@ -1886,7 +1900,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 50
+      "__id__": 51
     },
     "_enabled": true,
     "_materials": [
@@ -1936,7 +1950,7 @@
     },
     "_enabled": true,
     "node_none": {
-      "__id__": 20
+      "__id__": 21
     },
     "node_lock": {
       "__id__": 5
@@ -1945,10 +1959,10 @@
       "__id__": 12
     },
     "lbl_red_value": {
-      "__id__": 38
+      "__id__": 39
     },
     "lbl_rmb_value": {
-      "__id__": 28
+      "__id__": 29
     },
     "_id": ""
   },

assets/resources/module/cashOutRecord.meta → assets/resources/module/redBagCash/texture.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.2",
-  "uuid": "77c0c02b-e1b3-4c2b-bdf1-928dc52af043",
+  "uuid": "2f209724-f34f-43be-8187-187bd749b58d",
   "isBundle": false,
   "bundleName": "",
   "priority": 1,

assets/resources/module/redBagCash/texture/bg.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "327ec290-13fd-46f6-9101-a41d5b75abc0",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 750,
+  "height": 1700,
+  "platformSettings": {},
+  "subMetas": {
+    "bg": {
+      "ver": "1.0.4",
+      "uuid": "644b06fc-7d3a-45bc-b5f5-2955e3d25ab8",
+      "rawTextureUuid": "327ec290-13fd-46f6-9101-a41d5b75abc0",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 750,
+      "height": 1700,
+      "rawWidth": 750,
+      "rawHeight": 1700,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/module/cashOutRecord/texture/bg1.png.meta → assets/resources/module/redBagCash/texture/bg1.png.meta

@@ -1,20 +1,20 @@
 {
   "ver": "2.3.5",
-  "uuid": "c08ab98f-eac4-4706-825c-03908ccae9ad",
+  "uuid": "2c237cd5-9d2b-4e7a-9100-a922f4b235db",
   "type": "sprite",
   "wrapMode": "clamp",
   "filterMode": "bilinear",
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 720,
-  "height": 1,
+  "width": 678,
+  "height": 153,
   "platformSettings": {},
   "subMetas": {
     "bg1": {
       "ver": "1.0.4",
-      "uuid": "26758cc8-0442-4c35-b41a-e6c6812db258",
-      "rawTextureUuid": "c08ab98f-eac4-4706-825c-03908ccae9ad",
+      "uuid": "1b979527-4ef6-4c3a-aee2-975c2ee696b6",
+      "rawTextureUuid": "2c237cd5-9d2b-4e7a-9100-a922f4b235db",
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
@@ -22,10 +22,10 @@
       "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 720,
-      "height": 1,
-      "rawWidth": 720,
-      "rawHeight": 1,
+      "width": 678,
+      "height": 153,
+      "rawWidth": 678,
+      "rawHeight": 153,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

assets/resources/module/cashOutRecord/texture/close.png.meta → assets/resources/module/redBagCash/texture/close.png.meta

@@ -1,20 +1,20 @@
 {
   "ver": "2.3.5",
-  "uuid": "510e5833-96e9-43ff-86ed-67775bcf6854",
+  "uuid": "c4588afd-f46d-48c4-819c-7fb745bdb246",
   "type": "sprite",
   "wrapMode": "clamp",
   "filterMode": "bilinear",
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 26,
-  "height": 28,
+  "width": 53,
+  "height": 49,
   "platformSettings": {},
   "subMetas": {
     "close": {
       "ver": "1.0.4",
-      "uuid": "fa5301d9-95e8-4f3a-9ca3-a3c714bc574b",
-      "rawTextureUuid": "510e5833-96e9-43ff-86ed-67775bcf6854",
+      "uuid": "b4206a15-49d3-44ee-abdf-9f76c13ed88a",
+      "rawTextureUuid": "c4588afd-f46d-48c4-819c-7fb745bdb246",
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
@@ -22,10 +22,10 @@
       "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 26,
-      "height": 28,
-      "rawWidth": 26,
-      "rawHeight": 28,
+      "width": 53,
+      "height": 49,
+      "rawWidth": 53,
+      "rawHeight": 49,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

assets/scene/MainScene.fire

@@ -403,8 +403,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 750,
-      "height": 1334
+      "width": 0,
+      "height": 0
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -453,23 +453,23 @@
     "src_y": 0,
     "tar_x": 0,
     "tar_y": 200,
-    "bg_opacity": 100,
+    "bg_opacity": 40,
     "bg_color": {
       "__type__": "cc.Color",
-      "r": 36,
-      "g": 47,
-      "b": 232,
-      "a": 82
+      "r": 200,
+      "g": 200,
+      "b": 200,
+      "a": 255
     },
     "tip_color": {
       "__type__": "cc.Color",
-      "r": 220,
-      "g": 220,
-      "b": 80,
+      "r": 255,
+      "g": 255,
+      "b": 255,
       "a": 255
     },
-    "tip_size": 32,
-    "_id": "41Yz88THFLQYf9GACa9dX1"
+    "tip_size": 40,
+    "_id": "42q00FZdhI/bGXafJ7cQ2n"
   },
   {
     "__type__": "cc.Node",

assets/script/game/component/tween/UIOpenAndClose.ts → assets/script/game/component/tween/EffectOpenAndClose.ts

@@ -15,7 +15,7 @@ enum EffectType {
 @ccclass
 @executeInEditMode()
 @playOnFocus()
-export default class UIOpenAndClose extends cc.Component {
+export default class EffectOpenAndClose extends cc.Component {
 
     @property({ type: cc.Node, displayName: '动画节点' })
     private effect_par: cc.Node = null

assets/script/game/data/GData.ts

@@ -17,6 +17,7 @@ import { CashNormalData } from "./module/CashNormalData";
 import { ReceiptNoticeData } from "./module/ReceiptNoticeData";
 import { BlessingBagData } from "./module/BlessingBagData";
 import CashProData from "./module/CashProData";
+import { RedBagCashData } from "./module/RedBagCashData";
 import RedCodeData from "./module/RedCodeData";
 
 /**
@@ -51,6 +52,8 @@ class GData {
     public sign: SignData;
     /** 到账通知 */
     public receiptNotice: ReceiptNoticeData;
+    /** 红包提现 */
+    public redBagCash: RedBagCashData;
     /** 红包提现（常规提现） */
     public cashNormal: CashNormalData;
     /** 更多游戏 */
@@ -77,6 +80,7 @@ class GData {
         this.pigbank = new PigBankData();
         this.sign = new SignData();
         this.receiptNotice = new ReceiptNoticeData();
+        this.redBagCash = new RedBagCashData();
         this.cashNormal = new CashNormalData();
         this.moreGame = new MoreGameData();
         this.blessingBag = new BlessingBagData();
@@ -91,6 +95,7 @@ class GData {
         this.moduleData.set(Fun.blessingBag, this.blessingBag);
         this.moduleData.set(Fun.sign, this.sign);
         this.moduleData.set(Fun.cashNormal, this.cashNormal);
+        this.moduleData.set(Fun.redBagCash, this.redBagCash);
     }
 }
 
@@ -105,6 +110,7 @@ export enum Fun {
     blessingBag = 5,   //福袋
     sign = 6,       //签到
     cashNormal = 7, //常规提现
+    redBagCash = 8, //红包提现
 }
 
 declare global {

assets/script/game/data/GameData.ts

@@ -150,6 +150,9 @@ export enum GameProp {
     sign_last_bar = 120,
     /** 当前能否签到 */
     sign_can = 121,
+    /** ------------------ 红包提现 ----------------------------- */
+    /** 提现进度 */
+    redBag_cash_bar = 220,
 }
 
 /**
@@ -200,6 +203,8 @@ type PlayerInfoType = {
     piggyBankCashTimes: number,
     /** 累计存钱罐每日提现次数 */
     totalPiggyBankCashTimes: number,
+    /** 提现进度 */
+    cashIndex: number,
     /** 上次登录时间 */
     lastTime: number,
     /** 登录天数 */

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

@@ -6,10 +6,9 @@ import { Data } from "../../../mk/data/Data";
 export class CashNormalData extends Data {
     public init() {
         // 提现记录数据
-        gData.cashNormal.getRecord()
+        this.getRecord()
     }
 
-
     public async getRecord() {
         let response = await mk.http.sendData('getCashRecord', {});
         if (response.errcode != 0) {

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

@@ -0,0 +1,138 @@
+
+import { Data } from "../../../mk/data/Data";
+import { GameProp } from "../GameData";
+/**
+ * 红包提现数据
+ * - 跨Index不可提现，提示：请按顺序提现。
+ * @author 薛鸿潇
+ */
+export class RedBagCashData extends Data {
+
+    /**
+     * 数据初始化
+     */
+    public init() {
+        // 签到进度
+        this.cash_bar = gData.gameData.getProp(GameProp.redBag_cash_bar);// 自定义测试数据
+        // this.cash_bar = gData.gameData.gameData.cashIndex;// 服务端数据
+        // 签到配置表
+        if (gData.gameData.configs.CashCfg) {
+            gData.gameData.configs.CashCfg.forEach(item_data => {
+                for (const key in item_data) {
+                    item_data[key] = parseInt(item_data[key])
+                }
+            });
+            this.c_data = gData.gameData.configs.CashCfg;
+            this.sortList();
+            this.init_list = true;
+        }
+    }
+    /** 标志位：初始化列表 */
+    public init_list: boolean = false;
+
+    /** 配置表数据 */
+    public c_data: Array<CDataType> = [];
+
+    private _cash_bar: number = 0;
+    /** 提现进度 */
+    set cash_bar(value: number) {
+        this._cash_bar = value;
+        this.init_list = true;
+    }
+    get cash_bar() {
+        return this._cash_bar;
+    }
+
+    /**
+     * 提现操作
+     */
+    public cashOP() {
+        /** 提现档位 */
+        const cash_index = this.cash_bar;
+        this.cash_bar++;
+        gData.gameData.setProp(GameProp.redBag_cash_bar, this.cash_bar);
+
+        // 扣除红包
+        this.sortList();
+        let item_data = this.getItemDataByIndex(cash_index);
+        gData.gameData.gameData.redMoney -= item_data.type_value;
+
+        // 打开提现到账界面
+        gData.receiptNotice.receip_rmb = item_data.money;
+        gData.cashNormal.receip_total_rmb += gData.receiptNotice.receip_rmb;
+        mk.ui.openPanel('module/receiptNotice/receiptNotice');
+
+    }
+
+    /**
+     * 排序
+     * - 已提条目放最后
+     */
+    private sortList() {
+        const l_count = this.c_data.length;
+        let index = 0;
+        for (let i = 0; i < l_count; i++) {
+            if (this.c_data[index].index <= gData.redBagCash.cash_bar) {
+                let item_data = this.c_data.splice(index, 1);
+                this.c_data.push(item_data[0]);
+                index--;
+            }
+            index++;
+        }
+    }
+
+
+    /**
+     * 获取条目，通过index
+     * @param cash_index 对应id
+     * @returns 
+     */
+    private getItemDataByIndex(cash_index: number): CDataType {
+        const l_count = this.c_data.length;
+        for (let i = 0; i < l_count; i++) {
+            if (this.c_data[i].index === cash_index) {
+                return this.c_data[i]
+            }
+        }
+    }
+
+    // /** 客户端造的假数据 */
+    // private initCData() {
+    //     for (let i = 0; i < 20; i++) {
+    //         const id = i + 1;
+    //         let obj = {
+    //             index: id,
+    //             /** 毛币数量？ */
+    //             money: id,
+    //             /** 红包数量 */
+    //             type_value: id * 1000,
+    //             time: id,
+    //             directVideoTime: id,
+    //             delayVideoTimes: id,
+    //             money_type: id,
+    //             num: id,
+    //             moneyshow: id,
+    //             summoney: id
+    //         };
+    //         this.c_data.push(obj)
+    //     }
+    //     this.init_list = true;
+    // }
+}
+/** 配置表数据内容 */
+export type CDataType = {
+    /** id */
+    index: number,
+    /** 毛币数量，单位分 */
+    money: number,
+    /** 红包币数量 */
+    type_value: number,
+    time: number,
+    directVideoTime: number,
+    delayVideoTimes: number,
+    money_type: number,
+    num: number,
+    moneyshow: number,
+    summoney: number
+}
+

assets/script/game/module/module/cashOutRecord/CashOutItem.ts.meta → assets/script/game/data/module/RedBagCashData.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.0.8",
-  "uuid": "320779e4-e4d9-462e-a3c4-bb225f6aefad",
+  "uuid": "8b9fda5e-c308-4613-abd2-318b5012f278",
   "isPlugin": false,
   "loadPluginInWeb": true,
   "loadPluginInNative": true,

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

@@ -18,7 +18,6 @@ export class SignData extends Data {
                 }
             });
             this.c_sign = gData.gameData.configs.SignIn;
-            this.init_list = true;
         }
         // 服务端数据不对
         // this.sign_last_bar = gData.gameData.gameData.signInDay;
@@ -31,8 +30,6 @@ export class SignData extends Data {
 
     /** 标志位：是否需要刷新数据 */
     public init_data: boolean = false;
-    /** 标志位：是否初始化配置列表 */
-    public init_list: boolean = false;
 
     /** 配置数据 签到 */
     private _c_sign: Array<CSignType> = [];

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

@@ -1,9 +1,10 @@
 import { Data } from "../../../mk/data/Data";
+import { AdFun } from "../AdData";
 import { GameProp } from "../GameData";
 
-interface TurntableItem{
-    id:string,
-    type:string,
+interface TurntableItem {
+    id: string,
+    type: string,
 }
 
 /**
@@ -14,10 +15,11 @@ export class TurnableData extends Data {
 
 
     public leftTimes: number = 2;
-    public config:TurntableItem[];
+    public config: TurntableItem[];
 
-    public init(){
+    public init() {
         this.config = gData.gameData.configs.TurntableCfg;
+        this.leftTimes = gData.gameData.gameData.turntableTimes == null ? 0 : gData.gameData.gameData.turntableTimes;
     }
 
     public setAdData(data) {
@@ -28,11 +30,7 @@ export class TurnableData extends Data {
     }
 
 
-    public async draw() {
-        let data = {};
-        let response = await mk.http.sendRequest('turnable', 'POST', JSON.stringify(data));
-        if (response.errcode != 0) {
-            return;
-        }
+    public draw() {
+        gData.adData.watchVideo(AdFun.turntable);
     }
 }

assets/script/game/module/module/cashNormal.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.2",
-  "uuid": "4d0ef30e-c860-413a-8bb2-994f05d1a5ac",
+  "uuid": "57b28902-1e8c-4327-bcbf-3b36b90c9728",
   "isBundle": false,
   "bundleName": "",
   "priority": 1,

assets/script/game/module/module/cashNormal/CashNormal.ts

@@ -1,26 +1,26 @@
 
 const { ccclass, property } = cc._decorator;
 /**
- * 红包提现界面
+ * 提现记录
  * @author 薛鸿潇
  */
 @ccclass
-export default class RedBagCash extends cc.Component {
+export default class CashNormal extends cc.Component {
 
     @property({ displayName: '滚动视图', type: cc.ScrollView })
     sroll_view: cc.ScrollView = null!;
+    @property({ displayName: 'lbl累计提现', type: cc.Label })
+    private lbl_rmb_total: cc.Label = null;
 
-    onLoad() {
-
-    }
+    // onLoad () {}
 
     start() {
+        this.initTotal();
         this.initScrollView();
-        // 请求记录
-        // gData.cashNormal.getRecord()
     }
 
     // update (dt) {}
+
     /**
      * 初始化滚动视图
      */
@@ -33,4 +33,11 @@ export default class RedBagCash extends cc.Component {
         }
         this.sroll_view.node.emit('srollview-init', data);
     }
+
+    /**
+     * 初始化累计提现
+     */
+    private initTotal() {
+        this.lbl_rmb_total.string = '￥' + gData.cashNormal.receip_total_rmb + '元';
+    }
 }

assets/script/game/module/module/cashNormal/CashNormal.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.0.8",
-  "uuid": "e7d9e315-9c20-4285-a213-03bd5197dfc1",
+  "uuid": "94e2a861-593e-420e-8f17-9cf47e7bd2ee",
   "isPlugin": false,
   "loadPluginInWeb": true,
   "loadPluginInNative": true,

assets/script/game/module/module/cashNormal/CashNormalItem.ts

@@ -1,31 +1,26 @@
 
 const { ccclass, property } = cc._decorator;
 /**
- * 常规提现条目
+ * 提现记录条目
  * @author 薛鸿潇
  */
 @ccclass
-export default class RedBagItem extends cc.Component {
+export default class CashNormalItem extends cc.Component {
 
-    @property({ displayName: '已领取', type: cc.Node })
-    node_none: cc.Node = null;
-    @property({ displayName: '未达成', type: cc.Node })
-    node_lock: cc.Node = null;
-    @property({ displayName: '可领取', type: cc.Node })
-    node_unlock: cc.Node = null;
-    @property({ displayName: '红包数量', type: cc.Label })
-    lbl_red_value: cc.Label = null;
-    @property({ displayName: '毛币数量', type: cc.Label })
-    lbl_rmb_value: cc.Label = null;
+    @property({ displayName: 'lbl提现类型', type: cc.Label })
+    private lbl_cash_type: cc.Label = null;
+    @property({ displayName: 'lbl提现时间', type: cc.Label })
+    private lbl_cash_time: cc.Label = null;
+    @property({ displayName: 'lbl红包码', type: cc.Label })
+    private lbl_red_ma: cc.Label = null;
+    @property({ displayName: 'lbl毛币数量', type: cc.Label })
+    private lbl_rmb_value: cc.Label = null;
 
-    onLoad() {
+    // onLoad () {}
 
-    }
-
-    start() {
-
-    }
+    // start () {
 
+    // }
 
     /**
      * 初始化数据
@@ -34,7 +29,10 @@ export default class RedBagItem extends cc.Component {
         await this.initStyle(item_data);
     }
     private initStyle(item_data) {
-        
-    }
 
+        this.lbl_cash_type.string = '签到提现';
+        this.lbl_cash_time.string = '2021.03.05';
+        this.lbl_red_ma.string = '红包码：' + "AABBCC";
+        this.lbl_rmb_value.string = '￥' + 0.30 + '元';
+    }
 }

assets/script/game/module/module/cashNormal/CashNormalItem.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.0.8",
-  "uuid": "822d48f6-d559-48c5-babd-ad8c52192410",
+  "uuid": "320779e4-e4d9-462e-a3c4-bb225f6aefad",
   "isPlugin": false,
   "loadPluginInWeb": true,
   "loadPluginInNative": true,

assets/script/game/module/module/cashOutRecord/CashOutItem.ts

@@ -1,38 +0,0 @@
-
-const { ccclass, property } = cc._decorator;
-/**
- * 提现记录条目
- * @author 薛鸿潇
- */
-@ccclass
-export default class CashOutItem extends cc.Component {
-
-    @property({ displayName: 'lbl提现类型', type: cc.Label })
-    private lbl_cash_type: cc.Label = null;
-    @property({ displayName: 'lbl提现时间', type: cc.Label })
-    private lbl_cash_time: cc.Label = null;
-    @property({ displayName: 'lbl红包码', type: cc.Label })
-    private lbl_red_ma: cc.Label = null;
-    @property({ displayName: 'lbl毛币数量', type: cc.Label })
-    private lbl_rmb_value: cc.Label = null;
-
-    // onLoad () {}
-
-    // start () {
-
-    // }
-
-    /**
-     * 初始化数据
-     */
-    public async setItemData(item_data) {
-        await this.initStyle(item_data);
-    }
-    private initStyle(item_data) {
-
-        this.lbl_cash_type.string = '签到提现';
-        this.lbl_cash_time.string = '2021.03.05';
-        this.lbl_red_ma.string = '红包码：' + "AABB左右左右BABA";
-        this.lbl_rmb_value.string = '￥' + 0.30 + '元';
-    }
-}

assets/script/game/module/module/cashOutRecord/CashOutRecord.ts

@@ -1,43 +0,0 @@
-
-const { ccclass, property } = cc._decorator;
-/**
- * 提现记录
- * @author 薛鸿潇
- */
-@ccclass
-export default class CashOutRecord extends cc.Component {
-
-    @property({ displayName: '滚动视图', type: cc.ScrollView })
-    sroll_view: cc.ScrollView = null!;
-    @property({ displayName: 'lbl累计提现', type: cc.Label })
-    private lbl_rmb_total: cc.Label = null;
-
-    // onLoad () {}
-
-    start() {
-        this.initTotal();
-        this.initScrollView();
-    }
-
-    // update (dt) {}
-
-    /**
-     * 初始化滚动视图
-     */
-    private initScrollView() {
-        // 测试数据
-        let data = []
-        for (let i = 0; i < 10; i++) {
-            let obj = {};
-            data.push(666)
-        }
-        this.sroll_view.node.emit('srollview-init', data);
-    }
-
-    /**
-     * 初始化累计提现
-     */
-    private initTotal() {
-        this.lbl_rmb_total.string = '￥' + gData.cashNormal.receip_total_rmb + '元';
-    }
-}

assets/script/game/module/module/cashOutRecord.meta → assets/script/game/module/module/redBagCash.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.2",
-  "uuid": "57b28902-1e8c-4327-bcbf-3b36b90c9728",
+  "uuid": "4d0ef30e-c860-413a-8bb2-994f05d1a5ac",
   "isBundle": false,
   "bundleName": "",
   "priority": 1,

assets/script/game/module/module/redBagCash/RedBagCash.ts

@@ -0,0 +1,53 @@
+import TableView from "../../../component/TableView";
+
+const { ccclass, property } = cc._decorator;
+/**
+ * 红包提现界面
+ * @author 薛鸿潇
+ */
+@ccclass
+export default class RedBagCash extends cc.Component {
+
+    @property({ displayName: '滚动视图', type: cc.ScrollView })
+    private sroll_view: cc.ScrollView = null!;
+    @property({ displayName: 'lbl红包数量', type: cc.Label })
+    private lbl_redbag: cc.Label = null!;
+    @property({ displayName: 'lbl毛币数量', type: cc.Label })
+    private lbl_rmb: cc.Label = null!;
+
+    private tableview: TableView = null;
+    onLoad() {
+        gData.gameData.gameData.redMoney = 10200
+        this.tableview = this.sroll_view.getComponent('TableView');
+    }
+
+    start() {
+        this.initMoney();
+        this.initScrollView();
+    }
+
+    update(dt) {
+        if (gData.redBagCash.init_list) {
+            this.initScrollView();
+            this.initMoney();
+        }
+    }
+
+    /**
+     * 初始化滚动视图
+     */
+    private initScrollView() {
+        this.sroll_view.node.emit('srollview-init', gData.redBagCash.c_data);
+        gData.redBagCash.init_list = false;
+    }
+
+    /**
+     * 初始化货币数量
+     */
+    private initMoney() {
+        this.lbl_redbag.string = `${gData.gameData.gameData.redMoney}`;
+        let rmb = gData.gameData.gameData.redMoney / 10000;
+        rmb = rmb > 1 ? Math.floor(rmb) : parseFloat(rmb.toFixed(2));
+        this.lbl_rmb.string = `${rmb}`;
+    }
+}