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

assets/resources/game/prefab/texture.meta

@@ -0,0 +1,12 @@
+{
+  "ver": "1.1.2",
+  "uuid": "9a1cfc78-9e3b-482f-b382-886a5b8402b4",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

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/cashNormal/cashNormal.prefab

@@ -21,23 +21,23 @@
         "__id__": 2
       },
       {
-        "__id__": 32
+        "__id__": 35
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 38
+        "__id__": 41
       },
       {
-        "__id__": 39
+        "__id__": 42
       },
       {
-        "__id__": 40
+        "__id__": 43
       }
     ],
     "_prefab": {
-      "__id__": 41
+      "__id__": 44
     },
     "_opacity": 255,
     "_color": {
@@ -104,17 +104,17 @@
         "__id__": 12
       },
       {
-        "__id__": 21
+        "__id__": 24
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 30
+        "__id__": 33
       }
     ],
     "_prefab": {
-      "__id__": 31
+      "__id__": 34
     },
     "_opacity": 255,
     "_color": {
@@ -282,7 +282,7 @@
         "__id__": 7
       }
     ],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 10
@@ -501,19 +501,87 @@
     "_children": [
       {
         "__id__": 13
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 22
+      }
+    ],
+    "_prefab": {
+      "__id__": 23
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 750,
+      "height": 140
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        596.935,
+        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__": 12
+    },
+    "_children": [
+      {
+        "__id__": 14
       },
       {
-        "__id__": 16
+        "__id__": 17
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 19
+        "__id__": 20
       }
     ],
     "_prefab": {
-      "__id__": 20
+      "__id__": 21
     },
     "_opacity": 255,
     "_color": {
@@ -525,8 +593,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 720,
-      "height": 140
+      "width": 450.88,
+      "height": 150
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -538,7 +606,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        452.869,
+        0,
         0,
         0,
         0,
@@ -567,17 +635,17 @@
     "_name": "累计提现",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 12
+      "__id__": 13
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 14
+        "__id__": 15
       }
     ],
     "_prefab": {
-      "__id__": 15
+      "__id__": 16
     },
     "_opacity": 255,
     "_color": {
@@ -589,8 +657,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 160,
-      "height": 50.4
+      "width": 225,
+      "height": 56.7
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -601,8 +669,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -131.497,
-        1.252,
+        -112.94,
+        1,
         0,
         0,
         0,
@@ -631,7 +699,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 13
+      "__id__": 14
     },
     "_enabled": true,
     "_materials": [
@@ -643,8 +711,8 @@
     "_dstBlendFactor": 771,
     "_string": "累计提现：",
     "_N$string": "累计提现：",
-    "_fontSize": 32,
-    "_lineHeight": 40,
+    "_fontSize": 45,
+    "_lineHeight": 45,
     "_enableWrapText": true,
     "_N$file": {
       "__uuid__": "0bc2f1e8-1dd4-45ba-8f7e-36c47dde4152"
@@ -669,7 +737,7 @@
     "asset": {
       "__uuid__": "18ca563c-e8dc-4633-bf04-5fdd65113bb0"
     },
-    "fileId": "e5zd+xERZCLqOsiiTz5ez+",
+    "fileId": "b7MKBj7FJPQoBHSldOxkJJ",
     "sync": false
   },
   {
@@ -677,17 +745,17 @@
     "_name": "lbl累计提现",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 12
+      "__id__": 13
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 17
+        "__id__": 18
       }
     ],
     "_prefab": {
-      "__id__": 18
+      "__id__": 19
     },
     "_opacity": 255,
     "_color": {
@@ -711,8 +779,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        75.976,
-        3.08,
+        112.5,
+        1,
         0,
         0,
         0,
@@ -741,7 +809,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 16
+      "__id__": 17
     },
     "_enabled": true,
     "_materials": [
@@ -779,7 +847,50 @@
     "asset": {
       "__uuid__": "18ca563c-e8dc-4633-bf04-5fdd65113bb0"
     },
-    "fileId": "85BNm1Km9HD7zlwBbxmJyM",
+    "fileId": "caHE3GHHtJ+KSW2kt1qsRj",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Layout",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 13
+    },
+    "_enabled": true,
+    "_layoutSize": {
+      "__type__": "cc.Size",
+      "width": 450.88,
+      "height": 150
+    },
+    "_resize": 1,
+    "_N$layoutType": 1,
+    "_N$cellSize": {
+      "__type__": "cc.Size",
+      "width": 40,
+      "height": 40
+    },
+    "_N$startAxis": 0,
+    "_N$paddingLeft": 0,
+    "_N$paddingRight": 0,
+    "_N$paddingTop": 0,
+    "_N$paddingBottom": 0,
+    "_N$spacingX": 0,
+    "_N$spacingY": 0,
+    "_N$verticalDirection": 1,
+    "_N$horizontalDirection": 0,
+    "_N$affectedByScale": false,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "18ca563c-e8dc-4633-bf04-5fdd65113bb0"
+    },
+    "fileId": "002ddBz5xFH4HW+p1HTA2v",
     "sync": false
   },
   {
@@ -834,20 +945,20 @@
     },
     "_children": [
       {
-        "__id__": 22
+        "__id__": 25
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 27
+        "__id__": 30
       },
       {
-        "__id__": 28
+        "__id__": 31
       }
     ],
     "_prefab": {
-      "__id__": 29
+      "__id__": 32
     },
     "_opacity": 255,
     "_color": {
@@ -860,7 +971,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 720,
-      "height": 1000
+      "height": 1150
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -872,7 +983,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        -126.654,
+        -69.584,
         0,
         0,
         0,
@@ -901,21 +1012,21 @@
     "_name": "view",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 21
+      "__id__": 24
     },
     "_children": [
       {
-        "__id__": 23
+        "__id__": 26
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 25
+        "__id__": 28
       }
     ],
     "_prefab": {
-      "__id__": 26
+      "__id__": 29
     },
     "_opacity": 255,
     "_color": {
@@ -928,7 +1039,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 720,
-      "height": 1000
+      "height": 1150
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -969,13 +1080,13 @@
     "_name": "content",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 22
+      "__id__": 25
     },
     "_children": [],
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 24
+      "__id__": 27
     },
     "_opacity": 255,
     "_color": {
@@ -988,7 +1099,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 720,
-      "height": 1000
+      "height": 1150
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1000,7 +1111,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        500,
+        575,
         0,
         0,
         0,
@@ -1040,7 +1151,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 22
+      "__id__": 25
     },
     "_enabled": true,
     "_materials": [
@@ -1071,7 +1182,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 21
+      "__id__": 24
     },
     "_enabled": true,
     "horizontal": false,
