Prechádzať zdrojové kódy

【优化】UI优化,完善方块根据关卡选择逻辑

mojunshou 1 rok pred
rodič
commit
5c5e46ded4
46 zmenil súbory, kde vykonal 3173 pridanie a 4875 odobranie
  1. 5 3
      assets/bundle/common/prefab/KindTips.prefab
  2. 340 308
      assets/bundle/gui/eliminate/eliminate.prefab
  3. 549 549
      assets/bundle/gui/eliminate/prefab/cashWithdrawal.prefab
  4. 313 174
      assets/bundle/gui/eliminate/prefab/doubleSpeed.prefab
  5. 1 1
      assets/bundle/gui/eliminate/prefab/gameOver.prefab
  6. 356 37
      assets/bundle/gui/eliminate/prefab/item/RecordItem.prefab
  7. 2 2
      assets/bundle/gui/eliminate/prefab/item/gooditem_1.prefab
  8. 4 4
      assets/bundle/gui/eliminate/prefab/item/gooditem_2.prefab
  9. 4 4
      assets/bundle/gui/eliminate/prefab/item/gooditem_3.prefab
  10. 1 1
      assets/bundle/gui/eliminate/prefab/popup/wechatTransferring.prefab
  11. 26 49
      assets/bundle/gui/eliminate/prefab/popup/welfareOne.prefab
  12. 40 15
      assets/bundle/gui/eliminate/prefab/redPackeItem.prefab
  13. 252 3049
      assets/bundle/gui/eliminate/prefab/redPacketWithdrawal.prefab
  14. 347 208
      assets/bundle/gui/eliminate/prefab/wechatWithdrawal.prefab
  15. 117 217
      assets/bundle/gui/eliminate/prefab/withdrawalRecord.prefab
  16. 1 141
      assets/bundle/gui/eliminate/skeletal/FingerClick_ske.json
  17. 1 15
      assets/bundle/gui/eliminate/skeletal/FingerClick_tex.json
  18. BIN
      assets/bundle/gui/eliminate/skeletal/FingerClick_tex.png
  19. 27 27
      assets/bundle/gui/eliminate/skeletal/FingerClick_tex.png.meta
  20. BIN
      assets/bundle/gui/eliminate/texture/bricks/item_type_1.png
  21. 13 13
      assets/bundle/gui/eliminate/texture/bricks/item_type_1.png.meta
  22. BIN
      assets/bundle/gui/eliminate/texture/bricks/item_type_2.png
  23. BIN
      assets/bundle/gui/eliminate/texture/bricks/item_type_4.png
  24. 13 13
      assets/bundle/gui/eliminate/texture/bricks/item_type_4.png.meta
  25. BIN
      assets/bundle/gui/eliminate/texture/bricks/item_type_5.png
  26. 10 10
      assets/bundle/gui/eliminate/texture/bricks/item_type_5.png.meta
  27. BIN
      assets/bundle/gui/eliminate/texture/bricks/item_type_7.png
  28. 10 10
      assets/bundle/gui/eliminate/texture/bricks/item_type_7.png.meta
  29. BIN
      assets/bundle/gui/eliminate/texture/icon_hb.png
  30. 134 0
      assets/bundle/gui/eliminate/texture/icon_hb.png.meta
  31. BIN
      assets/bundle/gui/eliminate/texture/line2.png
  32. 134 0
      assets/bundle/gui/eliminate/texture/line2.png.meta
  33. BIN
      assets/bundle/gui/eliminate/texture/reference/提现记录.png
  34. 134 0
      assets/bundle/gui/eliminate/texture/reference/提现记录.png.meta
  35. BIN
      assets/bundle/gui/eliminate/texture/text/kqebs.png
  36. 134 0
      assets/bundle/gui/eliminate/texture/text/kqebs.png.meta
  37. BIN
      assets/bundle/gui/eliminate/texture/text/text_txcry.png
  38. 134 0
      assets/bundle/gui/eliminate/texture/text/text_txcry.png.meta
  39. 2 2
      assets/resources/config.json
  40. 2 2
      assets/script/game/common/manager/LoginHandler.ts
  41. 0 2
      assets/script/game/initialize/view/LoadingViewComp.ts
  42. 3 3
      assets/script/game/utils/Format.ts
  43. 4 6
      assets/script/game/view/DoubleSpeedViewComp.ts
  44. 53 4
      assets/script/game/view/EliminateViewComp.ts
  45. 3 3
      assets/script/game/view/WechatWithdrawalViewComp.ts
  46. 4 3
      assets/script/game/view/WithdrawalRecordViewComp.ts

+ 5 - 3
assets/bundle/common/prefab/KindTips.prefab

@@ -1207,6 +1207,8 @@
       "__id__": 0
     },
     "fileId": "8blNg8BMtFDbj06Z89F5mg",
+    "instance": null,
+    "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {
@@ -1224,7 +1226,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 570,
-      "height": 430
+      "height": 530.4
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1249,7 +1251,7 @@
     "__prefab": {
       "__id__": 55
     },
-    "_resizeMode": 0,
+    "_resizeMode": 1,
     "_layoutType": 2,
     "_cellSize": {
       "__type__": "cc.Size",
@@ -2361,7 +2363,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 720,
-      "height": 1600.0000000000002
+      "height": 1600
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 340 - 308
assets/bundle/gui/eliminate/eliminate.prefab


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 549 - 549
assets/bundle/gui/eliminate/prefab/cashWithdrawal.prefab


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 313 - 174
assets/bundle/gui/eliminate/prefab/doubleSpeed.prefab


+ 1 - 1
assets/bundle/gui/eliminate/prefab/gameOver.prefab

@@ -336,7 +336,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": -11.662,
-      "y": 123.284,
+      "y": 120.184,
       "z": 0
     },
     "_lrot": {

+ 356 - 37
assets/bundle/gui/eliminate/prefab/item/RecordItem.prefab

@@ -43,16 +43,19 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 44
+        "__id__": 56
+      },
+      {
+        "__id__": 58
       }
     ],
     "_prefab": {
-      "__id__": 46
+      "__id__": 60
     },
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 0,
+      "y": -65,
       "z": 0
     },
     "_lrot": {
@@ -237,7 +240,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -243.754,
+      "x": -246.763,
       "y": 0,
       "z": 0
     },
@@ -373,8 +376,8 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 231.748,
-      "y": -20.138,
+      "x": 226.579,
+      "y": -22.514,
       "z": 0
     },
     "_lrot": {
@@ -509,8 +512,8 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 231.748,
-      "y": -20.138,
+      "x": 226.483,
+      "y": -23.147,
       "z": 0
     },
     "_lrot": {
@@ -645,8 +648,8 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -179.061,
-      "y": 25.1,
+      "x": -190.971,
+      "y": 21.339,
       "z": 0
     },
     "_lrot": {
@@ -686,7 +689,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 80,
+      "width": 112,
       "height": 50.4
     },
     "_anchorPoint": {
@@ -725,8 +728,8 @@
     "_string": "提现成功",
     "_horizontalAlign": 1,
     "_verticalAlign": 1,
-    "_actualFontSize": 20,
-    "_fontSize": 20,
+    "_actualFontSize": 28,
+    "_fontSize": 28,
     "_fontFamily": "Arial",
     "_lineHeight": 40,
     "_overflow": 0,
@@ -804,8 +807,8 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -179.882,
-      "y": -23.965,
+      "x": -191.793,
+      "y": -24.717,
       "z": 0
     },
     "_lrot": {
@@ -845,7 +848,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 157.91015625,
+      "width": 189.4921875,
       "height": 50.4
     },
     "_anchorPoint": {
@@ -879,13 +882,13 @@
       "r": 96,
       "g": 46,
       "b": 9,
-      "a": 255
+      "a": 189
     },
     "_string": "2025-03-17 15:36",
     "_horizontalAlign": 1,
     "_verticalAlign": 1,
