Преглед изворни кода

【音效】增加按钮音效,修改游戏更新分数逻辑

mojunshou пре 7 месеци
родитељ
комит
647218039c
29 измењених фајлова са 815 додато и 856 уклоњено
  1. BIN
      assets/bundle/common/audios/button-click.mp3
  2. 14 0
      assets/bundle/common/audios/button-click.mp3.meta
  3. 31 42
      assets/bundle/common/prefab/KindTips.prefab
  4. 13 12
      assets/bundle/common/prefab/about.prefab
  5. 18 6
      assets/bundle/common/prefab/retention.prefab
  6. 87 99
      assets/bundle/common/prefab/setting.prefab
  7. 0 9
      assets/bundle/gui/eliminate/audio.meta
  8. 91 34
      assets/bundle/gui/eliminate/eliminate.prefab
  9. 13 12
      assets/bundle/gui/eliminate/prefab/cashRebate.prefab
  10. 12 8
      assets/bundle/gui/eliminate/prefab/cashWithdrawal.prefab
  11. 34 27
      assets/bundle/gui/eliminate/prefab/doubleRewards.prefab
  12. 56 127
      assets/bundle/gui/eliminate/prefab/doubleSpeed.prefab
  13. 25 20
      assets/bundle/gui/eliminate/prefab/gameOver.prefab
  14. 28 16
      assets/bundle/gui/eliminate/prefab/gamePass.prefab
  15. 13 12
      assets/bundle/gui/eliminate/prefab/popup/ReservePopup.prefab
  16. 15 14
      assets/bundle/gui/eliminate/prefab/popup/UnlockFunction.prefab
  17. 16 15
      assets/bundle/gui/eliminate/prefab/popup/WarmReminder.prefab
  18. 1 1
      assets/bundle/gui/eliminate/prefab/popup/WelfareThree.prefab
  19. 63 134
      assets/bundle/gui/eliminate/prefab/popup/keepDoubleSpeed.prefab
  20. 60 47
      assets/bundle/gui/eliminate/prefab/popup/wechatTransferring.prefab
  21. 1 1
      assets/bundle/gui/eliminate/prefab/popup/welfareOne.prefab
  22. 119 143
      assets/bundle/gui/eliminate/prefab/redPackeItem.prefab
  23. 37 26
      assets/bundle/gui/eliminate/prefab/redPacketWithdrawal.prefab
  24. 30 14
      assets/bundle/gui/eliminate/prefab/wechatWithdrawal.prefab
  25. 13 12
      assets/bundle/gui/eliminate/prefab/withdrawalRecord.prefab
  26. 3 1
      assets/script/game/common/config/GameEvent.ts
  27. 4 1
      assets/script/game/common/manager/ServerHandler.ts
  28. 5 2
      assets/script/game/view/EliminateViewComp.ts
  29. 13 21
      assets/script/game/view/RedPackeWithdrawalViewComp.ts

BIN
assets/bundle/common/audios/button-click.mp3


+ 14 - 0
assets/bundle/common/audios/button-click.mp3.meta

@@ -0,0 +1,14 @@
+{
+  "ver": "1.0.0",
+  "importer": "audio-clip",
+  "imported": true,
+  "uuid": "9bc4e751-c1e7-4b95-95e1-4946ba1024fd",
+  "files": [
+    ".json",
+    ".mp3"
+  ],
+  "subMetas": {},
+  "userData": {
+    "downloadMode": 0
+  }
+}

+ 31 - 42
assets/bundle/common/prefab/KindTips.prefab

@@ -28,17 +28,17 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 108
+        "__id__": 106
       },
       {
-        "__id__": 110
+        "__id__": 108
       },
       {
-        "__id__": 112
+        "__id__": 110
       }
     ],
     "_prefab": {
-      "__id__": 114
+      "__id__": 112
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -309,14 +309,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 103
+        "__id__": 101
       },
       {
-        "__id__": 105
+        "__id__": 103
       }
     ],
     "_prefab": {
-      "__id__": 107
+      "__id__": 105
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1953,7 +1953,7 @@
     "fileId": "97DfqDEZVLIJdr5V33R3yr"
   },
   {
-    "__type__": "cc.Button",
+    "__type__": "86cefAWukVE77lEwgfFdYeD",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -1966,7 +1966,7 @@
     },
     "clickEvents": [],
     "_interactable": true,
-    "_transition": 0,
+    "_transition": 3,
     "_normalColor": {
       "__type__": "cc.Color",
       "r": 255,
@@ -2000,13 +2000,19 @@
     "_pressedSprite": null,
     "_disabledSprite": null,
     "_duration": 0.1,
-    "_zoomScale": 1.2,
+    "_zoomScale": 1.1,
     "_target": null,
+    "interval": 500,
+    "once": false,
+    "effect": {
+      "__uuid__": "9bc4e751-c1e7-4b95-95e1-4946ba1024fd",
+      "__expectedType__": "cc.AudioClip"
+    },
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "42f/cs7LVPUqZ2eYWR6Sxm"
+    "fileId": "a1erMRAyBD87DXU1rvjDyw"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -2040,13 +2046,10 @@
       },
       {
         "__id__": 98
-      },
-      {
-        "__id__": 100
       }
     ],
     "_prefab": {
-      "__id__": 102
+      "__id__": 100
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -2174,7 +2177,7 @@
     "fileId": "9cWch0bgBAxIjDAY1ukg+S"
   },
   {
-    "__type__": "cc.Button",
+    "__type__": "86cefAWukVE77lEwgfFdYeD",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -2221,33 +2224,19 @@
     "_pressedSprite": null,
     "_disabledSprite": null,
     "_duration": 0.1,
-    "_zoomScale": 1.2,
+    "_zoomScale": 1.1,
     "_target": null,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "8eaAHzv4tPtJLmS0uLw+ks"
-  },
-  {
-    "__type__": "110c8vEd5NEPL/N9meGQnaX",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 93
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 101
+    "interval": 500,
+    "once": false,
+    "effect": {
+      "__uuid__": "9bc4e751-c1e7-4b95-95e1-4946ba1024fd",
+      "__expectedType__": "cc.AudioClip"
     },
-    "_params": [],
-    "_dataID": "common_disagree",
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "339M3Sj69HF6is7feRqZzj"
+    "fileId": "ceOnwP9V5JxK6QQNeE8bTf"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -2272,7 +2261,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 104
+      "__id__": 102
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2300,7 +2289,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 106
+      "__id__": 104
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -2358,7 +2347,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 109
+      "__id__": 107
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2386,7 +2375,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 111
+      "__id__": 109
     },
     "_id": ""
   },
@@ -2404,7 +2393,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 113
+      "__id__": 111
     },
     "_alignFlags": 45,
     "_target": null,

+ 13 - 12
assets/bundle/common/prefab/about.prefab

