薛鸿潇 5 年 前
コミット
3fa31a4223
68 ファイル変更1432 行追加1231 行削除
  1. 318 69
      assets/resources/game/prefab/game.prefab
  2. 1 1
      assets/resources/module/cashNormal.meta
  3. 48 916
      assets/resources/module/cashNormal/cashNormal.prefab
  4. 1 1
      assets/resources/module/cashNormal/cashNormal.prefab.meta
  5. 1 1
      assets/resources/module/cashNormal/cashNormalItem.prefab
  6. 0 0
      assets/resources/module/cashNormal/cashNormalItem.prefab.meta
  7. 1 1
      assets/resources/module/cashNormal/texture.meta
  8. BIN
      assets/resources/module/cashNormal/texture/bg.png
  9. 9 9
      assets/resources/module/cashNormal/texture/bg.png.meta
  10. BIN
      assets/resources/module/cashNormal/texture/bg1.png
  11. 9 9
      assets/resources/module/cashNormal/texture/bg1.png.meta
  12. 0 0
      assets/resources/module/cashNormal/texture/bg2.png
  13. 0 0
      assets/resources/module/cashNormal/texture/bg2.png.meta
  14. BIN
      assets/resources/module/cashNormal/texture/close.png
  15. 9 9
      assets/resources/module/cashNormal/texture/close.png.meta
  16. 0 0
      assets/resources/module/cashNormal/texture/top.png
  17. 0 0
      assets/resources/module/cashNormal/texture/top.png.meta
  18. 0 0
      assets/resources/module/cashNormal/提现记录.png
  19. 0 0
      assets/resources/module/cashNormal/提现记录.png.meta
  20. BIN
      assets/resources/module/cashOutRecord/texture/bg.png
  21. BIN
      assets/resources/module/cashOutRecord/texture/bg1.png
  22. BIN
      assets/resources/module/cashOutRecord/texture/close.png
  23. 1 1
      assets/resources/module/redBagCash.meta
  24. 910 42
      assets/resources/module/redBagCash/redBagCash.prefab
  25. 1 1
      assets/resources/module/redBagCash/redBagCash.prefab.meta
  26. 1 1
      assets/resources/module/redBagCash/redBagCashItem.prefab
  27. 0 0
      assets/resources/module/redBagCash/redBagCashItem.prefab.meta
  28. 1 1
      assets/resources/module/redBagCash/texture.meta
  29. BIN
      assets/resources/module/redBagCash/texture/bg.png
  30. 9 9
      assets/resources/module/redBagCash/texture/bg.png.meta
  31. BIN
      assets/resources/module/redBagCash/texture/bg1.png
  32. 9 9
      assets/resources/module/redBagCash/texture/bg1.png.meta
  33. 0 0
      assets/resources/module/redBagCash/texture/button.png
  34. 0 0
      assets/resources/module/redBagCash/texture/button.png.meta
  35. 0 0
      assets/resources/module/redBagCash/texture/button1.png
  36. 0 0
      assets/resources/module/redBagCash/texture/button1.png.meta
  37. 0 0
      assets/resources/module/redBagCash/texture/button2.png
  38. 0 0
      assets/resources/module/redBagCash/texture/button2.png.meta
  39. BIN
      assets/resources/module/redBagCash/texture/close.png
  40. 9 9
      assets/resources/module/redBagCash/texture/close.png.meta
  41. 0 0
      assets/resources/module/redBagCash/texture/icon_hb.png
  42. 0 0
      assets/resources/module/redBagCash/texture/icon_hb.png.meta
  43. 0 0
      assets/resources/module/redBagCash/texture/icon_hb1.png
  44. 0 0
      assets/resources/module/redBagCash/texture/icon_hb1.png.meta
  45. 0 0
      assets/resources/module/redBagCash/texture/icon_hb1_bg.png
  46. 0 0
      assets/resources/module/redBagCash/texture/icon_hb1_bg.png.meta
  47. 0 0
      assets/resources/module/redBagCash/texture/icon_hb1_bg1.png
  48. 0 0
      assets/resources/module/redBagCash/texture/icon_hb1_bg1.png.meta
  49. 0 0
      assets/resources/module/redBagCash/texture/icon_hb_bg.png
  50. 0 0
      assets/resources/module/redBagCash/texture/icon_hb_bg.png.meta
  51. 0 0
      assets/resources/module/redBagCash/texture/title.png
  52. 0 0
      assets/resources/module/redBagCash/texture/title.png.meta
  53. 0 0
      assets/resources/module/redBagCash/texture/title_bg.png
  54. 0 0
      assets/resources/module/redBagCash/texture/title_bg.png.meta
  55. 8 43
      assets/scene/MainScene.fire
  56. 1 2
      assets/script/game/data/module/CashNormalData.ts
  57. 1 1
      assets/script/game/module/module/cashNormal.meta
  58. 14 7
      assets/script/game/module/module/cashNormal/CashNormal.ts
  59. 1 1
      assets/script/game/module/module/cashNormal/CashNormal.ts.meta
  60. 18 20
      assets/script/game/module/module/cashNormal/CashNormalItem.ts
  61. 1 1
      assets/script/game/module/module/cashNormal/CashNormalItem.ts.meta
  62. 0 12
      assets/script/game/module/module/cashOutRecord.meta
  63. 0 38
      assets/script/game/module/module/cashOutRecord/CashOutItem.ts
  64. 1 1
      assets/script/game/module/module/redBagCash.meta
  65. 7 14
      assets/script/game/module/module/redBagCash/RedBagCash.ts
  66. 1 1
      assets/script/game/module/module/redBagCash/RedBagCash.ts.meta
  67. 40 0
      assets/script/game/module/module/redBagCash/RedBagCashItem.ts
  68. 1 1
      assets/script/game/module/module/redBagCash/RedBagCashItem.ts.meta

