Przeglądaj źródła

【功能】红包提现,微信提现,提现记录,对接完成

mojunshou 1 rok temu
rodzic
commit
68a63283b7
46 zmienionych plików z 7222 dodań i 2061 usunięć
  1. 533 162
      assets/bundle/common/prefab/kind_tips.prefab
  2. 4 4
      assets/bundle/common/prefab/notify.prefab
  3. 462 233
      assets/bundle/common/prefab/retention.prefab
  4. 2 2
      assets/bundle/common/prefab/wait.prefab
  5. BIN
      assets/bundle/common/texture/Switch_Single_Bg.png
  6. BIN
      assets/bundle/common/texture/Switch_Single_Fill.png
  7. BIN
      assets/bundle/common/texture/Switch_Single_Handle.png
  8. 0 134
      assets/bundle/common/texture/Switch_Single_Handle.png.meta
  9. BIN
      assets/bundle/common/texture/btn_off.png
  10. BIN
      assets/bundle/common/texture/btn_on.png
  11. 213 0
      assets/bundle/gui/eliminate/animation/light_rotation.anim
  12. 13 0
      assets/bundle/gui/eliminate/animation/light_rotation.anim.meta
  13. 25 23
      assets/bundle/gui/eliminate/animation/tx_rotation1.anim
  14. 805 0
      assets/bundle/gui/eliminate/animation/wxtx_rotation.anim
  15. 13 0
      assets/bundle/gui/eliminate/animation/wxtx_rotation.anim.meta
  16. 1153 268
      assets/bundle/gui/eliminate/prefab/cashWithdrawal.prefab
  17. 135 68
      assets/bundle/gui/eliminate/prefab/redPackeItem.prefab
  18. 515 581
      assets/bundle/gui/eliminate/prefab/redPacketWithdrawal.prefab
  19. 551 0
      assets/bundle/gui/eliminate/prefab/stateItem2.prefab
  20. 13 0
      assets/bundle/gui/eliminate/prefab/stateItem2.prefab.meta
  21. 1866 287
      assets/bundle/gui/eliminate/prefab/wechatWithdrawal.prefab
  22. BIN
      assets/bundle/gui/eliminate/texture/bg/bg4.png
  23. 34 34
      assets/bundle/common/texture/Switch_Single_Bg.png.meta
  24. BIN
      assets/bundle/gui/eliminate/texture/bg/bg5.png
  25. 34 34
      assets/bundle/common/texture/Switch_Single_Fill.png.meta
  26. BIN
      assets/bundle/gui/eliminate/texture/button/btn_back2.png
  27. 30 30
      assets/bundle/common/texture/btn_on.png.meta
  28. BIN
      assets/bundle/gui/eliminate/texture/title_bg3.png
  29. 30 30
      assets/bundle/common/texture/btn_off.png.meta
  30. BIN
      assets/bundle/gui/eliminate/texture/温馨提示.png
  31. 134 0
      assets/bundle/gui/eliminate/texture/温馨提示.png.meta
  32. BIN
      assets/bundle/gui/eliminate/texture/隐私政策及说明.png
  33. 134 0
      assets/bundle/gui/eliminate/texture/隐私政策及说明.png.meta
  34. 9 25
      assets/script/game/account/model/AccountModelComp.ts
  35. 7 3
      assets/script/game/common/about/AboutViewComp.ts
  36. 4 1
      assets/script/game/common/config/GameEvent.ts
  37. 31 23
      assets/script/game/common/manager/ProtocolEvent.ts
  38. 95 12
      assets/script/game/common/manager/ServerHandler.ts
  39. 2 1
      assets/script/game/common/tips/KindTipsView.ts
  40. 96 2
      assets/script/game/model/GameModelComp.ts
  41. 71 12
      assets/script/game/view/CashWithdrawalView.ts
  42. 11 5
      assets/script/game/view/EliminateViewComp.ts
  43. 35 45
      assets/script/game/view/RedPackeItemView.ts
  44. 72 35
      assets/script/game/view/RedPackeWithdrawalViewComp.ts
  45. 86 6
      assets/script/game/view/WechatWithdrawalViewComp.ts
  46. 4 1
      assets/script/game/view/WithdrawalRecordViewComp.ts

Plik diff jest za duży
+ 533 - 162
assets/bundle/common/prefab/kind_tips.prefab


+ 4 - 4
assets/bundle/common/prefab/notify.prefab

@@ -241,7 +241,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 131.2109375,
+      "width": 86.66015625,
       "height": 50.4
     },
     "_anchorPoint": {
@@ -280,8 +280,8 @@
     "_string": "content",
     "_horizontalAlign": 1,
     "_verticalAlign": 1,
-    "_actualFontSize": 40,
-    "_fontSize": 40,
+    "_actualFontSize": 24,
+    "_fontSize": 24,
     "_fontFamily": "Arial",
     "_lineHeight": 40,
     "_overflow": 0,
@@ -290,7 +290,7 @@
     "_isSystemFontUsed": true,
     "_spacingX": 0,
     "_isItalic": false,
-    "_isBold": false,
+    "_isBold": true,
     "_isUnderline": false,
     "_underlineHeight": 2,
     "_cacheMode": 1,

Plik diff jest za duży
+ 462 - 233
assets/bundle/common/prefab/retention.prefab


+ 2 - 2
assets/bundle/common/prefab/wait.prefab

@@ -137,7 +137,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 720,
-      "height": 1200
+      "height": 1600
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -395,7 +395,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 720,
-      "height": 1200
+      "height": 1600
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",

BIN
assets/bundle/common/texture/Switch_Single_Bg.png


BIN
assets/bundle/common/texture/Switch_Single_Fill.png


BIN
assets/bundle/common/texture/Switch_Single_Handle.png


+ 0 - 134
assets/bundle/common/texture/Switch_Single_Handle.png.meta

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.27",
-  "importer": "image",
-  "imported": true,
-  "uuid": "3e2e1f9a-374c-4e17-b482-98f7aafcc443",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "3e2e1f9a-374c-4e17-b482-98f7aafcc443@6c48a",
-      "displayName": "Switch_Single_Handle",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "3e2e1f9a-374c-4e17-b482-98f7aafcc443",
-        "isUuid": true,
-        "visible": false,
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "none",
-        "anisotropy": 0
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f9941": {
-      "importer": "sprite-frame",
-      "uuid": "3e2e1f9a-374c-4e17-b482-98f7aafcc443@f9941",
-      "displayName": "Switch_Single_Handle",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 0,
-        "offsetY": 0,
-        "trimX": 0,
-        "trimY": 0,
-        "width": 59,
-        "height": 68,
-        "rawWidth": 59,
-        "rawHeight": 68,
-        "borderTop": 28,
-        "borderBottom": 28,
-        "borderLeft": 25,
-        "borderRight": 25,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -29.5,
-            -34,
-            0,
-            29.5,
-            -34,
-            0,
-            -29.5,
-            34,
-            0,
-            29.5,
-            34,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            0,
-            68,
-            59,
-            68,
-            0,
-            0,
-            59,
-            0
-          ],
-          "nuv": [
-            0,
-            0,
-            1,
-            0,
-            0,
-            1,
-            1,
-            1
-          ],
-          "minPos": [
-            -29.5,
-            -34,
-            0
-          ],
-          "maxPos": [
-            29.5,
-            34,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "3e2e1f9a-374c-4e17-b482-98f7aafcc443@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "3e2e1f9a-374c-4e17-b482-98f7aafcc443@6c48a"
-  }
-}

BIN
assets/bundle/common/texture/btn_off.png


BIN
assets/bundle/common/texture/btn_on.png


+ 213 - 0
assets/bundle/gui/eliminate/animation/light_rotation.anim

@@ -0,0 +1,213 @@
+[
+  {
+    "__type__": "cc.AnimationClip",
+    "_name": "light_rotation",
+    "_objFlags": 0,
+    "__editorExtras__": {
+      "embeddedPlayerGroups": []
+    },
+    "_native": "",
+    "sample": 10,
+    "speed": 1,
+    "wrapMode": 2,
+    "enableTrsBlending": false,
+    "_duration": 5.9,
+    "_hash": 500763545,
+    "_tracks": [
+      {
+        "__id__": 1
+      }
+    ],
+    "_exoticAnimation": null,
+    "_events": [],
+    "_embeddedPlayers": [],
+    "_additiveSettings": {
+      "__id__": 11
+    },
+    "_auxiliaryCurveEntries": []
+  },
+  {
+    "__type__": "cc.animation.VectorTrack",
+    "_binding": {
+      "__type__": "cc.animation.TrackBinding",
+      "path": {
+        "__id__": 2
+      },
+      "proxy": null
+    },
+    "_channels": [
+      {
+        "__id__": 3
+      },
+      {
+        "__id__": 5
+      },
+      {
+        "__id__": 7
+      },
+      {
+        "__id__": 9
+      }
+    ],
+    "_nComponents": 3
+  },
+  {
+    "__type__": "cc.animation.TrackPath",
+    "_paths": [
+      "eulerAngles"
+    ]
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 4
+    }
+  },
+  {
+    "__type__": "cc.RealCurve",
+    "_times": [
+      0,
+      5.9
+    ],
+    "_values": [
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 0,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "broken": null
+        }
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 0,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "broken": null
+        }
+      }
+    ],
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 6
+    }
+  },
+  {
+    "__type__": "cc.RealCurve",
+    "_times": [
+      0,
+      5.9
+    ],
+    "_values": [
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 0,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "broken": null
+        }
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 0,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "broken": null
+        }
+      }
+    ],
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 8
+    }
+  },
+  {
+    "__type__": "cc.RealCurve",
+    "_times": [
+      0,
+      5.9
+    ],
+    "_values": [
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 0,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "broken": null
+        }
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": -360,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "broken": null
+        }
+      }
+    ],
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 10
+    }
+  },
+  {
+    "__type__": "cc.RealCurve",
+    "_times": [],
+    "_values": [],
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
+  },
+  {
+    "__type__": "cc.AnimationClipAdditiveSettings",
+    "enabled": false,
+    "refClip": null
+  }
+]

+ 13 - 0
assets/bundle/gui/eliminate/animation/light_rotation.anim.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "2.0.3",
+  "importer": "animation-clip",
+  "imported": true,
+  "uuid": "62c95173-1005-48b0-bef6-f49a73db295c",
+  "files": [
+    ".cconb"
+  ],
+  "subMetas": {},
+  "userData": {
+    "name": "light_rotation"
+  }
+}

+ 25 - 23
assets/bundle/gui/eliminate/animation/tx_rotation1.anim

@@ -270,7 +270,7 @@
     "__type__": "cc.RealCurve",
     "_times": [
       0,
-      0.25
+      0.2666666805744171
     ],
     "_values": [
       {
@@ -297,9 +297,7 @@
         "leftTangent": 0,
         "leftTangentWeight": 1,
         "easingMethod": 0,
-        "__editorExtras__": {
-          "broken": null
-        }
+        "__editorExtras__": null
       }
     ],
     "preExtrapolation": 1,
@@ -315,7 +313,7 @@
     "__type__": "cc.RealCurve",
     "_times": [
       0,
-      0.25
+      0.2666666805744171
     ],
     "_values": [
       {
@@ -342,9 +340,7 @@
         "leftTangent": 0,
         "leftTangentWeight": 1,
         "easingMethod": 0,
-        "__editorExtras__": {
-          "broken": null
-        }
+        "__editorExtras__": null
       }
     ],
     "preExtrapolation": 1,
@@ -360,7 +356,7 @@
     "__type__": "cc.RealCurve",
     "_times": [
       0,
-      0.25
+      0.2666666805744171
     ],
     "_values": [
       {
@@ -387,9 +383,7 @@
         "leftTangent": 0,
         "leftTangentWeight": 1,
         "easingMethod": 0,
-        "__editorExtras__": {
-          "broken": null
-        }
+        "__editorExtras__": null
       }
     ],
     "preExtrapolation": 1,