@@ -1440,7 +1440,7 @@
     "fileId": "87LJAmaVpGm7YafFbTrqYV"
   },
   {
-    "__type__": "cc.Button",
+    "__type__": "86cefAWukVE77lEwgfFdYeD",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -1456,9 +1456,9 @@
     "_transition": 3,
     "_normalColor": {
       "__type__": "cc.Color",
-      "r": 214,
-      "g": 214,
-      "b": 214,
+      "r": 255,
+      "g": 255,
+      "b": 255,
       "a": 255
     },
     "_hoverColor": {
@@ -1482,23 +1482,24 @@
       "b": 124,
       "a": 255
     },
-    "_normalSprite": {
-      "__uuid__": "dc0dfb95-c0c5-442e-9a1a-55dde91d34ab@f9941",
-      "__expectedType__": "cc.SpriteFrame"
-    },
+    "_normalSprite": null,
     "_hoverSprite": null,
     "_pressedSprite": null,
     "_disabledSprite": null,
     "_duration": 0.1,
-    "_zoomScale": 1.2,
-    "_target": {
-      "__id__": 55
+    "_zoomScale": 1.1,
+    "_target": null,
+    "interval": 500,
+    "once": false,
+    "effect": {
+      "__uuid__": "9bc4e751-c1e7-4b95-95e1-4946ba1024fd",
+      "__expectedType__": "cc.AudioClip"
     },
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "fdxkyalplNvIccIy1v9ldM"
+    "fileId": "074IzqXm9C7KCCsuY5qTTG"
   },
   {
     "__type__": "cc.PrefabInfo",

+ 18 - 6
assets/bundle/common/prefab/retention.prefab

@@ -1366,7 +1366,7 @@
     "fileId": "97DfqDEZVLIJdr5V33R3yr"
   },
   {
-    "__type__": "cc.Button",
+    "__type__": "86cefAWukVE77lEwgfFdYeD",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -1413,13 +1413,19 @@
     "_pressedSprite": null,
     "_disabledSprite": null,
     "_duration": 0.1,
-    "_zoomScale": 1.2,
+    "_zoomScale": 1.1,
     "_target": null,
+    "interval": 500,
+    "once": false,
+    "effect": {
+      "__uuid__": "9bc4e751-c1e7-4b95-95e1-4946ba1024fd",
+      "__expectedType__": "cc.AudioClip"
+    },
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "42f/cs7LVPUqZ2eYWR6Sxm"
+    "fileId": "belmWJyAlLuYoM/8/iFRms"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -1744,7 +1750,7 @@
     "fileId": "01Z1COr/5FI61vOg8WVe9m"
   },
   {
-    "__type__": "cc.Button",
+    "__type__": "86cefAWukVE77lEwgfFdYeD",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -1791,13 +1797,19 @@
     "_pressedSprite": null,
     "_disabledSprite": null,
     "_duration": 0.1,
-    "_zoomScale": 1.2,
+    "_zoomScale": 1.1,
     "_target": null,
+    "interval": 500,
+    "once": false,
+    "effect": {
+      "__uuid__": "9bc4e751-c1e7-4b95-95e1-4946ba1024fd",
+      "__expectedType__": "cc.AudioClip"
+    },
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "0a6BV10vJFcpLoNIQxu9kF"
+    "fileId": "0agHh3EmtAMrORQJR7sEPI"
   },
   {
     "__type__": "cc.PrefabInfo",

+ 87 - 99
assets/bundle/common/prefab/setting.prefab

@@ -556,7 +556,7 @@
     "fileId": "e8qvmDsQVFRIbrrcr6bdGS"
   },
   {
-    "__type__": "cc.Button",
+    "__type__": "86cefAWukVE77lEwgfFdYeD",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -572,9 +572,9 @@
     "_transition": 3,
     "_normalColor": {
       "__type__": "cc.Color",
-      "r": 214,
-      "g": 214,
-      "b": 214,
+      "r": 255,
+      "g": 255,
+      "b": 255,
       "a": 255
     },
     "_hoverColor": {
@@ -598,23 +598,24 @@
       "b": 124,
       "a": 255
     },
-    "_normalSprite": {
-      "__uuid__": "54138f51-a62d-48d9-8dd2-b01485086792@f9941",
-      "__expectedType__": "cc.SpriteFrame"
-    },
+    "_normalSprite": null,
     "_hoverSprite": null,
     "_pressedSprite": null,
     "_disabledSprite": null,
     "_duration": 0.1,
-    "_zoomScale": 1.2,
-    "_target": {
-      "__id__": 15
+    "_zoomScale": 1.1,
+    "_target": null,
+    "interval": 500,
+    "once": false,
+    "effect": {
+      "__uuid__": "9bc4e751-c1e7-4b95-95e1-4946ba1024fd",
+      "__expectedType__": "cc.AudioClip"
     },
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "e7+6oOTkdAw6+WHgtttFkn"
+    "fileId": "688o/dzvZNgZrhYLMkj52l"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -2691,7 +2692,7 @@
     "fileId": "2dkB/Oz9ZD0q9k+6ZHWr+X"
   },
   {
-    "__type__": "cc.Button",
+    "__type__": "86cefAWukVE77lEwgfFdYeD",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -2704,12 +2705,12 @@
     },
     "clickEvents": [],
     "_interactable": true,
-    "_transition": 2,
+    "_transition": 0,
     "_normalColor": {
       "__type__": "cc.Color",
-      "r": 214,
-      "g": 214,
-      "b": 214,
+      "r": 255,
+      "g": 255,
+      "b": 255,
       "a": 255
     },
     "_hoverColor": {
@@ -2733,32 +2734,24 @@
       "b": 124,
       "a": 255
     },
-    "_normalSprite": {
-      "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941",
-      "__expectedType__": "cc.SpriteFrame"
-    },
-    "_hoverSprite": {
-      "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941",
-      "__expectedType__": "cc.SpriteFrame"
-    },
-    "_pressedSprite": {
-      "__uuid__": "544e49d6-3f05-4fa8-9a9e-091f98fc2ce8@f9941",
-      "__expectedType__": "cc.SpriteFrame"
-    },
-    "_disabledSprite": {
-      "__uuid__": "951249e0-9f16-456d-8b85-a6ca954da16b@f9941",
-      "__expectedType__": "cc.SpriteFrame"
-    },
+    "_normalSprite": null,
+    "_hoverSprite": null,
+    "_pressedSprite": null,
+    "_disabledSprite": null,
     "_duration": 0.1,
-    "_zoomScale": 1.2,
-    "_target": {
-      "__id__": 97
+    "_zoomScale": 1.1,
+    "_target": null,
+    "interval": 10,
+    "once": false,
+    "effect": {
+      "__uuid__": "9bc4e751-c1e7-4b95-95e1-4946ba1024fd",
+      "__expectedType__": "cc.AudioClip"
     },
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "12SxBIvNRKLqKZTR+u/QG6"
+    "fileId": "f2C+SrXKtNppfOS0aMlHKl"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -3131,7 +3124,7 @@
     "fileId": "3f3716mVhO35d+3FOjBZZY"
   },
   {
-    "__type__": "cc.Button",
+    "__type__": "86cefAWukVE77lEwgfFdYeD",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -3144,12 +3137,12 @@
     },
     "clickEvents": [],
     "_interactable": true,
-    "_transition": 2,
+    "_transition": 0,
     "_normalColor": {
       "__type__": "cc.Color",
-      "r": 214,
-      "g": 214,
-      "b": 214,
+      "r": 255,
+      "g": 255,
+      "b": 255,
       "a": 255
     },
     "_hoverColor": {
@@ -3173,32 +3166,24 @@
       "b": 124,
       "a": 255
     },
-    "_normalSprite": {
-      "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941",
-      "__expectedType__": "cc.SpriteFrame"
-    },
-    "_hoverSprite": {
-      "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941",
-      "__expectedType__": "cc.SpriteFrame"
-    },
-    "_pressedSprite": {
-      "__uuid__": "544e49d6-3f05-4fa8-9a9e-091f98fc2ce8@f9941",
-      "__expectedType__": "cc.SpriteFrame"
-    },
-    "_disabledSprite": {
-      "__uuid__": "951249e0-9f16-456d-8b85-a6ca954da16b@f9941",
-      "__expectedType__": "cc.SpriteFrame"
-    },
+    "_normalSprite": null,
+    "_hoverSprite": null,
+    "_pressedSprite": null,
+    "_disabledSprite": null,
     "_duration": 0.1,
-    "_zoomScale": 1.2,
-    "_target": {
-      "__id__": 115
+    "_zoomScale": 1.1,
+    "_target": null,
+    "interval": 10,
+    "once": false,
+    "effect": {
+      "__uuid__": "9bc4e751-c1e7-4b95-95e1-4946ba1024fd",
+      "__expectedType__": "cc.AudioClip"
     },
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "7bjGq1d55IepT0rA/StjIn"
+    "fileId": "2553nZ5LZGzbIvia4VtU39"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -3503,7 +3488,7 @@
     "fileId": "96RoaUGgxHi6/FNqkAXQpY"
   },
   {
-    "__type__": "cc.Button",
+    "__type__": "86cefAWukVE77lEwgfFdYeD",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -3519,9 +3504,9 @@
     "_transition": 3,
     "_normalColor": {
       "__type__": "cc.Color",
-      "r": 214,
-      "g": 214,
-      "b": 214,
+      "r": 255,
+      "g": 255,
+      "b": 255,
       "a": 255
     },
     "_hoverColor": {
@@ -3545,23 +3530,24 @@
       "b": 124,
       "a": 255
     },
-    "_normalSprite": {
-      "__uuid__": "23729a95-b11c-4aaf-ba33-fa309c0cf506@f9941",
-      "__expectedType__": "cc.SpriteFrame"
-    },
+    "_normalSprite": null,
     "_hoverSprite": null,
     "_pressedSprite": null,
     "_disabledSprite": null,
     "_duration": 0.1,
-    "_zoomScale": 1.2,
-    "_target": {
-      "__id__": 133
+    "_zoomScale": 1.1,
+    "_target": null,
+    "interval": 500,
+    "once": false,
+    "effect": {
+      "__uuid__": "9bc4e751-c1e7-4b95-95e1-4946ba1024fd",
+      "__expectedType__": "cc.AudioClip"
     },
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "cfrjztjdRG0rEzFDRbfPoX"
+    "fileId": "4faIDho6dLQKDYLIQlWFwf"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -3866,7 +3852,7 @@
     "fileId": "b9QSiKfRlILpuBeuAZBOhx"
   },
   {
-    "__type__": "cc.Button",
+    "__type__": "86cefAWukVE77lEwgfFdYeD",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -3882,9 +3868,9 @@
     "_transition": 3,
     "_normalColor": {
       "__type__": "cc.Color",
-      "r": 214,
-      "g": 214,
-      "b": 214,
+      "r": 255,
+      "g": 255,
+      "b": 255,
       "a": 255
     },
     "_hoverColor": {
@@ -3908,23 +3894,24 @@
       "b": 124,
       "a": 255
     },
-    "_normalSprite": {
-      "__uuid__": "23729a95-b11c-4aaf-ba33-fa309c0cf506@f9941",
-      "__expectedType__": "cc.SpriteFrame"
-    },
+    "_normalSprite": null,
     "_hoverSprite": null,
     "_pressedSprite": null,
     "_disabledSprite": null,
     "_duration": 0.1,
-    "_zoomScale": 1.2,
-    "_target": {
-      "__id__": 147
+    "_zoomScale": 1.1,
+    "_target": null,
+    "interval": 500,
+    "once": false,
+    "effect": {
+      "__uuid__": "9bc4e751-c1e7-4b95-95e1-4946ba1024fd",
+      "__expectedType__": "cc.AudioClip"
     },
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "f1yVaK35lFnbZW15/1TWtO"
+    "fileId": "6evHu6mJpIYbQrW25iX7t9"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -4229,7 +4216,7 @@
     "fileId": "cc1Do3DPlIuZ5D/6UMfI1y"
   },
   {
-    "__type__": "cc.Button",
+    "__type__": "86cefAWukVE77lEwgfFdYeD",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -4245,9 +4232,9 @@
     "_transition": 3,
     "_normalColor": {
       "__type__": "cc.Color",
-      "r": 214,
-      "g": 214,
-      "b": 214,
+      "r": 255,
+      "g": 255,
+      "b": 255,
       "a": 255
     },
     "_hoverColor": {
@@ -4271,23 +4258,24 @@
       "b": 124,
       "a": 255
     },
-    "_normalSprite": {
-      "__uuid__": "23729a95-b11c-4aaf-ba33-fa309c0cf506@f9941",
-      "__expectedType__": "cc.SpriteFrame"
-    },
+    "_normalSprite": null,
     "_hoverSprite": null,
     "_pressedSprite": null,
     "_disabledSprite": null,
     "_duration": 0.1,
-    "_zoomScale": 1.2,
-    "_target": {
-      "__id__": 161
+    "_zoomScale": 1.1,
+    "_target": null,
+    "interval": 500,
+    "once": false,
+    "effect": {
+      "__uuid__": "9bc4e751-c1e7-4b95-95e1-4946ba1024fd",
+      "__expectedType__": "cc.AudioClip"
     },
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "7ej3yMVWxPMqZS2xYvYElb"
+    "fileId": "47xshJvLxMG6QdOL+s2wyE"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -4403,7 +4391,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 720,
-      "height": 1600.0000000000002
+      "height": 1600
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",

+ 0 - 9
assets/bundle/gui/eliminate/audio.meta

@@ -1,9 +0,0 @@
-{
-  "ver": "1.2.0",
-  "importer": "directory",
-  "imported": true,
-  "uuid": "955e3ec9-4c1c-4cdc-9e7b-68a75777e9fe",
-  "files": [],
-  "subMetas": {},
-  "userData": {}
-}

+ 91 - 34
assets/bundle/gui/eliminate/eliminate.prefab

@@ -1499,7 +1499,7 @@
     "fileId": "28QCT5LChLpYtZiTtwXENx"
   },
   {
-    "__type__": "cc.Button",
+    "__type__": "86cefAWukVE77lEwgfFdYeD",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -1515,9 +1515,9 @@
     "_transition": 3,
     "_normalColor": {
       "__type__": "cc.Color",
-      "r": 214,
-      "g": 214,
-      "b": 214,
+      "r": 255,
+      "g": 255,
+      "b": 255,
       "a": 255
     },
     "_hoverColor": {
@@ -1547,14 +1547,18 @@
     "_disabledSprite": null,
     "_duration": 0.1,
     "_zoomScale": 1.1,
-    "_target": {
-      "__id__": 18
+    "_target": null,
+    "interval": 500,
+    "once": false,
+    "effect": {
+      "__uuid__": "9bc4e751-c1e7-4b95-95e1-4946ba1024fd",
+      "__expectedType__": "cc.AudioClip"
     },
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "d1M63HY79JcZhL+lcF8nA5"
+    "fileId": "57LIejTzFOpa+TISGu2Cj7"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -2529,7 +2533,7 @@
     "fileId": "b94ybOjYdP8YUKHVEQ6neh"
   },
   {
-    "__type__": "cc.Button",
+    "__type__": "86cefAWukVE77lEwgfFdYeD",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -2545,9 +2549,9 @@
     "_transition": 3,
     "_normalColor": {
       "__type__": "cc.Color",
-      "r": 214,
-      "g": 214,
-      "b": 214,
+      "r": 255,
+      "g": 255,
+      "b": 255,
       "a": 255
     },
     "_hoverColor": {
@@ -2577,14 +2581,18 @@
     "_disabledSprite": null,
     "_duration": 0.1,
     "_zoomScale": 1.1,
-    "_target": {
-      "__id__": 60
+    "_target": null,
+    "interval": 500,
+    "once": false,
+    "effect": {
+      "__uuid__": "9bc4e751-c1e7-4b95-95e1-4946ba1024fd",
+      "__expectedType__": "cc.AudioClip"
     },
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "a0EZ1JB9ZF1KewQ6xJfisP"
+    "fileId": "7bHSDU5BlAOYLXam9DTNgk"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -5662,7 +5670,7 @@
     "fileId": "1dnHaI0RdE3oxhGpGmR4xB"
   },
   {
-    "__type__": "cc.Button",
+    "__type__": "86cefAWukVE77lEwgfFdYeD",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -5678,9 +5686,9 @@
     "_transition": 3,
     "_normalColor": {
       "__type__": "cc.Color",
-      "r": 214,
-      "g": 214,
-      "b": 214,
+      "r": 255,
+      "g": 255,
+      "b": 255,
       "a": 255
     },
     "_hoverColor": {
@@ -5709,15 +5717,19 @@
     "_pressedSprite": null,
     "_disabledSprite": null,
     "_duration": 0.1,
-    "_zoomScale": 1.2,
-    "_target": {
-      "__id__": 222
+    "_zoomScale": 1.1,
+    "_target": null,
+    "interval": 500,
+    "once": false,
+    "effect": {
+      "__uuid__": "9bc4e751-c1e7-4b95-95e1-4946ba1024fd",
+      "__expectedType__": "cc.AudioClip"
     },
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "3f7/GP1m5DIaOpHq0TVSOJ"
+    "fileId": "cdmAE63kxG0rNhpLx5jdOl"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -8332,7 +8344,7 @@
     "fileId": "73oZ8ZhqJGBI++XkOlV678"
   },
   {
-    "__type__": "8d645yObX1FvJfk2sbi0rxp",
+    "__type__": "86cefAWukVE77lEwgfFdYeD",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -8343,14 +8355,55 @@
     "__prefab": {
       "__id__": 342
     },
-    "once": false,
+    "clickEvents": [],
+    "_interactable": true,
+    "_transition": 3,
+    "_normalColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_hoverColor": {
+      "__type__": "cc.Color",
+      "r": 211,
+      "g": 211,
+      "b": 211,
+      "a": 255
+    },
+    "_pressedColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_disabledColor": {
+      "__type__": "cc.Color",
+      "r": 124,
+      "g": 124,
+      "b": 124,
+      "a": 255
+    },
+    "_normalSprite": null,
+    "_hoverSprite": null,
+    "_pressedSprite": null,
+    "_disabledSprite": null,
+    "_duration": 0.1,
+    "_zoomScale": 1.1,
+    "_target": null,
     "interval": 1000,
-    "effect": null,
+    "once": false,
+    "effect": {
+      "__uuid__": "9bc4e751-c1e7-4b95-95e1-4946ba1024fd",
+      "__expectedType__": "cc.AudioClip"
+    },
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "a3K0KTnztBkIqRZFhBZyoA"
+    "fileId": "16pg8JYy9GgKspia9RNXON"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -8791,7 +8844,7 @@
     "fileId": "051RasuOlCfqyrOcSn0M7G"
   },
   {
-    "__type__": "cc.Button",
+    "__type__": "86cefAWukVE77lEwgfFdYeD",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -8807,9 +8860,9 @@
     "_transition": 3,
     "_normalColor": {
       "__type__": "cc.Color",
-      "r": 214,
-      "g": 214,
-      "b": 214,
+      "r": 255,
+      "g": 255,
+      "b": 255,
       "a": 255
     },
     "_hoverColor": {
@@ -8838,15 +8891,19 @@
     "_pressedSprite": null,
     "_disabledSprite": null,
     "_duration": 0.1,
-    "_zoomScale": 1.2,
-    "_target": {
-      "__id__": 344
+    "_zoomScale": 1.1,
+    "_target": null,
+    "interval": 500,
+    "once": false,
+    "effect": {
+      "__uuid__": "9bc4e751-c1e7-4b95-95e1-4946ba1024fd",
+      "__expectedType__": "cc.AudioClip"
     },
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "07fPczGjxBXK0hOdTolWKV"
+    "fileId": "6egjtw5c5BdKS66mJnaTL2"
   },
   {
     "__type__": "cc.PrefabInfo",

+ 13 - 12
assets/bundle/gui/eliminate/prefab/cashRebate.prefab

@@ -1737,7 +1737,7 @@
     "fileId": "40/+L7hqdIq625mn7HWn94"
   },
   {
-    "__type__": "cc.Button",
+    "__type__": "86cefAWukVE77lEwgfFdYeD",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -1753,9 +1753,9 @@
     "_transition": 3,
     "_normalColor": {
       "__type__": "cc.Color",
-      "r": 214,
-      "g": 214,
-      "b": 214,
+      "r": 255,
+      "g": 255,
+      "b": 255,
       "a": 255
     },
     "_hoverColor": {
@@ -1779,23 +1779,24 @@
       "b": 124,
       "a": 255
     },
-    "_normalSprite": {
-      "__uuid__": "e8764bc7-2f97-4e71-a73b-a525a89d1855@f9941",
-      "__expectedType__": "cc.SpriteFrame"
-    },
+    "_normalSprite": null,
     "_hoverSprite": null,
     "_pressedSprite": null,
     "_disabledSprite": null,
     "_duration": 0.1,
-    "_zoomScale": 1.2,
-    "_target": {
-      "__id__": 57
+    "_zoomScale": 1.1,
+    "_target": null,
+    "interval": 500,
+    "once": false,
+    "effect": {
+      "__uuid__": "9bc4e751-c1e7-4b95-95e1-4946ba1024fd",
+      "__expectedType__": "cc.AudioClip"
     },
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "aeCP6y4lNOC5Pi7wUHxGmB"
+    "fileId": "4bDWCnqIJCWJRE1J8LpBu3"
   },
   {
     "__type__": "cc.PrefabInfo",

+ 12 - 8
assets/bundle/gui/eliminate/prefab/cashWithdrawal.prefab

@@ -2880,7 +2880,7 @@
     "fileId": "5aWH+XirBKS6ZLfk+tINgv"
   },
   {
-    "__type__": "cc.Button",
+    "__type__": "86cefAWukVE77lEwgfFdYeD",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -2896,9 +2896,9 @@
     "_transition": 3,
     "_normalColor": {
       "__type__": "cc.Color",
-      "r": 214,
-      "g": 214,
-      "b": 214,
+      "r": 255,
+      "g": 255,
+      "b": 255,
       "a": 255
     },
     "_hoverColor": {
@@ -2927,15 +2927,19 @@
     "_pressedSprite": null,
     "_disabledSprite": null,
     "_duration": 0.1,
-    "_zoomScale": 1.2,
-    "_target": {
-      "__id__": 136
+    "_zoomScale": 1.1,
+    "_target": null,
+    "interval": 500,
+    "once": false,
+    "effect": {
+      "__uuid__": "9bc4e751-c1e7-4b95-95e1-4946ba1024fd",
+      "__expectedType__": "cc.AudioClip"
     },
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "11a4Zn0eNMvKFyrX545lfQ"
+    "fileId": "7ag0KJX9VCY5BqIxUQNGiR"
   },
   {
     "__type__": "cc.PrefabInfo",

+ 34 - 27
assets/bundle/gui/eliminate/prefab/doubleRewards.prefab

@@ -1042,7 +1042,7 @@
     "fileId": "fa5pD6ysZM5LXFYKVX93M/"
   },
   {
-    "__type__": "cc.Button",
+    "__type__": "86cefAWukVE77lEwgfFdYeD",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -1058,9 +1058,9 @@
     "_transition": 3,
     "_normalColor": {
       "__type__": "cc.Color",
-      "r": 214,
-      "g": 214,
-      "b": 214,
+      "r": 255,
+      "g": 255,
+      "b": 255,
       "a": 255
     },
     "_hoverColor": {
@@ -1084,23 +1084,24 @@
       "b": 124,
       "a": 255
     },
-    "_normalSprite": {
-      "__uuid__": "e8764bc7-2f97-4e71-a73b-a525a89d1855@f9941",
-      "__expectedType__": "cc.SpriteFrame"
-    },
+    "_normalSprite": null,
     "_hoverSprite": null,
     "_pressedSprite": null,
     "_disabledSprite": null,
     "_duration": 0.1,
-    "_zoomScale": 1.2,
-    "_target": {
-      "__id__": 33
+    "_zoomScale": 1.1,
+    "_target": null,
+    "interval": 500,
+    "once": false,
+    "effect": {
+      "__uuid__": "9bc4e751-c1e7-4b95-95e1-4946ba1024fd",
+      "__expectedType__": "cc.AudioClip"
     },
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "73FLkkJ69PlayVOwaA3fs4"
+    "fileId": "92xdmSR9hEPaE1zB9bj1+c"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -1265,7 +1266,7 @@
     "fileId": "3ef3notUdHopS415Pyox15"
   },
   {
-    "__type__": "cc.Button",
+    "__type__": "86cefAWukVE77lEwgfFdYeD",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -1312,13 +1313,19 @@
     "_pressedSprite": null,
     "_disabledSprite": null,
     "_duration": 0.1,
-    "_zoomScale": 1.2,
+    "_zoomScale": 1.1,
     "_target": null,
+    "interval": 500,
+    "once": false,
+    "effect": {
+      "__uuid__": "9bc4e751-c1e7-4b95-95e1-4946ba1024fd",
+      "__expectedType__": "cc.AudioClip"
+    },
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "85N0i5B5RKKqejzodXRkuW"
+    "fileId": "7fECa5zEpLHJX8YTWwzhFj"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -3911,8 +3918,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 180,
-      "height": 195
+      "width": 120,
+      "height": 130
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -4087,8 +4094,8 @@
     "_string": "",
     "_horizontalAlign": 1,
     "_verticalAlign": 1,
-    "_actualFontSize": 60,
-    "_fontSize": 60,
+    "_actualFontSize": 40,
+    "_fontSize": 40,
     "_fontFamily": "Arial",
     "_lineHeight": 60,
     "_overflow": 0,
@@ -4541,10 +4548,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,
@@ -4940,7 +4947,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 0,
-      "height": 75.6
+      "height": 50.4
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -4995,10 +5002,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,
@@ -5394,7 +5401,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 0,
-      "height": 75.6
+      "height": 50.4
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",

+ 56 - 127
assets/bundle/gui/eliminate/prefab/doubleSpeed.prefab

@@ -25,17 +25,17 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 134
+        "__id__": 130
       },
       {
-        "__id__": 136
+        "__id__": 132
       },
       {
-        "__id__": 138
+        "__id__": 134
       }
     ],
     "_prefab": {
-      "__id__": 140
+      "__id__": 136
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -112,20 +112,20 @@
         "__id__": 111
       },
       {
-        "__id__": 123
+        "__id__": 119
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 129
+        "__id__": 125
       },
       {
-        "__id__": 131
+        "__id__": 127
       }
     ],
     "_prefab": {
-      "__id__": 133
+      "__id__": 129
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -691,7 +691,7 @@
     "fileId": "6aDCLI1ZxMn5F9oyezMmei"
   },
   {
-    "__type__": "cc.Button",
+    "__type__": "86cefAWukVE77lEwgfFdYeD",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -707,9 +707,9 @@
     "_transition": 3,
     "_normalColor": {
       "__type__": "cc.Color",
-      "r": 214,
-      "g": 214,
-      "b": 214,
+      "r": 255,
+      "g": 255,
+      "b": 255,
       "a": 255
     },
     "_hoverColor": {
@@ -733,23 +733,24 @@
       "b": 124,
       "a": 255
     },
-    "_normalSprite": {
-      "__uuid__": "54138f51-a62d-48d9-8dd2-b01485086792@f9941",
-      "__expectedType__": "cc.SpriteFrame"
-    },
+    "_normalSprite": null,
     "_hoverSprite": null,
     "_pressedSprite": null,
     "_disabledSprite": null,
     "_duration": 0.1,
-    "_zoomScale": 1.2,
-    "_target": {
-      "__id__": 21
+    "_zoomScale": 1.1,
+    "_target": null,
+    "interval": 500,
+    "once": false,
+    "effect": {
+      "__uuid__": "9bc4e751-c1e7-4b95-95e1-4946ba1024fd",
+      "__expectedType__": "cc.AudioClip"
     },
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "24Sd4WhH9E1KOFzEyQap3S"
+    "fileId": "47uh72IdFLk4ZI/r4EpDUJ"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -2676,7 +2677,7 @@
     "fileId": "40/+L7hqdIq625mn7HWn94"
   },
   {
-    "__type__": "cc.Button",
+    "__type__": "86cefAWukVE77lEwgfFdYeD",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -2692,9 +2693,9 @@
     "_transition": 3,
     "_normalColor": {
       "__type__": "cc.Color",
-      "r": 214,
-      "g": 214,
-      "b": 214,
+      "r": 255,
+      "g": 255,
+      "b": 255,
       "a": 255
     },
     "_hoverColor": {
@@ -2723,15 +2724,19 @@
     "_pressedSprite": null,
     "_disabledSprite": null,
     "_duration": 0.1,
-    "_zoomScale": 1.2,
-    "_target": {
-      "__id__": 85
+    "_zoomScale": 1.1,
+    "_target": null,
+    "interval": 500,
+    "once": false,
+    "effect": {
+      "__uuid__": "9bc4e751-c1e7-4b95-95e1-4946ba1024fd",
+      "__expectedType__": "cc.AudioClip"
     },
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "aeCP6y4lNOC5Pi7wUHxGmB"
+    "fileId": "b6L+w/s0RCxKVwMoW/uPsm"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -2765,16 +2770,10 @@
       },
       {
         "__id__": 116
-      },
-      {
-        "__id__": 118
-      },
-      {
-        "__id__": 120
       }
     ],
     "_prefab": {
-      "__id__": 122
+      "__id__": 118
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -2902,7 +2901,7 @@
     "fileId": "5bnTwh7adIr5i6FFVbh8s8"
   },
   {
-    "__type__": "cc.Button",
+    "__type__": "86cefAWukVE77lEwgfFdYeD",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -2949,89 +2948,19 @@
     "_pressedSprite": null,
     "_disabledSprite": null,
     "_duration": 0.1,
-    "_zoomScale": 1.2,
+    "_zoomScale": 1.1,
     "_target": null,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "6bvUPD56FGo6L2Zb2FIyrM"
-  },
-  {
-    "__type__": "110c8vEd5NEPL/N9meGQnaX",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 111
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 119
-    },
-    "_params": [],
-    "_dataID": "doubleSpeed_close",
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "3aWOCjHANMDrwuN53ZSZ8E"
-  },
-  {
-    "__type__": "cc.Button",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 111
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 121
-    },
-    "clickEvents": [],
-    "_interactable": true,
-    "_transition": 0,
-    "_normalColor": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_hoverColor": {
-      "__type__": "cc.Color",
-      "r": 211,
-      "g": 211,
-      "b": 211,
-      "a": 255
-    },
-    "_pressedColor": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
+    "interval": 500,
+    "once": false,
+    "effect": {
+      "__uuid__": "9bc4e751-c1e7-4b95-95e1-4946ba1024fd",
+      "__expectedType__": "cc.AudioClip"
     },
-    "_disabledColor": {
-      "__type__": "cc.Color",
-      "r": 124,
-      "g": 124,
-      "b": 124,
-      "a": 255
-    },
-    "_normalSprite": null,
-    "_hoverSprite": null,
-    "_pressedSprite": null,
-    "_disabledSprite": null,
-    "_duration": 0.1,
-    "_zoomScale": 1.2,
-    "_target": null,
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "d8bMKJh75IEo5UoeVZbbJ2"
+    "fileId": "af3W3cJh1PsLTgmEy+8dLR"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -3058,14 +2987,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 124
+        "__id__": 120
       },
       {
-        "__id__": 126
+        "__id__": 122
       }
     ],
     "_prefab": {
-      "__id__": 128
+      "__id__": 124
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -3102,16 +3031,16 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 123
+      "__id__": 119
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 125
+      "__id__": 121
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 180,
-      "height": 195
+      "width": 120,
+      "height": 130
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -3130,11 +3059,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 123
+      "__id__": 119
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 127
+      "__id__": 123
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -3195,7 +3124,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 130
+      "__id__": 126
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -3223,7 +3152,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 132
+      "__id__": 128
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -3281,7 +3210,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 135
+      "__id__": 131
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -3309,7 +3238,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 137
+      "__id__": 133
     },
     "_id": ""
   },
@@ -3327,7 +3256,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 139
+      "__id__": 135
     },
     "_alignFlags": 45,
     "_target": null,

+ 25 - 20
assets/bundle/gui/eliminate/prefab/gameOver.prefab

@@ -1630,7 +1630,7 @@
     "fileId": "1b4qkvobhBLYpdbrgLOv4P"
   },
   {
-    "__type__": "cc.Button",
+    "__type__": "86cefAWukVE77lEwgfFdYeD",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -1646,9 +1646,9 @@
     "_transition": 3,
     "_normalColor": {
       "__type__": "cc.Color",
-      "r": 214,
-      "g": 214,
-      "b": 214,
+      "r": 255,
+      "g": 255,
+      "b": 255,
       "a": 255
     },
     "_hoverColor": {
@@ -1677,15 +1677,19 @@
     "_pressedSprite": null,
     "_disabledSprite": null,
     "_duration": 0.1,
-    "_zoomScale": 1.2,
-    "_target": {
-      "__id__": 49
+    "_zoomScale": 1.1,
+    "_target": null,
+    "interval": 500,
+    "once": false,
+    "effect": {
+      "__uuid__": "9bc4e751-c1e7-4b95-95e1-4946ba1024fd",
+      "__expectedType__": "cc.AudioClip"
     },
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "baVg8R4y9GppQWAYTX5OK4"
+    "fileId": "d72aXBfMJEtZUysyx/1Y+8"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -1990,7 +1994,7 @@
     "fileId": "52QZzZ7FZGC7NizNZhNkKe"
   },
   {
-    "__type__": "cc.Button",
+    "__type__": "86cefAWukVE77lEwgfFdYeD",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -2006,9 +2010,9 @@
     "_transition": 3,
     "_normalColor": {
       "__type__": "cc.Color",
-      "r": 214,
-      "g": 214,
-      "b": 214,
+      "r": 255,
+      "g": 255,
+      "b": 255,
       "a": 255
     },
     "_hoverColor": {
@@ -2032,23 +2036,24 @@
       "b": 124,
       "a": 255
     },
-    "_normalSprite": {
-      "__uuid__": "687ccbde-5159-4afa-84c3-6671c93b20b7@f9941",
-      "__expectedType__": "cc.SpriteFrame"
-    },
+    "_normalSprite": null,
     "_hoverSprite": null,
     "_pressedSprite": null,
     "_disabledSprite": null,
     "_duration": 0.1,
-    "_zoomScale": 1.2,
-    "_target": {
-      "__id__": 69
+    "_zoomScale": 1.1,
+    "_target": null,
+    "interval": 500,
+    "once": false,
+    "effect": {
+      "__uuid__": "9bc4e751-c1e7-4b95-95e1-4946ba1024fd",
+      "__expectedType__": "cc.AudioClip"
     },
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "edpFXvePBIRZ1a9WGkfbH2"
+    "fileId": "28WApV0SNJG5IRUILSg3CP"
   },
   {
     "__type__": "cc.PrefabInfo",

+ 28 - 16
assets/bundle/gui/eliminate/prefab/gamePass.prefab

@@ -1696,7 +1696,7 @@
     "fileId": "abo6yXKJxEl4ZQ/6jxI9SN"
   },
   {
-    "__type__": "cc.Button",
+    "__type__": "86cefAWukVE77lEwgfFdYeD",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -1743,13 +1743,19 @@
     "_pressedSprite": null,
     "_disabledSprite": null,
     "_duration": 0.1,
-    "_zoomScale": 1.2,
+    "_zoomScale": 1.1,
     "_target": null,
+    "interval": 500,
+    "once": false,
+    "effect": {
+      "__uuid__": "9bc4e751-c1e7-4b95-95e1-4946ba1024fd",
+      "__expectedType__": "cc.AudioClip"
+    },
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "5dF/KESxxH8o2mMIJxfiOJ"
+    "fileId": "6e3lUvLTtNVpZctHr1JhpP"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -2077,7 +2083,7 @@
     "fileId": "a6PfgRCdRJPaWSCa+M0r1e"
   },
   {
-    "__type__": "cc.Button",
+    "__type__": "86cefAWukVE77lEwgfFdYeD",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -2124,13 +2130,19 @@
     "_pressedSprite": null,
     "_disabledSprite": null,
     "_duration": 0.1,
-    "_zoomScale": 1.2,
+    "_zoomScale": 1.1,
     "_target": null,
+    "interval": 500,
+    "once": false,
+    "effect": {
+      "__uuid__": "9bc4e751-c1e7-4b95-95e1-4946ba1024fd",
+      "__expectedType__": "cc.AudioClip"
+    },
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "f3m298mn1Av6qirRiJQ0j4"
+    "fileId": "0bLMzJSiJLlrwdHUDyAWhx"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -2312,8 +2324,8 @@
     "_string": "",
     "_horizontalAlign": 1,
     "_verticalAlign": 1,
-    "_actualFontSize": 60,
-    "_fontSize": 60,
+    "_actualFontSize": 40,
+    "_fontSize": 40,
     "_fontFamily": "Arial",
     "_lineHeight": 60,
     "_overflow": 0,
@@ -2766,10 +2778,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,
@@ -3165,7 +3177,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 0,
-      "height": 75.6
+      "height": 50.4
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -3220,10 +3232,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,
@@ -3619,7 +3631,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 0,
-      "height": 75.6
+      "height": 50.4
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",

+ 13 - 12
assets/bundle/gui/eliminate/prefab/popup/ReservePopup.prefab

@@ -3957,7 +3957,7 @@
     "fileId": "0aAufYgO1MGbNWjgSMP/uG"
   },
   {
-    "__type__": "cc.Button",
+    "__type__": "86cefAWukVE77lEwgfFdYeD",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -3973,9 +3973,9 @@
     "_transition": 3,
     "_normalColor": {
       "__type__": "cc.Color",
-      "r": 214,
-      "g": 214,
-      "b": 214,
+      "r": 255,
+      "g": 255,
+      "b": 255,
       "a": 255
     },
     "_hoverColor": {
@@ -3999,23 +3999,24 @@
       "b": 124,
       "a": 255
     },
-    "_normalSprite": {
-      "__uuid__": "e8764bc7-2f97-4e71-a73b-a525a89d1855@f9941",
-      "__expectedType__": "cc.SpriteFrame"
-    },
+    "_normalSprite": null,
     "_hoverSprite": null,
     "_pressedSprite": null,
     "_disabledSprite": null,
     "_duration": 0.1,
-    "_zoomScale": 1.2,
-    "_target": {
-      "__id__": 203
+    "_zoomScale": 1.1,
+    "_target": null,
+    "interval": 500,
+    "once": false,
+    "effect": {
+      "__uuid__": "9bc4e751-c1e7-4b95-95e1-4946ba1024fd",
+      "__expectedType__": "cc.AudioClip"
     },
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "24PuuhKL1GE7hRNPUIwgbG"
+    "fileId": "3a7TX/f8JDLoTkmk12rBGp"
   },
   {
     "__type__": "cc.PrefabInfo",

+ 15 - 14
assets/bundle/gui/eliminate/prefab/popup/UnlockFunction.prefab

@@ -634,7 +634,7 @@
     "fileId": "23wOwUOkdBAYC2q6ccHNoq"
   },
   {
-    "__type__": "cc.Button",
+    "__type__": "86cefAWukVE77lEwgfFdYeD",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -650,9 +650,9 @@
     "_transition": 3,
     "_normalColor": {
       "__type__": "cc.Color",
-      "r": 214,
-      "g": 214,
-      "b": 214,
+      "r": 255,
+      "g": 255,
+      "b": 255,
       "a": 255
     },
     "_hoverColor": {
@@ -676,23 +676,24 @@
       "b": 124,
       "a": 255
     },
-    "_normalSprite": {
-      "__uuid__": "e8764bc7-2f97-4e71-a73b-a525a89d1855@f9941",
-      "__expectedType__": "cc.SpriteFrame"
-    },
+    "_normalSprite": null,
     "_hoverSprite": null,
     "_pressedSprite": null,
     "_disabledSprite": null,
     "_duration": 0.1,
-    "_zoomScale": 1.2,
-    "_target": {
-      "__id__": 14
+    "_zoomScale": 1.1,
+    "_target": null,
+    "interval": 500,
+    "once": false,
+    "effect": {
+      "__uuid__": "9bc4e751-c1e7-4b95-95e1-4946ba1024fd",
+      "__expectedType__": "cc.AudioClip"
     },
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "1eqjW9g3tGu7BG1kdJMGet"
+    "fileId": "2aYw7SRE1GP7vSfCQvsjpM"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -771,8 +772,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 180,
-      "height": 195
+      "width": 120,
+      "height": 130
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",

+ 16 - 15
assets/bundle/gui/eliminate/prefab/popup/WarmReminder.prefab

@@ -776,7 +776,7 @@
     "fileId": "4b2K/UZJpKtZNO2+n3AGkM"
   },
   {
-    "__type__": "cc.Button",
+    "__type__": "86cefAWukVE77lEwgfFdYeD",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -792,9 +792,9 @@
     "_transition": 3,
     "_normalColor": {
       "__type__": "cc.Color",
-      "r": 214,
-      "g": 214,
-      "b": 214,
+      "r": 255,
+      "g": 255,
+      "b": 255,
       "a": 255
     },
     "_hoverColor": {
@@ -818,23 +818,24 @@
       "b": 124,
       "a": 255
     },
-    "_normalSprite": {
-      "__uuid__": "e8764bc7-2f97-4e71-a73b-a525a89d1855@f9941",
-      "__expectedType__": "cc.SpriteFrame"
-    },
+    "_normalSprite": null,
     "_hoverSprite": null,
     "_pressedSprite": null,
     "_disabledSprite": null,
     "_duration": 0.1,
-    "_zoomScale": 1.2,
-    "_target": {
-      "__id__": 20
+    "_zoomScale": 1.1,
+    "_target": null,
+    "interval": 500,
+    "once": false,
+    "effect": {
+      "__uuid__": "9bc4e751-c1e7-4b95-95e1-4946ba1024fd",
+      "__expectedType__": "cc.AudioClip"
     },
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "22VQzEI11EArW5EvOuj6wM"
+    "fileId": "cco4neq/xHybPgR/NM5qTy"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -913,8 +914,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 180,
-      "height": 195
+      "width": 120,
+      "height": 130
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1003,7 +1004,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 720,
-      "height": 1600.0000000000002
+      "height": 1600
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",

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

@@ -1060,7 +1060,7 @@
     },
     "_type": 0,
     "_fillType": 0,
-    "_sizeMode": 1,
+    "_sizeMode": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,

+ 63 - 134
assets/bundle/gui/eliminate/prefab/popup/keepDoubleSpeed.prefab

@@ -25,17 +25,17 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 102
+        "__id__": 98
       },
       {
-        "__id__": 104
+        "__id__": 100
       },
       {
-        "__id__": 106
+        "__id__": 102
       }
     ],
     "_prefab": {
-      "__id__": 108
+      "__id__": 104
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -103,23 +103,23 @@
         "__id__": 73
       },
       {
-        "__id__": 85
+        "__id__": 81
       },
       {
-        "__id__": 91
+        "__id__": 87
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 97
+        "__id__": 93
       },
       {
-        "__id__": 99
+        "__id__": 95
       }
     ],
     "_prefab": {
-      "__id__": 101
+      "__id__": 97
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1139,7 +1139,7 @@
     "fileId": "6aDCLI1ZxMn5F9oyezMmei"
   },
   {
-    "__type__": "cc.Button",
+    "__type__": "86cefAWukVE77lEwgfFdYeD",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -1155,9 +1155,9 @@
     "_transition": 3,
     "_normalColor": {
       "__type__": "cc.Color",
-      "r": 214,
-      "g": 214,
-      "b": 214,
+      "r": 255,
+      "g": 255,
+      "b": 255,
       "a": 255
     },
     "_hoverColor": {
@@ -1181,23 +1181,24 @@
       "b": 124,
       "a": 255
     },
-    "_normalSprite": {
-      "__uuid__": "54138f51-a62d-48d9-8dd2-b01485086792@f9941",
-      "__expectedType__": "cc.SpriteFrame"
-    },
+    "_normalSprite": null,
     "_hoverSprite": null,
     "_pressedSprite": null,
     "_disabledSprite": null,
     "_duration": 0.1,
-    "_zoomScale": 1.2,
-    "_target": {
-      "__id__": 39
+    "_zoomScale": 1.1,
+    "_target": null,
+    "interval": 500,
+    "once": false,
+    "effect": {
+      "__uuid__": "9bc4e751-c1e7-4b95-95e1-4946ba1024fd",
+      "__expectedType__": "cc.AudioClip"
     },
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "24Sd4WhH9E1KOFzEyQap3S"
+    "fileId": "f6kAp5NqdPSqL/ubsADC+l"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -1780,7 +1781,7 @@
     "fileId": "40/+L7hqdIq625mn7HWn94"
   },
   {
-    "__type__": "cc.Button",
+    "__type__": "86cefAWukVE77lEwgfFdYeD",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -1796,9 +1797,9 @@
     "_transition": 3,
     "_normalColor": {
       "__type__": "cc.Color",
-      "r": 214,
-      "g": 214,
-      "b": 214,
+      "r": 255,
+      "g": 255,
+      "b": 255,
       "a": 255
     },
     "_hoverColor": {
@@ -1827,15 +1828,19 @@
     "_pressedSprite": null,
     "_disabledSprite": null,
     "_duration": 0.1,
-    "_zoomScale": 1.2,
-    "_target": {
-      "__id__": 47
+    "_zoomScale": 1.1,
+    "_target": null,
+    "interval": 500,
+    "once": false,
+    "effect": {
+      "__uuid__": "9bc4e751-c1e7-4b95-95e1-4946ba1024fd",
+      "__expectedType__": "cc.AudioClip"
     },
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "aeCP6y4lNOC5Pi7wUHxGmB"
+    "fileId": "f6wfh8YgFAzpFXageJ7Z90"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -1869,16 +1874,10 @@
       },
       {
         "__id__": 78
-      },
-      {
-        "__id__": 80
-      },
-      {
-        "__id__": 82
       }
     ],
     "_prefab": {
-      "__id__": 84
+      "__id__": 80
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -2006,7 +2005,7 @@
     "fileId": "5bnTwh7adIr5i6FFVbh8s8"
   },
   {
-    "__type__": "cc.Button",
+    "__type__": "86cefAWukVE77lEwgfFdYeD",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -2053,89 +2052,19 @@
     "_pressedSprite": null,
     "_disabledSprite": null,
     "_duration": 0.1,
-    "_zoomScale": 1.2,
+    "_zoomScale": 1.1,
     "_target": null,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "6bvUPD56FGo6L2Zb2FIyrM"
-  },
-  {
-    "__type__": "110c8vEd5NEPL/N9meGQnaX",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 73
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 81
-    },
-    "_params": [],
-    "_dataID": "doubleSpeed_close",
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "3aWOCjHANMDrwuN53ZSZ8E"
-  },
-  {
-    "__type__": "cc.Button",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 73
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 83
-    },
-    "clickEvents": [],
-    "_interactable": true,
-    "_transition": 0,
-    "_normalColor": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
+    "interval": 500,
+    "once": false,
+    "effect": {
+      "__uuid__": "9bc4e751-c1e7-4b95-95e1-4946ba1024fd",
+      "__expectedType__": "cc.AudioClip"
     },
-    "_hoverColor": {
-      "__type__": "cc.Color",
-      "r": 211,
-      "g": 211,
-      "b": 211,
-      "a": 255
-    },
-    "_pressedColor": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_disabledColor": {
-      "__type__": "cc.Color",
-      "r": 124,
-      "g": 124,
-      "b": 124,
-      "a": 255
-    },
-    "_normalSprite": null,
-    "_hoverSprite": null,
-    "_pressedSprite": null,
-    "_disabledSprite": null,
-    "_duration": 0.1,
-    "_zoomScale": 1.2,
-    "_target": null,
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "d8bMKJh75IEo5UoeVZbbJ2"
+    "fileId": "5d8uXgTe5PJ7iiDJoNQEos"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -2162,14 +2091,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 86
+        "__id__": 82
       },
       {
-        "__id__": 88
+        "__id__": 84
       }
     ],
     "_prefab": {
-      "__id__": 90
+      "__id__": 86
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -2206,11 +2135,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 85
+      "__id__": 81
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 87
+      "__id__": 83
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2234,11 +2163,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 85
+      "__id__": 81
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 89
+      "__id__": 85
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -2321,14 +2250,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 92
+        "__id__": 88
       },
       {
-        "__id__": 94
+        "__id__": 90
       }
     ],
     "_prefab": {
-      "__id__": 96
+      "__id__": 92
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -2365,11 +2294,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 91
+      "__id__": 87
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 93
+      "__id__": 89
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2393,11 +2322,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 91
+      "__id__": 87
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 95
+      "__id__": 91
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -2458,7 +2387,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 98
+      "__id__": 94
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2486,7 +2415,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 100
+      "__id__": 96
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -2544,7 +2473,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 103
+      "__id__": 99
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2572,7 +2501,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 105
+      "__id__": 101
     },
     "_alignFlags": 45,
     "_target": null,
@@ -2608,10 +2537,10 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 107
+      "__id__": 103
     },
     "lab_time": {
-      "__id__": 88
+      "__id__": 84
     },
     "_id": ""
   },

+ 60 - 47
assets/bundle/gui/eliminate/prefab/popup/wechatTransferring.prefab

@@ -4138,7 +4138,7 @@
     "fileId": "5aWH+XirBKS6ZLfk+tINgv"
   },
   {
-    "__type__": "cc.Button",
+    "__type__": "86cefAWukVE77lEwgfFdYeD",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -4154,9 +4154,9 @@
     "_transition": 3,
     "_normalColor": {
       "__type__": "cc.Color",
-      "r": 214,
-      "g": 214,
-      "b": 214,
+      "r": 255,
+      "g": 255,
+      "b": 255,
       "a": 255
     },
     "_hoverColor": {
@@ -4185,15 +4185,19 @@
     "_pressedSprite": null,
     "_disabledSprite": null,
     "_duration": 0.1,
-    "_zoomScale": 1.2,
-    "_target": {
-      "__id__": 209
+    "_zoomScale": 1.1,
+    "_target": null,
+    "interval": 500,
+    "once": false,
+    "effect": {
+      "__uuid__": "9bc4e751-c1e7-4b95-95e1-4946ba1024fd",
+      "__expectedType__": "cc.AudioClip"
     },
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "11a4Zn0eNMvKFyrX545lfQ"
+    "fileId": "3657CrBvdKfZ4CT5TlXmCs"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -4625,7 +4629,7 @@
     "fileId": "91ze2W8VJI0ZGXvBx9Hvx1"
   },
   {
-    "__type__": "cc.Button",
+    "__type__": "86cefAWukVE77lEwgfFdYeD",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -4641,9 +4645,9 @@
     "_transition": 3,
     "_normalColor": {
       "__type__": "cc.Color",
-      "r": 214,
-      "g": 214,
-      "b": 214,
+      "r": 255,
+      "g": 255,
+      "b": 255,
       "a": 255
     },
     "_hoverColor": {
@@ -4667,23 +4671,24 @@
       "b": 124,
       "a": 255
     },
-    "_normalSprite": {
-      "__uuid__": "54138f51-a62d-48d9-8dd2-b01485086792@f9941",
-      "__expectedType__": "cc.SpriteFrame"
-    },
+    "_normalSprite": null,
     "_hoverSprite": null,
     "_pressedSprite": null,
     "_disabledSprite": null,
     "_duration": 0.1,
-    "_zoomScale": 1.2,
-    "_target": {
-      "__id__": 236
+    "_zoomScale": 1.1,
+    "_target": null,
+    "interval": 500,
+    "once": false,
+    "effect": {
+      "__uuid__": "9bc4e751-c1e7-4b95-95e1-4946ba1024fd",
+      "__expectedType__": "cc.AudioClip"
     },
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "f0Y7KusDVPG6N8eTroy3sG"
+    "fileId": "65NFMz3bxElq6hmDybULtp"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -5147,7 +5152,7 @@
     "fileId": "cbUtMyIG1ByakNmIvX0qrO"
   },
   {
-    "__type__": "cc.Button",
+    "__type__": "86cefAWukVE77lEwgfFdYeD",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -5163,9 +5168,9 @@
     "_transition": 3,
     "_normalColor": {
       "__type__": "cc.Color",
-      "r": 214,
-      "g": 214,
-      "b": 214,
+      "r": 255,
+      "g": 255,
+      "b": 255,
       "a": 255
     },
     "_hoverColor": {
@@ -5189,23 +5194,24 @@
       "b": 124,
       "a": 255
     },
-    "_normalSprite": {
-      "__uuid__": "a49999bb-986e-40f5-9a9a-d4171636116f@f9941",
-      "__expectedType__": "cc.SpriteFrame"
-    },
+    "_normalSprite": null,
     "_hoverSprite": null,
     "_pressedSprite": null,
     "_disabledSprite": null,
     "_duration": 0.1,
-    "_zoomScale": 1.2,
-    "_target": {
-      "__id__": 250
+    "_zoomScale": 1.1,
+    "_target": null,
+    "interval": 500,
+    "once": false,
+    "effect": {
+      "__uuid__": "9bc4e751-c1e7-4b95-95e1-4946ba1024fd",
+      "__expectedType__": "cc.AudioClip"
     },
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "106n9nz7hN3qTeYOPQKOqv"
+    "fileId": "e9o4RwPRRIVpnpXtgU4RxW"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -6075,7 +6081,7 @@
     "fileId": "a7fPHUwftBHKI/LMYaro6T"
   },
   {
-    "__type__": "cc.Button",
+    "__type__": "86cefAWukVE77lEwgfFdYeD",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -6122,13 +6128,19 @@
     "_pressedSprite": null,
     "_disabledSprite": null,
     "_duration": 0.1,
-    "_zoomScale": 1.2,
+    "_zoomScale": 1.1,
     "_target": null,
+    "interval": 500,
+    "once": false,
+    "effect": {
+      "__uuid__": "9bc4e751-c1e7-4b95-95e1-4946ba1024fd",
+      "__expectedType__": "cc.AudioClip"
+    },
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "ae5cLFuoxAKbyiD1V1e6I6"
+    "fileId": "18mAeQsDpHJojYS5aGrIqb"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -7390,7 +7402,7 @@
     "fileId": "d2OtskXYBA+Y0NlSVDcw2O"
   },
   {
-    "__type__": "cc.Button",
+    "__type__": "86cefAWukVE77lEwgfFdYeD",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -7406,9 +7418,9 @@
     "_transition": 3,
     "_normalColor": {
       "__type__": "cc.Color",
-      "r": 214,
-      "g": 214,
-      "b": 214,
+      "r": 255,
+      "g": 255,
+      "b": 255,
       "a": 255
     },
     "_hoverColor": {
@@ -7432,23 +7444,24 @@
       "b": 124,
       "a": 255
     },
-    "_normalSprite": {
-      "__uuid__": "4c6cc9d8-7cec-4eba-acba-fef2a3f62688@f9941",
-      "__expectedType__": "cc.SpriteFrame"
-    },
+    "_normalSprite": null,
     "_hoverSprite": null,
     "_pressedSprite": null,
     "_disabledSprite": null,
     "_duration": 0.1,
-    "_zoomScale": 1.2,
-    "_target": {
-      "__id__": 345
+    "_zoomScale": 1.1,
+    "_target": null,
+    "interval": 500,
+    "once": false,
+    "effect": {
+      "__uuid__": "9bc4e751-c1e7-4b95-95e1-4946ba1024fd",
+      "__expectedType__": "cc.AudioClip"
     },
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "cfK10YnwxPUJIFeg9pHz6q"
+    "fileId": "f2p2DQ3fFGC6Wo7APKCHsJ"
   },
   {
     "__type__": "cc.PrefabInfo",

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

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

+ 119 - 143
assets/bundle/gui/eliminate/prefab/redPackeItem.prefab

@@ -25,17 +25,17 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 106
+        "__id__": 104
       },
       {
-        "__id__": 108
+        "__id__": 106
       },
       {
-        "__id__": 110
+        "__id__": 108
       }
     ],
     "_prefab": {
-      "__id__": 112
+      "__id__": 110
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -91,26 +91,26 @@
         "__id__": 35
       },
       {
-        "__id__": 50
+        "__id__": 49
       },
       {
-        "__id__": 65
+        "__id__": 63
       },
       {
-        "__id__": 77
+        "__id__": 75
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 101
+        "__id__": 99
       },
       {
-        "__id__": 103
+        "__id__": 101
       }
     ],
     "_prefab": {
-      "__id__": 105
+      "__id__": 103
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -279,7 +279,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "lab_num",
+    "_name": "lab_money",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
@@ -925,7 +925,7 @@
       }
     ],
     "_prefab": {
-      "__id__": 49
+      "__id__": 48
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1189,7 +1189,7 @@
     "fileId": "a5kLJMvgxDWKeYHmFRa0R/"
   },
   {
-    "__type__": "cc.Button",
+    "__type__": "86cefAWukVE77lEwgfFdYeD",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -1200,18 +1200,14 @@
     "__prefab": {
       "__id__": 47
     },
-    "clickEvents": [
-      {
-        "__id__": 48
-      }
-    ],
+    "clickEvents": [],
     "_interactable": true,
     "_transition": 3,
     "_normalColor": {
       "__type__": "cc.Color",
-      "r": 214,
-      "g": 214,
-      "b": 214,
+      "r": 255,
+      "g": 255,
+      "b": 255,
       "a": 255
     },
     "_hoverColor": {
@@ -1235,33 +1231,24 @@
       "b": 124,
       "a": 255
     },
-    "_normalSprite": {
-      "__uuid__": "ae788310-a1d3-4237-843e-93a6bdb97bc3@f9941",
-      "__expectedType__": "cc.SpriteFrame"
-    },
+    "_normalSprite": null,
     "_hoverSprite": null,
     "_pressedSprite": null,
     "_disabledSprite": null,
     "_duration": 0.1,
-    "_zoomScale": 1.2,
-    "_target": {
-      "__id__": 35
+    "_zoomScale": 1.1,
+    "_target": null,
+    "interval": 500,
+    "once": false,
+    "effect": {
+      "__uuid__": "9bc4e751-c1e7-4b95-95e1-4946ba1024fd",
+      "__expectedType__": "cc.AudioClip"
     },
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "a83nMOhcRAmKbYwaNFGgaN"
-  },
-  {
-    "__type__": "cc.ClickEvent",
-    "target": {
-      "__id__": 1
-    },
-    "component": "",
-    "_componentId": "f2eabVLcvlH5IXRlUEbXdFa",
-    "handler": "btn_none",
-    "customEventData": ""
+    "fileId": "736GImQGFMGqiDIiYztr9b"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -1286,23 +1273,23 @@
     },
     "_children": [
       {
-        "__id__": 51
+        "__id__": 50
       }
     ],
     "_active": false,
     "_components": [
       {
-        "__id__": 57
+        "__id__": 56
       },
       {
-        "__id__": 59
+        "__id__": 58
       },
       {
-        "__id__": 61
+        "__id__": 60
       }
     ],
     "_prefab": {
-      "__id__": 64
+      "__id__": 62
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1339,20 +1326,20 @@
     "_objFlags": 512,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 50
+      "__id__": 49
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 52
+        "__id__": 51
       },
       {
-        "__id__": 54
+        "__id__": 53
       }
     ],
     "_prefab": {
-      "__id__": 56
+      "__id__": 55
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1389,11 +1376,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 51
+      "__id__": 50
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 53
+      "__id__": 52
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1417,11 +1404,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 51
+      "__id__": 50
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 55
+      "__id__": 54
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1498,11 +1485,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 50
+      "__id__": 49
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 58
+      "__id__": 57
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1526,11 +1513,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 50
+      "__id__": 49
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 60
+      "__id__": 59
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1566,29 +1553,25 @@
     "fileId": "63j8wN2T5LTKtEGQuLEQbf"
   },
   {
-    "__type__": "cc.Button",
+    "__type__": "86cefAWukVE77lEwgfFdYeD",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 50
+      "__id__": 49
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 62
+      "__id__": 61
     },
-    "clickEvents": [
-      {
-        "__id__": 63
-      }
-    ],
+    "clickEvents": [],
     "_interactable": true,
     "_transition": 3,
     "_normalColor": {
       "__type__": "cc.Color",
-      "r": 214,
-      "g": 214,
-      "b": 214,
+      "r": 255,
+      "g": 255,
+      "b": 255,
       "a": 255
     },
     "_hoverColor": {
@@ -1612,33 +1595,24 @@
       "b": 124,
       "a": 255
     },
-    "_normalSprite": {
-      "__uuid__": "21ab0f03-1c03-4f3e-bd0b-4b227ff123c8@f9941",
-      "__expectedType__": "cc.SpriteFrame"
-    },
+    "_normalSprite": null,
     "_hoverSprite": null,
     "_pressedSprite": null,
     "_disabledSprite": null,
     "_duration": 0.1,
-    "_zoomScale": 1.2,
-    "_target": {
-      "__id__": 50
+    "_zoomScale": 1.1,
+    "_target": null,
+    "interval": 500,
+    "once": false,
+    "effect": {
+      "__uuid__": "9bc4e751-c1e7-4b95-95e1-4946ba1024fd",
+      "__expectedType__": "cc.AudioClip"
     },
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "b46IOZYGlIbqBtU6kAKnyD"
-  },
-  {
-    "__type__": "cc.ClickEvent",
-    "target": {
-      "__id__": 1
-    },
-    "component": "",
-    "_componentId": "f2eabVLcvlH5IXRlUEbXdFa",
-    "handler": "btn_receive",
-    "customEventData": ""
+    "fileId": "32D4pX6B1LMYdNmu0LPuVm"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -1663,20 +1637,20 @@
     },
     "_children": [
       {
-        "__id__": 66
+        "__id__": 64
       }
     ],
     "_active": false,
     "_components": [
       {
-        "__id__": 72
+        "__id__": 70
       },
       {
-        "__id__": 74
+        "__id__": 72
       }
     ],
     "_prefab": {
-      "__id__": 76
+      "__id__": 74
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1713,20 +1687,20 @@
     "_objFlags": 512,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 65
+      "__id__": 63
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 67
+        "__id__": 65
       },
       {
-        "__id__": 69
+        "__id__": 67
       }
     ],
     "_prefab": {
-      "__id__": 71
+      "__id__": 69
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1763,11 +1737,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 66
+      "__id__": 64
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 68
+      "__id__": 66
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1791,11 +1765,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 66
+      "__id__": 64
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 70
+      "__id__": 68
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1872,11 +1846,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 65
+      "__id__": 63
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 73
+      "__id__": 71
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1900,11 +1874,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 65
+      "__id__": 63
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 75
+      "__id__": 73
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1962,26 +1936,26 @@
     },
     "_children": [
       {
-        "__id__": 78
+        "__id__": 76
       },
       {
-        "__id__": 84
+        "__id__": 82
       },
       {
-        "__id__": 90
+        "__id__": 88
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 96
+        "__id__": 94
       },
       {
-        "__id__": 98
+        "__id__": 96
       }
     ],
     "_prefab": {
-      "__id__": 100
+      "__id__": 98
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -2018,20 +1992,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 77
+      "__id__": 75
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 79
+        "__id__": 77
       },
       {
-        "__id__": 81
+        "__id__": 79
       }
     ],
     "_prefab": {
-      "__id__": 83
+      "__id__": 81
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -2068,11 +2042,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 78
+      "__id__": 76
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 80
+      "__id__": 78
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2096,11 +2070,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 78
+      "__id__": 76
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 82
+      "__id__": 80
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -2177,20 +2151,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 77
+      "__id__": 75
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 85
+        "__id__": 83
       },
       {
-        "__id__": 87
+        "__id__": 85
       }
     ],
     "_prefab": {
-      "__id__": 89
+      "__id__": 87
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -2227,11 +2201,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 84
+      "__id__": 82
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 86
+      "__id__": 84
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2255,11 +2229,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 84
+      "__id__": 82
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 88
+      "__id__": 86
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -2336,20 +2310,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 77
+      "__id__": 75
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 91
+        "__id__": 89
       },
       {
-        "__id__": 93
+        "__id__": 91
       }
     ],
     "_prefab": {
-      "__id__": 95
+      "__id__": 93
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -2386,11 +2360,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 90
+      "__id__": 88
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 92
+      "__id__": 90
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2414,11 +2388,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 90
+      "__id__": 88
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 94
+      "__id__": 92
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -2495,11 +2469,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 77
+      "__id__": 75
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 97
+      "__id__": 95
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2523,11 +2497,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 77
+      "__id__": 75
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 99
+      "__id__": 97
     },
     "_resizeMode": 1,
     "_layoutType": 1,
@@ -2578,7 +2552,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 102
+      "__id__": 100
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2606,7 +2580,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 104
+      "__id__": 102
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -2650,6 +2624,8 @@
       "__id__": 0
     },
     "fileId": "f0xLFYr+dIUrtlfmMMkUIt",
+    "instance": null,
+    "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {
@@ -2662,7 +2638,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 107
+      "__id__": 105
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2690,19 +2666,19 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 109
+      "__id__": 107
     },
     "receiveNode": {
-      "__id__": 50
+      "__id__": 49
     },
     "receivedNode": {
-      "__id__": 65
+      "__id__": 63
     },
     "unReceiveNode": {
       "__id__": 35
     },
     "lab_title": {
-      "__id__": 87
+      "__id__": 85
     },
     "lab_progress": {
       "__id__": 32
@@ -2729,7 +2705,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 111
+      "__id__": 109
     },
     "selectedMode": 0,
     "selectedFlag": null,

+ 37 - 26
assets/bundle/gui/eliminate/prefab/redPacketWithdrawal.prefab

@@ -491,7 +491,7 @@
     "fileId": "ecO7e3UCRI7KDE/g4leDR9"
   },
   {
-    "__type__": "cc.Button",
+    "__type__": "86cefAWukVE77lEwgfFdYeD",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -507,9 +507,9 @@
     "_transition": 3,
     "_normalColor": {
       "__type__": "cc.Color",
-      "r": 214,
-      "g": 214,
-      "b": 214,
+      "r": 255,
+      "g": 255,
+      "b": 255,
       "a": 255
     },
     "_hoverColor": {
@@ -538,15 +538,19 @@
     "_pressedSprite": null,
     "_disabledSprite": null,
     "_duration": 0.1,
-    "_zoomScale": 1.2,
-    "_target": {
-      "__id__": 12
+    "_zoomScale": 1.1,
+    "_target": null,
+    "interval": 500,
+    "once": false,
+    "effect": {
+      "__uuid__": "9bc4e751-c1e7-4b95-95e1-4946ba1024fd",
+      "__expectedType__": "cc.AudioClip"
     },
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "e9xB02y8JKv4tJkWqDxY8c"
+    "fileId": "6by9matmVFsJYIhklkLhR5"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -870,7 +874,7 @@
     "fileId": "893EPU35hJGabOoZm9GB0c"
   },
   {
-    "__type__": "cc.Button",
+    "__type__": "86cefAWukVE77lEwgfFdYeD",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -917,13 +921,19 @@
     "_pressedSprite": null,
     "_disabledSprite": null,
     "_duration": 0.1,
-    "_zoomScale": 1.2,
+    "_zoomScale": 1.1,
     "_target": null,
+    "interval": 500,
+    "once": false,
+    "effect": {
+      "__uuid__": "9bc4e751-c1e7-4b95-95e1-4946ba1024fd",
+      "__expectedType__": "cc.AudioClip"
+    },
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "7fmsNaqjlAebqbbbZh+8TA"
+    "fileId": "fd6jn+sRhAdKaqfw7EtlEU"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -2194,7 +2204,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 100,
+      "width": 300,
       "height": 60
     },
     "_anchorPoint": {
@@ -2461,7 +2471,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "topNode-001",
+    "_name": "centerNode",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
@@ -2965,7 +2975,7 @@
     "fileId": "3e+NLFRq1HtK+i1dmRWXt0"
   },
   {
-    "__type__": "cc.Button",
+    "__type__": "86cefAWukVE77lEwgfFdYeD",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -2981,9 +2991,9 @@
     "_transition": 3,
     "_normalColor": {
       "__type__": "cc.Color",
-      "r": 214,
-      "g": 214,
-      "b": 214,
+      "r": 255,
+      "g": 255,
+      "b": 255,
       "a": 255
     },
     "_hoverColor": {
@@ -3007,23 +3017,24 @@
       "b": 124,
       "a": 255
     },
-    "_normalSprite": {
-      "__uuid__": "a49999bb-986e-40f5-9a9a-d4171636116f@f9941",
-      "__expectedType__": "cc.SpriteFrame"
-    },
+    "_normalSprite": null,
     "_hoverSprite": null,
     "_pressedSprite": null,
     "_disabledSprite": null,
     "_duration": 0.1,
-    "_zoomScale": 1.2,
-    "_target": {
-      "__id__": 103
+    "_zoomScale": 1.1,
+    "_target": null,
+    "interval": 500,
+    "once": false,
+    "effect": {
+      "__uuid__": "9bc4e751-c1e7-4b95-95e1-4946ba1024fd",
+      "__expectedType__": "cc.AudioClip"
     },
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "52Nmykh/dLaqUW0A+LFtDE"
+    "fileId": "32Xn5HbFdACbaObIe9dH6v"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -3097,7 +3108,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "lab_num",
+    "_name": "lab_money",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {

+ 30 - 14
assets/bundle/gui/eliminate/prefab/wechatWithdrawal.prefab

@@ -1616,7 +1616,7 @@
     "fileId": "186IYpz7xChbTJXLNVu1ZC"
   },
   {
-    "__type__": "cc.Button",
+    "__type__": "86cefAWukVE77lEwgfFdYeD",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -1632,9 +1632,9 @@
     "_transition": 3,
     "_normalColor": {
       "__type__": "cc.Color",
-      "r": 214,
-      "g": 214,
-      "b": 214,
+      "r": 255,
+      "g": 255,
+      "b": 255,
       "a": 255
     },
     "_hoverColor": {
@@ -1663,15 +1663,19 @@
     "_pressedSprite": null,
     "_disabledSprite": null,
     "_duration": 0.1,
-    "_zoomScale": 1.2,
-    "_target": {
-      "__id__": 60
+    "_zoomScale": 1.1,
+    "_target": null,
+    "interval": 500,
+    "once": false,
+    "effect": {
+      "__uuid__": "9bc4e751-c1e7-4b95-95e1-4946ba1024fd",
+      "__expectedType__": "cc.AudioClip"
     },
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "e0zM8CS05F7JB5GMMHSZtk"
+    "fileId": "93Io7h2klHd7MzFYMZU0yL"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -1836,7 +1840,7 @@
     "fileId": "45tjsutmRGkpxan1HIm68O"
   },
   {
-    "__type__": "cc.Button",
+    "__type__": "86cefAWukVE77lEwgfFdYeD",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -1883,13 +1887,19 @@
     "_pressedSprite": null,
     "_disabledSprite": null,
     "_duration": 0.1,
-    "_zoomScale": 1.2,
+    "_zoomScale": 1.1,
     "_target": null,
+    "interval": 500,
+    "once": false,
+    "effect": {
+      "__uuid__": "9bc4e751-c1e7-4b95-95e1-4946ba1024fd",
+      "__expectedType__": "cc.AudioClip"
+    },
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "74QJAPi9VHIKsN8f3mcQsb"
+    "fileId": "3cIDWW/9pD1oNj6ryczz4h"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -2927,7 +2937,7 @@
     "fileId": "cfdhHCEm1HjIOyZIAqN1Xo"
   },
   {
-    "__type__": "cc.Button",
+    "__type__": "86cefAWukVE77lEwgfFdYeD",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -2974,13 +2984,19 @@
     "_pressedSprite": null,
     "_disabledSprite": null,
     "_duration": 0.1,
-    "_zoomScale": 1.2,
+    "_zoomScale": 1.1,
     "_target": null,
+    "interval": 500,
+    "once": false,
+    "effect": {
+      "__uuid__": "9bc4e751-c1e7-4b95-95e1-4946ba1024fd",
+      "__expectedType__": "cc.AudioClip"
+    },
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "c3E8OrIk1Pe4EzQgutk7Gj"
+    "fileId": "6bFFhZ/01CwLnQtGT80DcD"
   },
   {
     "__type__": "cc.PrefabInfo",

+ 13 - 12
assets/bundle/gui/eliminate/prefab/withdrawalRecord.prefab

@@ -437,7 +437,7 @@
     "fileId": "09q5UMP+BIPLEEFF3AYFBr"
   },
   {
-    "__type__": "cc.Button",
+    "__type__": "86cefAWukVE77lEwgfFdYeD",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -453,9 +453,9 @@
     "_transition": 3,
     "_normalColor": {
       "__type__": "cc.Color",
-      "r": 214,
-      "g": 214,
-      "b": 214,
+      "r": 255,
+      "g": 255,
+      "b": 255,
       "a": 255
     },
     "_hoverColor": {
@@ -479,23 +479,24 @@
       "b": 124,
       "a": 255
     },
-    "_normalSprite": {
-      "__uuid__": "dc0dfb95-c0c5-442e-9a1a-55dde91d34ab@f9941",
-      "__expectedType__": "cc.SpriteFrame"
-    },
+    "_normalSprite": null,
     "_hoverSprite": null,
     "_pressedSprite": null,
     "_disabledSprite": null,
     "_duration": 0.1,
-    "_zoomScale": 1.2,
-    "_target": {
-      "__id__": 11
+    "_zoomScale": 1.1,
+    "_target": null,
+    "interval": 500,
+    "once": false,
+    "effect": {
+      "__uuid__": "9bc4e751-c1e7-4b95-95e1-4946ba1024fd",
+      "__expectedType__": "cc.AudioClip"
     },
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "6dgNK39lZCx5KHoEpkg5zm"
+    "fileId": "42Di0JD5hO/LzLKEjRNMV3"
   },
   {
     "__type__": "cc.PrefabInfo",

+ 3 - 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-27 14:21:50
+ * @LastEditTime: 2025-04-28 11:45:08
  */
 
 /** 游戏事件 */
@@ -39,6 +39,8 @@ export enum GameEvent {
     pauseGame = "pauseGame",
     /**恢复游戏*/
     resumeGame = "resumeGame",
+    /**更新消除后分数*/
+    updateGameScore = "updateGameScore"
 
 
 }

+ 4 - 1
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-27 18:52:03
+ * @LastEditTime: 2025-04-28 11:46:05
  * @Description: 
  */
 // ServerHandler.ts
@@ -193,6 +193,7 @@ export class ServerHandler {
     }
 
     onGameAwardInfo(str: string) {
+        console.log('[服务器] 获取通关信息', str);
         const result = JSON.parse(str);
         smc.game.GameModel.passViewInfo = result;
         oops.message.dispatchEvent(GameEvent.openView, 'openPassView');
@@ -261,6 +262,8 @@ export class ServerHandler {
             game.changeHbCoin = changes['1004'] || 0;
             game.changeWxCoin = changes['1005'] || 0;
             oops.message.dispatchEvent(GameEvent.showCoinAnimation);
+            //更新分数情况,判断是否可以通关
+            oops.message.dispatchEvent(GameEvent.updateGameScore);
         }
     }
 

+ 5 - 2
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-27 19:02:38
+ * @LastEditTime: 2025-04-28 11:46:45
  * @Description: 消除游戏主场景
  */
 import { _decorator, Button, Color, EventTouch, instantiate, JsonAsset, v3, Label, Node, Prefab, randomRangeInt, Sprite, tween, UITransform, Vec2, Vec3, Widget } from "cc";
@@ -21,6 +21,7 @@ import { Tween } from "cc";
 import { AD_TYPE } from "../common/config/GameDefine";
 import { ADHandler } from "../common/manager/ADHandler";
 import { director } from "cc";
+import { Game } from "cc";
 
 const { ccclass, property } = _decorator;
 
@@ -285,6 +286,7 @@ export class EliminateViewComp extends CCComp {
         oops.message.on(GameEvent.updateHbAndWxCoin, this.updateCoin, this);
         oops.message.on(GameEvent.StartAutoGame, this.startAutoGame, this);
         oops.message.on(GameEvent.updateGameState, this.updateGameState, this);
+        oops.message.on(GameEvent.updateGameScore, this.updateGameScore, this);
         oops.message.on(GameEvent.pauseGame, this.pauseGame, this);
         oops.message.on(GameEvent.resumeGame, this.resumeGame, this);
     }
@@ -392,6 +394,7 @@ export class EliminateViewComp extends CCComp {
 
 
     openView(event: string, args: string) {
+        console.log("打开的弹窗>>>>>>>>>>>>>", args);
         switch (args) {
             case "openRedBagView":
                 oops.gui.open(UIID.RedPacketWithdraw);
@@ -1603,7 +1606,7 @@ export class EliminateViewComp extends CCComp {
                     }
                 }
 
-                this.updateGameScore();
+                // this.updateGameScore();
                 resolve(true)
             }, 0.1)
         })

+ 13 - 21
assets/script/game/view/RedPackeWithdrawalViewComp.ts

@@ -2,7 +2,7 @@
  * @Author: mojunshou 1637302775@qq.com
  * @Date: 2025-03-20 17:53:50
  * @LastEditors: mojunshou 1637302775@qq.com
- * @LastEditTime: 2025-04-25 19:53:14
+ * @LastEditTime: 2025-04-28 11:29:05
  * @Description: 红包提现
  */
 import { _decorator, Label, Node } from "cc";
@@ -93,8 +93,17 @@ export class RedPackeWithdrawalViewComp extends CCVMParentComp {
         console.log("wxCash", wxCash);
         let hbCoin = Format.formatRedPacketCoin(smc.account.AccountModel.hbCoin);
         console.log("hbCoin", hbCoin);
-        this.lab_wxCash.string = `${wxCash}`;
-        this.lab_hbCoin.string = `${hbCoin}`;
+        if (this.lab_wxCash) {
+            this.lab_wxCash.string = `${wxCash}`;
+        } else {
+            console.log("找不到这个节点>>>>>>>", this.lab_wxCash)
+        }
+        if (this.lab_hbCoin) {
+            this.lab_hbCoin.string = `${hbCoin}`;
+        } else {
+            console.log("找不到这个节点", this.lab_hbCoin)
+        }
+
     }
 
     private btn_back() {
@@ -131,24 +140,7 @@ export class RedPackeWithdrawalViewComp extends CCVMParentComp {
 
 
     btn_text() {
-        const info = {
-            "ssid": "730596b822fe47b09d48be6bd41d085e",
-            "props": {
-                "1004": 44278,
-                "1005": 1837207,
-                "1006": 6,
-                "1007": 129,
-                "2001": 2,
-                "8001": 140,
-                "9001": 2
-            },
-            "changes": {
-                "1004": -500000,
-                "8001": 50
-            },
-            "money": 0.04
-        }
-
+        const info = { "ssid": "0cee6baebcb1413180e266d733510e38", "props": { "1007": 60, "9001": 5, "1005": 1889260, "1004": 5137068, "8001": 550, "1006": 9, "2001": 11, "1008": 30 }, "changes": { "8001": 500, "1004": -5000000 }, "money": 5.13, "transferStatus": 1, "outTransferNo": "2504281114186442061262848" }
         ServerHandler.inst.onHbReward(JSON.stringify(info));
     }
 }