+ 318 - 69
assets/resources/game/prefab/game.prefab

@@ -30,11 +30,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 57
+        "__id__": 65
       }
     ],
     "_prefab": {
-      "__id__": 58
+      "__id__": 66
     },
     "_opacity": 255,
     "_color": {
@@ -273,17 +273,17 @@
         "__id__": 8
       },
       {
-        "__id__": 19
+        "__id__": 27
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 55
+        "__id__": 63
       }
     ],
     "_prefab": {
-      "__id__": 56
+      "__id__": 64
     },
     "_opacity": 255,
     "_color": {
@@ -342,16 +342,19 @@
     "_children": [
       {
         "__id__": 9
+      },
+      {
+        "__id__": 17
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 17
+        "__id__": 25
       }
     ],
     "_prefab": {
-      "__id__": 18
+      "__id__": 26
     },
     "_opacity": 255,
     "_color": {
@@ -621,7 +624,7 @@
     "_enabled": true,
     "panel_name": "module/receiptNotice/receiptNotice",
     "open_type": 0,
-    "transition_type": 0,
+    "transition_type": 3,
     "onComplete": {
       "__id__": 15
     },
@@ -647,6 +650,252 @@
     "sync": false
   },
   {
+    "__type__": "cc.Node",
+    "_name": "红包提现",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 8
+    },
+    "_children": [
+      {
+        "__id__": 18
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 21
+      },
+      {
+        "__id__": 22
+      }
+    ],
+    "_prefab": {
+      "__id__": 24
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 97,
+      "height": 101
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        -113.426,
+        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": "lbl_desc",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 17
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 19
+      }
+    ],
+    "_prefab": {
+      "__id__": 20
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 0,
+      "g": 255,
+      "b": 56,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 160,
+      "height": 50.4
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        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.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 18
+    },
+    "_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": 0,
+    "_N$cacheMode": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "b4dea4a9-29c8-46bc-a50d-5754afa7a2bd"
+    },
+    "fileId": "20te+LdTpLvYZ322brTxtJ",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 17
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "c53d92da-02b7-4ea1-9d09-e0c26277ea0a"
+    },
+    "_type": 0,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "b8d2cnq+GZLFK30xbLDqr/m",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 17
+    },
+    "_enabled": true,
+    "panel_name": "module/redBagCash/redBagCash",
+    "open_type": 0,
+    "transition_type": 3,
+    "onComplete": {
+      "__id__": 23
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.ClickEvent",
+    "target": null,
+    "component": "",
+    "_componentId": "",
+    "handler": "",
+    "customEventData": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "b4dea4a9-29c8-46bc-a50d-5754afa7a2bd"
+    },
+    "fileId": "8fhASICIBIfIdySz9lv0PW",
+    "sync": false
+  },
+  {
     "__type__": "cc.Widget",
     "_name": "",
     "_objFlags": 0,
@@ -693,38 +942,38 @@
     },
     "_children": [
       {
-        "__id__": 20
+        "__id__": 28
       },
       {
-        "__id__": 22
+        "__id__": 30
       },
       {
-        "__id__": 27
+        "__id__": 35
       },
       {
-        "__id__": 32
+        "__id__": 40
       },
       {
-        "__id__": 37
+        "__id__": 45
       },
       {
-        "__id__": 42
+        "__id__": 50
       },
       {
-        "__id__": 47
+        "__id__": 55
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 52
+        "__id__": 60
       },
       {
-        "__id__": 53
+        "__id__": 61
       }
     ],
     "_prefab": {
-      "__id__": 54
+      "__id__": 62
     },
     "_opacity": 255,
     "_color": {
@@ -777,10 +1026,10 @@
     "__type__": "cc.Node",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 19
+      "__id__": 27
     },
     "_prefab": {
-      "__id__": 21
+      "__id__": 29
     },
     "_name": "btn1",
     "_active": true,