@@ -989,12 +983,10 @@
   {
     "__type__": "cc.ObjectCurve",
     "_times": [
-      0.016666666666666666,
-      0.75,
+      0,
       1.1666666666666667
     ],
     "_values": [
-      true,
       false,
       true
     ]
@@ -1035,12 +1027,10 @@
     "__type__": "cc.ObjectCurve",
     "_times": [
       0,
-      0.75,
       1.1666666666666667
     ],
     "_values": [
       true,
-      true,
       false
     ]
   },
@@ -1148,7 +1138,9 @@
         "leftTangent": 0,
         "leftTangentWeight": 1,
         "easingMethod": 0,
-        "__editorExtras__": null
+        "__editorExtras__": {
+          "broken": null
+        }
       },
       {
         "__type__": "cc.RealKeyframeValue",
@@ -1160,7 +1152,9 @@
         "leftTangent": 0,
         "leftTangentWeight": 1,
         "easingMethod": 0,
-        "__editorExtras__": null
+        "__editorExtras__": {
+          "broken": null
+        }
       }
     ],
     "preExtrapolation": 1,
@@ -1189,7 +1183,9 @@
         "leftTangent": 0,
         "leftTangentWeight": 1,
         "easingMethod": 0,
-        "__editorExtras__": null
+        "__editorExtras__": {
+          "broken": null
+        }
       },
       {
         "__type__": "cc.RealKeyframeValue",
@@ -1201,7 +1197,9 @@
         "leftTangent": 0,
         "leftTangentWeight": 1,
         "easingMethod": 0,
-        "__editorExtras__": null
+        "__editorExtras__": {
+          "broken": null
+        }
       }
     ],
     "preExtrapolation": 1,
@@ -1230,7 +1228,9 @@
         "leftTangent": 0,
         "leftTangentWeight": 1,
         "easingMethod": 0,
-        "__editorExtras__": null
+        "__editorExtras__": {
+          "broken": null
+        }
       },
       {
         "__type__": "cc.RealKeyframeValue",
@@ -1242,7 +1242,9 @@
         "leftTangent": 0,
         "leftTangentWeight": 1,
         "easingMethod": 0,
-        "__editorExtras__": null
+        "__editorExtras__": {
+          "broken": null
+        }
       }
     ],
     "preExtrapolation": 1,

+ 805 - 0
assets/bundle/gui/eliminate/animation/wxtx_rotation.anim

@@ -0,0 +1,805 @@
+[
+  {
+    "__type__": "cc.AnimationClip",
+    "_name": "wxtx_rotation",
+    "_objFlags": 0,
+    "__editorExtras__": {
+      "embeddedPlayerGroups": []
+    },
+    "_native": "",
+    "sample": 60,
+    "speed": 1,
+    "wrapMode": 1,
+    "enableTrsBlending": false,
+    "_duration": 1.5,
+    "_hash": 500763545,
+    "_tracks": [
+      {
+        "__id__": 1
+      },
+      {
+        "__id__": 8
+      },
+      {
+        "__id__": 19
+      },
+      {
+        "__id__": 24
+      },
+      {
+        "__id__": 29
+      },
+      {
+        "__id__": 40
+      },
+      {
+        "__id__": 45
+      },
+      {
+        "__id__": 50
+      }
+    ],
+    "_exoticAnimation": null,
+    "_events": [],
+    "_embeddedPlayers": [],
+    "_additiveSettings": {
+      "__id__": 61
+    },
+    "_auxiliaryCurveEntries": []
+  },
+  {
+    "__type__": "cc.animation.SizeTrack",
+    "_binding": {
+      "__type__": "cc.animation.TrackBinding",
+      "path": {
+        "__id__": 2
+      },
+      "proxy": null
+    },
+    "_channels": [
+      {
+        "__id__": 4
+      },
+      {
+        "__id__": 6
+      }
+    ]
+  },
+  {
+    "__type__": "cc.animation.TrackPath",
+    "_paths": [
+      {
+        "__id__": 3
+      },
+      "contentSize"
+    ]
+  },
+  {
+    "__type__": "cc.animation.ComponentPath",
+    "component": "cc.UITransform"
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 5
+    }
+  },
+  {
+    "__type__": "cc.RealCurve",
+    "_times": [],
+    "_values": [],
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 7
+    }
+  },
+  {
+    "__type__": "cc.RealCurve",
+    "_times": [
+      0,
+      1.5
+    ],
+    "_values": [
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 0,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "broken": null
+        }
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 280,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "broken": null
+        }
+      }
+    ],
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
+  },
+  {
+    "__type__": "cc.animation.VectorTrack",
+    "_binding": {
+      "__type__": "cc.animation.TrackBinding",
+      "path": {
+        "__id__": 9
+      },
+      "proxy": null
+    },
+    "_channels": [
+      {
+        "__id__": 11
+      },
+      {
+        "__id__": 13
+      },
+      {
+        "__id__": 15
+      },
+      {
+        "__id__": 17
+      }
+    ],
+    "_nComponents": 3
+  },
+  {
+    "__type__": "cc.animation.TrackPath",
+    "_paths": [
+      {
+        "__id__": 10
+      },
+      "eulerAngles"
+    ]
+  },
+  {
+    "__type__": "cc.animation.HierarchyPath",
+    "path": "stateItem/sp_icon1"
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 12
+    }
+  },
+  {
+    "__type__": "cc.RealCurve",
+    "_times": [
+      0,
+      0.3333333333333333
+    ],
+    "_values": [
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 0,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 0,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      }
+    ],
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 14
+    }
+  },
+  {
+    "__type__": "cc.RealCurve",
+    "_times": [
+      0,
+      0.3333333333333333
+    ],
+    "_values": [
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 0,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 0,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      }
+    ],
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 16
+    }
+  },
+  {
+    "__type__": "cc.RealCurve",
+    "_times": [
+      0,
+      0.3333333333333333
+    ],
+    "_values": [
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 0,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": -360,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      }
+    ],
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 18
+    }
+  },
+  {
+    "__type__": "cc.RealCurve",
+    "_times": [],
+    "_values": [],
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
+  },
+  {
+    "__type__": "cc.animation.ObjectTrack",
+    "_binding": {
+      "__type__": "cc.animation.TrackBinding",
+      "path": {
+        "__id__": 20
+      },
+      "proxy": null
+    },
+    "_channel": {
+      "__id__": 22
+    }
+  },
+  {
+    "__type__": "cc.animation.TrackPath",
+    "_paths": [
+      {
+        "__id__": 21
+      },
+      "active"
+    ]
+  },
+  {
+    "__type__": "cc.animation.HierarchyPath",
+    "path": "stateItem/sp_icon1"
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 23
+    }
+  },
+  {
+    "__type__": "cc.ObjectCurve",
+    "_times": [
+      0,
+      0.3333333333333333
+    ],
+    "_values": [
+      true,
+      false
+    ]
+  },
+  {
+    "__type__": "cc.animation.ObjectTrack",
+    "_binding": {
+      "__type__": "cc.animation.TrackBinding",
+      "path": {
+        "__id__": 25
+      },
+      "proxy": null
+    },
+    "_channel": {
+      "__id__": 27
+    }
+  },
+  {
+    "__type__": "cc.animation.TrackPath",
+    "_paths": [
+      {
+        "__id__": 26
+      },
+      "active"
+    ]
+  },
+  {
+    "__type__": "cc.animation.HierarchyPath",
+    "path": "stateItem/icon_20"
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 28
+    }
+  },
+  {
+    "__type__": "cc.ObjectCurve",
+    "_times": [
+      0,
+      0.3333333333333333
+    ],
+    "_values": [
+      false,
+      true
+    ]
+  },
+  {
+    "__type__": "cc.animation.VectorTrack",
+    "_binding": {
+      "__type__": "cc.animation.TrackBinding",
+      "path": {
+        "__id__": 30
+      },
+      "proxy": null
+    },
+    "_channels": [
+      {
+        "__id__": 32
+      },
+      {
+        "__id__": 34
+      },
+      {
+        "__id__": 36
+      },
+      {
+        "__id__": 38
+      }
+    ],
+    "_nComponents": 3
+  },
+  {
+    "__type__": "cc.animation.TrackPath",
+    "_paths": [
+      {
+        "__id__": 31
+      },
+      "eulerAngles"
+    ]
+  },
+  {
+    "__type__": "cc.animation.HierarchyPath",
+    "path": "stateItem-001/sp_icon1"
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 33
+    }
+  },
+  {
+    "__type__": "cc.RealCurve",
+    "_times": [
+      0.6,
+      0.8333333333333334
+    ],
+    "_values": [
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 0,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 0,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      }
+    ],
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 35
+    }
+  },
+  {
+    "__type__": "cc.RealCurve",
+    "_times": [
+      0.6,
+      0.8333333333333334
+    ],
+    "_values": [
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 0,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 0,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      }
+    ],
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 37
+    }
+  },
+  {
+    "__type__": "cc.RealCurve",
+    "_times": [
+      0.6,
+      0.8333333333333334
+    ],
+    "_values": [
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 0,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      },
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": -360,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": null
+      }
+    ],
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 39
+    }
+  },
+  {
+    "__type__": "cc.RealCurve",
+    "_times": [],
+    "_values": [],
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
+  },
+  {
+    "__type__": "cc.animation.ObjectTrack",
+    "_binding": {
+      "__type__": "cc.animation.TrackBinding",
+      "path": {
+        "__id__": 41
+      },
+      "proxy": null
+    },
+    "_channel": {
+      "__id__": 43
+    }
+  },
+  {
+    "__type__": "cc.animation.TrackPath",
+    "_paths": [
+      {
+        "__id__": 42
+      },
+      "active"
+    ]
+  },
+  {
+    "__type__": "cc.animation.HierarchyPath",
+    "path": "stateItem-001/icon_20"
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 44
+    }
+  },
+  {
+    "__type__": "cc.ObjectCurve",
+    "_times": [
+      0.6,
+      0.8333333333333334
+    ],
+    "_values": [
+      false,
+      true
+    ]
+  },
+  {
+    "__type__": "cc.animation.ObjectTrack",
+    "_binding": {
+      "__type__": "cc.animation.TrackBinding",
+      "path": {
+        "__id__": 46
+      },
+      "proxy": null
+    },
+    "_channel": {
+      "__id__": 48
+    }
+  },
+  {
+    "__type__": "cc.animation.TrackPath",
+    "_paths": [
+      {
+        "__id__": 47
+      },
+      "active"
+    ]
+  },
+  {
+    "__type__": "cc.animation.HierarchyPath",
+    "path": "stateItem-001/sp_icon1"
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 49
+    }
+  },
+  {
+    "__type__": "cc.ObjectCurve",
+    "_times": [
+      0,
+      0.8333333333333334
+    ],
+    "_values": [
+      true,
+      false
+    ]
+  },
+  {
+    "__type__": "cc.animation.VectorTrack",
+    "_binding": {
+      "__type__": "cc.animation.TrackBinding",
+      "path": {
+        "__id__": 51
+      },
+      "proxy": null
+    },
+    "_channels": [
+      {
+        "__id__": 53
+      },
+      {
+        "__id__": 55
+      },
+      {
+        "__id__": 57
+      },
+      {
+        "__id__": 59
+      }
+    ],
+    "_nComponents": 3
+  },
+  {
+    "__type__": "cc.animation.TrackPath",
+    "_paths": [
+      {
+        "__id__": 52
+      },
+      "eulerAngles"
+    ]
+  },
+  {
+    "__type__": "cc.animation.HierarchyPath",
+    "path": "stateItem2/sp_icon1"
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 54
+    }
+  },
+  {
+    "__type__": "cc.RealCurve",
+    "_times": [
+      1.3333333333333333
+    ],
+    "_values": [
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 0,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "tangentMode": 0
+        }
+      }
+    ],
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 56
+    }
+  },
+  {
+    "__type__": "cc.RealCurve",
+    "_times": [
+      1.3333333333333333
+    ],
+    "_values": [
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 0,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "tangentMode": 0
+        }
+      }
+    ],
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 58
+    }
+  },
+  {
+    "__type__": "cc.RealCurve",
+    "_times": [
+      1.3333333333333333
+    ],
+    "_values": [
+      {
+        "__type__": "cc.RealKeyframeValue",
+        "interpolationMode": 0,
+        "tangentWeightMode": 0,
+        "value": 0,
+        "rightTangent": 0,
+        "rightTangentWeight": 1,
+        "leftTangent": 0,
+        "leftTangentWeight": 1,
+        "easingMethod": 0,
+        "__editorExtras__": {
+          "tangentMode": 0
+        }
+      }
+    ],
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
+  },
+  {
+    "__type__": "cc.animation.Channel",
+    "_curve": {
+      "__id__": 60
+    }
+  },
+  {
+    "__type__": "cc.RealCurve",
+    "_times": [],
+    "_values": [],
+    "preExtrapolation": 1,
+    "postExtrapolation": 1
+  },
+  {
+    "__type__": "cc.AnimationClipAdditiveSettings",
+    "enabled": false,
+    "refClip": null
+  }
+]