-    "_actualFontSize": 20,
-    "_fontSize": 20,
+    "_actualFontSize": 24,
+    "_fontSize": 24,
     "_fontFamily": "Arial",
     "_lineHeight": 40,
     "_overflow": 0,
@@ -942,29 +945,86 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "lab_money",
+    "_name": "moneyNode",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
       "__id__": 1
     },
+    "_children": [
+      {
+        "__id__": 39
+      },
+      {
+        "__id__": 45
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 51
+      },
+      {
+        "__id__": 53
+      }
+    ],
+    "_prefab": {
+      "__id__": 55
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 273.954,
+      "y": 21.012,
+      "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": "lab_money-001",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 38
+    },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 39
+        "__id__": 40
       },
       {
-        "__id__": 41
+        "__id__": 42
       }
     ],
     "_prefab": {
-      "__id__": 43
+      "__id__": 44
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 262.851,
-      "y": 36.048,
+      "x": 0,
+      "y": -0.08500000000003638,
       "z": 0
     },
     "_lrot": {
@@ -996,15 +1056,174 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
+      "__id__": 39
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 41
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 20,
+      "height": 27.72
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 1,
+      "y": 0.6
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "a8o7ZfzAdLsbJFY2msb/ro"
+  },
+  {
+    "__type__": "cc.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 39
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 43
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 96,
+      "g": 46,
+      "b": 9,
+      "a": 255
+    },
+    "_string": "元",
+    "_horizontalAlign": 1,
+    "_verticalAlign": 1,
+    "_actualFontSize": 20,
+    "_fontSize": 20,
+    "_fontFamily": "Arial",
+    "_lineHeight": 22,
+    "_overflow": 0,
+    "_enableWrapText": true,
+    "_font": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_isItalic": false,
+    "_isBold": true,
+    "_isUnderline": false,
+    "_underlineHeight": 2,
+    "_cacheMode": 0,
+    "_enableOutline": false,
+    "_outlineColor": {
+      "__type__": "cc.Color",
+      "r": 0,
+      "g": 0,
+      "b": 0,
+      "a": 255
+    },
+    "_outlineWidth": 2,
+    "_enableShadow": false,
+    "_shadowColor": {
+      "__type__": "cc.Color",
+      "r": 0,
+      "g": 0,
+      "b": 0,
+      "a": 255
+    },
+    "_shadowOffset": {
+      "__type__": "cc.Vec2",
+      "x": 2,
+      "y": 2
+    },
+    "_shadowBlur": 2,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "316cjICRJJt7diCJKovRLZ"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "fe/9X9mm9JRpsntdqJXDLM",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "lab_money",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
       "__id__": 38
     },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 46
+      },
+      {
+        "__id__": 48
+      }
+    ],
+    "_prefab": {
+      "__id__": 50
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": -22,
+      "y": -0.08500000000003638,
+      "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__": 45
+    },
     "_enabled": true,
     "__prefab": {
-      "__id__": 40
+      "__id__": 47
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 58.92578125,
+      "width": 77.8515625,
       "height": 50.4
     },
     "_anchorPoint": {
@@ -1024,27 +1243,27 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 38
+      "__id__": 45
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 42
+      "__id__": 49
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
     "_dstBlendFactor": 4,
     "_color": {
       "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
+      "r": 96,
+      "g": 46,
+      "b": 9,
       "a": 255
     },
-    "_string": "0.10",
+    "_string": "0.10",
     "_horizontalAlign": 1,
     "_verticalAlign": 1,
-    "_actualFontSize": 20,
-    "_fontSize": 20,
+    "_actualFontSize": 40,
+    "_fontSize": 40,
     "_fontFamily": "Arial",
     "_lineHeight": 40,
     "_overflow": 0,
@@ -1105,11 +1324,90 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
+      "__id__": 38
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 52
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 100,
+      "height": 40
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 1,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "f0L7K11oBHXIVID1pH29nJ"
+  },
+  {
+    "__type__": "cc.Layout",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 38
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 54
+    },
+    "_resizeMode": 0,
+    "_layoutType": 1,
+    "_cellSize": {
+      "__type__": "cc.Size",
+      "width": 40,
+      "height": 40
+    },
+    "_startAxis": 0,
+    "_paddingLeft": 0,
+    "_paddingRight": 0,
+    "_paddingTop": 0,
+    "_paddingBottom": 0,
+    "_spacingX": 2,
+    "_spacingY": 0,
+    "_verticalDirection": 1,
+    "_horizontalDirection": 1,
+    "_constraint": 0,
+    "_constraintNum": 2,
+    "_affectedByScale": false,
+    "_isAlign": false,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "87bo1isNtCg6QuY0RL9OVc"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "9dNR95JKRH+qdREOBDUgof",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
       "__id__": 1
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 45
+      "__id__": 57
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1128,6 +1426,28 @@
     "fileId": "ccD/w4OrpEdqPYI/IRChcf"
   },
   {
+    "__type__": "95212EyccpCj4EFPKMZrM7G",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 59
+    },
+    "selectedMode": 0,
+    "selectedFlag": null,
+    "selectedSpriteFrame": null,
+    "adaptiveSize": false,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "76CZA+av1PyZZAAc1SH05T"
+  },
+  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1
@@ -1136,7 +1456,6 @@
       "__id__": 0
     },
     "fileId": "c46/YsCPVOJYA4mWEpNYRx",
-    "instance": null,
     "targetOverrides": null
   }
 ]

+ 2 - 2
assets/bundle/gui/eliminate/prefab/item/gooditem_1.prefab

@@ -362,8 +362,8 @@
     "_string": "",
     "_horizontalAlign": 1,
     "_verticalAlign": 1,
-    "_actualFontSize": 60,
-    "_fontSize": 60,
+    "_actualFontSize": 40,
+    "_fontSize": 40,
     "_fontFamily": "Arial",
     "_lineHeight": 60,
     "_overflow": 0,

+ 4 - 4
assets/bundle/gui/eliminate/prefab/item/gooditem_2.prefab

@@ -324,7 +324,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 0,
-      "height": 75.6
+      "height": 50.4
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -362,10 +362,10 @@
     "_string": "",
     "_horizontalAlign": 1,
     "_verticalAlign": 1,
-    "_actualFontSize": 60,
-    "_fontSize": 60,
+    "_actualFontSize": 40,
+    "_fontSize": 40,
     "_fontFamily": "Arial",
-    "_lineHeight": 60,
+    "_lineHeight": 40,
     "_overflow": 0,
     "_enableWrapText": true,
     "_font": null,