@@ -811,7 +1060,7 @@
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 20
+      "__id__": 28
     },
     "asset": {
       "__uuid__": "87af2d92-1d51-45d4-9ffe-c343a549a2a0"
@@ -824,20 +1073,20 @@
     "_name": "btn2",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 19
+      "__id__": 27
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 23
+        "__id__": 31
       },
       {
-        "__id__": 24
+        "__id__": 32
       }
     ],
     "_prefab": {
-      "__id__": 26
+      "__id__": 34
     },
     "_opacity": 255,
     "_color": {
@@ -891,7 +1140,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 22
+      "__id__": 30
     },
     "_enabled": true,
     "_materials": [
@@ -923,14 +1172,14 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 22
+      "__id__": 30
     },
     "_enabled": true,
     "panel_name": "module/turnable/turnable",
     "open_type": 0,
     "transition_type": 0,
     "onComplete": {
-      "__id__": 25
+      "__id__": 33
     },
     "_id": ""
   },
@@ -958,20 +1207,20 @@
     "_name": "btn3",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 19
+      "__id__": 27
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 28
+        "__id__": 36
       },
       {
-        "__id__": 29
+        "__id__": 37
       }
     ],
     "_prefab": {
-      "__id__": 31
+      "__id__": 39
     },
     "_opacity": 255,
     "_color": {
@@ -1025,7 +1274,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 27
+      "__id__": 35
     },
     "_enabled": true,
     "_materials": [
@@ -1057,14 +1306,14 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 27
+      "__id__": 35
     },
     "_enabled": true,
     "panel_name": "module/invite/invite",
     "open_type": 0,
     "transition_type": 0,
     "onComplete": {
-      "__id__": 30
+      "__id__": 38
     },
     "_id": ""
   },
@@ -1092,20 +1341,20 @@
     "_name": "btn4",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 19
+      "__id__": 27
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 33
+        "__id__": 41
       },
       {
-        "__id__": 34
+        "__id__": 42
       }
     ],
     "_prefab": {
-      "__id__": 36
+      "__id__": 44
     },
     "_opacity": 255,
     "_color": {
@@ -1159,7 +1408,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 32
+      "__id__": 40
     },
     "_enabled": true,
     "_materials": [
@@ -1191,14 +1440,14 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 32
+      "__id__": 40
     },
     "_enabled": true,
     "panel_name": "module/pigBank/pigBank",
     "open_type": 0,
     "transition_type": 0,
     "onComplete": {
-      "__id__": 35
+      "__id__": 43
     },
     "_id": ""
   },
@@ -1226,20 +1475,20 @@
     "_name": "btn5",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 19
+      "__id__": 27
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 38
+        "__id__": 46
       },
       {
-        "__id__": 39
+        "__id__": 47
       }
     ],
     "_prefab": {
-      "__id__": 41
+      "__id__": 49
     },
     "_opacity": 255,
     "_color": {
@@ -1293,7 +1542,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 37
+      "__id__": 45
     },
     "_enabled": true,
     "_materials": [
@@ -1325,14 +1574,14 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 37
+      "__id__": 45
     },
     "_enabled": true,
     "panel_name": "module/blessingBag/blessingBag",
     "open_type": 0,
     "transition_type": 0,
     "onComplete": {
-      "__id__": 40
+      "__id__": 48
     },
     "_id": ""
   },
