Sfoglia il codice sorgente

【功能】修改福利弹窗,预约提现弹窗,只弹一次

mojunshou 7 mesi fa
parent
commit
74d9efd3b7

+ 160 - 122
assets/bundle/gui/eliminate/prefab/popup/ReservePopup.prefab

@@ -25,17 +25,17 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 222
+        "__id__": 225
       },
       {
-        "__id__": 224
+        "__id__": 227
       },
       {
-        "__id__": 226
+        "__id__": 229
       }
     ],
     "_prefab": {
-      "__id__": 228
+      "__id__": 231
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -85,14 +85,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 217
+        "__id__": 220
       },
       {
-        "__id__": 219
+        "__id__": 222
       }
     ],
     "_prefab": {
-      "__id__": 221
+      "__id__": 224
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -980,26 +980,26 @@
         "__id__": 114
       },
       {
-        "__id__": 140
+        "__id__": 143
       },
       {
-        "__id__": 164
+        "__id__": 167
       },
       {
-        "__id__": 182
+        "__id__": 185
       },
       {
-        "__id__": 200
+        "__id__": 203
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 214
+        "__id__": 217
       }
     ],
     "_prefab": {
-      "__id__": 216
+      "__id__": 219
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -2472,6 +2472,12 @@
       },
       {
         "__id__": 138
+      },
+      {
+        "__id__": 140
+      },
+      {
+        "__id__": 141
       }
     ],
     "removedComponents": []
@@ -2509,10 +2515,12 @@
     "__prefab": {
       "__id__": 126
     },
-    "templateMode": false,
+    "templateMode": true,
     "watchPath": "*.money",
     "labelType": "cc.Label",
-    "watchPathArr": [],
+    "watchPathArr": [
+      "*.money"
+    ],
     "_id": ""
   },
   {
@@ -2582,7 +2590,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 56,
+      "width": 80.978515625,
       "height": 50.4
     },
     "_anchorPoint": {
@@ -2618,7 +2626,7 @@
       "b": 53,
       "a": 255
     },
-    "_string": "白给",
+    "_string": "{{0}}元",
     "_horizontalAlign": 1,
     "_verticalAlign": 1,
     "_actualFontSize": 28,
@@ -2818,20 +2826,50 @@
     ]
   },
   {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 139
+    },
+    "propertyPath": [
+      "_string"
+    ],
+    "value": "{{0}}元"
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 142
+    },
+    "propertyPath": [
+      "_contentSize"
+    ],
+    "value": {
+      "__type__": "cc.Size",
+      "width": 80.978515625,
+      "height": 50.4
+    }
+  },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "51BPKK9URIwZxTVm73y+0k"
+    ]
+  },
+  {
     "__type__": "cc.Node",
     "_objFlags": 0,
     "_parent": {
       "__id__": 39
     },
     "_prefab": {
-      "__id__": 141
+      "__id__": 144
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 140
+      "__id__": 143
     },
     "asset": {
       "__uuid__": "2c86a366-3c74-488c-ba54-32ec8e92a390",
@@ -2839,7 +2877,7 @@
     },
     "fileId": "53AM6G8hhJ6788mDYZ8O44",
     "instance": {
-      "__id__": 142
+      "__id__": 145
     },
     "targetOverrides": null
   },
@@ -2852,30 +2890,30 @@
     "mountedChildren": [],
     "mountedComponents": [
       {
-        "__id__": 143
+        "__id__": 146
       }
     ],
     "propertyOverrides": [
       {
-        "__id__": 153
+        "__id__": 156
       },
       {
-        "__id__": 155
+        "__id__": 158
       },
       {
-        "__id__": 156
+        "__id__": 159
       },
       {
-        "__id__": 157
+        "__id__": 160
       },
       {
-        "__id__": 158
+        "__id__": 161
       },
       {
-        "__id__": 160
+        "__id__": 163
       },
       {
-        "__id__": 162
+        "__id__": 165
       }
     ],
     "removedComponents": []
@@ -2883,11 +2921,11 @@
   {
     "__type__": "cc.MountedComponentsInfo",
     "targetInfo": {
-      "__id__": 144
+      "__id__": 147
     },
     "components": [
       {
-        "__id__": 145
+        "__id__": 148
       }
     ]
   },
@@ -2903,15 +2941,15 @@
     "_objFlags": 0,
     "__editorExtras__": {
       "mountedRoot": {
-        "__id__": 140
+        "__id__": 143
       }
     },
     "node": {
-      "__id__": 146
+      "__id__": 149
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 152
+      "__id__": 155
     },
     "templateMode": false,
     "watchPath": "*.time",
@@ -2925,23 +2963,23 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 140
+      "__id__": 143
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 147
+        "__id__": 150
       },
       {
-        "__id__": 149
+        "__id__": 152
       },
       {
-        "__id__": 145
+        "__id__": 148
       }
     ],
     "_prefab": {
-      "__id__": 151
+      "__id__": 154
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -2978,11 +3016,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 146
+      "__id__": 149
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 148
+      "__id__": 151
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -3006,11 +3044,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 146
+      "__id__": 149
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 150
+      "__id__": 153
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -3088,7 +3126,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 154
+      "__id__": 157
     },
     "propertyPath": [
       "_name"
@@ -3104,7 +3142,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 154
+      "__id__": 157
     },
     "propertyPath": [
       "_lpos"
@@ -3119,7 +3157,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 154
+      "__id__": 157
     },
     "propertyPath": [
       "_lrot"
@@ -3135,7 +3173,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 154
+      "__id__": 157
     },
     "propertyPath": [
       "_euler"
@@ -3150,7 +3188,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 159
+      "__id__": 162
     },
     "propertyPath": [
       "_active"
@@ -3166,7 +3204,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 161
+      "__id__": 164
     },
     "propertyPath": [
       "_string"
@@ -3182,7 +3220,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 163
+      "__id__": 166
     },
     "propertyPath": [
       "_contentSize"
@@ -3206,14 +3244,14 @@
       "__id__": 39
     },
     "_prefab": {
-      "__id__": 165
+      "__id__": 168
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 164
+      "__id__": 167
     },
     "asset": {
       "__uuid__": "2c86a366-3c74-488c-ba54-32ec8e92a390",
@@ -3221,7 +3259,7 @@
     },
     "fileId": "53AM6G8hhJ6788mDYZ8O44",
     "instance": {
-      "__id__": 166
+      "__id__": 169
     },
     "targetOverrides": null
   },