+ 13 - 0
assets/bundle/gui/eliminate/animation/wxtx_rotation.anim.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "2.0.3",
+  "importer": "animation-clip",
+  "imported": true,
+  "uuid": "676a8f68-c148-4319-a78a-d88ee8246801",
+  "files": [
+    ".cconb"
+  ],
+  "subMetas": {},
+  "userData": {
+    "name": "wxtx_rotation"
+  }
+}

Plik diff jest za duży
+ 1153 - 268
assets/bundle/gui/eliminate/prefab/cashWithdrawal.prefab


+ 135 - 68
assets/bundle/gui/eliminate/prefab/redPackeItem.prefab

@@ -25,11 +25,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 92
+        "__id__": 94
+      },
+      {
+        "__id__": 96
       }
     ],
     "_prefab": {
-      "__id__": 94
+      "__id__": 98
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -85,23 +88,23 @@
         "__id__": 35
       },
       {
-        "__id__": 49
+        "__id__": 50
       },
       {
-        "__id__": 63
+        "__id__": 65
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 87
+        "__id__": 89
       },
       {
-        "__id__": 89
+        "__id__": 91
       }
     ],
     "_prefab": {
-      "__id__": 91
+      "__id__": 93
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -916,7 +919,7 @@
       }
     ],
     "_prefab": {
-      "__id__": 48
+      "__id__": 49
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1191,7 +1194,11 @@
     "__prefab": {
       "__id__": 47
     },
-    "clickEvents": [],
+    "clickEvents": [
+      {
+        "__id__": 48
+      }
+    ],
     "_interactable": true,
     "_transition": 3,
     "_normalColor": {
@@ -1241,6 +1248,16 @@
     "fileId": "a83nMOhcRAmKbYwaNFGgaN"
   },
   {
+    "__type__": "cc.ClickEvent",
+    "target": {
+      "__id__": 1
+    },
+    "component": "",
+    "_componentId": "f2eabVLcvlH5IXRlUEbXdFa",
+    "handler": "btn_none",
+    "customEventData": ""
+  },
+  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1
@@ -1263,23 +1280,23 @@
     },
     "_children": [
       {
-        "__id__": 50
+        "__id__": 51
       }
     ],
     "_active": false,
     "_components": [
       {
-        "__id__": 56
+        "__id__": 57
       },
       {
-        "__id__": 58
+        "__id__": 59
       },
       {
-        "__id__": 60
+        "__id__": 61
       }
     ],
     "_prefab": {
-      "__id__": 62
+      "__id__": 64
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1316,20 +1333,20 @@
     "_objFlags": 512,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 49
+      "__id__": 50
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 51
+        "__id__": 52
       },
       {
-        "__id__": 53
+        "__id__": 54
       }
     ],
     "_prefab": {
-      "__id__": 55
+      "__id__": 56
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1366,11 +1383,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 50
+      "__id__": 51
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 52
+      "__id__": 53
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1394,11 +1411,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 50
+      "__id__": 51
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 54
+      "__id__": 55
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1475,11 +1492,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 49
+      "__id__": 50
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 57
+      "__id__": 58
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1503,11 +1520,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 49
+      "__id__": 50
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 59
+      "__id__": 60
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1548,15 +1565,19 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 49
+      "__id__": 50
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 61
+      "__id__": 62
     },
-    "clickEvents": [],
+    "clickEvents": [
+      {
+        "__id__": 63
+      }
+    ],
     "_interactable": true,
-    "_transition": 2,
+    "_transition": 3,
     "_normalColor": {
       "__type__": "cc.Color",
       "r": 214,
@@ -1595,7 +1616,7 @@
     "_duration": 0.1,
     "_zoomScale": 1.2,
     "_target": {
-      "__id__": 49
+      "__id__": 50
     },
     "_id": ""
   },
@@ -1604,6 +1625,16 @@
     "fileId": "b46IOZYGlIbqBtU6kAKnyD"
   },
   {
+    "__type__": "cc.ClickEvent",
+    "target": {
+      "__id__": 1
+    },
+    "component": "",
+    "_componentId": "f2eabVLcvlH5IXRlUEbXdFa",
+    "handler": "btn_receive",
+    "customEventData": ""
+  },
+  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1
@@ -1626,26 +1657,26 @@
     },
     "_children": [
       {
-        "__id__": 64
+        "__id__": 66
       },
       {
-        "__id__": 70
+        "__id__": 72
       },
       {
-        "__id__": 76
+        "__id__": 78
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 82
+        "__id__": 84
       },
       {
-        "__id__": 84
+        "__id__": 86
       }
     ],
     "_prefab": {
-      "__id__": 86
+      "__id__": 88
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1682,20 +1713,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 63
+      "__id__": 65
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 65
+        "__id__": 67
       },
       {
-        "__id__": 67
+        "__id__": 69
       }
     ],
     "_prefab": {
-      "__id__": 69
+      "__id__": 71
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1732,11 +1763,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 64
+      "__id__": 66
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 66
+      "__id__": 68
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1760,11 +1791,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 64
+      "__id__": 66
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 68
+      "__id__": 70
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1841,20 +1872,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 63
+      "__id__": 65
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 71
+        "__id__": 73
       },
       {
-        "__id__": 73
+        "__id__": 75
       }
     ],
     "_prefab": {
-      "__id__": 75
+      "__id__": 77
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1891,11 +1922,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 70
+      "__id__": 72
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 72
+      "__id__": 74
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1919,11 +1950,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 70
+      "__id__": 72
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 74
+      "__id__": 76
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -2000,20 +2031,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 63
+      "__id__": 65
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 77
+        "__id__": 79
       },
       {
-        "__id__": 79
+        "__id__": 81
       }
     ],
     "_prefab": {
-      "__id__": 81
+      "__id__": 83
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -2050,11 +2081,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 76
+      "__id__": 78
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 78
+      "__id__": 80
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2078,11 +2109,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 76
+      "__id__": 78
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 80
+      "__id__": 82
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -2159,11 +2190,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 63
+      "__id__": 65
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 83
+      "__id__": 85
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2187,11 +2218,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 63
+      "__id__": 65
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 85
+      "__id__": 87
     },
     "_resizeMode": 1,
     "_layoutType": 1,
@@ -2242,7 +2273,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 88
+      "__id__": 90
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2270,7 +2301,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 90
+      "__id__": 92
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -2328,7 +2359,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 93
+      "__id__": 95
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2347,6 +2378,42 @@
     "fileId": "66c/6wuo1F0IzbuSBnY9FS"
   },
   {
+    "__type__": "f2eabVLcvlH5IXRlUEbXdFa",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 97
+    },
+    "receiveNode": {
+      "__id__": 50
+    },
+    "unReceiveNode": {
+      "__id__": 35
+    },
+    "lab_title": {
+      "__id__": 75
+    },
+    "lab_progress": {
+      "__id__": 32
+    },
+    "pro_progress": {
+      "__id__": 26
+    },
+    "lab_num": {
+      "__id__": 12
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "12O1/akC1BIYSPVusB1QM/"
+  },
+  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1

Plik diff jest za duży
+ 515 - 581
assets/bundle/gui/eliminate/prefab/redPacketWithdrawal.prefab


+ 551 - 0
assets/bundle/gui/eliminate/prefab/stateItem2.prefab

@@ -0,0 +1,551 @@
+[
+  {
+    "__type__": "cc.Prefab",
+    "_name": "stateItem2",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_native": "",
+    "data": {
+      "__id__": 1
+    },
+    "optimizationPolicy": 0,
+    "persistent": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "stateItem2",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": null,
+    "_children": [
+      {
+        "__id__": 2
+      },
+      {
+        "__id__": 8
+      },
+      {
+        "__id__": 14
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 20
+      },
+      {
+        "__id__": 22
+      }
+    ],
+    "_prefab": {
+      "__id__": 24
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "sp_icon1",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 3
+      },
+      {
+        "__id__": 5
+      }
+    ],
+    "_prefab": {
+      "__id__": 7
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 18,
+      "y": 0,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 4
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 36,
+      "height": 36
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "351fLHEqBPVIbTfn3fCmmM"
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 6
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_spriteFrame": {
+      "__uuid__": "55c1d083-41db-4ad3-9425-4eb0c56ce875@f9941",
+      "__expectedType__": "cc.SpriteFrame"
+    },
+    "_type": 0,
+    "_fillType": 0,
+    "_sizeMode": 1,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_useGrayscale": false,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "a6Veu0zUpIVZWl/WKEGUP+"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "c7yNhRpMRGOLUmmiRue+5G",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "icon_20",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": false,
+    "_components": [
+      {
+        "__id__": 9
+      },
+      {
+        "__id__": 11
+      }
+    ],
+    "_prefab": {
+      "__id__": 13
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 8
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 10
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 32,
+      "height": 30
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "69lD/846hCzL/AG7jQVkXa"
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 8
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 12
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_spriteFrame": {
+      "__uuid__": "d061ae7e-71e1-4d90-949f-e6d7a8cd0c9f@f9941",
+      "__expectedType__": "cc.SpriteFrame"
+    },
+    "_type": 0,
+    "_fillType": 0,
+    "_sizeMode": 1,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_useGrayscale": false,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "bbP5lMW9ZC54ASXLa0HFoJ"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "ea71UIZK5Ko6vWMRRa1kI5",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "RichText",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 15
+      },
+      {
+        "__id__": 17
+      }
+    ],
+    "_prefab": {
+      "__id__": 19
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 237.3583984375,
+      "y": 17.91,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 14
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 16
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 382.716796875,
+      "height": 67.8
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 1
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "21DW0dqr1EsaKOTgbSvYEc"
+  },
+  {
+    "__type__": "cc.RichText",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 14
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 18
+    },
+    "_lineHeight": 30,
+    "_string": "微信大额提现需要300元手续费\n已赚210.9元,仅差89.1元",
+    "_horizontalAlign": 0,
+    "_verticalAlign": 0,
+    "_fontSize": 28,
+    "_fontColor": {
+      "__type__": "cc.Color",
+      "r": 32,
+      "g": 32,
+      "b": 32,
+      "a": 255
+    },
+    "_maxWidth": 0,
+    "_fontFamily": "Arial",
+    "_font": null,
+    "_isSystemFontUsed": true,
+    "_userDefinedFont": null,
+    "_cacheMode": 0,
+    "_imageAtlas": null,
+    "_handleTouchEvent": true,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "34mj0wavNG34VPMKWT6TpX"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "0e9BP9nbZFLrODDbUOWWkX",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 21
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 428.716796875,
+      "height": 36
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "e0Dz3xLbFGqYaCoVHqF758"
+  },
+  {
+    "__type__": "cc.Layout",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 23
+    },
+    "_resizeMode": 1,
+    "_layoutType": 1,
+    "_cellSize": {
+      "__type__": "cc.Size",
+      "width": 40,
+      "height": 40
+    },
+    "_startAxis": 0,
+    "_paddingLeft": 0,
+    "_paddingRight": 0,
+    "_paddingTop": 0,
+    "_paddingBottom": 0,
+    "_spacingX": 10,
+    "_spacingY": 0,
+    "_verticalDirection": 1,
+    "_horizontalDirection": 0,
+    "_constraint": 0,
+    "_constraintNum": 2,
+    "_affectedByScale": false,
+    "_isAlign": false,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "f3PgdUZrhDgI45SM/WwUT3"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "96CGE5Ft9DJrhNlL7I8PHH",
+    "instance": null,
+    "targetOverrides": null
+  }
+]