@@ -1360,20 +1609,20 @@
     "_name": "btn6",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 19
+      "__id__": 27
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 43
+        "__id__": 51
       },
       {
-        "__id__": 44
+        "__id__": 52
       }
     ],
     "_prefab": {
-      "__id__": 46
+      "__id__": 54
     },
     "_opacity": 255,
     "_color": {
@@ -1427,7 +1676,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 42
+      "__id__": 50
     },
     "_enabled": true,
     "_materials": [
@@ -1459,14 +1708,14 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 42
+      "__id__": 50
     },
     "_enabled": true,
     "panel_name": "module/sign/sign",
     "open_type": 0,
     "transition_type": 0,
     "onComplete": {
-      "__id__": 45
+      "__id__": 53
     },
     "_id": ""
   },
@@ -1494,20 +1743,20 @@
     "_name": "btn7",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 19
+      "__id__": 27
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 48
+        "__id__": 56
       },
       {
-        "__id__": 49
+        "__id__": 57
       }
     ],
     "_prefab": {
-      "__id__": 51
+      "__id__": 59
     },
     "_opacity": 255,
     "_color": {
@@ -1561,7 +1810,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 47
+      "__id__": 55
     },
     "_enabled": true,
     "_materials": [
@@ -1593,14 +1842,14 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 47
+      "__id__": 55
     },
     "_enabled": true,
     "panel_name": "module/blessingBag/blessingBag",
     "open_type": 0,
     "transition_type": 0,
     "onComplete": {
-      "__id__": 50
+      "__id__": 58
     },
     "_id": ""
   },
@@ -1628,7 +1877,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 19
+      "__id__": 27
     },
     "_enabled": true,
     "_layoutSize": {
@@ -1660,7 +1909,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 19
+      "__id__": 27
     },
     "_enabled": true,
     "alignMode": 1,
@@ -1705,16 +1954,16 @@
     "_enabled": true,
     "btn1": null,
     "btn2": {
-      "__id__": 22
+      "__id__": 30
     },
     "btn3": {
-      "__id__": 27
+      "__id__": 35
     },
     "btn4": {
-      "__id__": 32
+      "__id__": 40
     },
     "btn5": {
-      "__id__": 20
+      "__id__": 28
     },
     "_id": ""
   },

+ 1 - 1
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,

ファイルの差分が大きいため隠しています
+ 48 - 916
assets/resources/module/cashNormal/cashNormal.prefab


+ 1 - 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,

+ 1 - 1
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": [

+ 0 - 0
assets/resources/module/cashOutRecord/cashOutItem.prefab.meta → assets/resources/module/cashNormal/cashNormalItem.prefab.meta


+ 1 - 1
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,

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


+ 9 - 9
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,

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


+ 9 - 9
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,

+ 0 - 0
assets/resources/module/cashOutRecord/texture/bg2.png → assets/resources/module/cashNormal/texture/bg2.png


+ 0 - 0
assets/resources/module/cashOutRecord/texture/bg2.png.meta → assets/resources/module/cashNormal/texture/bg2.png.meta


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


+ 9 - 9
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,

+ 0 - 0
assets/resources/module/cashOutRecord/texture/top.png → assets/resources/module/cashNormal/texture/top.png


+ 0 - 0
assets/resources/module/cashOutRecord/texture/top.png.meta → assets/resources/module/cashNormal/texture/top.png.meta


+ 0 - 0
assets/resources/module/cashOutRecord/提现记录.png → assets/resources/module/cashNormal/提现记录.png


+ 0 - 0
assets/resources/module/cashOutRecord/提现记录.png.meta → assets/resources/module/cashNormal/提现记录.png.meta


BIN
assets/resources/module/cashOutRecord/texture/bg.png


BIN
assets/resources/module/cashOutRecord/texture/bg1.png


BIN
assets/resources/module/cashOutRecord/texture/close.png


+ 1 - 1
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,

ファイルの差分が大きいため隠しています
+ 910 - 42
assets/resources/module/redBagCash/redBagCash.prefab


+ 1 - 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,

+ 1 - 1
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": [

+ 0 - 0
assets/resources/module/cashNormal/prefab/cashNormalItem.prefab.meta → assets/resources/module/redBagCash/redBagCashItem.prefab.meta