+ 4 - 4
assets/bundle/gui/eliminate/prefab/item/gooditem_3.prefab

@@ -324,7 +324,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 0,
-      "height": 75.6
+      "height": 50.4
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -362,10 +362,10 @@
     "_string": "",
     "_horizontalAlign": 1,
     "_verticalAlign": 1,
-    "_actualFontSize": 60,
-    "_fontSize": 60,
+    "_actualFontSize": 40,
+    "_fontSize": 40,
     "_fontFamily": "Arial",
-    "_lineHeight": 60,
+    "_lineHeight": 40,
     "_overflow": 0,
     "_enableWrapText": true,
     "_font": null,

+ 1 - 1
assets/bundle/gui/eliminate/prefab/popup/wechatTransferring.prefab

@@ -88,7 +88,7 @@
         "__id__": 3
       }
     ],
-    "_active": false,
+    "_active": true,
     "_components": [
       {
         "__id__": 226

+ 26 - 49
assets/bundle/gui/eliminate/prefab/popup/welfareOne.prefab

@@ -2012,7 +2012,7 @@
         "__id__": 145
       }
     ],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 149
@@ -2191,7 +2191,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "Label",
+    "_name": "text_txcry",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
@@ -2213,7 +2213,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": -200.865,
+      "y": -206.272,
       "z": 0
     },
     "_lrot": {
@@ -2253,8 +2253,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 347.9609375,
-      "height": 96.2
+      "width": 349,
+      "height": 69
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -2265,10 +2265,10 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "d1tZryPtBJa7zJU5+w8HZT"
+    "fileId": "f9j7ZKH85NiZjq1ND06DkC"
   },
   {
-    "__type__": "cc.Label",
+    "__type__": "cc.Sprite",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -2285,55 +2285,32 @@
     "_color": {
       "__type__": "cc.Color",
       "r": 255,
-      "g": 229,
-      "b": 163,
-      "a": 255
-    },
-    "_string": "提现超容易!!",
-    "_horizontalAlign": 1,
-    "_verticalAlign": 1,
-    "_actualFontSize": 60,
-    "_fontSize": 60,
-    "_fontFamily": "Arial",
-    "_lineHeight": 70,
-    "_overflow": 0,
-    "_enableWrapText": true,
-    "_font": null,
-    "_isSystemFontUsed": true,
-    "_spacingX": 0,
-    "_isItalic": false,
-    "_isBold": true,
-    "_isUnderline": false,
-    "_underlineHeight": 2,
-    "_cacheMode": 0,
-    "_enableOutline": true,
-    "_outlineColor": {
-      "__type__": "cc.Color",
-      "r": 88,
-      "g": 42,
-      "b": 9,
+      "g": 255,
+      "b": 255,
       "a": 255
     },
-    "_outlineWidth": 4,
-    "_enableShadow": false,
-    "_shadowColor": {
-      "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
-      "a": 255
+    "_spriteFrame": {
+      "__uuid__": "8b586d7e-a982-4a13-9036-e437df5586a9@f9941",
+      "__expectedType__": "cc.SpriteFrame"
     },
-    "_shadowOffset": {
+    "_type": 0,
+    "_fillType": 0,
+    "_sizeMode": 1,
+    "_fillCenter": {
       "__type__": "cc.Vec2",
-      "x": 2,
-      "y": 2
+      "x": 0,
+      "y": 0
     },
-    "_shadowBlur": 2,
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_useGrayscale": false,
+    "_atlas": null,
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "2e8vhRJV9B1ITgUMR6pwb0"
+    "fileId": "fcabG6xJ5Jvb9NPBsQiSSh"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -2343,7 +2320,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "feiVZS+TBK04UjggHb9STJ",
+    "fileId": "c22+mqhMxIuIqH7JnwNJgh",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -3611,7 +3588,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 720,
-      "height": 1600
+      "height": 1600.0000000000002
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",

+ 40 - 15
assets/bundle/gui/eliminate/prefab/redPackeItem.prefab

@@ -29,15 +29,18 @@
       },
       {
         "__id__": 108
+      },
+      {
+        "__id__": 110
       }
     ],
     "_prefab": {
-      "__id__": 110
+      "__id__": 112
     },
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 0,
+      "y": -75,
       "z": 0
     },
     "_lrot": {
@@ -161,7 +164,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -238.392,
+      "x": -236.494,
       "y": 21.871,
       "z": 0
     },
@@ -202,8 +205,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 60,
-      "height": 60
+      "width": 76,
+      "height": 76
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -239,7 +242,7 @@
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "b26678f8-846f-4447-bd57-0659cca862e1@f9941",
+      "__uuid__": "03b1ca85-34a1-4f0b-9a63-26912a2614fa@f9941",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 0,
@@ -338,8 +341,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 73.3798828125,
-      "height": 54.4
+      "width": 77.3798828125,
+      "height": 58.4
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -399,7 +402,7 @@
       "b": 12,
       "a": 255
     },
-    "_outlineWidth": 2,
+    "_outlineWidth": 4,
     "_enableShadow": false,
     "_shadowColor": {
       "__type__": "cc.Color",
@@ -1982,7 +1985,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 0,
+      "x": -139.757,
       "y": 30.711,
       "z": 0
     },
@@ -2032,7 +2035,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -68.021484375,
+      "x": 48,
       "y": 0,
       "z": 0
     },
@@ -2191,7 +2194,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 12,
+      "x": 128.021484375,
       "y": 0,
       "z": 0
     },
@@ -2350,7 +2353,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 80.021484375,
+      "x": 196.04296875,
       "y": 0,
       "z": 0
     },
@@ -2505,7 +2508,7 @@
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
-      "x": 0.5,
+      "x": 0,
       "y": 0.5
     },
     "_id": ""
@@ -2719,6 +2722,28 @@
     "fileId": "12O1/akC1BIYSPVusB1QM/"
   },
   {
+    "__type__": "95212EyccpCj4EFPKMZrM7G",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 111
+    },
+    "selectedMode": 0,
+    "selectedFlag": null,
+    "selectedSpriteFrame": null,
+    "adaptiveSize": false,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "8emLt0s/lBnLkWjiOISTbO"
+  },
+  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1
@@ -2728,6 +2753,6 @@
     },
     "fileId": "0bM3EFCaFEsJmH1QgSc8lH",
     "instance": null,
-    "targetOverrides": null
+    "targetOverrides": []
   }
 ]

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 252 - 3049
assets/bundle/gui/eliminate/prefab/redPacketWithdrawal.prefab


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 347 - 208
assets/bundle/gui/eliminate/prefab/wechatWithdrawal.prefab


+ 117 - 217
assets/bundle/gui/eliminate/prefab/withdrawalRecord.prefab