+ 13 - 0
assets/bundle/gui/eliminate/prefab/stateItem2.prefab.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "1.1.50",
+  "importer": "prefab",
+  "imported": true,
+  "uuid": "799a91ba-e6c6-4a21-9870-c925fb991fb8",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {
+    "syncNodeName": "stateItem2"
+  }
+}

Plik diff jest za duży
+ 1866 - 287
assets/bundle/gui/eliminate/prefab/wechatWithdrawal.prefab


BIN
assets/bundle/gui/eliminate/texture/bg/bg4.png


+ 34 - 34
assets/bundle/common/texture/Switch_Single_Bg.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.27",
   "importer": "image",
   "imported": true,
-  "uuid": "47491ef6-4bfe-4a4b-852a-0c9a32369cc7",
+  "uuid": "dea0ac8f-c8b1-4d14-9e66-bd44d8696ad3",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "47491ef6-4bfe-4a4b-852a-0c9a32369cc7@6c48a",
-      "displayName": "Switch_Single_Bg",
+      "uuid": "dea0ac8f-c8b1-4d14-9e66-bd44d8696ad3@6c48a",
+      "displayName": "bg4",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "47491ef6-4bfe-4a4b-852a-0c9a32369cc7",
+        "imageUuidOrDatabaseUri": "dea0ac8f-c8b1-4d14-9e66-bd44d8696ad3",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,26 +34,25 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "47491ef6-4bfe-4a4b-852a-0c9a32369cc7@f9941",
-      "displayName": "Switch_Single_Bg",
+      "uuid": "dea0ac8f-c8b1-4d14-9e66-bd44d8696ad3@f9941",
+      "displayName": "bg4",
       "id": "f9941",
       "name": "spriteFrame",
       "userData": {
-        "trimType": "auto",
         "trimThreshold": 1,
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 62,
-        "height": 66,
-        "rawWidth": 62,
-        "rawHeight": 66,
-        "borderTop": 25,
-        "borderBottom": 25,
-        "borderLeft": 25,
-        "borderRight": 25,
+        "width": 672,
+        "height": 660,
+        "rawWidth": 672,
+        "rawHeight": 660,
+        "borderTop": 158,
+        "borderBottom": 165,
+        "borderLeft": 157,
+        "borderRight": 117,
         "packable": true,
         "pixelsToUnit": 100,
         "pivotX": 0.5,
@@ -61,17 +60,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -31,
-            -33,
+            -336,
+            -330,
             0,
-            31,
-            -33,
+            336,
+            -330,
             0,
-            -31,
-            33,
+            -336,
+            330,
             0,
-            31,
-            33,
+            336,
+            330,
             0
           ],
           "indexes": [
@@ -84,12 +83,12 @@
           ],
           "uv": [
             0,
-            66,
-            62,
-            66,
+            660,
+            672,
+            660,
             0,
             0,
-            62,
+            672,
             0
           ],
           "nuv": [
@@ -103,19 +102,20 @@
             1
           ],
           "minPos": [
-            -31,
-            -33,
+            -336,
+            -330,
             0
           ],
           "maxPos": [
-            31,
-            33,
+            336,
+            330,
             0
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "47491ef6-4bfe-4a4b-852a-0c9a32369cc7@6c48a",
-        "atlasUuid": ""
+        "imageUuidOrDatabaseUri": "dea0ac8f-c8b1-4d14-9e66-bd44d8696ad3@6c48a",
+        "atlasUuid": "",
+        "trimType": "auto"
       },
       "ver": "1.0.12",
       "imported": true,
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "47491ef6-4bfe-4a4b-852a-0c9a32369cc7@6c48a"
+    "redirect": "dea0ac8f-c8b1-4d14-9e66-bd44d8696ad3@6c48a"
   }
 }

BIN
assets/bundle/gui/eliminate/texture/bg/bg5.png


+ 34 - 34
assets/bundle/common/texture/Switch_Single_Fill.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.27",
   "importer": "image",
   "imported": true,
-  "uuid": "bcc086cd-126a-4973-8238-54e0a5689f82",
+  "uuid": "e08acc8d-0391-4c12-99f1-9234e604dec0",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "bcc086cd-126a-4973-8238-54e0a5689f82@6c48a",
-      "displayName": "Switch_Single_Fill",
+      "uuid": "e08acc8d-0391-4c12-99f1-9234e604dec0@6c48a",
+      "displayName": "bg5",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "bcc086cd-126a-4973-8238-54e0a5689f82",
+        "imageUuidOrDatabaseUri": "e08acc8d-0391-4c12-99f1-9234e604dec0",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,26 +34,25 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "bcc086cd-126a-4973-8238-54e0a5689f82@f9941",
-      "displayName": "Switch_Single_Fill",
+      "uuid": "e08acc8d-0391-4c12-99f1-9234e604dec0@f9941",
+      "displayName": "bg5",
       "id": "f9941",
       "name": "spriteFrame",
       "userData": {
-        "trimType": "auto",
         "trimThreshold": 1,
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 42,
-        "height": 46,
-        "rawWidth": 42,
-        "rawHeight": 46,
-        "borderTop": 18,
-        "borderBottom": 18,
-        "borderLeft": 18,
-        "borderRight": 18,
+        "width": 624,
+        "height": 296,
+        "rawWidth": 624,
+        "rawHeight": 296,
+        "borderTop": 54,
+        "borderBottom": 79,
+        "borderLeft": 117,
+        "borderRight": 96,
         "packable": true,
         "pixelsToUnit": 100,
         "pivotX": 0.5,
@@ -61,17 +60,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -21,
-            -23,
+            -312,
+            -148,
             0,
-            21,
-            -23,
+            312,
+            -148,
             0,
-            -21,
-            23,
+            -312,
+            148,
             0,
-            21,
-            23,
+            312,
+            148,
             0
           ],
           "indexes": [
@@ -84,12 +83,12 @@
           ],
           "uv": [
             0,
-            46,
-            42,
-            46,
+            296,
+            624,
+            296,
             0,
             0,
-            42,
+            624,
             0
           ],
           "nuv": [
@@ -103,19 +102,20 @@
             1
           ],
           "minPos": [
-            -21,
-            -23,
+            -312,
+            -148,
             0
           ],
           "maxPos": [
-            21,
-            23,
+            312,
+            148,
             0
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "bcc086cd-126a-4973-8238-54e0a5689f82@6c48a",
-        "atlasUuid": ""
+        "imageUuidOrDatabaseUri": "e08acc8d-0391-4c12-99f1-9234e604dec0@6c48a",
+        "atlasUuid": "",
+        "trimType": "auto"
       },
       "ver": "1.0.12",
       "imported": true,
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "bcc086cd-126a-4973-8238-54e0a5689f82@6c48a"
+    "redirect": "e08acc8d-0391-4c12-99f1-9234e604dec0@6c48a"
   }
 }

BIN
assets/bundle/gui/eliminate/texture/button/btn_back2.png


+ 30 - 30
assets/bundle/common/texture/btn_on.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.27",
   "importer": "image",
   "imported": true,
-  "uuid": "c62b3746-bd34-4eef-8490-9f11dbb10fdd",
+  "uuid": "8b20d99a-ee95-4791-b54a-03502890398e",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "c62b3746-bd34-4eef-8490-9f11dbb10fdd@6c48a",
-      "displayName": "btn_on",
+      "uuid": "8b20d99a-ee95-4791-b54a-03502890398e@6c48a",
+      "displayName": "btn_back2",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "c62b3746-bd34-4eef-8490-9f11dbb10fdd",
+        "imageUuidOrDatabaseUri": "8b20d99a-ee95-4791-b54a-03502890398e",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,22 +34,21 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "c62b3746-bd34-4eef-8490-9f11dbb10fdd@f9941",
-      "displayName": "btn_on",
+      "uuid": "8b20d99a-ee95-4791-b54a-03502890398e@f9941",
+      "displayName": "btn_back2",
       "id": "f9941",
       "name": "spriteFrame",
       "userData": {
-        "trimType": "auto",
         "trimThreshold": 1,
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 146,
-        "height": 73,
-        "rawWidth": 146,
-        "rawHeight": 73,
+        "width": 80,
+        "height": 80,
+        "rawWidth": 80,
+        "rawHeight": 80,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +60,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -73,
-            -36.5,
+            -40,
+            -40,
             0,
-            73,
-            -36.5,
+            40,
+            -40,
             0,
-            -73,
-            36.5,
+            -40,
+            40,
             0,
-            73,
-            36.5,
+            40,
+            40,
             0
           ],
           "indexes": [
@@ -84,12 +83,12 @@
           ],
           "uv": [
             0,
-            73,
-            146,
-            73,
+            80,
+            80,
+            80,
             0,
             0,
-            146,
+            80,
             0
           ],
           "nuv": [
@@ -103,19 +102,20 @@
             1
           ],
           "minPos": [
-            -73,
-            -36.5,
+            -40,
+            -40,
             0
           ],
           "maxPos": [
-            73,
-            36.5,
+            40,
+            40,
             0
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "c62b3746-bd34-4eef-8490-9f11dbb10fdd@6c48a",
-        "atlasUuid": ""
+        "imageUuidOrDatabaseUri": "8b20d99a-ee95-4791-b54a-03502890398e@6c48a",
+        "atlasUuid": "",
+        "trimType": "auto"
       },
       "ver": "1.0.12",
       "imported": true,
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "c62b3746-bd34-4eef-8490-9f11dbb10fdd@6c48a"
+    "redirect": "8b20d99a-ee95-4791-b54a-03502890398e@6c48a"
   }
 }

BIN
assets/bundle/gui/eliminate/texture/title_bg3.png


+ 30 - 30
assets/bundle/common/texture/btn_off.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.27",
   "importer": "image",
   "imported": true,
-  "uuid": "aff33eaa-4ab1-4e81-b8f2-9b2f59356e3f",
+  "uuid": "55ef8b80-116c-42f5-9f7b-7b70724ffff2",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "aff33eaa-4ab1-4e81-b8f2-9b2f59356e3f@6c48a",
-      "displayName": "btn_off",
+      "uuid": "55ef8b80-116c-42f5-9f7b-7b70724ffff2@6c48a",
+      "displayName": "title_bg3",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "aff33eaa-4ab1-4e81-b8f2-9b2f59356e3f",
+        "imageUuidOrDatabaseUri": "55ef8b80-116c-42f5-9f7b-7b70724ffff2",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,22 +34,21 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "aff33eaa-4ab1-4e81-b8f2-9b2f59356e3f@f9941",
-      "displayName": "btn_off",
+      "uuid": "55ef8b80-116c-42f5-9f7b-7b70724ffff2@f9941",
+      "displayName": "title_bg3",
       "id": "f9941",
       "name": "spriteFrame",
       "userData": {
-        "trimType": "auto",
         "trimThreshold": 1,
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 149,
-        "height": 73,
-        "rawWidth": 149,
-        "rawHeight": 73,
+        "width": 438,
+        "height": 24,
+        "rawWidth": 438,
+        "rawHeight": 24,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +60,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -74.5,
-            -36.5,
+            -219,
+            -12,
             0,
-            74.5,
-            -36.5,
+            219,
+            -12,
             0,
-            -74.5,
-            36.5,
+            -219,
+            12,
             0,
-            74.5,
-            36.5,
+            219,
+            12,
             0
           ],
           "indexes": [
@@ -84,12 +83,12 @@
           ],
           "uv": [
             0,
-            73,
-            149,
-            73,
+            24,
+            438,
+            24,
             0,
             0,
-            149,
+            438,
             0
           ],
           "nuv": [
@@ -103,19 +102,20 @@
             1
           ],
           "minPos": [
-            -74.5,
-            -36.5,
+            -219,
+            -12,
             0
           ],
           "maxPos": [
-            74.5,
-            36.5,
+            219,
+            12,
             0
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "aff33eaa-4ab1-4e81-b8f2-9b2f59356e3f@6c48a",
-        "atlasUuid": ""
+        "imageUuidOrDatabaseUri": "55ef8b80-116c-42f5-9f7b-7b70724ffff2@6c48a",
+        "atlasUuid": "",
+        "trimType": "auto"
       },
       "ver": "1.0.12",
       "imported": true,
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "aff33eaa-4ab1-4e81-b8f2-9b2f59356e3f@6c48a"
+    "redirect": "55ef8b80-116c-42f5-9f7b-7b70724ffff2@6c48a"
   }
 }