+ 1 - 1
assets/resources/module/cashOutRecord/texture.meta → assets/resources/module/redBagCash/texture.meta

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

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


+ 9 - 9
assets/resources/module/cashOutRecord/texture/bg.png.meta → assets/resources/module/redBagCash/texture/bg.png.meta

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

BIN
assets/resources/module/redBagCash/texture/bg1.png


+ 9 - 9
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,

+ 0 - 0
assets/resources/module/cashNormal/texture/button.png → assets/resources/module/redBagCash/texture/button.png


+ 0 - 0
assets/resources/module/cashNormal/texture/button.png.meta → assets/resources/module/redBagCash/texture/button.png.meta


+ 0 - 0
assets/resources/module/cashNormal/texture/button1.png → assets/resources/module/redBagCash/texture/button1.png


+ 0 - 0
assets/resources/module/cashNormal/texture/button1.png.meta → assets/resources/module/redBagCash/texture/button1.png.meta


+ 0 - 0
assets/resources/module/cashNormal/texture/button2.png → assets/resources/module/redBagCash/texture/button2.png


+ 0 - 0
assets/resources/module/cashNormal/texture/button2.png.meta → assets/resources/module/redBagCash/texture/button2.png.meta


BIN
assets/resources/module/redBagCash/texture/close.png


+ 9 - 9
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,

+ 0 - 0
assets/resources/module/cashNormal/texture/icon_hb.png → assets/resources/module/redBagCash/texture/icon_hb.png


+ 0 - 0
assets/resources/module/cashNormal/texture/icon_hb.png.meta → assets/resources/module/redBagCash/texture/icon_hb.png.meta


+ 0 - 0
assets/resources/module/cashNormal/texture/icon_hb1.png → assets/resources/module/redBagCash/texture/icon_hb1.png


+ 0 - 0
assets/resources/module/cashNormal/texture/icon_hb1.png.meta → assets/resources/module/redBagCash/texture/icon_hb1.png.meta


+ 0 - 0
assets/resources/module/cashNormal/texture/icon_hb1_bg.png → assets/resources/module/redBagCash/texture/icon_hb1_bg.png


+ 0 - 0
assets/resources/module/cashNormal/texture/icon_hb1_bg.png.meta → assets/resources/module/redBagCash/texture/icon_hb1_bg.png.meta


+ 0 - 0
assets/resources/module/cashNormal/texture/icon_hb1_bg1.png → assets/resources/module/redBagCash/texture/icon_hb1_bg1.png


+ 0 - 0
assets/resources/module/cashNormal/texture/icon_hb1_bg1.png.meta → assets/resources/module/redBagCash/texture/icon_hb1_bg1.png.meta


+ 0 - 0
assets/resources/module/cashNormal/texture/icon_hb_bg.png → assets/resources/module/redBagCash/texture/icon_hb_bg.png


+ 0 - 0
assets/resources/module/cashNormal/texture/icon_hb_bg.png.meta → assets/resources/module/redBagCash/texture/icon_hb_bg.png.meta


+ 0 - 0
assets/resources/module/cashNormal/texture/title.png → assets/resources/module/redBagCash/texture/title.png


+ 0 - 0
assets/resources/module/cashNormal/texture/title.png.meta → assets/resources/module/redBagCash/texture/title.png.meta


+ 0 - 0
assets/resources/module/cashNormal/texture/title_bg.png → assets/resources/module/redBagCash/texture/title_bg.png


+ 0 - 0
assets/resources/module/cashNormal/texture/title_bg.png.meta → assets/resources/module/redBagCash/texture/title_bg.png.meta


+ 8 - 43
assets/scene/MainScene.fire

@@ -81,15 +81,18 @@
         "__id__": 8
       },
       {
-        "__id__": 10
+        "__id__": 9
       },
       {
-        "__id__": 11
+        "__id__": 10
       }
     ],
     "_active": true,
     "_components": [
       {
+        "__id__": 11
+      },
+      {
         "__id__": 12
       },
       {
@@ -97,9 +100,6 @@
       },
       {
         "__id__": 14
-      },
-      {
-        "__id__": 15
       }
     ],
     "_prefab": null,
@@ -387,11 +387,7 @@
     },
     "_children": [],
     "_active": true,