@@ -1083,10 +1194,10 @@
     "scrollEvents": [],
     "cancelInnerEvents": false,
     "_N$content": {
-      "__id__": 23
+      "__id__": 26
     },
     "content": {
-      "__id__": 23
+      "__id__": 26
     },
     "_N$horizontalScrollBar": null,
     "_N$verticalScrollBar": null,
@@ -1097,7 +1208,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 21
+      "__id__": 24
     },
     "_enabled": true,
     "pre_item": [
@@ -1169,17 +1280,17 @@
     },
     "_children": [
       {
-        "__id__": 33
+        "__id__": 36
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 36
+        "__id__": 39
       }
     ],
     "_prefab": {
-      "__id__": 37
+      "__id__": 40
     },
     "_opacity": 255,
     "_color": {
@@ -1204,7 +1315,7 @@
       "ctor": "Float64Array",
       "array": [
         -325,
-        604,
+        596.033,
         0,
         0,
         0,
@@ -1233,17 +1344,17 @@
     "_name": "按钮纹理",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 32
+      "__id__": 35
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 34
+        "__id__": 37
       }
     ],
     "_prefab": {
-      "__id__": 35
+      "__id__": 38
     },
     "_opacity": 255,
     "_color": {
@@ -1255,8 +1366,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 26,
-      "height": 28
+      "width": 22,
+      "height": 36
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1297,7 +1408,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 33
+      "__id__": 36
     },
     "_enabled": true,
     "_materials": [
@@ -1308,7 +1419,7 @@
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
-      "__uuid__": "fa5301d9-95e8-4f3a-9ca3-a3c714bc574b"
+      "__uuid__": "96791d9f-b2a7-406c-84c0-d63af62e60ea"
     },
     "_type": 0,
     "_sizeMode": 1,
@@ -1340,7 +1451,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 32
+      "__id__": 35
     },
     "_enabled": true,
     "node_panel": {
@@ -1397,10 +1508,10 @@
     },
     "_enabled": true,
     "sroll_view": {
-      "__id__": 27
+      "__id__": 30
     },
     "lbl_rmb_total": {
-      "__id__": 17
+      "__id__": 18
     },
     "_id": ""
   },

assets/resources/module/cashNormal/cashNormalItem.prefab

@@ -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/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/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/redBagCash/redBagCashItem.prefab

@@ -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": {
@@ -693,7 +693,11 @@
     "_grayMaterial": null,
     "duration": 0.1,
     "zoomScale": 1.2,
-    "clickEvents": [],
+    "clickEvents": [
+      {
+        "__id__": 19
+      }
+    ],
     "_N$interactable": true,
     "_N$enableAutoGrayEffect": false,
     "_N$transition": 3,
@@ -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": {
@@ -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": {
@@ -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": {
@@ -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/script/game/data/GameData.ts