BIN
assets/bundle/gui/eliminate/texture/温馨提示.png


+ 134 - 0
assets/bundle/gui/eliminate/texture/温馨提示.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "684095e2-17bc-4bfb-bc16-c30dec9d8829",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "684095e2-17bc-4bfb-bc16-c30dec9d8829@6c48a",
+      "displayName": "温馨提示",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "684095e2-17bc-4bfb-bc16-c30dec9d8829",
+        "isUuid": true,
+        "visible": false,
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "anisotropy": 0
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "f9941": {
+      "importer": "sprite-frame",
+      "uuid": "684095e2-17bc-4bfb-bc16-c30dec9d8829@f9941",
+      "displayName": "温馨提示",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 720,
+        "height": 1600,
+        "rawWidth": 720,
+        "rawHeight": 1600,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -360,
+            -800,
+            0,
+            360,
+            -800,
+            0,
+            -360,
+            800,
+            0,
+            360,
+            800,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            1600,
+            720,
+            1600,
+            0,
+            0,
+            720,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -360,
+            -800,
+            0
+          ],
+          "maxPos": [
+            360,
+            800,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "684095e2-17bc-4bfb-bc16-c30dec9d8829@6c48a",
+        "atlasUuid": "",
+        "trimType": "auto"
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "684095e2-17bc-4bfb-bc16-c30dec9d8829@6c48a"
+  }
+}

BIN
assets/bundle/gui/eliminate/texture/隐私政策及说明.png


+ 134 - 0
assets/bundle/gui/eliminate/texture/隐私政策及说明.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "e3ff62e4-757b-407a-9ab6-f97d3c5d51d3",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "e3ff62e4-757b-407a-9ab6-f97d3c5d51d3@6c48a",
+      "displayName": "隐私政策及说明",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "e3ff62e4-757b-407a-9ab6-f97d3c5d51d3",
+        "isUuid": true,
+        "visible": false,
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "anisotropy": 0
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "f9941": {
+      "importer": "sprite-frame",
+      "uuid": "e3ff62e4-757b-407a-9ab6-f97d3c5d51d3@f9941",
+      "displayName": "隐私政策及说明",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 720,
+        "height": 1600,
+        "rawWidth": 720,
+        "rawHeight": 1600,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -360,
+            -800,
+            0,
+            360,
+            -800,
+            0,
+            -360,
+            800,
+            0,
+            360,
+            800,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            1600,
+            720,
+            1600,
+            0,
+            0,
+            720,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -360,
+            -800,
+            0
+          ],
+          "maxPos": [
+            360,
+            800,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "e3ff62e4-757b-407a-9ab6-f97d3c5d51d3@6c48a",
+        "atlasUuid": "",
+        "trimType": "auto"
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "e3ff62e4-757b-407a-9ab6-f97d3c5d51d3@6c48a"
+  }
+}

+ 9 - 25
assets/script/game/account/model/AccountModelComp.ts

@@ -4,7 +4,7 @@
  * @Author: dgflash
  * @Date: 2021-11-12 10:02:31
  * @LastEditors: mojunshou 1637302775@qq.com
- * @LastEditTime: 2025-04-11 18:08:50
+ * @LastEditTime: 2025-04-15 15:28:53
  */
 import { oops } from "db://oops-framework/core/Oops";
 import { ecs } from "../../../../../extensions/oops-plugin-framework/assets/libs/ecs/ECS";