-    "_components": [
-      {
-        "__id__": 9
-      }
-    ],
+    "_components": [],
     "_prefab": null,
     "_opacity": 255,
     "_color": {
@@ -403,8 +399,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 750,
-      "height": 1334
+      "width": 0,
+      "height": 0
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -441,37 +437,6 @@
     "_id": "75aso/yzBLpLz+LJ97b9pt"
   },
   {
-    "__type__": "5b808c7i9JMAJCR/OQTRrlG",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 8
-    },
-    "_enabled": true,
-    "tween_time": 1,
-    "src_x": 0,
-    "src_y": 0,
-    "tar_x": 0,
-    "tar_y": 200,
-    "bg_opacity": 100,
-    "bg_color": {
-      "__type__": "cc.Color",
-      "r": 36,
-      "g": 47,
-      "b": 232,
-      "a": 82
-    },
-    "tip_color": {
-      "__type__": "cc.Color",
-      "r": 220,
-      "g": 220,
-      "b": 80,
-      "a": 255
-    },
-    "tip_size": 32,
-    "_id": "41Yz88THFLQYf9GACa9dX1"
-  },
-  {
     "__type__": "cc.Node",
     "_name": "特效层",
     "_objFlags": 0,

+ 1 - 2
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) {

+ 1 - 1
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,

+ 14 - 7
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 + '元';
+    }
 }

+ 1 - 1
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,

+ 18 - 20
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 = '红包码:' + "AABB左右左右BABA";
+        this.lbl_rmb_value.string = '¥' + 0.30 + '元';
+    }
 }

+ 1 - 1
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,

+ 0 - 12
assets/script/game/module/module/cashOutRecord.meta

@@ -1,12 +0,0 @@
-{
-  "ver": "1.1.2",
-  "uuid": "57b28902-1e8c-4327-bcbf-3b36b90c9728",
-  "isBundle": false,
-  "bundleName": "",
-  "priority": 1,
-  "compressionType": {},
-  "optimizeHotUpdate": {},
-  "inlineSpriteFrames": {},
-  "isRemoteBundle": {},
-  "subMetas": {}
-}

+ 0 - 38
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 + '元';
-    }
-}

+ 1 - 1
assets/resources/module/cashOutRecord.meta → assets/script/game/module/module/redBagCash.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.2",
-  "uuid": "77c0c02b-e1b3-4c2b-bdf1-928dc52af043",
+  "uuid": "4d0ef30e-c860-413a-8bb2-994f05d1a5ac",
   "isBundle": false,
   "bundleName": "",
   "priority": 1,

+ 7 - 14
assets/script/game/module/module/cashOutRecord/CashOutRecord.ts → assets/script/game/module/module/redBagCash/RedBagCash.ts

@@ -1,26 +1,26 @@
 
 const { ccclass, property } = cc._decorator;
 /**
- * 提现记录
+ * 红包提现界面
  * @author 薛鸿潇
  */
 @ccclass
-export default class CashOutRecord extends cc.Component {
+export default class RedBagCash 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,11 +33,4 @@ export default class CashOutRecord extends cc.Component {
         }
         this.sroll_view.node.emit('srollview-init', data);
     }
-
-    /**
-     * 初始化累计提现
-     */
-    private initTotal() {
-        this.lbl_rmb_total.string = '¥' + gData.cashNormal.receip_total_rmb + '元';
-    }
 }

+ 1 - 1
assets/script/game/module/module/cashOutRecord/CashOutRecord.ts.meta → assets/script/game/module/module/redBagCash/RedBagCash.ts.meta

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

+ 40 - 0
assets/script/game/module/module/redBagCash/RedBagCashItem.ts

@@ -0,0 +1,40 @@
+
+const { ccclass, property } = cc._decorator;
+/**
+ * 常规提现条目
+ * @author 薛鸿潇
+ */
+@ccclass
+export default class RedBagCashItem 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;
+
+    onLoad() {
+
+    }
+
+    start() {
+
+    }
+
+
+    /**
+     * 初始化数据
+     */
+    public async setItemData(item_data) {
+        await this.initStyle(item_data);
+    }
+    private initStyle(item_data) {
+        
+    }
+
+}

+ 1 - 1
assets/script/game/module/module/cashOutRecord/CashOutItem.ts.meta → assets/script/game/module/module/redBagCash/RedBagCashItem.ts.meta

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

この差分においてかなりの量のファイルが変更されているため、一部のファイルを表示していません