@@ -28,17 +28,17 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 90
+        "__id__": 79
       },
       {
-        "__id__": 92
+        "__id__": 81
       },
       {
-        "__id__": 94
+        "__id__": 83
       }
     ],
     "_prefab": {
-      "__id__": 96
+      "__id__": 85
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -137,7 +137,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 720,
-      "height": 1600
+      "height": 1600.0000000000002
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -263,23 +263,23 @@
         "__id__": 25
       },
       {
-        "__id__": 71
+        "__id__": 60
       },
       {
-        "__id__": 77
+        "__id__": 66
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 85
+        "__id__": 74
       },
       {
-        "__id__": 87
+        "__id__": 76
       }
     ],
     "_prefab": {
-      "__id__": 89
+      "__id__": 78
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -512,7 +512,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "title_record",
+    "_name": "Label",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
@@ -534,7 +534,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 670.915,
+      "y": 672.374,
       "z": 0
     },
     "_lrot": {
@@ -574,8 +574,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 163,
-      "height": 42
+      "width": 168,
+      "height": 71
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -586,10 +586,10 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "d0Vhwo7RBFkrM5992a6Qvi"
+    "fileId": "7d2S09bLRPY4xShCx8P9nM"
   },
   {
-    "__type__": "cc.Sprite",
+    "__type__": "cc.Label",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -610,28 +610,51 @@
       "b": 255,
       "a": 255
     },
-    "_spriteFrame": {
-      "__uuid__": "c82f70b8-5c12-4207-bb3d-643b42a81322@f9941",
-      "__expectedType__": "cc.SpriteFrame"
+    "_string": "提现记录",
+    "_horizontalAlign": 1,
+    "_verticalAlign": 1,
+    "_actualFontSize": 40,
+    "_fontSize": 40,
+    "_fontFamily": "Arial",
+    "_lineHeight": 50,
+    "_overflow": 0,
+    "_enableWrapText": true,
+    "_font": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_isItalic": false,
+    "_isBold": true,
+    "_isUnderline": false,
+    "_underlineHeight": 2,
+    "_cacheMode": 0,
+    "_enableOutline": true,
+    "_outlineColor": {
+      "__type__": "cc.Color",
+      "r": 128,
+      "g": 67,
+      "b": 21,
+      "a": 255
     },
-    "_type": 0,
-    "_fillType": 0,
-    "_sizeMode": 1,
-    "_fillCenter": {
+    "_outlineWidth": 4,
+    "_enableShadow": false,
+    "_shadowColor": {
+      "__type__": "cc.Color",
+      "r": 0,
+      "g": 0,
+      "b": 0,
+      "a": 255
+    },
+    "_shadowOffset": {
       "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 0
+      "x": 2,
+      "y": 2
     },
-    "_fillStart": 0,
-    "_fillRange": 0,
-    "_isTrimmedMode": true,
-    "_useGrayscale": false,
-    "_atlas": null,
+    "_shadowBlur": 2,
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "e5XkQoTKpNeq+uq4Wm4x7Y"
+    "fileId": "7dC3MT3UVJf7o43Pxbabm1"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -641,7 +664,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "2cTIQIAnhD17X1yGEFoOJa",
+    "fileId": "d57iRkM9VOTZkZ7yAuXOjj",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -662,20 +685,20 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 59
+        "__id__": 48
       },
       {
-        "__id__": 61
+        "__id__": 50
       },
       {
-        "__id__": 63
+        "__id__": 52
       },
       {
-        "__id__": 65
+        "__id__": 54
       }
     ],
     "_prefab": {
-      "__id__": 70
+      "__id__": 59
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -722,22 +745,22 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 52
+        "__id__": 41
       },
       {
-        "__id__": 54
+        "__id__": 43
       },
       {
-        "__id__": 56
+        "__id__": 45
       }
     ],
     "_prefab": {
-      "__id__": 58
+      "__id__": 47
     },
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": -26.106,
+      "y": -37.374,
       "z": 0
     },
     "_lrot": {
@@ -779,14 +802,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 47
+        "__id__": 36
       },
       {
-        "__id__": 49
+        "__id__": 38
       }
     ],
     "_prefab": {
-      "__id__": 51
+      "__id__": 40
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -850,86 +873,27 @@
       "__id__": 1
     },
     "mountedChildren": [],
-    "mountedComponents": [
-      {
-        "__id__": 31
-      }
-    ],
+    "mountedComponents": [],
     "propertyOverrides": [
       {
-        "__id__": 35
-      },
-      {
-        "__id__": 37
-      },
-      {
-        "__id__": 38
-      },
-      {
-        "__id__": 39
-      },
-      {
-        "__id__": 40
+        "__id__": 31
       },
       {
-        "__id__": 42
+        "__id__": 33
       },
       {
-        "__id__": 44
+        "__id__": 34
       },
       {
-        "__id__": 46
+        "__id__": 35
       }
     ],
     "removedComponents": []
   },
   {
-    "__type__": "cc.MountedComponentsInfo",
-    "targetInfo": {
-      "__id__": 32
-    },
-    "components": [
-      {
-        "__id__": 33
-      }
-    ]
-  },
-  {
-    "__type__": "cc.TargetInfo",
-    "localID": [
-      "c46/YsCPVOJYA4mWEpNYRx"
-    ]
-  },
-  {
-    "__type__": "95212EyccpCj4EFPKMZrM7G",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {
-      "mountedRoot": {
-        "__id__": 28
-      }
-    },
-    "node": {
-      "__id__": 28
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 34
-    },
-    "selectedMode": 0,
-    "selectedFlag": null,
-    "selectedSpriteFrame": null,
-    "adaptiveSize": false,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "76CZA+av1PyZZAAc1SH05T"
-  },
-  {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 36
+      "__id__": 32
     },
     "propertyPath": [
       "_name"
@@ -945,7 +909,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 36
+      "__id__": 32
     },
     "propertyPath": [
       "_lpos"
@@ -960,7 +924,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 36
+      "__id__": 32
     },
     "propertyPath": [
       "_lrot"
@@ -976,7 +940,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 36
+      "__id__": 32
     },
     "propertyPath": [
       "_euler"
@@ -989,70 +953,6 @@
     }
   },
   {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 41
-    },
-    "propertyPath": [
-      "_color"
-    ],
-    "value": {
-      "__type__": "cc.Color",
-      "r": 96,
-      "g": 46,
-      "b": 9,
-      "a": 255
-    }
-  },
-  {
-    "__type__": "cc.TargetInfo",
-    "localID": [
-      "f1jadVLpxICL20ap4GcGsG"
-    ]
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 43
-    },
-    "propertyPath": [
-      "_active"
-    ],
-    "value": true
-  },
-  {
-    "__type__": "cc.TargetInfo",
-    "localID": [
-      "652hl5LaNK2o6yuh+4xoly"
-    ]
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 45
-    },
-    "propertyPath": [
-      "_active"
-    ],
-    "value": true
-  },
-  {
-    "__type__": "cc.TargetInfo",
-    "localID": [
-      "d2z2XZX5lHMI2b7oCpAlOO"
-    ]
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 36
-    },
-    "propertyPath": [
-      "_active"
-    ],
-    "value": true
-  },
-  {
     "__type__": "cc.UITransform",
     "_name": "",
     "_objFlags": 0,
@@ -1062,7 +962,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 48
+      "__id__": 37
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1090,7 +990,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 50
+      "__id__": 39
     },
     "_resizeMode": 1,
     "_layoutType": 2,
@@ -1105,7 +1005,7 @@
     "_paddingTop": 5,
     "_paddingBottom": 5,
     "_spacingX": 0,
-    "_spacingY": 10,
+    "_spacingY": 19,
     "_verticalDirection": 1,
     "_horizontalDirection": 0,
     "_constraint": 0,