@@ -203,6 +203,8 @@ type PlayerInfoType = {
     piggyBankCashTimes: number,
     /** 累计存钱罐每日提现次数 */
     totalPiggyBankCashTimes: number,
+    /** 提现进度 */
+    cashIndex: number,
     /** 上次登录时间 */
     lastTime: number,
     /** 登录天数 */

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

@@ -12,18 +12,20 @@ export class RedBagCashData extends Data {
      * 数据初始化
      */
     public init() {
+        // 签到进度
+        this.cash_bar = gData.gameData.getProp(GameProp.redBag_cash_bar);// 自定义测试数据
+        // this.cash_bar = gData.gameData.gameData.cashIndex;// 服务端数据
         // 签到配置表
-        this.initCData();
-        if (gData.gameData.configs.cashcfg) {
-            gData.gameData.configs.cashcfg.forEach(item_data => {
+        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.c_data = gData.gameData.configs.CashCfg;
+            this.sortList();
             this.init_list = true;
         }
-        this.cash_bar = gData.gameData.getProp(GameProp.redBag_cash_bar);
     }
     /** 标志位：初始化列表 */
     public init_list: boolean = false;
@@ -31,40 +33,91 @@ export class RedBagCashData extends Data {
     /** 配置表数据 */
     public c_data: Array<CDataType> = [];
 
-    /** 标志位：初始化指定列表 */
+    private _cash_bar: number = 0;
     /** 提现进度 */
-    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++;
+        }
     }
 
-    /** 客户端造的假数据 */
-    private initCData() {
-        for (let i = 0; i < 20; i++) {
-            const id = i + 1;
-            let obj = {
-                index: id,
-                /** 毛币数量？ */
-                money: id,
-                /** 红包数量 */
-                type_value: id * 10000,
-                time: id,
-                directVideoTime: id,
-                delayVideoTimes: id,
-                money_type: id,
-                num: id,
-                moneyshow: id,
-                summoney: id
-            };
-            this.c_data.push(obj)
+
+    /**
+     * 获取条目，通过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]
+            }
         }
-        this.init_list = true;
     }
+
+    // /** 客户端造的假数据 */
+    // 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 = {

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/module/module/cashNormal/CashNormalItem.ts

@@ -32,7 +32,7 @@ export default class CashNormalItem extends cc.Component {
 
         this.lbl_cash_type.string = '签到提现';
         this.lbl_cash_time.string = '2021.03.05';
-        this.lbl_red_ma.string = '红包码：' + "AABB左右左右BABA";
+        this.lbl_red_ma.string = '红包码：' + "AABBCC";
         this.lbl_rmb_value.string = '￥' + 0.30 + '元';
     }
 }

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

@@ -9,8 +9,7 @@ const { ccclass, property } = cc._decorator;
 export default class RedBagCash extends cc.Component {
 
     @property({ displayName: '滚动视图', type: cc.ScrollView })
-    sroll_view: cc.ScrollView = null!;
-
+    private sroll_view: cc.ScrollView = null!;
     @property({ displayName: 'lbl红包数量', type: cc.Label })
     private lbl_redbag: cc.Label = null!;
     @property({ displayName: 'lbl毛币数量', type: cc.Label })
@@ -18,6 +17,7 @@ export default class RedBagCash extends cc.Component {
 
     private tableview: TableView = null;
     onLoad() {
+        gData.gameData.gameData.redMoney = 10200
         this.tableview = this.sroll_view.getComponent('TableView');
     }
 
@@ -26,13 +26,21 @@ export default class RedBagCash extends cc.Component {
         this.initScrollView();
     }
 
-    // update (dt) {}
+    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;
     }
+
     /**
      * 初始化货币数量
      */

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

@@ -44,7 +44,9 @@ export default class RedBagCashItem extends cc.Component {
     private initStyle(item_data) {
         this.item_data = item_data;
         this.lbl_red_value.string = `${this.item_data.type_value}`;
-        this.lbl_rmb_value.string = this.item_data.money + '元';
+        let rmb_value = this.item_data.money / 100;
+        rmb_value = rmb_value > 1 ? rmb_value : parseFloat(rmb_value.toFixed(2))
+        this.lbl_rmb_value.string = rmb_value + '元';
 
         if (this.item_data.index <= gData.redBagCash.cash_bar) {
             // 已提现
@@ -71,11 +73,12 @@ export default class RedBagCashItem extends cc.Component {
      */
     private clickCashOP() {
         // if (!gData.redBagCash.cash_enable) return;
-        if (this.item_data.index > gData.redBagCash.cash_bar) {
+        if (this.item_data.index > gData.redBagCash.cash_bar + 1) {
             mk.tip.pop('请按顺序提现');
             return;
         }
         gData.redBagCash.cashOP();
+        cc.log('红包现成功')
     }
 
 }

assets/script/game/module/module/sign/Sign.ts

@@ -31,6 +31,7 @@ export default class Sign extends cc.Component {
         // gData.sign.sign_can = gData.gameData.getProp(GameProp.sign_can);
         gData.sign.initListData();
         gData.sign.init_data = true;
+        this.initScollView();
     }
 
     /**
@@ -52,11 +53,6 @@ export default class Sign extends cc.Component {
             this.initBtnStyle();
             return;
         }
-        if (gData.sign.init_list) {
-            gData.sign.init_list = false;
-            this.initScollView();
-            return;
-        }
         if (gData.sign.adData) {
             // 展示奖励
             this.getReward();