@@ -35,28 +35,8 @@ export class AccountModelComp extends ecs.Comp {
     _goldCoin: number = 0;
     /**是否登录过*/
     _isLogined: boolean = false;
-
-
-    // /**手续费*/
-    // _handlingCharge: number = 0;
-    // /**当前分数*/
-    // _curScore: number = 0;
-    // /**目标分数*/
-    // _targetScore: number = 0;
-    // /**协议类型 1隐私 2用户*/
-    // _protocolType: number = 1;
-    // //当前关卡信息
-    // _curLevelInfo: CurLevelInfo = null!;
-    // /**当前关卡配置*/
-    // _curLevelConfig: CurLevelConfig = null!;
-    // /**游戏费用配置*/
-    // _costInfo: CostInfo = null!;
-    // //提现记录
-    // _recordList: RecordInfo[] = [];
-
-    // //是否是广告时间
-    // _isShowAd: boolean = false;
-
+    /**消除次数*/
+    _xcCount: number = 0;
 
 
     reset() {
@@ -132,6 +112,10 @@ export class AccountModelComp extends ecs.Comp {
         this._isLogined = value;
     }
 
-
-
+    get xcCount() {
+        return this._xcCount;
+    }
+    set xcCount(value: number) {
+        this._xcCount = value;
+    }
 }

+ 7 - 3
assets/script/game/common/about/AboutViewComp.ts

@@ -1,3 +1,10 @@
+/*
+ * @Author: mojunshou 1637302775@qq.com
+ * @Date: 2025-04-07 17:49:55
+ * @LastEditors: mojunshou 1637302775@qq.com
+ * @LastEditTime: 2025-04-15 15:35:54
+ * @Description: 
+ */
 import { _decorator } from "cc";
 import { oops } from "db://oops-framework/core/Oops";
 import { ecs } from "db://oops-framework/libs/ecs/ECS";
@@ -17,8 +24,6 @@ export class aboutViewComp extends CCVMParentComp {
         companyName: "",
     }
 
-
-
     /** 视图层逻辑代码分离演示 */
     start() {
         // const entity = this.ent as ecs.Entity;         // ecs.Entity 可转为当前模块的具体实体对象
@@ -33,7 +38,6 @@ export class aboutViewComp extends CCVMParentComp {
         this.node.destroy();
     }
 
-
     btn_back() {
         oops.gui.remove(UIID.AboutUs);
     }

+ 4 - 1
assets/script/game/common/config/GameEvent.ts

@@ -2,7 +2,7 @@
  * @Author: dgflash
  * @Date: 2021-11-23 15:28:39
  * @LastEditors: mojunshou 1637302775@qq.com
- * @LastEditTime: 2025-04-10 17:12:49
+ * @LastEditTime: 2025-04-15 17:28:14
  */
 
 /** 游戏事件 */
@@ -29,4 +29,7 @@ export enum GameEvent {
     showCoinAnimation = "showCoinAnimation",
     //复活游戏
 
+    //更新红包提现任务列表
+    updateRedPackeTaskList = "updateRedPackeTaskList",
+
 }

+ 31 - 23
assets/script/game/common/manager/ProtocolEvent.ts

@@ -2,7 +2,7 @@
  * @Author: mojunshou 1637302775@qq.com
  * @Date: 2025-04-07 10:17:16
  * @LastEditors: mojunshou 1637302775@qq.com
- * @LastEditTime: 2025-04-14 17:26:45
+ * @LastEditTime: 2025-04-15 14:42:02
  * @Description: 消息定义
  */
 
@@ -18,30 +18,49 @@ export enum ProtocolEvent {
     ModifySetting = server_url + "/project/playlet/v1/user/updateSetting",
     /**领取每日奖励*/
     GetDailyReward = server_url + "/project/playlet/v1/daily/eliminationTsk/gain",
-    /**获取获取红包提现列表数据*/
-    GetDailyTask = server_url + "/project/playlet/v1/daily/eliminationTsk/info",
     /**用户道具信息*/
     UserItemInfo = server_url + "/project/playlet/v1/props/all",
     /**直接领取通关奖励*/
     GetPassReward = server_url + "/project/playlet/v1/reward/littlePass",
     /**少量领取翻倍奖励*/
     GetLittlePassReward = server_url + "/project/playlet/v1/reward/double",
-    /**加速奖励*/
-    GetSpeedReward = server_url + "/project/playlet/v1/reward/speed",
-    /**10倍领取通关奖励*/
-    GetTenTimesPassReward = server_url + "/project/playlet/v1/reward/doublePass",
-    /**全部领取翻倍奖励*/
-    GetAllDoublePassReward = server_url + "/project/playlet/v1/reward/twoDouble",
     /**消除奖励*/
     GetEliminationReward = server_url + "/project/playlet/v1/elimination/reward",
+    /**获取通关奖励数*/
+    GetGameAward = server_url + "/project/playlet/v1/reward/passView",
+    /**惊喜翻倍奖励信息*/
+    GetDoubleAwardInfo = server_url + "/project/playlet/v1/reward/doubleView",
+    /**获取二倍速奖励信息*/
+    GetDoubleSpeedAward = server_url + "/project/playlet/v1/reward/speedView",
+    /**获取复活奖励信息*/
+    GetReviveInfo = server_url + "/project/playlet/v1/reward/reviveView",
+    /**广告视频开始*/
+    AdVideoStart = server_url + "/project/playlet/v1/video/start",
+    /**视频奖励*/
+    GetVideorReward = server_url + "/project/playlet/v1/reward/videoReward",
+    /**领取手续费*/
+
+
+    //获取微信提现页信息
+    GetWechatTxInfo = server_url + "/project/playlet/v3/withdraw/view/wechat/fake",
+
+
     /**红包币提现*/
     GetRedPacketCash = server_url + "/project/playlet/v1/withdraw/convert",
     /**提现记录*/
     GetWithdrawRecord = server_url + "/project/playlet/v1/withdraw/log/page",
-    /**微信提现页信息*/
-    GetWithdrawInfo = server_url + "/project/playlet/v3/withdraw/view/detail",
+    /**提现返利信息*/
+    GetWithdrawReward = server_url + "/project/playlet/v1/withdraw/rebate",
+
+
+    /**红包提现页信息*/
+    GetHbWithdrawInfo = server_url + "/project/playlet/v3/withdraw/view/detail",
     /**福利点提现*/
     GetWelfarePointCash = server_url + "/project/playlet/v1/reward/weal",
+
+
+
+
     /**获取当前关卡配置信息*/
     GetCurrentLevelConfig = server_url + "/project/playlet/v1/checkPoint/conf",
     /**获取所有关卡配置信息*/
@@ -52,20 +71,9 @@ export enum ProtocolEvent {
     SaveCurrentLevelInfo = server_url + "/project/playlet/v1/checkPoint/saveLevelInfo",
     /**下一关*/
     NextLevel = server_url + "/project/playlet/v1/checkPoint/next",
-    /**获取通关奖励数*/
-    GetGameAward = server_url + "/project/playlet/v1/reward/passView",
-    /**惊喜翻倍奖励信息*/
-    GetDoubleAwardInfo = server_url + "/project/playlet/v1/reward/doubleView",
-    /**提现返利信息*/
-    GetWithdrawReward = server_url + "/project/playlet/v1/withdraw/rebate",
-    /**广告视频开始*/
-    AdVideoStart = server_url + "/project/playlet/v1/video/start",
-    /**视频奖励*/
-    GetVideorReward = server_url + "/project/playlet/v1/reward/videoReward",
     //重新开始游戏
     RestartGame = server_url + "/project/playlet/v1/checkPoint/restart",
-    //微信提现页面
-    WechatReward = server_url + "/project/playlet/v1/reward/weal",
+
 
 
 

+ 95 - 12
assets/script/game/common/manager/ServerHandler.ts

@@ -2,7 +2,7 @@
  * @Author: mojunshou 1637302775@qq.com
  * @Date: 2025-04-11 10:16:41
  * @LastEditors: mojunshou 1637302775@qq.com
- * @LastEditTime: 2025-04-14 17:44:08
+ * @LastEditTime: 2025-04-15 18:15:31
  * @Description: 
  */
 // ServerHandler.ts
@@ -12,6 +12,7 @@ import { oops } from 'db://oops-framework/core/Oops';
 import { CocosHandler, CocosHandlerType } from './CocosHandler';
 import { ProtocolEvent } from './ProtocolEvent';
 import { url } from 'inspector';
+import { Game } from 'cc';
 
 export class ServerHandler {
     private static _inst: ServerHandler;
@@ -79,13 +80,16 @@ export class ServerHandler {
         game.targetScore = data.currentLevelConf.score;
         game.curLevelConfig = data.currentLevelConf;
         game.costInfo = data.handlingChargeConf;
+        game.eventType = data.currentLevelConf.eventType;
         oops.message.dispatchEvent(GameEvent.UserLogin);
     }
 
     getDailyReward(level: number) {
         const param = {
             url: ProtocolEvent.GetDailyReward,
-            param: { level },
+            param: {
+                level: level
+            },
             callback: this.buildCallback('ServerHandler.inst.onDailyReward', 'ServerHandler.inst.onRequestFail')
         };
         this.sendMsgToServer(param);
@@ -93,23 +97,37 @@ export class ServerHandler {
 
     onDailyReward(str: string) {
         console.log('[服务器] 每日奖励返回', str);
+        let result = JSON.parse(str);
+        smc.account.AccountModel.hbCoin = result.props["1004"] / 100;
+        smc.account.AccountModel.xcCount = result.props["1007"];  //消除次数
+        smc.account.AccountModel.goldCoin = result.props["1006"] //金砖数量
+        smc.game.GameModel.wxCash = result.money;
+        smc.game.GameModel.taskList = result.taskList;
+        oops.message.dispatchEvent(GameEvent.updateRedPackeTaskList);
     }
 
-    //红包币-获取记录
-    getDailyTaskReward() {
-        this.getUserItemInfo();
+
+    //获取红包页信息
+    getHbTxInfo() {
         const param = {
-            url: ProtocolEvent.GetDailyTask,
-            callback: this.buildCallback('ServerHandler.inst.onDailyTaskReward', 'ServerHandler.inst.onRequestFail')
+            url: ProtocolEvent.GetHbWithdrawInfo,
+            callback: this.buildCallback('ServerHandler.inst.onHbTxInfo', 'ServerHandler.instonRequestFail')
         };
         this.sendMsgToServer(param);
     }
 
-    onDailyTaskReward(str: string) {
-        console.log('[服务器] 红包任务数据返回', str);
-        oops.message.dispatchEvent(GameEvent.openView, 'openRedBagView');
+    onHbTxInfo(str: string) {
+        console.log('[服务器] 获取红包页面信息返回', str);
+        let result = JSON.parse(str);
+        smc.account.AccountModel.hbCoin = result.props["1004"] / 100;
+        smc.account.AccountModel.xcCount = result.props["1007"];  //消除次数
+        smc.account.AccountModel.goldCoin = result.props["1006"] //金砖数量
+        smc.game.GameModel.taskList = result.taskList;
+        oops.message.dispatchEvent(GameEvent.openView, "openRedBagView");
     }
 
+
+    //获取用户信息
     getUserItemInfo() {
         const param = {
             url: ProtocolEvent.UserItemInfo,
@@ -135,7 +153,7 @@ export class ServerHandler {
             url: ProtocolEvent.GetWithdrawRecord,
             param: {
                 offset: 0,
-                limit: 50
+                limit: 10
             },
             callback: this.buildCallback('ServerHandler.inst.onRecordList', 'ServerHandler.inst.onRequestFail')
         };
@@ -144,9 +162,10 @@ export class ServerHandler {
 
     //提现列表
     onRecordList(str: string) {
+        console.log('[服务器] 提现列表返回', str);
         const result = JSON.parse(str);
         if (result.count > 0) {
-            smc.game.GameModel.recordList = result.data.list;
+            smc.game.GameModel.recordList = result.list;
         }
         oops.message.dispatchEvent(GameEvent.openRecordView);
     }
@@ -352,6 +371,7 @@ export class ServerHandler {
         let result = JSON.parse(str);
         smc.account.AccountModel.curLevel = result.currentLevelData.level;
         smc.game.GameModel.targetScore = result.currentLevelData.score;
+        smc.game.GameModel.eventType = result.currentLevelConf.eventType;
         oops.message.dispatchEvent(GameEvent.RestartGame);
     }
 
@@ -374,6 +394,69 @@ export class ServerHandler {
         oops.message.dispatchEvent(GameEvent.RestartGame);
     }
 
+    //微信提现页面
+    WechatReward() {
+        const param = {
+            url: ProtocolEvent.GetWelfarePointCash,
+            param: {
+                level: smc.account.AccountModel.curLevel,
+                riskToken: "",
+                riskBusinessId: ""
+            },
+            callback: this.buildCallback('ServerHandler.inst.onWechatReward', 'ServerHandler.inst.onRequestFail')
+
+        }
+        this.sendMsgToServer(param);
+    }
+
+    onWechatReward(str: string) {
+        console.log("[服务器] 微信提现请求成功", str);
+        let result = JSON.parse(str);
+        smc.game.GameModel.txNum = result.changes["8001"];
+        smc.game.GameModel.txType = 1;
+        oops.message.dispatchEvent(GameEvent.openView, "openCashWithdrawalView")
+    }
+
+
+    //红包币页提现
+    HbReward() {
+        const param = {
+            url: ProtocolEvent.GetRedPacketCash,
+            param: {
+                riskToken: "",
+                riskBusinessId: ""
+            },
+            callback: this.buildCallback('ServerHandler.inst.onHbReward', 'ServerHandler.inst.onRequestFail')
+        }
+        this.sendMsgToServer(param);
+    }
+
+    onHbReward(str: string) {
+        console.log('[服务器] 红包币提现返回', str);
+        let result = JSON.parse(str);
+        smc.game.GameModel.txNum = result.changes["8001"];
+        smc.game.GameModel.txType = 2;
+        //这里打开界面关闭的时候只是关闭,不是打开提现返利
+        oops.message.dispatchEvent(GameEvent.openView, "openCashWithdrawalView");
+    }
+
+
+    //获取微信提现页信息
+    getWechatTxInfo() {
+        const param = {
+            url: ProtocolEvent.GetWechatTxInfo,
+            callback: this.buildCallback('ServerHandler.inst.onGetWechatTxInfo', 'ServerHandler.inst.onRequestFail')
+        }
+        this.sendMsgToServer(param);
+    }
+
+    onGetWechatTxInfo(str: string) {
+        console.log('[服务器] 获取微信提现页信息返回', str);
+        let result = JSON.parse(str);
+        smc.game.GameModel.wechat_tx_info = result;
+        oops.message.dispatchEvent(GameEvent.openView, "openWechatWithdrawalView");
+    }
+
 
 
     onRequestFail(code: number, str: string) {

+ 2 - 1
assets/script/game/common/tips/KindTipsView.ts

@@ -2,7 +2,7 @@
  * @Author: mojunshou 1637302775@qq.com
  * @Date: 2025-03-19 18:02:51
  * @LastEditors: mojunshou 1637302775@qq.com
- * @LastEditTime: 2025-04-11 11:23:26
+ * @LastEditTime: 2025-04-15 17:05:08
  * @Description: 温馨提示弹窗
  */
 import { _decorator } from 'cc';
@@ -36,6 +36,7 @@ export class KindTipsView extends GameComponent {
 
     private btn_disagree() {
         oops.gui.open(UIID.Retention);
+        oops.gui.remove(UIID.KindTips);
     }
 }
 

+ 96 - 2
assets/script/game/model/GameModelComp.ts

@@ -2,7 +2,7 @@
  * @Author: mojunshou 1637302775@qq.com
  * @Date: 2025-04-10 14:49:42
  * @LastEditors: mojunshou 1637302775@qq.com
- * @LastEditTime: 2025-04-14 16:33:50
+ * @LastEditTime: 2025-04-15 17:01:42
  * @Description: 
  */
 import { ecs } from "db://oops-framework/libs/ecs/ECS";
@@ -28,6 +28,7 @@ interface CostInfo {
     giftNum: number;         //赠送金
 }
 
+//提现记录
 interface RecordInfo {
     title: string,
     amount: number,
@@ -47,6 +48,28 @@ interface PassViewInfo {
     doubleReward: boolean
 }
 
+//微信提现页信息
+interface wechat_tx_info {
+    money: number,          //已有金额
+    gapGoldNum: number,    //差多少金砖
+    handingChargeProgress: cost_info
+}
+
+//手续费信息
+interface cost_info {
+    totalMoney: number,      //已有金额
+    handingCharge: number,   //设置的手续费
+    hasNum: number,  //已经有
+    gapNum: number,  //还差
+}
+
+//红包币提现页信息
+interface taskList_info {
+    level: number,
+    target: number,
+    reward: goodsList[],
+    status: number
+}
 
 /** 数据层对象 */
 @ecs.register('GameModel')
@@ -90,6 +113,26 @@ export class GameModelComp extends ecs.Comp {
     /**提现必反*/
     _cashNum: number = 0;
 
+    _txNum: number = 0;
+
+    //事件类型 WITHDRAW_POINT-提现点  SIGN_POINT--预约登记  --PROCEDURE_POINT手续费
+    _eventType: string = "";
+
+    /**提现方式 1正常提现 2红包币提现,不要打开提现返利*/
+    _txType: number = 1;
+
+    //微信提现页信息
+    _wechat_tx_info: wechat_tx_info = null!;
+    //红包提现页信息
+    _wxCash: number = 0;
+
+    _taskList: taskList_info = null!;
+
+
+
+
+
+
     /** 数据层组件移除时,重置所有数据为默认值 */
     reset() {
         this.id = -1;
@@ -99,6 +142,57 @@ export class GameModelComp extends ecs.Comp {
         this.costInfo = null!;
     }
 
+    set wxCash(v: number) {
+        this._wxCash = v;
+    }
+
+    get wxCash() {
+        return this._wxCash;
+    }
+
+    set taskList(v: taskList_info) {
+        this._taskList = v;
+    }
+
+    get taskList() {
+        return this._taskList;
+    }
+
+
+    set wechat_tx_info(value: wechat_tx_info) {
+        this._wechat_tx_info = value;
+    }
+
+    get wechat_tx_info() {
+        return this._wechat_tx_info;
+    }
+
+
+    set eventType(v: string) {
+        this._eventType = v;
+    }
+
+    get eventType() {
+        return this._eventType;
+    }
+
+    set txType(v: number) {
+        this._txType = v;
+    }
+
+    get txType() {
+        return this._txType;
+    }
+
+    //提现成功的金额
+    set txNum(v: number) {
+        this._txNum;
+    }
+
+    get txNum() {
+        return this._txNum;
+    }
+
     /**改变的红包币*/
     set changeHbCoin(value: number) {
         this._changeHbCoin = value;
@@ -212,7 +306,7 @@ export class GameModelComp extends ecs.Comp {
     }
 
     set recordList(value: RecordInfo[]) {
-        this.recordList = value;
+        this._recordList = value;
     }
 
     get isShowAd() {

+ 71 - 12
assets/script/game/view/CashWithdrawalView.ts

@@ -2,46 +2,100 @@
  * @Author: mojunshou 1637302775@qq.com
  * @Date: 2025-03-21 15:03:37
  * @LastEditors: mojunshou 1637302775@qq.com
- * @LastEditTime: 2025-04-14 18:15:34
+ * @LastEditTime: 2025-04-15 10:40:20
  * @Description: 微信提现到零钱,需要有一个动画展示步骤
  */
-import { _decorator } from 'cc';
+import { _decorator, Node, Animation } from 'cc';
 import { DeviceUtil } from 'db://oops-framework/core/utils/DeviceUtil';
 import { GameComponent } from "db://oops-framework/module/common/GameComponent";
 import { ServerHandler } from '../common/manager/ServerHandler';
 import { oops } from 'db://oops-framework/core/Oops';
 import { UIID } from '../common/config/GameUIConfig';
+import { Label } from 'cc';
+import { ProgressBar } from 'cc';
+import { tween } from 'cc';
+import { smc } from '../common/SingletonModuleComp';
 
 const { ccclass, property } = _decorator;
 
 /** 显示对象控制 */
 @ccclass('CashWithdrawalView')
 export class CashWithdrawalView extends GameComponent {
-    str: string[] = [
-        "发起提现申请",
-        "确认用户信息",
-        "发起打款:$m元",
-        "提现成功,到账微信零钱"
-    ]
-
+    @property(Label)
+    lab_cashNum: Label = null!;
+    @property(Label)
+    lab_tips: Label = null!;
 
+    @property(Node)
+    private loadNode: Node = null!;
+    @property(Node)
+    private mainNode: Node = null!
+    @property(ProgressBar)
+    private loadProgressBar: ProgressBar = null!;
 
 
 
     protected start() {
         this.setButton();
+        this.setData();
     }
 
-    showAnimation() {
 
 
+    setData() {
+        const num = smc.game.GameModel.txNum;
+        if (num > 0) {
+            if (this.lab_cashNum) {
+                this.lab_cashNum.string = `¥${num}`;
+                //正则替换$m为num
+                this.lab_tips.string = this.lab_tips.string.replace(/\$m/g, `${num}`);
+            }
+        }
+        let eventType = smc.game.GameModel.eventType;
+        if (eventType) {
+            if (eventType == "WITHDRAW_POINT" && smc.game.GameModel.txType == 1) {
+                this.showLoad();
+            } else {
+                this.loadNode.active = false;
+                this.mainNode.active = true;
+                this.showAnimation();
+            }
+        }
+    }
+
 
+    showLoad() {
+        if (this.loadNode && this.loadProgressBar) {
+            this.loadProgressBar.progress = 0;
+            this.loadNode.active = true;
+            tween(this.loadProgressBar)
+                .to(0.5, { progress: 1 })
+                .call(() => {
+                    this.loadNode.active = false;
+                    if (this.mainNode) {
+                        this.mainNode.active = true;
+                        this.showAnimation();
+                    }
+                })
+        }
+    }
+
+
+
+    showAnimation() {
+        if (this.mainNode) {
+            const animationComponent = this.mainNode.addComponent(Animation);
+            animationComponent.play();
+        }
     }
 
     btn_continue() {
-        //打开提现返利界面
+        //打开提现返利界面--判断从哪打开如果从红包币那打开就只是关闭
         if (DeviceUtil.isNative && DeviceUtil.isAndroid) {
-            ServerHandler.inst.getTxbfInfo();
+            const type = smc.game.GameModel.txType;
+            if (type == 1) {
+                ServerHandler.inst.getTxbfInfo();
+            }
             oops.gui.remove(UIID.WithSussce);
         } else {
             //
@@ -49,4 +103,9 @@ export class CashWithdrawalView extends GameComponent {
         }
 
     }
+
+    protected onDestroy(): void {
+        this.mainNode.active = false;
+        this.loadNode.active = true;
+    }
 }

+ 11 - 5
assets/script/game/view/EliminateViewComp.ts

@@ -2,7 +2,7 @@
  * @Author: mojunshou 1637302775@qq.com
  * @Date: 2025-03-20 15:01:09
  * @LastEditors: mojunshou 1637302775@qq.com
- * @LastEditTime: 2025-04-14 17:22:29
+ * @LastEditTime: 2025-04-15 14:51:11
  * @Description: 消除游戏主场景
  */
 import { _decorator, Button, Color, EventTouch, instantiate, JsonAsset, Label, Node, Prefab, randomRangeInt, Sprite, tween, UITransform, Vec2, Vec3, Widget } from "cc";
@@ -287,6 +287,12 @@ export class EliminateViewComp extends CCComp {
             case "openRebateView":
                 oops.gui.open(UIID.CashRebate);
                 break;
+            case "openCashWithdrawalView":
+                oops.gui.open(UIID.WithSussce);  //提现成功
+                break;
+            case "openWechatWithdrawalView":
+                oops.gui.open(UIID.WechatWithdraw);  //微信提现页
+                break;
         }
     }
 
@@ -1548,7 +1554,7 @@ export class EliminateViewComp extends CCComp {
     //左边微信按钮
     private btn_withdraw() {
         if (DeviceUtil.isNative && DeviceUtil.isAndroid) {
-
+            ServerHandler.inst.getWechatTxInfo();
         } else {
             oops.gui.open(UIID.WechatWithdraw);
         }
@@ -1560,7 +1566,7 @@ export class EliminateViewComp extends CCComp {
         //oops.gui.open(UIID.RedPacketWithdraw);
 
         if (DeviceUtil.isNative && DeviceUtil.isAndroid) {
-            ServerHandler.inst.getDailyTaskReward();
+            ServerHandler.inst.getHbTxInfo();
         } else {
             oops.gui.open(UIID.RedPacketWithdraw);
         }
@@ -1587,7 +1593,7 @@ export class EliminateViewComp extends CCComp {
 
     // 执行自动放置
     executeAutoPlace() {
-        if (!this.autoState || this.gameState !== GameState.PLAYING || this.adShowingFlag || this.editingFlag) {
+        if (!this.autoState || this.gameState !== GameState.PLAYING || this.adShowingFlag) {
             return
         }
 
@@ -1713,7 +1719,7 @@ export class EliminateViewComp extends CCComp {
 
         // 构建对应网格列表
         this.editingData.gridList = []
-        placement.gridConfig.forEach((gridConfigData) => {
+        placement.gridConfig.forEach((gridConfigData: GridConfigData) => {
             const r = gridConfigData.row + placement.rowIndex
             const c = gridConfigData.column + placement.columnIndex
             this.editingData.gridList.push(this.gridList[r][c])

+ 35 - 45
assets/script/game/view/RedPackeItemView.ts

@@ -2,84 +2,71 @@
  * @Author: mojunshou 1637302775@qq.com
  * @Date: 2025-03-20 18:39:37
  * @LastEditors: mojunshou 1637302775@qq.com
- * @LastEditTime: 2025-04-11 14:06:25
+ * @LastEditTime: 2025-04-15 17:59:17
  * @Description: 红包列表item
  */
 import { _decorator, Label, Node, ProgressBar, Sprite } from 'cc';
 import { oops } from 'db://oops-framework/core/Oops';
-import VMParent from 'db://oops-framework/libs/model-view/VMParent';
+import { GameComponent } from 'db://oops-framework/module/common/GameComponent';
+import { smc } from '../common/SingletonModuleComp';
+import { TableLevelConfig } from '../common/table/TableLevelConfig';
+import { ServerHandler } from '../common/manager/ServerHandler';
 
 const { ccclass, property } = _decorator;
 
 /** 显示对象控制 */
 @ccclass('RedPackeItemView')
-export class RedPackeItemView extends VMParent {
+export class RedPackeItemView extends GameComponent {
     @property(Node)
     private receiveNode: Node = null!;
 
     @property(Node)
     private unReceiveNode: Node = null!;
-
+    @property(Label)
     private lab_title: Label = null!;
+    @property(Label)
     private lab_progress: Label = null!;
+    @property(ProgressBar)
     private pro_progress: ProgressBar = null!;
     private sp_icon: Sprite = null!;
+    @property(Label)
     private lab_num: Label = null!;
 
     data: any = {
-        title: "完成任务即可领取红包~",
-        current: 10,
-        total: 100,
-        state: 1,
-        goods: [
-            {
-                type: 1001,
-                num: 100
-            }
-        ]
+        id: 0,
+        title_num: 0,
+        cur_num: 0,
+        total_num: 0,
+        status: 0,
+        reward: [],
+        level: 0
     }
 
     protected start() {
-        this.setButton();
-        this.initComponent();
-    }
-
-
-
-    private initComponent() {
-        this.lab_title = this.node.getChildByPath("Bg/lab_title")?.uiLabel!;
-        this.lab_progress = this.node.getChildByPath("Bg/lab_progress")?.uiLabel!;
-        this.pro_progress = this.node.getChildByPath("Bg/pro_progress")?.uiProgressBar!;
-        this.sp_icon = this.node.getChildByPath("Bg/sp_icon")?.uiSprite!;
-        this.lab_num = this.node.getChildByPath("Bg/lab_num")?.uiLabel!;
 
     }
 
 
-
-
     setItem(data: any, idx: number) {
-        console.log("setData>>>>>>>>>>>>>", data);
-        this.data = data;
+        this.data.id = data.id;
+        this.data.level = data.level;
+        this.data.title_num = data.target;
+        this.data.cur_num = smc.account.AccountModel.xcCount;
+        this.data.total_num = data.target;
+        this.data.status = data.status;
+        this.data.reward = data.reward;
         this.updateData();
     }
 
     //更新数据
     private updateData() {
-        console.log("updateData", this.data);
-
-        if (this.data.state == 0) {
-            this.receiveNode.active = false;
-            this.unReceiveNode.active = true;
-        } else if (this.data.state == 1) {
-            this.receiveNode.active = true;
-            this.unReceiveNode.active = false;
-        }
-        // this.lab_title.string = this.data.title;
-        // this.lab_progress.string = `${this.data.current}/${this.data.total}`;
-        // this.pro_progress.progress = this.data.current / this.data.total;
-        // // this.sp_icon.spriteFrame = oops.res.getSpriteFrame(this.data.goods[0].type);
-        // this.lab_num.string = this.data.goods[0].num;
+        this.unReceiveNode.active = this.data.status == 0;
+        this.receiveNode.active = this.data.status == 1;
+        this.lab_title.string = this.data.title_num + "次";
+        this.lab_num.string = this.data.reward[0].propNum + "元";
+        this.lab_progress.string = `${smc.account.AccountModel.xcCount}/${this.data.total_num}`;
+        const loadNum = smc.account.AccountModel.xcCount / this.data.target > 1 ? 1 : smc.account.AccountModel.xcCount / this.data.target;
+        this.pro_progress.progress = loadNum;
     }
 
 
@@ -91,8 +78,11 @@ export class RedPackeItemView extends VMParent {
 
     //可领取按钮
     private btn_receive() {
-        oops.gui.toast("领取红包~");
         //发送领取红包请求
+        if (this.data.status == 1) {
+            console.log("发送领取红包请求");
+            ServerHandler.inst.getDailyReward(this.data.level);
+        }
     }
 
 

+ 72 - 35
assets/script/game/view/RedPackeWithdrawalViewComp.ts

@@ -2,79 +2,105 @@
  * @Author: mojunshou 1637302775@qq.com
  * @Date: 2025-03-20 17:53:50
  * @LastEditors: mojunshou 1637302775@qq.com
- * @LastEditTime: 2025-04-11 10:28:16
+ * @LastEditTime: 2025-04-15 18:17:59
  * @Description: 红包提现
  */
 import { _decorator, Label, Node } from "cc";
 import { oops } from "db://oops-framework/core/Oops";
 import { DeviceUtil } from "db://oops-framework/core/utils/DeviceUtil";
-import { GameComponent } from "db://oops-framework/module/common/GameComponent";
+import { ecs } from "db://oops-framework/libs/ecs/ECS";
+import { CCVMParentComp } from "db://oops-framework/module/common/CCVMParentComp";
 import { GameEvent } from "../common/config/GameEvent";
 import { UIID } from "../common/config/GameUIConfig";
-import { CocosHandler } from "../common/manager/CocosHandler";
+import { ServerHandler } from "../common/manager/ServerHandler";
 import List from "../ui/List";
 import { RedPackeItemView } from "./RedPackeItemView";
-import { ServerHandler } from "../common/manager/ServerHandler";
+import { smc } from "../common/SingletonModuleComp";
 
 const { ccclass, property } = _decorator;
 
 /** 视图层对象 */
 @ccclass('RedPackeWithdrawalViewComp')
-export class RedPackeWithdrawalViewComp extends GameComponent {
+@ecs.register(`RedPackeWithdrawalViewComp`, false)
+export class RedPackeWithdrawalViewComp extends CCVMParentComp {
 
     @property(List)
     recordList: List = null!;
 
     @property(Label)
-    lab_redNum: Label = null!;  //红包金额
-
-    @property(Label)
-    lab_tips: Label = null!;  //提示金额
-
-    @property(Label)
-    lab_wxNum: Label = null!;  //微信金额
-
-    data: any[] = [];
-    onLoad() {
+    lab_tips: Label = null!;
+
+    data: any = {
+        tasklist: [],
+        wxCash: 0,
+        hbCoin: 0,
+        goldNum: 0
+    };
+    start() {
         this.setButton();
         this.addEvent();
-        const data = {
-            title: `每日消除100次即可领取`,
-            current: 1,
-            total: 100,
-            state: 0,
-            goods: [
-                {
-                    type: 1001,
-                    num: 100
-                }
-            ]
+        // const data = {
+        //     title: `每日消除100次即可领取`,
+        //     current: 1,
+        //     total: 100,
+        //     state: 0,
+        //     goods: [
+        //         {
+        //             type: 1001,
+        //             num: 100
+        //         }
+        //     ]
+        // }
+
+        // for (let i = 0; i < 10; i++) {
+        //     this.data.push(data);
+        // }
+        // oops.log.logView(this.data, "this.data");
+        // this.recordList.numItems = this.data.length;
+        // oops.log.logView(this.recordList.numItems, "this.recordList.numItems");
+        // this
+        this.data.taskList = smc.game.GameModel.taskList;
+        this.data.wxCash = smc.game.GameModel.wxCash;
+        this.data.hbCoin = smc.account.AccountModel.hbCoin;
+        this.data.goldNum = smc.account.AccountModel.goldCoin;
+        if (this.data.taskList.length > 0) {
+            this.recordList.numItems = this.data.taskList.length;
         }
+        this.lab_tips.string = `当前收集金砖${this.data.goldNum}块,红包10000元=人民币1元`;
 
-        for (let i = 0; i < 10; i++) {
-            this.data.push(data);
-        }
-        oops.log.logView(this.data, "this.data");
-        this.recordList.numItems = this.data.length;
-        oops.log.logView(this.recordList.numItems, "this.recordList.numItems");
     }
 
 
 
     addEvent() {
         oops.message.on(GameEvent.openRecordView, this.openRecordView, this);
+        oops.message.on(GameEvent.updateRedPackeTaskList, this.updateList, this);
     }
 
 
     private onListRender(item: Node, idx: number) {
-        console.log("onListRender", idx);
         const itemView: RedPackeItemView | null = item.getComponent(RedPackeItemView);
         if (itemView) {
-            console.log(">>>>>>>>>>>>>>>>>", itemView)
-            itemView.setItem(this.data[idx], idx);
+            itemView.setItem(this.data.taskList[idx], idx);
         }
     }
 
+
+    updateList() {
+        // console.log("更新提现记录信息", this.data.wxCash);
+        this.data.taskList = smc.game.GameModel.taskList;
+        this.data.wxCash = smc.game.GameModel.wxCash;
+        this.data.hbCoin = smc.account.AccountModel.hbCoin;
+        this.data.goldNum = smc.account.AccountModel.goldCoin;
+        this.recordList.numItems = 0;
+        if (this.data.taskList.length > 0) {
+            this.recordList.numItems = this.data.taskList.length;
+        }
+        this.lab_tips.string = `当前收集金砖${this.data.goldNum}块,红包10000元=人民币1元`;
+        oops.gui.toast("领取成功");
+
+    }
+
     private btn_back() {
         oops.gui.remove(UIID.RedPacketWithdraw);
     }
@@ -96,7 +122,18 @@ export class RedPackeWithdrawalViewComp extends GameComponent {
 
     private btn_withdrawal() {
         //全部提现
+        if (this.data.wxCash > 0.1) {
+            //红包提现
+            ServerHandler.inst.HbReward();
+        } else {
+            oops.gui.toast("微信官方限制大于0.1元,才能提现~");
+        }
+    }
+
 
+    /** 视图对象通过 ecs.Entity.remove(WechatWithdrawalViewComp) 删除组件是触发组件处理自定义释放逻辑 */
+    reset() {
+        this.node.destroy();
     }
 
 }

+ 86 - 6
assets/script/game/view/WechatWithdrawalViewComp.ts

@@ -2,36 +2,52 @@
  * @Author: mojunshou 1637302775@qq.com
  * @Date: 2025-03-20 17:00:12
  * @LastEditors: mojunshou 1637302775@qq.com
- * @LastEditTime: 2025-04-10 15:09:55
+ * @LastEditTime: 2025-04-15 14:47:44
  * @Description: 微信提现页面
  */
-import { _decorator, Node, RichText, tween, Vec3 } from "cc";
+import { _decorator, ImageAsset, Label, Node, RichText, Size, Sprite, SpriteFrame, Texture2D, tween, UITransform, Vec3 } from "cc";
+import { IRemoteOptions, resLoader } from "db://oops-framework/core/common/loader/ResLoader";
 import { oops } from "db://oops-framework/core/Oops";
 import { DeviceUtil } from "db://oops-framework/core/utils/DeviceUtil";
 import { ecs } from "db://oops-framework/libs/ecs/ECS";
-import { CCComp } from "db://oops-framework/module/common/CCComp";
+import { CCVMParentComp } from "db://oops-framework/module/common/CCVMParentComp";
 import { GameEvent } from "../common/config/GameEvent";
 import { UIID } from "../common/config/GameUIConfig";
-import { CocosHandler } from "../common/manager/CocosHandler";
 import { ServerHandler } from "../common/manager/ServerHandler";
+import { smc } from "../common/SingletonModuleComp";
 
 const { ccclass, property } = _decorator;
 
 /** 视图层对象 */
 @ccclass('WechatWithdrawalViewComp')
 @ecs.register('WechatWithdrawalView', false)
-export class WechatWithdrawalViewComp extends CCComp {
+export class WechatWithdrawalViewComp extends CCVMParentComp {
     data: any = {
         nickName: "",
         money: 0,
-        channel: "微信零钱"
+        channel: "微信零钱",
+        headUrl: "",
+        cost: 0,
     }
 
+    str_list: string[] = [
+        `再收集<color =#C13935>$m块</color>金砖,<color =#C13935>现金</color>全部自动到账`,
+        `微信大额提现需要<color =#C13935>$m元</color>手续费
+已赚$y元,仅差<color =#C13935>$n元</color>`
+
+
+    ]
+
     @property(RichText)
     private richText: RichText = null!;
 
     @property(Node)
     private node_notice: Node = null!;
+    @property(Label)
+    private lab_cost: Label = null!;  //手续费
+
+    @property(RichText)
+    private richText_tips: RichText = null!;  //提示
 
 
 
@@ -40,6 +56,8 @@ export class WechatWithdrawalViewComp extends CCComp {
         // const entity = this.ent as ecs.Entity;         // ecs.Entity 可转为当前模块的具体实体对象
         this.setButton();
         this.updateNotice();
+        this.setData();
+        this.updateHead();
         this.addEvent();
     }
 
@@ -49,12 +67,50 @@ export class WechatWithdrawalViewComp extends CCComp {
     }
 
 
+    //设置数据
+    setData() {
+        this.data.nickName = smc.account.AccountModel.accountName;
+        this.data.headUrl = smc.account.AccountModel.headUrl;
+        this.data.money = smc.game.GameModel.wechat_tx_info.money;
+        //当前关卡
+        const curLevel = smc.account.AccountModel.curLevel;
+        console.log(">>>>>>>>>>>>>>", curLevel)
+        this.lab_cost.node.active = curLevel == 12;
+        //判断替换
+        this.richText_tips.string = this.str_list[curLevel == 12 ? 1 : 0];
+        const info = smc.game.GameModel.wechat_tx_info.handingChargeProgress;
+        if (curLevel > 12) {
+            //info.handingCharge替换$m,info.hasNum替换$y,info.gapNum替换$n
+            this.richText_tips.string = this.richText_tips.string.replace(/\$m/g, `${info.handingCharge}`);
+            this.richText_tips.string = this.richText_tips.string.replace(/\$y/g, `${info.hasNum}`);
+            this.richText_tips.string = this.richText_tips.string.replace(/\$n/g, `${info.gapNum}`);
+        } else {
+            this.richText_tips.string = this.richText_tips.string.replace(/\$m/g, `${smc.game.GameModel.wechat_tx_info.gapGoldNum}`);
+        }
+        //更新头像
+    }
+
 
     /** 视图对象通过 ecs.Entity.remove(WechatWithdrawalViewComp) 删除组件是触发组件处理自定义释放逻辑 */
     reset() {
         this.node.destroy();
     }
 
+    private btn_auto() {
+        //判断能否提现
+        const num = smc.game.GameModel.wechat_tx_info.gapGoldNum;
+
+        if (num) {
+            oops.gui.toast(`还需凑齐${num}金块即可微信打款`);
+        } else {
+            //展示提现界面//向服务器申请提现信息
+            ServerHandler.inst.getWechatTxInfo();
+        }
+
+
+    }
+
+
 
     private btn_back() {
         oops.gui.remove(UIID.WechatWithdraw);
@@ -71,6 +127,7 @@ export class WechatWithdrawalViewComp extends CCComp {
 
 
     private openRecordView() {
+        console.log("打开提现列表");
         oops.gui.open(UIID.WithdrawRecord);
     }
 
@@ -120,4 +177,27 @@ export class WechatWithdrawalViewComp extends CCComp {
     }
 
 
+    private updateHead() {
+        let url = smc.account.AccountModel.headUrl;
+        let spriteNode = this.node.getChildByPath("Scene/Center/nameNode/Mask/sp_head");
+        if (spriteNode) {
+            const uiTransform = spriteNode.getComponent(UITransform);
+            uiTransform?.setContentSize(new Size(30, 30))
+            let sprite = spriteNode.getComponent(Sprite);
+            if (sprite) {
+                console.log("更新头像啦")
+                var opt: IRemoteOptions = { ext: ".png" };
+                var onComplete = (err: Error | null, data: ImageAsset) => {
+                    const texture = new Texture2D();
+                    texture.image = data;
+                    const spriteFrame = new SpriteFrame();
+                    spriteFrame.texture = texture;
+                    sprite.spriteFrame = spriteFrame;
+                }
+                resLoader.loadRemote<ImageAsset>(url, opt, onComplete);
+            }
+        }
+    }
+
+
 }

+ 4 - 1
assets/script/game/view/WithdrawalRecordViewComp.ts

@@ -2,7 +2,7 @@
  * @Author: mojunshou 1637302775@qq.com
  * @Date: 2025-03-21 10:17:49
  * @LastEditors: mojunshou 1637302775@qq.com
- * @LastEditTime: 2025-04-10 15:10:48
+ * @LastEditTime: 2025-04-15 16:58:21
  * @Description: 提现记录
  */
 import { _decorator, Label, Node } from "cc";
@@ -77,6 +77,9 @@ export class WithdrawalRecordViewComp extends CCComp {
             case 4:
                 str = "已拒绝"
                 break
+            case 5:
+                str = ""
+                break
         }
 
         const stateLabel = item.getChildByName("lab_state")?.getComponent(Label);