@@ -1141,7 +1041,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 53
+      "__id__": 42
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1169,7 +1069,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 55
+      "__id__": 44
     },
     "_type": 0,
     "_inverted": false,
@@ -1191,7 +1091,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 57
+      "__id__": 46
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1250,7 +1150,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 60
+      "__id__": 49
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1278,7 +1178,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 62
+      "__id__": 51
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1323,7 +1223,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 64
+      "__id__": 53
     },
     "bounceDuration": 0.23,
     "brake": 0.75,
@@ -1354,7 +1254,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 66
+      "__id__": 55
     },
     "templateType": 1,
     "tmpNode": {
@@ -1364,7 +1264,7 @@
     "_slideMode": 1,
     "pageDistance": 0.3,
     "pageChangeEvent": {
-      "__id__": 67
+      "__id__": 56
     },
     "_virtual": true,
     "cyclic": false,
@@ -1373,11 +1273,11 @@
     "_updateRate": 0,
     "frameByFrameRenderNum": 0,
     "renderEvent": {
-      "__id__": 68
+      "__id__": 57
     },
     "selectedMode": 0,
     "selectedEvent": {
-      "__id__": 69
+      "__id__": 58
     },
     "repeatEventSingle": false,
     "_id": ""
@@ -1437,14 +1337,14 @@
     "_active": false,
     "_components": [
       {
-        "__id__": 72
+        "__id__": 61
       },
       {
-        "__id__": 74
+        "__id__": 63
       }
     ],
     "_prefab": {
-      "__id__": 76
+      "__id__": 65
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1481,11 +1381,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 71
+      "__id__": 60
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 73
+      "__id__": 62
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1509,11 +1409,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 71
+      "__id__": 60
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 75
+      "__id__": 64
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1596,22 +1496,22 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 78
+        "__id__": 67
       },
       {
-        "__id__": 80
+        "__id__": 69
       },
       {
-        "__id__": 82
+        "__id__": 71
       }
     ],
     "_prefab": {
-      "__id__": 84
+      "__id__": 73
     },
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": -740.767,
+      "y": -740.7670000000002,
       "z": 0
     },
     "_lrot": {
@@ -1643,11 +1543,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 77
+      "__id__": 66
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 79
+      "__id__": 68
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1671,11 +1571,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 77
+      "__id__": 66
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 81
+      "__id__": 70
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1716,11 +1616,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 77
+      "__id__": 66
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 83
+      "__id__": 72
     },
     "_alignFlags": 44,
     "_target": null,
@@ -1769,12 +1669,12 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 86
+      "__id__": 75
     },
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 720,
-      "height": 1600
+      "height": 1600.0000000000002
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1797,7 +1697,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 88
+      "__id__": 77
     },
     "_alignFlags": 45,
     "_target": null,
@@ -1846,12 +1746,12 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 91
+      "__id__": 80
     },
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 720,
-      "height": 1600
+      "height": 1600.0000000000002
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1874,13 +1774,13 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 93
+      "__id__": 82
     },
     "recordList": {
-      "__id__": 65
+      "__id__": 54
     },
     "noRecord": {
-      "__id__": 71
+      "__id__": 60
     },
     "content": {
       "__id__": 27
@@ -1901,7 +1801,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 95
+      "__id__": 84
     },
     "_alignFlags": 45,
     "_target": null,

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 1 - 141
assets/bundle/gui/eliminate/skeletal/FingerClick_ske.json


+ 1 - 15
assets/bundle/gui/eliminate/skeletal/FingerClick_tex.json

@@ -1,15 +1 @@
-{
-    "width": 256,
-    "imagePath": "FingerClick_tex.png",
-    "height": 256,
-    "name": "FingerClick",
-    "SubTexture": [
-        {
-            "width": 180,
-            "y": 1,
-            "height": 195,
-            "name": "shouzhi",
-            "x": 1
-        }
-    ]
-}
+{"width":128,"imagePath":"FingerClick_tex.png","height":256,"name":"FingerClick","SubTexture":[{"frameY":0,"y":1,"frameWidth":120,"frameX":0,"frameHeight":130,"width":120,"height":129,"name":"guide","x":1}]}

BIN
assets/bundle/gui/eliminate/skeletal/FingerClick_tex.png


+ 27 - 27
assets/bundle/gui/eliminate/skeletal/FingerClick_tex.png.meta

@@ -41,13 +41,13 @@
       "userData": {
         "trimThreshold": 1,
         "rotated": false,
-        "offsetX": -37,
-        "offsetY": 29.5,
+        "offsetX": -3,
+        "offsetY": 62.5,
         "trimX": 1,
         "trimY": 1,
-        "width": 180,
-        "height": 195,
-        "rawWidth": 256,
+        "width": 120,
+        "height": 129,
+        "rawWidth": 128,
         "rawHeight": 256,
         "borderTop": 0,
         "borderBottom": 0,
@@ -60,17 +60,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -90,
-            -97.5,
+            -60,
+            -64.5,
             0,
-            90,
-            -97.5,
+            60,
+            -64.5,
             0,
-            -90,
-            97.5,
+            -60,
+            64.5,
             0,
-            90,
-            97.5,
+            60,
+            64.5,
             0
           ],
           "indexes": [
@@ -84,31 +84,31 @@
           "uv": [
             1,
             255,
-            181,
+            121,
             255,
             1,
-            60,
-            181,
-            60
+            126,
+            121,
+            126
           ],
           "nuv": [
-            0.00390625,
-            0.234375,
-            0.70703125,
-            0.234375,
-            0.00390625,
+            0.0078125,
+            0.4921875,
+            0.9453125,
+            0.4921875,
+            0.0078125,
             0.99609375,
-            0.70703125,
+            0.9453125,
             0.99609375
           ],
           "minPos": [
-            -90,
-            -97.5,
+            -60,
+            -64.5,
             0
           ],
           "maxPos": [
-            90,
-            97.5,
+            60,
+            64.5,
             0
           ]
         },

BIN
assets/bundle/gui/eliminate/texture/bricks/item_type_1.png


+ 13 - 13
assets/bundle/gui/eliminate/texture/bricks/item_type_1.png.meta

@@ -42,13 +42,13 @@
         "trimType": "auto",
         "trimThreshold": 1,
         "rotated": false,
-        "offsetX": -0.5,
+        "offsetX": 0,
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 76,
+        "width": 78,
         "height": 76,
-        "rawWidth": 77,
+        "rawWidth": 78,
         "rawHeight": 76,
         "borderTop": 0,
         "borderBottom": 0,
@@ -61,16 +61,16 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -38,
+            -39,
             -38,
             0,
-            38,
+            39,
             -38,
             0,
-            -38,
+            -39,
             38,
             0,
-            38,
+            39,
             38,
             0
           ],
@@ -85,30 +85,30 @@
           "uv": [
             0,
             76,
-            76,
+            78,
             76,
             0,
             0,
-            76,
+            78,
             0
           ],
           "nuv": [
             0,
             0,
-            0.987012987012987,
+            1,
             0,
             0,
             1,
-            0.987012987012987,
+            1,
             1
           ],
           "minPos": [
-            -38,
+            -39,
             -38,
             0
           ],
           "maxPos": [
-            38,
+            39,
             38,
             0
           ]