@@ -3235,31 +3273,31 @@
     "mountedComponents": [],
     "propertyOverrides": [
       {
-        "__id__": 167
+        "__id__": 170
       },
       {
-        "__id__": 169
+        "__id__": 172
       },
       {
-        "__id__": 170
+        "__id__": 173
       },
       {
-        "__id__": 171
+        "__id__": 174
       },
       {
-        "__id__": 172
+        "__id__": 175
       },
       {
-        "__id__": 174
+        "__id__": 177
       },
       {
-        "__id__": 176
+        "__id__": 179
       },
       {
-        "__id__": 178
+        "__id__": 181
       },
       {
-        "__id__": 180
+        "__id__": 183
       }
     ],
     "removedComponents": []
@@ -3267,7 +3305,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 168
+      "__id__": 171
     },
     "propertyPath": [
       "_name"
@@ -3283,7 +3321,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 168
+      "__id__": 171
     },
     "propertyPath": [
       "_lpos"
@@ -3298,7 +3336,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 168
+      "__id__": 171
     },
     "propertyPath": [
       "_lrot"
@@ -3314,7 +3352,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 168
+      "__id__": 171
     },
     "propertyPath": [
       "_euler"
@@ -3329,7 +3367,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 173
+      "__id__": 176
     },
     "propertyPath": [
       "_active"
@@ -3345,7 +3383,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 175
+      "__id__": 178
     },
     "propertyPath": [
       "_string"
@@ -3361,7 +3399,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 177
+      "__id__": 180
     },
     "propertyPath": [
       "_contentSize"
@@ -3381,7 +3419,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 179
+      "__id__": 182
     },
     "propertyPath": [
       "_string"
@@ -3397,7 +3435,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 181
+      "__id__": 184
     },
     "propertyPath": [
       "_contentSize"
@@ -3421,14 +3459,14 @@
       "__id__": 39
     },
     "_prefab": {
-      "__id__": 183
+      "__id__": 186
     },
     "__editorExtras__": {}
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 182
+      "__id__": 185
     },
     "asset": {
       "__uuid__": "2c86a366-3c74-488c-ba54-32ec8e92a390",
@@ -3436,7 +3474,7 @@
     },
     "fileId": "53AM6G8hhJ6788mDYZ8O44",
     "instance": {
-      "__id__": 184
+      "__id__": 187
     },
     "targetOverrides": null
   },
@@ -3450,31 +3488,31 @@
     "mountedComponents": [],
     "propertyOverrides": [
       {
-        "__id__": 185
+        "__id__": 188
       },
       {
-        "__id__": 187
+        "__id__": 190
       },
       {
-        "__id__": 188
+        "__id__": 191
       },
       {
-        "__id__": 189
+        "__id__": 192
       },
       {
-        "__id__": 190
+        "__id__": 193
       },
       {
-        "__id__": 192
+        "__id__": 195
       },
       {
-        "__id__": 194
+        "__id__": 197
       },
       {
-        "__id__": 196
+        "__id__": 199
       },
       {
-        "__id__": 198
+        "__id__": 201
       }
     ],
     "removedComponents": []
@@ -3482,7 +3520,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 186
+      "__id__": 189
     },
     "propertyPath": [
       "_name"
@@ -3498,7 +3536,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 186
+      "__id__": 189
     },
     "propertyPath": [
       "_lpos"
@@ -3513,7 +3551,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 186
+      "__id__": 189
     },
     "propertyPath": [
       "_lrot"
@@ -3529,7 +3567,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 186
+      "__id__": 189
     },
     "propertyPath": [
       "_euler"
@@ -3544,7 +3582,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 191
+      "__id__": 194
     },
     "propertyPath": [
       "_active"
@@ -3560,7 +3598,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 193
+      "__id__": 196
     },
     "propertyPath": [
       "_string"
@@ -3576,7 +3614,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 195
+      "__id__": 198
     },
     "propertyPath": [
       "_contentSize"
@@ -3596,7 +3634,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 197
+      "__id__": 200
     },
     "propertyPath": [
       "_string"
@@ -3612,7 +3650,7 @@
   {
     "__type__": "CCPropertyOverrideInfo",
     "targetInfo": {
-      "__id__": 199
+      "__id__": 202
     },
     "propertyPath": [
       "_contentSize"
@@ -3639,23 +3677,23 @@
     },
     "_children": [
       {
-        "__id__": 201
+        "__id__": 204
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 207
+        "__id__": 210
       },
       {
-        "__id__": 209
+        "__id__": 212
       },
       {
-        "__id__": 211
+        "__id__": 214
       }
     ],
     "_prefab": {
-      "__id__": 213
+      "__id__": 216
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -3692,20 +3730,20 @@
     "_objFlags": 512,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 200
+      "__id__": 203
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 202
+        "__id__": 205
       },
       {
-        "__id__": 204
+        "__id__": 207
       }
     ],
     "_prefab": {
-      "__id__": 206
+      "__id__": 209
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -3742,11 +3780,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 201
+      "__id__": 204
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 203
+      "__id__": 206
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -3770,11 +3808,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 201
+      "__id__": 204
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 205
+      "__id__": 208
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -3851,11 +3889,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 200
+      "__id__": 203
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 208
+      "__id__": 211
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -3879,11 +3917,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 200
+      "__id__": 203
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 210
+      "__id__": 213
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -3924,11 +3962,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 200
+      "__id__": 203
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 212
+      "__id__": 215
     },
     "clickEvents": [],
     "_interactable": true,
@@ -3971,7 +4009,7 @@
     "_duration": 0.1,
     "_zoomScale": 1.2,
     "_target": {
-      "__id__": 200
+      "__id__": 203
     },
     "_id": ""
   },