BIN
assets/bundle/gui/eliminate/texture/bricks/item_type_2.png


BIN
assets/bundle/gui/eliminate/texture/bricks/item_type_4.png


+ 13 - 13
assets/bundle/gui/eliminate/texture/bricks/item_type_4.png.meta

@@ -42,13 +42,13 @@
         "trimType": "auto",
         "trimThreshold": 1,
         "rotated": false,
-        "offsetX": 0,
+        "offsetX": -0.5,
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 78,
+        "width": 76,
         "height": 76,
-        "rawWidth": 78,
+        "rawWidth": 77,
         "rawHeight": 76,
         "borderTop": 0,
         "borderBottom": 0,
@@ -61,16 +61,16 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -39,
+            -38,
             -38,
             0,
-            39,
+            38,
             -38,
             0,
-            -39,
+            -38,
             38,
             0,
-            39,
+            38,
             38,
             0
           ],
@@ -85,30 +85,30 @@
           "uv": [
             0,
             76,
-            78,
+            76,
             76,
             0,
             0,
-            78,
+            76,
             0
           ],
           "nuv": [
             0,
             0,
-            1,
+            0.987012987012987,
             0,
             0,
             1,
-            1,
+            0.987012987012987,
             1
           ],
           "minPos": [
-            -39,
+            -38,
             -38,
             0
           ],
           "maxPos": [
-            39,
+            38,
             38,
             0
           ]

BIN
assets/bundle/gui/eliminate/texture/bricks/item_type_5.png


+ 10 - 10
assets/bundle/gui/eliminate/texture/bricks/item_type_5.png.meta

@@ -42,9 +42,9 @@
         "trimType": "auto",
         "trimThreshold": 1,
         "rotated": false,
-        "offsetX": 0.5,
+        "offsetX": -0.5,
         "offsetY": 0,
-        "trimX": 1,
+        "trimX": 0,
         "trimY": 0,
         "width": 76,
         "height": 76,
@@ -83,23 +83,23 @@
             3
           ],
           "uv": [
-            1,
+            0,
             76,
-            77,
             76,
-            1,
+            76,
+            0,
             0,
-            77,
+            76,
             0
           ],
           "nuv": [
-            0.012987012987012988,
             0,
-            1,
             0,
-            0.012987012987012988,
-            1,
+            0.987012987012987,
+            0,
+            0,
             1,
+            0.987012987012987,
             1
           ],
           "minPos": [

BIN
assets/bundle/gui/eliminate/texture/bricks/item_type_7.png


+ 10 - 10
assets/bundle/gui/eliminate/texture/bricks/item_type_7.png.meta

@@ -42,9 +42,9 @@
         "trimType": "auto",
         "trimThreshold": 1,
         "rotated": false,
-        "offsetX": -0.5,
+        "offsetX": 0.5,
         "offsetY": 0,
-        "trimX": 0,
+        "trimX": 1,
         "trimY": 0,
         "width": 76,
         "height": 76,
@@ -83,23 +83,23 @@
             3
           ],
           "uv": [
-            0,
-            76,
+            1,
             76,
+            77,
             76,
+            1,
             0,
-            0,
-            76,
+            77,
             0
           ],
           "nuv": [
+            0.012987012987012988,
             0,
+            1,
             0,
-            0.987012987012987,
-            0,
-            0,
+            0.012987012987012988,
+            1,
             1,
-            0.987012987012987,
             1
           ],
           "minPos": [

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


+ 134 - 0
assets/bundle/gui/eliminate/texture/icon_hb.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "03b1ca85-34a1-4f0b-9a63-26912a2614fa",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "03b1ca85-34a1-4f0b-9a63-26912a2614fa@6c48a",
+      "displayName": "icon_hb",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "03b1ca85-34a1-4f0b-9a63-26912a2614fa",
+        "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": "03b1ca85-34a1-4f0b-9a63-26912a2614fa@f9941",
+      "displayName": "icon_hb",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 4,
+        "trimY": 0,
+        "width": 68,
+        "height": 76,
+        "rawWidth": 76,
+        "rawHeight": 76,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -34,
+            -38,
+            0,
+            34,
+            -38,
+            0,
+            -34,
+            38,
+            0,
+            34,
+            38,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            4,
+            76,
+            72,
+            76,
+            4,
+            0,
+            72,
+            0
+          ],
+          "nuv": [
+            0.05263157894736842,
+            0,
+            0.9473684210526315,
+            0,
+            0.05263157894736842,
+            1,
+            0.9473684210526315,
+            1
+          ],
+          "minPos": [
+            -34,
+            -38,
+            0
+          ],
+          "maxPos": [
+            34,
+            38,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "03b1ca85-34a1-4f0b-9a63-26912a2614fa@6c48a",
+        "atlasUuid": "",
+        "trimType": "auto"
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "03b1ca85-34a1-4f0b-9a63-26912a2614fa@6c48a"
+  }
+}

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


+ 134 - 0
assets/bundle/gui/eliminate/texture/line2.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "463ae526-36ca-4b9d-aade-5e58587ad9e5",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "463ae526-36ca-4b9d-aade-5e58587ad9e5@6c48a",
+      "displayName": "line2",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "463ae526-36ca-4b9d-aade-5e58587ad9e5",
+        "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": "463ae526-36ca-4b9d-aade-5e58587ad9e5@f9941",
+      "displayName": "line2",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": -0.5,
+        "trimX": 0,
+        "trimY": 1,
+        "width": 592,
+        "height": 2,
+        "rawWidth": 592,
+        "rawHeight": 3,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -296,
+            -1,
+            0,
+            296,
+            -1,
+            0,
+            -296,
+            1,
+            0,
+            296,
+            1,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            2,
+            592,
+            2,
+            0,
+            0,
+            592,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            0.6666666666666666,
+            1,
+            0.6666666666666666
+          ],
+          "minPos": [
+            -296,
+            -1,
+            0
+          ],
+          "maxPos": [
+            296,
+            1,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "463ae526-36ca-4b9d-aade-5e58587ad9e5@6c48a",
+        "atlasUuid": "",
+        "trimType": "auto"
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "463ae526-36ca-4b9d-aade-5e58587ad9e5@6c48a"
+  }
+}

BIN
assets/bundle/gui/eliminate/texture/reference/提现记录.png


+ 134 - 0
assets/bundle/gui/eliminate/texture/reference/提现记录.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "ed5ab3b9-f8df-4651-b83e-97000c2b0db0",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "ed5ab3b9-f8df-4651-b83e-97000c2b0db0@6c48a",
+      "displayName": "提现记录",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "ed5ab3b9-f8df-4651-b83e-97000c2b0db0",
+        "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": "ed5ab3b9-f8df-4651-b83e-97000c2b0db0@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": "ed5ab3b9-f8df-4651-b83e-97000c2b0db0@6c48a",
+        "atlasUuid": "",
+        "trimType": "auto"
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "ed5ab3b9-f8df-4651-b83e-97000c2b0db0@6c48a"
+  }
+}

BIN
assets/bundle/gui/eliminate/texture/text/kqebs.png


+ 134 - 0
assets/bundle/gui/eliminate/texture/text/kqebs.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "f3f6fe5b-d37e-4dd2-889b-3c7d76394247",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "f3f6fe5b-d37e-4dd2-889b-3c7d76394247@6c48a",
+      "displayName": "kqebs",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "f3f6fe5b-d37e-4dd2-889b-3c7d76394247",
+        "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": "f3f6fe5b-d37e-4dd2-889b-3c7d76394247@f9941",
+      "displayName": "kqebs",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0.5,
+        "offsetY": -0.5,
+        "trimX": 1,
+        "trimY": 1,
+        "width": 486,
+        "height": 42,
+        "rawWidth": 487,
+        "rawHeight": 43,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -243,
+            -21,
+            0,
+            243,
+            -21,
+            0,
+            -243,
+            21,
+            0,
+            243,
+            21,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            1,
+            42,
+            487,
+            42,
+            1,
+            0,
+            487,
+            0
+          ],
+          "nuv": [
+            0.002053388090349076,
+            0,
+            1,
+            0,
+            0.002053388090349076,
+            0.9767441860465116,
+            1,
+            0.9767441860465116
+          ],
+          "minPos": [
+            -243,
+            -21,
+            0
+          ],
+          "maxPos": [
+            243,
+            21,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "f3f6fe5b-d37e-4dd2-889b-3c7d76394247@6c48a",
+        "atlasUuid": "",
+        "trimType": "auto"
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "f3f6fe5b-d37e-4dd2-889b-3c7d76394247@6c48a"
+  }
+}

BIN
assets/bundle/gui/eliminate/texture/text/text_txcry.png


+ 134 - 0
assets/bundle/gui/eliminate/texture/text/text_txcry.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "8b586d7e-a982-4a13-9036-e437df5586a9",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "8b586d7e-a982-4a13-9036-e437df5586a9@6c48a",
+      "displayName": "text_txcry",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "8b586d7e-a982-4a13-9036-e437df5586a9",
+        "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": "8b586d7e-a982-4a13-9036-e437df5586a9@f9941",
+      "displayName": "text_txcry",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0.5,
+        "offsetY": -0.5,
+        "trimX": 1,
+        "trimY": 1,
+        "width": 349,
+        "height": 69,
+        "rawWidth": 350,
+        "rawHeight": 70,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -174.5,
+            -34.5,
+            0,
+            174.5,
+            -34.5,
+            0,
+            -174.5,
+            34.5,
+            0,
+            174.5,
+            34.5,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            1,
+            69,
+            350,
+            69,
+            1,
+            0,
+            350,
+            0
+          ],
+          "nuv": [
+            0.002857142857142857,
+            0,
+            1,
+            0,
+            0.002857142857142857,
+            0.9857142857142858,
+            1,
+            0.9857142857142858
+          ],
+          "minPos": [
+            -174.5,
+            -34.5,
+            0
+          ],
+          "maxPos": [
+            174.5,
+            34.5,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "8b586d7e-a982-4a13-9036-e437df5586a9@6c48a",
+        "atlasUuid": "",
+        "trimType": "auto"
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "8b586d7e-a982-4a13-9036-e437df5586a9@6c48a"
+  }
+}

+ 2 - 2
assets/resources/config.json

@@ -13,8 +13,8 @@
         "webSocketHeartTime": 6000,
         "webSocketReceiveTime": 10000,
         "webSocketReconnetTimeOut": 3000,
-        "gameName": "疯狂消消乐",
-        "gameVersion": "当前版本 1.0.5",
+        "gameName": "连赚方块",
+        "gameVersion": "当前版本 1.0.0",
         "gameCompanyName": "广州市游戏科技有限公司",
         "gamePrivacyUrl": "https://doc.v8dashen.com/doc/fc3ae42ddf3b5734",
         "gameProtocolUrl": "https://doc.v8dashen.com/doc/f692eedce36f7fb1"

+ 2 - 2
assets/script/game/common/manager/LoginHandler.ts

@@ -2,7 +2,7 @@
  * @Author: mojunshou 1637302775@qq.com
  * @Date: 2025-04-11 10:15:45
  * @LastEditors: mojunshou 1637302775@qq.com
- * @LastEditTime: 2025-04-22 14:00:23
+ * @LastEditTime: 2025-04-22 15:13:50
  * @Description: 登录管理
  */
 // LoginHandler.ts
@@ -69,7 +69,7 @@ export class LoginHandler {
 
     wechatLoginFail(str: number) {
         console.log('[微信] 登录失败', str);
-        oops.gui.toast('微信登录失败');
+        oops.gui.toast('登录失败,请重新尝试~');
     }
 
 }

+ 0 - 2
assets/script/game/initialize/view/LoadingViewComp.ts

@@ -75,7 +75,6 @@ export class LoadingViewComp extends CCVMParentComp {
 
     private userLogin() {
         const isLogin = smc.account.AccountModel.isLogined;
-        //暂时隐藏
         if (isLogin) {
             //登录过
             this.setWxLoginBtnState(false);
@@ -83,7 +82,6 @@ export class LoadingViewComp extends CCVMParentComp {
         } else {
             this.setWxLoginBtnState(true);
         }
-        // this.loadRes();
     }
 
 

+ 3 - 3
assets/script/game/utils/Format.ts

@@ -12,7 +12,7 @@ export class Format {
         //要先除1000
         wxCoin = wxCoin / 1000
         //再保留2位小数
-        return wxCoin.toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, '$1,')
+        return wxCoin.toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, '$1')
     }
 
     //格式化红包币,保留两位小数,要除100
@@ -20,7 +20,7 @@ export class Format {
         //要先除100
         redPacketCoin = redPacketCoin / 100
         //再保留2位小数
-        return redPacketCoin.toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, '$1,')
+        return redPacketCoin.toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, '$1')
     }
 
     //格式化修改的微信币,保留3位小数
@@ -28,7 +28,7 @@ export class Format {
         //要先除1000
         wxCoin = wxCoin / 1000
         //再保留3位小数
-        return wxCoin.toFixed(3).replace(/(\d)(?=(\d{3})+\.)/g, '$1,')
+        return wxCoin.toFixed(3).replace(/(\d)(?=(\d{3})+\.)/g, '$1')
     }
 }
 

+ 4 - 6
assets/script/game/view/DoubleSpeedViewComp.ts

@@ -2,18 +2,16 @@
  * @Author: mojunshou 1637302775@qq.com
  * @Date: 2025-03-21 11:17:22
  * @LastEditors: mojunshou 1637302775@qq.com
- * @LastEditTime: 2025-04-16 11:05:39
+ * @LastEditTime: 2025-04-22 16:27:55
  * @Description: 二倍速弹窗
  */
-import { _decorator, Label, RichText } from "cc";
+import { _decorator } from "cc";
 import { oops } from "db://oops-framework/core/Oops";
-import { ecs } from "db://oops-framework/libs/ecs/ECS";
-import { CCComp } from "db://oops-framework/module/common/CCComp";
+import VMParent from "db://oops-framework/libs/model-view/VMParent";
 import { AD_TYPE } from "../common/config/GameDefine";
 import { UIID } from "../common/config/GameUIConfig";
 import { ADHandler } from "../common/manager/ADHandler";
 import { smc } from "../common/SingletonModuleComp";