@@ -4002,7 +4040,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 215
+      "__id__": 218
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -4043,12 +4081,12 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 218
+      "__id__": 221
     },
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 720,
-      "height": 1600.0000000000002
+      "height": 1600
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -4071,7 +4109,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 220
+      "__id__": 223
     },
     "_alignFlags": 45,
     "_target": null,
@@ -4120,12 +4158,12 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 223
+      "__id__": 226
     },
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 720,
-      "height": 1600.0000000000002
+      "height": 1600
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -4148,7 +4186,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 225
+      "__id__": 228
     },
     "_alignFlags": 45,
     "_target": null,
@@ -4184,7 +4222,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 227
+      "__id__": 230
     },
     "_id": ""
   },
@@ -4205,13 +4243,13 @@
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": [
       {
-        "__id__": 182
+        "__id__": 185
       },
       {
-        "__id__": 164
+        "__id__": 167
       },
       {
-        "__id__": 140
+        "__id__": 143
       },
       {
         "__id__": 114

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

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

+ 18 - 18
assets/script/game/common/config/GameUIConfig.ts

@@ -1,7 +1,7 @@
 /*
  * @Date: 2021-08-12 09:33:37
  * @LastEditors: mojunshou 1637302775@qq.com
- * @LastEditTime: 2025-04-23 11:58:45
+ * @LastEditTime: 2025-04-24 16:51:05
  */
 import { LayerType, UIConfig } from "../../../../../extensions/oops-plugin-framework/assets/core/gui/layer/LayerManager";
 
@@ -69,30 +69,30 @@ export var UIConfigData: { [key: number]: UIConfig } = {
     [UIID.Loading]: { layer: LayerType.UI, prefab: "gui/loading/Loading" },
     [UIID.Alert]: { layer: LayerType.Dialog, prefab: "common/prefab/alert" },
     [UIID.Confirm]: { layer: LayerType.Dialog, prefab: "common/prefab/confirm" },
-    [UIID.KindTips]: { layer: LayerType.PopUp, prefab: "common/prefab/KindTips", vacancy: true, mask: true },
+    [UIID.KindTips]: { layer: LayerType.PopUp, prefab: "common/prefab/KindTips", mask: true },
     [UIID.Retention]: { layer: LayerType.PopUp, prefab: "common/prefab/Retention" },
     [UIID.Eliminate]: { layer: LayerType.UI, prefab: "gui/eliminate/Eliminate" },
     [UIID.Setting]: { layer: LayerType.PopUp, prefab: "common/prefab/Setting", vacancy: true, mask: true },
     [UIID.AboutUs]: { layer: LayerType.PopUp, prefab: "common/prefab/About" },
     [UIID.RedPacketWithdraw]: { layer: LayerType.UI, prefab: "gui/eliminate/prefab/RedPacketWithdrawal" },
-    [UIID.DoubleSpeed]: { layer: LayerType.PopUp, prefab: "gui/eliminate/prefab/DoubleSpeed", vacancy: true, mask: true },
-    [UIID.GameOver]: { layer: LayerType.PopUp, prefab: "gui/eliminate/prefab/GameOver", vacancy: true, mask: true },
-    [UIID.CashRebate]: { layer: LayerType.PopUp, prefab: "gui/eliminate/prefab/CashRebate", vacancy: true, mask: true },
-    [UIID.DoubleRewards]: { layer: LayerType.PopUp, prefab: "gui/eliminate/prefab/DoubleRewards", vacancy: true, mask: true },
-    [UIID.GamePass]: { layer: LayerType.PopUp, prefab: "gui/eliminate/prefab/GamePass", vacancy: true, mask: true },
-    [UIID.Verify]: { layer: LayerType.PopUp, prefab: "gui/eliminate/prefab/popup/VerifyPopup", vacancy: true, mask: true },
+    [UIID.DoubleSpeed]: { layer: LayerType.PopUp, prefab: "gui/eliminate/prefab/DoubleSpeed", mask: true },
+    [UIID.GameOver]: { layer: LayerType.PopUp, prefab: "gui/eliminate/prefab/GameOver", mask: true },
+    [UIID.CashRebate]: { layer: LayerType.PopUp, prefab: "gui/eliminate/prefab/CashRebate", mask: true },
+    [UIID.DoubleRewards]: { layer: LayerType.PopUp, prefab: "gui/eliminate/prefab/DoubleRewards", mask: true },
+    [UIID.GamePass]: { layer: LayerType.PopUp, prefab: "gui/eliminate/prefab/GamePass", mask: true },
+    [UIID.Verify]: { layer: LayerType.PopUp, prefab: "gui/eliminate/prefab/popup/VerifyPopup", mask: true },
     [UIID.WithdrawRecord]: { layer: LayerType.UI, prefab: "gui/eliminate/prefab/WithdrawalRecord" },
     [UIID.WechatWithdraw]: { layer: LayerType.UI, prefab: "gui/eliminate/prefab/WechatWithdrawal" },
-    [UIID.WithSussce]: { layer: LayerType.PopUp, prefab: "gui/eliminate/prefab/CashWithdrawal", vacancy: true, mask: true },
-    [UIID.KeepSpeed]: { layer: LayerType.PopUp, prefab: "gui/eliminate/prefab/popup/KeepDoubleSpeed", vacancy: true, mask: true },
-    [UIID.WarmReminder]: { layer: LayerType.PopUp, prefab: "gui/eliminate/prefab/popup/WarmReminder", vacancy: true, mask: true },
-    [UIID.WelfareOne]: { layer: LayerType.PopUp, prefab: "gui/eliminate/prefab/popup/WelfareOne", vacancy: true, mask: true },
-    [UIID.WelfareTwo]: { layer: LayerType.PopUp, prefab: "gui/eliminate/prefab/popup/WelfareTwo", vacancy: true, mask: true },
-    [UIID.WelfareThree]: { layer: LayerType.PopUp, prefab: "gui/eliminate/prefab/popup/WelfareThree", vacancy: true, mask: true },
-    [UIID.AutoWithdrawProgress]: { layer: LayerType.PopUp, prefab: "gui/eliminate/prefab/popup/AutoWithdrawProgress", vacancy: true, mask: true },
-    [UIID.UnlockFunction]: { layer: LayerType.PopUp, prefab: "gui/eliminate/prefab/popup/UnlockFunction", vacancy: true, mask: true },
-    [UIID.ReservePopup]: { layer: LayerType.PopUp, prefab: "gui/eliminate/prefab/popup/ReservePopup", vacancy: true, mask: true },
-    [UIID.WechaatTransfer]: { layer: LayerType.PopUp, prefab: "gui/eliminate/prefab/popup/WechatTransferring", vacancy: true, mask: true },
+    [UIID.WithSussce]: { layer: LayerType.PopUp, prefab: "gui/eliminate/prefab/CashWithdrawal", mask: true },
+    [UIID.KeepSpeed]: { layer: LayerType.PopUp, prefab: "gui/eliminate/prefab/popup/KeepDoubleSpeed", mask: true },
+    [UIID.WarmReminder]: { layer: LayerType.PopUp, prefab: "gui/eliminate/prefab/popup/WarmReminder", mask: true },
+    [UIID.WelfareOne]: { layer: LayerType.PopUp, prefab: "gui/eliminate/prefab/popup/WelfareOne", mask: true },
+    [UIID.WelfareTwo]: { layer: LayerType.PopUp, prefab: "gui/eliminate/prefab/popup/WelfareTwo", mask: true },
+    [UIID.WelfareThree]: { layer: LayerType.PopUp, prefab: "gui/eliminate/prefab/popup/WelfareThree", mask: true },
+    [UIID.AutoWithdrawProgress]: { layer: LayerType.PopUp, prefab: "gui/eliminate/prefab/popup/AutoWithdrawProgress", mask: true },
+    [UIID.UnlockFunction]: { layer: LayerType.PopUp, prefab: "gui/eliminate/prefab/popup/UnlockFunction", mask: true },
+    [UIID.ReservePopup]: { layer: LayerType.PopUp, prefab: "gui/eliminate/prefab/popup/ReservePopup", mask: true },
+    [UIID.WechaatTransfer]: { layer: LayerType.PopUp, prefab: "gui/eliminate/prefab/popup/WechatTransferring", mask: true },
 
 
 

+ 8 - 7
assets/script/game/common/manager/ADHandler.ts

@@ -2,7 +2,7 @@
  * @Author: mojunshou 1637302775@qq.com
  * @Date: 2025-04-11 10:14:44
  * @LastEditors: mojunshou 1637302775@qq.com
- * @LastEditTime: 2025-04-23 20:53:36
+ * @LastEditTime: 2025-04-24 15:00:31
  * @Description: 
  */
 // ADHandler.ts
@@ -75,6 +75,7 @@ export class ADHandler {
     //启屏广告关闭
     adSplashClose = async () => {
         console.log("启屏广告关闭")
+        oops.gui.waitClose();
         smc.game.GameModel.isShowAd = false;
         if (oops.gui.has(UIID.KindTips)) oops.gui.remove(UIID.KindTips);
         if (oops.gui.has(UIID.Retention)) oops.gui.remove(UIID.Retention);
@@ -83,28 +84,28 @@ export class ADHandler {
         if (result?.code === 0) {
             ServerHandler.inst.getAccountInfo();
         }
-        oops.gui.waitClose();
     };
 
     adSplashLoadFailed = () => {
+        oops.gui.waitClose();
         smc.game.GameModel.isShowAd = false;
         console.log('[广告] 启屏广告加载失败');
         ServerHandler.inst.getAccountInfo();
-        oops.gui.waitClose();
     };
 
     adInterstitialLoadFailed = () => {
+        console.log("000000")
+        oops.gui.waitClose();
         console.log('[广告] 插屏广告加载失败');
         oops.message.dispatchEvent(GameEvent.updateGameState, "playing");
-        oops.gui.waitClose();
     };
 
     adInterstitialClose = (type: boolean) => {
+        oops.gui.waitClose();
         smc.game.GameModel.isShowAd = false;
         console.log('[广告] 插屏广告关闭', type);
         //如果有弹窗,则不发送事件,
         oops.message.dispatchEvent(GameEvent.updateGameState, "playing");
-        oops.gui.waitClose();
     };
 
     adRewardShow = (str: string) => {
@@ -114,6 +115,7 @@ export class ADHandler {
     };
 
     adRewardLoadFailed = (str: string) => {
+        oops.gui.waitClose();
         smc.game.GameModel.isShowAd = false;
         oops.message.dispatchEvent(GameEvent.updateGameState, "playing");
         //展示失败
@@ -123,10 +125,10 @@ export class ADHandler {
             smc.game.GameModel.curScore = Math.floor(score / 2);
             oops.message.dispatchEvent(GameEvent.RestartGame);
         }
-        oops.gui.waitClose();
     };
 
     adRewardClose = (state: boolean) => {
+        oops.gui.waitClose();
         smc.game.GameModel.isShowAd = false;
         console.log("[广告] 激励视频关闭", state)
         smc.game.GameModel.isDone = state;
@@ -144,7 +146,6 @@ export class ADHandler {
             }
             ServerHandler.inst.getVideorReward();
         }
-        oops.gui.waitClose();
     };
 }
 window["ADHandler"] = ADHandler;

+ 5 - 10
assets/script/game/common/manager/ProtocolEvent.ts

@@ -2,13 +2,13 @@
  * @Author: mojunshou 1637302775@qq.com
  * @Date: 2025-04-07 10:17:16
  * @LastEditors: mojunshou 1637302775@qq.com
- * @LastEditTime: 2025-04-23 16:55:22
+ * @LastEditTime: 2025-04-24 16:32:01
  * @Description: 消息定义
  */
-// const server_url = "http://192.168.10.103:8880";
+const server_url = "http://192.168.10.103:8880";
 // https://central-test.atmob.com
 
-const server_url = "https://central-test.atmob.com";
+// const server_url = "https://central-test.atmob.com";
 
 export enum ProtocolEvent {
     /**微信登录*/
@@ -70,13 +70,8 @@ export enum ProtocolEvent {
     RestartGame = server_url + "/project/playlet/v1/checkPoint/restart",
     /**获取引导界面信息*/
     GetGuideInfo = server_url + "/project/playlet/v1/checkPoint/guideView",
-
-
-
-
-
-
-
+    //更新弹窗界面状态
+    UpdatePopUpState = server_url + "/project/playlet/v1/popup/event",
 
 
 }

+ 20 - 15
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-23 18:57:46
+ * @LastEditTime: 2025-04-24 16:37:30
  * @Description: 
  */
 // ServerHandler.ts
@@ -85,6 +85,7 @@ export class ServerHandler {
         account.hbCoin = data.props['1004'];
         account.goldCoin = data.props['1006'];
         console.log("account.goldCoin", account.goldCoin)
+        game.popupShow = data.currentLevelInfo.popupStatus
         oops.message.dispatchEvent(GameEvent.UserLogin);
     }
 
@@ -409,6 +410,7 @@ export class ServerHandler {
         smc.game.GameModel.curLevelConfig = result.currentLevelConf;
         smc.account.AccountModel.goldCoin = result.props["1006"] //金砖数量
         smc.game.GameModel.popupType = result.currentLevelConf.popupType || "";
+        smc.game.GameModel.popupShow = result.currentLevelData.popupStatus
         oops.message.dispatchEvent(GameEvent.RestartGame);
     }
 
@@ -525,7 +527,7 @@ export class ServerHandler {
 
 
     //获取引导界面信息
-    GetGuideInfo() {
+    getGuideInfo() {
         const param = {
             url: ProtocolEvent.GetGuideInfo,
             callback: this.buildCallback('ServerHandler.inst.onGetGuideInfo', 'ServerHandler.inst.onRequestFail')
@@ -537,23 +539,26 @@ export class ServerHandler {
         console.log('[服务器] 获取引导界面信息返回', str);
         let result = JSON.parse(str);
         smc.game.GameModel.loadbarInfo = result;
-        // smc.game.GameModel.guideInfo = result;
-        //只要数据就好
-        // oops.message.dispatchEvent(GameEvent.openView, "openGuideView");
     }
 
 
+    //更新弹出事件
+    async updatePopupState(data: { level: number, type: string }) {
+        const param = {
+            url: ProtocolEvent.UpdatePopUpState,
+            param: {
+                level: data.level,
+                type: data.type,
+                callback: this.buildCallback('ServerHandler.inst.onUpdatePopupState', 'ServerHandler.inst.onRequestFail')
+            },
+        }
+        this.sendMsgToServer(param);
+    }
 
-
-
-
-
-
-
-
-
-
-
+    onUpdatePopupState(str: string) {
+        console.log('[服务器] 更新弹出事件返回', str);
+        let result = JSON.parse(str);
+    }
 
     onRequestFail(code: number, str: string) {
         console.log('[服务器] 请求失败', code, str);

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

@@ -2,7 +2,7 @@
  * @Author: mojunshou 1637302775@qq.com
  * @Date: 2025-04-10 14:49:42
  * @LastEditors: mojunshou 1637302775@qq.com
- * @LastEditTime: 2025-04-23 10:37:23
+ * @LastEditTime: 2025-04-24 15:56:23
  * @Description: 
  */
 import { ecs } from "db://oops-framework/libs/ecs/ECS";
@@ -172,6 +172,7 @@ export class GameModelComp extends ecs.Comp {
 
 
     _popupType: string = "";
+    _popupShow: boolean = false;
 
     _gameState: GameState = GameState.READY;
 
@@ -184,7 +185,6 @@ export class GameModelComp extends ecs.Comp {
         this.costInfo = null!;
     }
 
-
     set gameState(v: GameState) {
         this._gameState = v;
     }
@@ -193,6 +193,13 @@ export class GameModelComp extends ecs.Comp {
         return this._gameState;
     }
 
+    set popupShow(v: boolean) {
+        this._popupShow = v;
+    }
+
+    get popupShow() {
+        return this._popupShow
+    }
 
     set popupType(v: string) {
         this._popupType = v;

+ 1 - 2
assets/script/game/view/DoubleRewardsView.ts

@@ -2,7 +2,7 @@
  * @Author: mojunshou 1637302775@qq.com
  * @Date: 2025-03-21 11:57:43
  * @LastEditors: mojunshou 1637302775@qq.com
- * @LastEditTime: 2025-04-23 17:33:31
+ * @LastEditTime: 2025-04-24 15:27:45
  * @Description: 惊喜翻倍弹窗
  */
 import { _decorator, instantiate, Label, Node, Prefab, UITransform } from 'cc';
@@ -84,7 +84,6 @@ export class DoubleRewardsView extends VMParent {
         ADHandler.inst.showAd(AD_TYPE.Double_Close);
         DCHandler.inst.reportData(2000401);
         DCHandler.inst.reportData(2000403);
-
     }
 
 

+ 52 - 48
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-24 10:57:36
+ * @LastEditTime: 2025-04-24 16:13:44
  * @Description: 消除游戏主场景
  */
 import { _decorator, Button, Color, EventTouch, instantiate, JsonAsset, v3, Label, Node, Prefab, randomRangeInt, Sprite, tween, UITransform, Vec2, Vec3, Widget } from "cc";
@@ -304,18 +304,17 @@ export class EliminateViewComp extends CCComp {
     //初始化按钮状态
     private initButtonState(state: boolean) {
         //自动按钮默认关闭
-        // if (this.autoBtn) {
-        //     //关闭
-        //     const on = this.autoBtn.node.getChildByName("on");
-        //     on ? on.active = state : null;
-        //     const off = this.autoBtn.node.getChildByName("off");
-        //     off ? off.active = !state : null;
-        //     // this.autoState = state;
-        // }
-        // //第一关隐藏二倍速和自动放置按钮
-        // const curLevel = smc.account.AccountModel.curLevel;
-        // this.autoBtn.node.active = curLevel > 1;
-        // this.doubleSpeedBtn.node.active = curLevel > 1;
+        if (this.autoBtn) {
+            //关闭
+            const on = this.autoBtn.node.getChildByName("on");
+            on ? on.active = state : null;
+            const off = this.autoBtn.node.getChildByName("off");
+            off ? off.active = !state : null;
+        }
+        //第一关隐藏二倍速和自动放置按钮
+        const curLevel = smc.account.AccountModel.curLevel;
+        this.autoBtn.node.active = curLevel > 1;
+        this.doubleSpeedBtn.node.active = curLevel > 1;
     }
 
 
@@ -1531,20 +1530,21 @@ export class EliminateViewComp extends CCComp {
                 }
 
                 if (DeviceUtil.isAndroid && DeviceUtil.isNative) {
-                    if (this.eliminateInterval.length == 0) {
-                        return;
-                    }
-                    const minNum = this.eliminateInterval[0]
-                    const maxNum = this.eliminateInterval[1]
-                    const randomNum = randomRangeInt(minNum, maxNum + 1);
-                    //这个数可以被总消除次数整除那就可以弹广告
-                    if (this.eliminateTotal % randomNum === 0) {
-                        // oops.gui.open(UIID.DoubleSpeed);
-                        //如果有自动就暂停自动
-                        this.gameState = GameState.PAUSED;
-                        console.log("弹出翻倍广告");
-                        ServerHandler.inst.getDoubleSurprise();
-                        //弹出广告
+                    if (this.eliminateInterval.length > 0) {
+                        const minNum = this.eliminateInterval[0]
+                        const maxNum = this.eliminateInterval[1]
+                        if (minNum && maxNum) {
+                            const randomNum = randomRangeInt(minNum, maxNum + 1);
+                            //这个数可以被总消除次数整除那就可以弹广告
+                            if (this.eliminateTotal % randomNum === 0) {
+                                // oops.gui.open(UIID.DoubleSpeed);
+                                //如果有自动就暂停自动
+                                this.gameState = GameState.PAUSED;
+                                console.log("弹出翻倍广告");
+                                ServerHandler.inst.getDoubleSurprise();
+                                //弹出广告
+                            }
+                        }
                     }
                 }
                 // 告诉调用者有消除发生
@@ -2236,6 +2236,7 @@ export class EliminateViewComp extends CCComp {
         this.callback = function () {
             if (!this.adShowingFlag && this.gameState === GameState.PLAYING && this.autoState) {
                 this.doubleSpeedTime--
+                this.autoMoveTime = 0.25;
                 //修改剩余时间,秒格式化成时分10:59
                 const minutes = Math.floor(this.doubleSpeedTime / 60);
                 const seconds = this.doubleSpeedTime % 60;
@@ -2243,6 +2244,7 @@ export class EliminateViewComp extends CCComp {
                 this.lab_doubleTime.string = formattedTime;
                 //时间到了
                 if (this.doubleSpeedTime <= 0) {
+                    this.autoMoveTime = 0.4;
                     this.lab_doubleTime.string = "二倍速";
                     this.isDoubleSpeed = false;
                     this.doubleNum = 1;
@@ -2297,32 +2299,34 @@ export class EliminateViewComp extends CCComp {
 
     //===============初始化检查是否要打开福利界面====
     private updateWelfarePoint() {
-        switch (this.popupType) {
-            case "weal_1":
-                oops.gui.open(UIID.WarmReminder);
-                ServerHandler.inst.GetGuideInfo();
-                break;
-            case "weal_2":
-                //打开福利二
-                oops.gui.open(UIID.WelfareTwo);
-                ServerHandler.inst.GetGuideInfo();
-                break;
-            case "weal_3":
-                //打开福利三
-                oops.gui.open(UIID.WelfareThree);
-                break;
-        }
-
-        if (smc.game.GameModel.curLevelConfig) {
-            if (smc.game.GameModel.curLevelConfig.eventType && smc.game.GameModel.curLevelConfig.eventType === "SIGN_POINT") {
-                //展示提现信息
-                oops.gui.open(UIID.ReservePopup);
+        const showState = smc.game.GameModel.popupShow
+        if (!showState) {
+            switch (this.popupType) {
+                case "weal_1":
+                    oops.gui.open(UIID.WarmReminder);
+                    ServerHandler.inst.getGuideInfo();
+                    break;
+                case "weal_2":
+                    //打开福利二
+                    oops.gui.open(UIID.WelfareTwo);
+                    ServerHandler.inst.getGuideInfo();
+                    break;
+                case "weal_3":
+                    //打开福利三
+                    oops.gui.open(UIID.WelfareThree);
+                    break;
+                case "sign":
+                    //打开福利三
+                    oops.gui.open(UIID.ReservePopup);
+                    break;
+                case "handlingCharge":
+                    oops.gui.open(UIID.WechaatTransfer);
+                    break;
             }
         }
     }
 
 
-
     btn_text() {
         // const param = {
         //     "showReward": [

+ 8 - 5
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-23 17:29:58
+ * @LastEditTime: 2025-04-24 15:11:03
  * @Description: 红包提现
  */
 import { _decorator, Label, Node } from "cc";
@@ -50,6 +50,7 @@ export class RedPackeWithdrawalViewComp extends CCVMParentComp {
             this.recordList.numItems = this.data.taskList.length;
         }
         this.lab_tips.string = `当前收集金砖${this.data.goldNum}块,红包10000元=人民币1元`;
+
     }
 
     addEvent() {
@@ -70,7 +71,8 @@ export class RedPackeWithdrawalViewComp extends CCVMParentComp {
         // console.log("更新提现记录信息", this.data.wxCash);
         this.data.taskList = smc.game.GameModel.taskList;
         this.data.wxCash = smc.game.GameModel.wxCash;
-        this.data.hbCoin = Format.formatRedPacketCoin(smc.account.AccountModel.hbCoin);
+        const hbCoin = Format.formatRedPacketCoin(smc.account.AccountModel.hbCoin);
+        this.data.hbCoin = Number(hbCoin);
         this.data.goldNum = smc.account.AccountModel.goldCoin;
         this.recordList.numItems = 0;
         if (this.data.taskList.length > 0) {
@@ -81,10 +83,11 @@ export class RedPackeWithdrawalViewComp extends CCVMParentComp {
     }
 
     updateCoin() {
-        console.log("更新红包币和微信币", smc.account.AccountModel.hbCoin, smc.game.GameModel.wxCash);
         this.data.wxCash = smc.game.GameModel.wxCash;
-        this.data.hbCoin = Format.formatRedPacketCoin(smc.account.AccountModel.hbCoin);
-        //可以提现的那个金额币
+        console.log("111111111111111111111")
+        const hbCoin = Format.formatRedPacketCoin(smc.account.AccountModel.hbCoin);
+        console.log("22222222222222222")
+        this.data.hbCoin = Number(hbCoin);
     }
 
     private btn_back() {

+ 9 - 8
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-23 15:54:40
+ * @LastEditTime: 2025-04-24 11:14:32
  * @Description: 微信提现页面
  */
 import { _decorator, ImageAsset, Label, Node, RichText, Size, Sprite, SpriteFrame, Texture2D, tween, UITransform, Vec3 } from "cc";
@@ -66,22 +66,23 @@ export class WechatWithdrawalViewComp extends CCVMParentComp {
 
     //设置数据
     setData() {
-        const curLevel = smc.account.AccountModel.curLevel;
+        // const curLevel = smc.account.AccountModel.curLevel;
         this.data.nickName = smc.account.AccountModel.accountName;
         this.data.headUrl = smc.account.AccountModel.headUrl;
-        this.richText_tips.string = this.str_list[curLevel > 12 ? 1 : 0];
-        this.data.money = Format.formatWxCoin(smc.game.GameModel.wechat_tx_info.money);
+        // this.richText_tips.string = this.str_list[curLevel > 12 ? 1 : 0];
+        this.data.money = smc.game.GameModel.wechat_tx_info.money;
         const info = smc.game.GameModel.wechat_tx_info.handingChargeProgress;
-        //当前关卡
-        console.log(">>>>>>>>>>>>>>", curLevel)
-        this.lab_cost.node.active = curLevel > 12;
         //判断替换
-        if (curLevel > 12 && info) {
+        if (info) {
+            this.lab_cost.node.active = true;
+            this.richText_tips.string = this.str_list[1];
             this.data.cost = smc.game.GameModel.wechat_tx_info.handingChargeProgress.handingCharge;
             this.richText_tips.string = this.richText_tips.string.replace(/\$m/g, `${info.handingCharge}`);
             this.richText_tips.string = this.richText_tips.string.replace(/\$y/g, `${info.hasNum}`);
             this.richText_tips.string = this.richText_tips.string.replace(/\$n/g, `${info.gapNum}`);
         } else {
+            this.lab_cost.node.active = false;
+            this.richText_tips.string = this.str_list[0];
             this.richText_tips.string = this.richText_tips.string.replace(/\$m/g, `${smc.game.GameModel.wechat_tx_info.gapGoldNum}`);
         }
     }

+ 12 - 1
assets/script/game/view/popup/ReservePopup.ts

@@ -6,6 +6,7 @@ import { DeviceUtil } from 'db://oops-framework/core/utils/DeviceUtil';
 import { smc } from '../../common/SingletonModuleComp';
 import { Format } from '../../utils/Format';
 import { DCHandler } from '../../common/manager/DCHandler';
+import { ServerHandler } from '../../common/manager/ServerHandler';
 const { ccclass, property } = _decorator;
 
 @ccclass('ReservePopup')
@@ -43,8 +44,18 @@ export class ReservePopup extends VMParent {
 
     async btn_confirm() {
         //加载微信转账中
-        await oops.gui.open(UIID.WechaatTransfer);
+        // await oops.gui.open(UIID.WechaatTransfer);
         oops.gui.remove(UIID.ReservePopup);
+        this.updateState();
+    }
+
+
+    updateState() {
+        ServerHandler.inst.updatePopupState({
+            level: smc.account.AccountModel.curLevel,
+            type: smc.game.GameModel.popupType
+        })
+
     }
 }
 

+ 13 - 0
assets/script/game/view/popup/UnlockFunction.ts

@@ -10,12 +10,15 @@ import { GameComponent } from 'db://oops-framework/module/common/GameComponent';
 import { UIID } from '../../common/config/GameUIConfig';
 import { oops } from 'db://oops-framework/core/Oops';
 import { GameEvent } from '../../common/config/GameEvent';
+import { ServerHandler } from '../../common/manager/ServerHandler';
+import { smc } from '../../common/SingletonModuleComp';
 const { ccclass, property } = _decorator;
 
 @ccclass('UnlockFunction')
 export class UnlockFunction extends GameComponent {
     start() {
         this.setButton();
+        this.updateState();
     }
 
 
@@ -24,6 +27,16 @@ export class UnlockFunction extends GameComponent {
         //发送开始自动玩游戏
         oops.message.dispatchEvent(GameEvent.StartAutoGame);
     }
+
+
+    //更新状态
+    updateState() {
+        ServerHandler.inst.updatePopupState({
+            level: smc.account.AccountModel.curLevel,
+            type: smc.game.GameModel.popupType
+        })
+
+    }
 }
 
 

+ 7 - 1
assets/script/game/view/popup/WechatTransfer.ts

@@ -2,7 +2,7 @@
  * @Author: mojunshou 1637302775@qq.com
  * @Date: 2025-04-19 11:34:46
  * @LastEditors: mojunshou 1637302775@qq.com
- * @LastEditTime: 2025-04-23 17:43:19
+ * @LastEditTime: 2025-04-24 15:52:43
  * @Description: 微信转账中界面
  */
 import { _decorator, Component, Node, Animation } from 'cc';
@@ -13,6 +13,7 @@ import { UIID } from '../../common/config/GameUIConfig';
 import { DeviceUtil } from 'db://oops-framework/core/utils/DeviceUtil';
 import { Format } from '../../utils/Format';
 import { DCHandler } from '../../common/manager/DCHandler';
+import { ServerHandler } from '../../common/manager/ServerHandler';
 const { ccclass, property } = _decorator;
 
 @ccclass('WechatTransfer')
@@ -121,8 +122,13 @@ export class WechatTransfer extends VMParent {
         if (animation) {
             animation.play();
         }
+        ServerHandler.inst.updatePopupState({
+            level: smc.account.AccountModel.curLevel,
+            type: smc.game.GameModel.popupType
+        })
         //3秒后关闭
         this.scheduleOnce(() => {
+            //更新
             oops.gui.remove(UIID.WechaatTransfer)
         }, 4)
     }

+ 12 - 1
assets/script/game/view/popup/WelfareOne.ts

@@ -2,7 +2,7 @@
  * @Author: mojunshou 1637302775@qq.com
  * @Date: 2025-04-18 19:11:51
  * @LastEditors: mojunshou 1637302775@qq.com
- * @LastEditTime: 2025-04-22 10:40:14
+ * @LastEditTime: 2025-04-24 16:30:58
  * @Description: 福利一
  */
 import { _decorator, Animation, instantiate, Node, Prefab } from 'cc';
@@ -12,6 +12,7 @@ import VMParent from 'db://oops-framework/libs/model-view/VMParent';
 import { UIID } from '../../common/config/GameUIConfig';
 import { smc } from '../../common/SingletonModuleComp';
 import { LoadBricsItem } from '../LoadBricsItem';
+import { ServerHandler } from '../../common/manager/ServerHandler';
 const { ccclass, property } = _decorator;
 
 interface LevelInfo {
@@ -108,6 +109,7 @@ export class WelfareOne extends VMParent {
         if (animation) {
             animation.play();
         }
+        this.updateState();
         //3秒后关闭
         this.scheduleOnce(() => {
             oops.gui.remove(UIID.WelfareOne);
@@ -115,6 +117,15 @@ export class WelfareOne extends VMParent {
     }
 
 
+    updateState() {
+        ServerHandler.inst.updatePopupState({
+            level: smc.account.AccountModel.curLevel,
+            type: smc.game.GameModel.popupType
+        })
+
+    }
+
+
 
     processLevelInfo(levelInfoList: LevelInfo[], totalLength: number = 602): LevelInfo[] {
         if (levelInfoList.length === 0) return [];

+ 10 - 1
assets/script/game/view/popup/WelfareThree.ts

@@ -2,6 +2,8 @@ import { _decorator, Component, Node, Animation } from 'cc';
 import { oops } from 'db://oops-framework/core/Oops';
 import { GameComponent } from 'db://oops-framework/module/common/GameComponent';
 import { UIID } from '../../common/config/GameUIConfig';
+import { ServerHandler } from '../../common/manager/ServerHandler';
+import { smc } from '../../common/SingletonModuleComp';
 const { ccclass, property } = _decorator;
 
 @ccclass('WelfareThree')
@@ -24,14 +26,21 @@ export class WelfareThree extends GameComponent {
             if (animation) {
                 animation.play();
             }
+
             //3秒后打开官方承诺,关闭当前窗口
             this.scheduleOnce(() => {
                 oops.gui.remove(UIID.WelfareThree);
             }, 5)
+            this.updateState();
+
         }, 3)
     }
 
-    update(deltaTime: number) {
+    updateState() {
+        ServerHandler.inst.updatePopupState({
+            level: smc.account.AccountModel.curLevel,
+            type: smc.game.GameModel.popupType
+        })
 
     }
 }