-import VMParent from "db://oops-framework/libs/model-view/VMParent";
 
 const { ccclass, property } = _decorator;
 
@@ -28,7 +26,7 @@ export class DoubleSpeedViewComp extends VMParent {
     start() {
         // const entity = this.ent as ecs.Entity;         // ecs.Entity 可转为当前模块的具体实体对象
         this.setButton();
-        this.data.time = smc.game.GameModel.doubleSpeedTime;
+        this.data.time = smc.game.GameModel.doubleSpeedTime / 60;
 
 
     }

+ 53 - 4
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-22 11:50:57
+ * @LastEditTime: 2025-04-22 18:11:43
  * @Description: 消除游戏主场景
  */
 import { _decorator, Button, Color, EventTouch, instantiate, JsonAsset, Label, Node, Prefab, randomRangeInt, Sprite, tween, UITransform, Vec2, Vec3, Widget } from "cc";
@@ -223,6 +223,7 @@ export class EliminateViewComp extends CCComp {
     ];
 
 
+    private randomList: number[] = [];
 
 
 
@@ -235,7 +236,6 @@ export class EliminateViewComp extends CCComp {
         this.initData();
         this.setData();
         this.addEventList();
-        this.initGrid();
         if (this.guideStep === 0 && smc.account.AccountModel.curLevel == 1) {
             this.startGuideMode()
         } else {
@@ -316,6 +316,8 @@ export class EliminateViewComp extends CCComp {
         const num = smc.account.AccountModel.goldCoin
         this.lab_goldNum.string = `${num + 1}`;
         this.gameState = GameState.PLAYING;
+
+        this.randomList = this.getRandomUniqueInts();
     }
 
     updateCoin() {
@@ -749,7 +751,8 @@ export class EliminateViewComp extends CCComp {
         }
         const brickKey = Object.keys(this.brickConfig['bricks'])[randomRangeInt(0, Object.keys(this.brickConfig['bricks']).length)];
         const brickConfig = this.brickConfig['bricks'][brickKey];
-        const randomIndex = oops.random.getRandomInt(1, 5);  //颜色
+        const num = Math.floor(Math.random() * this.randomList.length);
+        const randomIndex = this.randomList[num];
         // 生成方块
         const brickData: BrickData = {
             index,
@@ -2180,7 +2183,6 @@ export class EliminateViewComp extends CCComp {
 
     //===============初始化检查是否要打开福利界面====
     private updateWelfarePoint() {
-        // this.popupType = "weal_3";
         switch (this.popupType) {
             case "weal_1":
                 oops.gui.open(UIID.WarmReminder);
@@ -2257,6 +2259,53 @@ export class EliminateViewComp extends CCComp {
         // let str = JSON.stringify(param);
         // ServerHandler.inst.onDoubleSurprise(str);
         // ServerHandler.inst.GetGuideInfo();
+    }
+
+
+
+
+
+
+
+
+
 
+    getRandomUniqueInts(count: number = 3): number[] {
+        let min: number = 0;
+        let max: number = 0;
+        const curLevel = smc.account.AccountModel.curLevel || 1;
+        if (curLevel < 5) {
+            return [curLevel]
+        } else if (curLevel >= 5 && curLevel <= 7) {
+            //三种基础色
+            min = 1;
+            max = 5;
+        } else if (curLevel >= 8 && curLevel <= 11) {
+            min = 6;
+            max = 12;
+        } else {
+            min = 1;
+            max = 12;
+        }
+        if (max - min + 1 < count) {
+            throw new Error(`区间 [${min}, ${max}] 无法提供 ${count} 个不重复整数`);
+        }
+
+        const pool: number[] = [];
+        for (let i = min; i <= max; i++) {
+            pool.push(i);
+        }
+
+        this.shuffle(pool);
+
+        return pool.slice(0, count);
+    }
+
+    // 洗牌算法(Fisher-Yates)
+    shuffle(arr: number[]) {
+        for (let i = arr.length - 1; i > 0; i--) {
+            const j = Math.floor(Math.random() * (i + 1));
+            [arr[i], arr[j]] = [arr[j], arr[i]];
+        }
     }
 }

+ 3 - 3
assets/script/game/view/WechatWithdrawalViewComp.ts

@@ -2,7 +2,7 @@
  * @Author: mojunshou 1637302775@qq.com
  * @Date: 2025-03-20 17:00:12
  * @LastEditors: mojunshou 1637302775@qq.com
- * @LastEditTime: 2025-04-21 10:45:36
+ * @LastEditTime: 2025-04-22 16:30:02
  * @Description: 微信提现页面
  */
 import { _decorator, ImageAsset, Label, Node, RichText, Size, Sprite, SpriteFrame, Texture2D, tween, UITransform, Vec3 } from "cc";
@@ -124,7 +124,7 @@ export class WechatWithdrawalViewComp extends CCVMParentComp {
         const randomNum = Math.random() * 500;
         const numStr = randomNum.toFixed(2);
         let name = this.getRandomChineseName();
-        let str = "恭喜<color=#bcdc36>$y</color>收集<color=#bcdc36>$n</color>金砖,到账<color=#bcdc36>$m元</color>";
+        let str = "恭喜$y收集$n金砖,到账<color=#FFF07C>$m元</color>";
         //正则替换str里边的$y,$n,$m
         let str1 = str.replace(/\$y/g, name);
         str1 = str1.replace(/\$n/g, num + "块");
@@ -166,7 +166,7 @@ export class WechatWithdrawalViewComp extends CCVMParentComp {
         let spriteNode = this.node.getChildByPath("Scene/Center/nameNode/Mask/sp_head");
         if (spriteNode) {
             const uiTransform = spriteNode.getComponent(UITransform);
-            uiTransform?.setContentSize(new Size(30, 30))
+            uiTransform?.setContentSize(new Size(34, 34))
             let sprite = spriteNode.getComponent(Sprite);
             if (sprite) {
                 console.log("更新头像啦")

+ 4 - 3
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-15 16:58:21
+ * @LastEditTime: 2025-04-22 16:58:49
  * @Description: 提现记录
  */
 import { _decorator, Label, Node } from "cc";
@@ -13,6 +13,7 @@ import { CCComp } from "db://oops-framework/module/common/CCComp";
 import { UIID } from "../common/config/GameUIConfig";
 import { smc } from "../common/SingletonModuleComp";
 import List from "../ui/List";
+import { Format } from "../utils/Format";
 
 const { ccclass, property } = _decorator;
 
@@ -88,8 +89,8 @@ export class WithdrawalRecordViewComp extends CCComp {
         const timeLabel = item.getChildByName("lab_time")?.getComponent(Label);
         if (timeLabel) timeLabel.string = data.createTime;
 
-        const moneyLabel = item.getChildByName("lab_money")?.getComponent(Label);
-        if (moneyLabel) moneyLabel.string = this.formatNumber(data.amount / 100) + "元";
+        const moneyLabel = item.getChildByPath("moneyNode/lab_money")?.getComponent(Label);
+        if (moneyLabel) moneyLabel.string = Format.formatRedPacketCoin(data.amount);
         //TS原生随机数0 或者1
         const statusNode1 = item.getChildByName("record_state1");
         if (statusNode1) statusNode1.active = data.status == 2;