فهرست منبع

【优化】UI调整

mojunshou 1 سال پیش
والد
کامیت
141fa9687b
42فایلهای تغییر یافته به همراه5167 افزوده شده و 7713 حذف شده
  1. 3 3
      assets/bundle/common/prefab/mask.prefab
  2. 291 516
      assets/bundle/common/prefab/setting.prefab
  3. 560 519
      assets/bundle/gui/eliminate/eliminate.prefab
  4. 242 214
      assets/bundle/gui/eliminate/prefab/cashRebate.prefab
  5. 294 435
      assets/bundle/gui/eliminate/prefab/cashWithdrawal.prefab
  6. 379 520
      assets/bundle/gui/eliminate/prefab/doubleRewards.prefab
  7. 197 340
      assets/bundle/gui/eliminate/prefab/doubleSpeed.prefab
  8. 169 355
      assets/bundle/gui/eliminate/prefab/gameOver.prefab
  9. 265 406
      assets/bundle/gui/eliminate/prefab/gamePass.prefab
  10. 109 252
      assets/bundle/gui/eliminate/prefab/popup/AutoWithdrawBar.prefab
  11. 118 261
      assets/bundle/gui/eliminate/prefab/popup/NextGoalPopup.prefab
  12. 326 480
      assets/bundle/gui/eliminate/prefab/popup/ReservePopup.prefab
  13. 50 193
      assets/bundle/gui/eliminate/prefab/popup/UnlockFunction.prefab
  14. 87 230
      assets/bundle/gui/eliminate/prefab/popup/VerifyPopup.prefab
  15. 60 235
      assets/bundle/gui/eliminate/prefab/popup/WarmReminder.prefab
  16. 112 255
      assets/bundle/gui/eliminate/prefab/popup/WelfareThree.prefab
  17. 262 405
      assets/bundle/gui/eliminate/prefab/popup/WelfareTwo.prefab
  18. 123 266
      assets/bundle/gui/eliminate/prefab/popup/highValueUsers.prefab
  19. 158 301
      assets/bundle/gui/eliminate/prefab/popup/keepDoubleSpeed.prefab
  20. 92 235
      assets/bundle/gui/eliminate/prefab/popup/wechatPayment.prefab
  21. 648 789
      assets/bundle/gui/eliminate/prefab/popup/wechatTransferring.prefab
  22. 251 394
      assets/bundle/gui/eliminate/prefab/popup/welfareOne.prefab
  23. BIN
      assets/bundle/gui/eliminate/texture/bg/bg_light.png
  24. 23 23
      assets/bundle/gui/eliminate/texture/bg/bg_light.png.meta
  25. BIN
      assets/bundle/gui/eliminate/texture/bg_light.png
  26. 134 0
      assets/bundle/gui/eliminate/texture/bg_light.png.meta
  27. 2 2
      assets/bundle/gui/eliminate/texture/load_1.png.meta
  28. BIN
      assets/bundle/gui/eliminate/texture/load_5.png
  29. 134 0
      assets/bundle/gui/eliminate/texture/load_5.png.meta
  30. 4 4
      assets/bundle/gui/loading/loading.prefab
  31. BIN
      assets/bundle/gui/loading/texture/bg.png
  32. 6 6
      assets/bundle/gui/loading/texture/bg.png.meta
  33. 16 16
      assets/script/game/common/config/GameUIConfig.ts
  34. 10 4
      assets/script/game/common/manager/LoginHandler.ts
  35. 18 17
      assets/script/game/common/manager/ServerHandler.ts
  36. 1 4
      assets/script/game/common/setting/SettingViewComp.ts
  37. 5 3
      assets/script/game/common/tips/KindTipsView.ts
  38. 6 3
      assets/script/game/common/tips/RetentionView.ts
  39. 3 5
      assets/script/game/initialize/view/LoadingViewComp.ts
  40. 6 15
      assets/script/game/view/EliminateViewComp.ts
  41. 2 2
      assets/script/game/view/popup/WelfareOne.ts
  42. 1 5
      assets/script/game/view/popup/WelfareTwo.ts

+ 3 - 3
assets/bundle/common/prefab/mask.prefab

@@ -76,8 +76,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 1200,
-      "height": 720
+      "width": 720,
+      "height": 1600.0000000000002
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -146,7 +146,7 @@
       "r": 0,
       "g": 0,
       "b": 0,
-      "a": 100
+      "a": 179
     },
     "_spriteFrame": {
       "__uuid__": "7d8f9b89-4fd1-4c9f-a3ab-38ec7cded7ca@f9941",

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 291 - 516
assets/bundle/common/prefab/setting.prefab


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 560 - 519
assets/bundle/gui/eliminate/eliminate.prefab


+ 242 - 214
assets/bundle/gui/eliminate/prefab/cashRebate.prefab

@@ -22,23 +22,23 @@
         "__id__": 2
       },
       {
-        "__id__": 12
+        "__id__": 10
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 78
+        "__id__": 76
       },
       {
-        "__id__": 80
+        "__id__": 78
       },
       {
-        "__id__": 82
+        "__id__": 80
       }
     ],
     "_prefab": {
-      "__id__": 84
+      "__id__": 82
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -71,138 +71,171 @@
   },
   {
     "__type__": "cc.Node",
+    "_name": "bg_light",
     "_objFlags": 0,
+    "__editorExtras__": {},
     "_parent": {
       "__id__": 1
     },
-    "_prefab": {
-      "__id__": 3
-    },
-    "__editorExtras__": {}
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 2
-    },
-    "asset": {
-      "__uuid__": "142393a8-2641-4775-a79c-cbfe1bd9e5ca",
-      "__expectedType__": "cc.Prefab"
-    },
-    "fileId": "a0daVw8DRLi6ToMaTA0VS2",
-    "instance": {
-      "__id__": 4
-    },
-    "targetOverrides": null
-  },
-  {
-    "__type__": "cc.PrefabInstance",
-    "fileId": "83X+FICy9BrI8loI6eYaxe",
-    "prefabRootNode": {
-      "__id__": 1
-    },
-    "mountedChildren": [],
-    "mountedComponents": [],
-    "propertyOverrides": [
-      {
-        "__id__": 5
-      },
-      {
-        "__id__": 7
-      },
+    "_children": [],
+    "_active": true,
+    "_components": [
       {
-        "__id__": 8
+        "__id__": 3
       },
       {
-        "__id__": 9
+        "__id__": 5
       },
       {
-        "__id__": 10
+        "__id__": 7
       }
     ],
-    "removedComponents": []
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 6
-    },
-    "propertyPath": [
-      "_name"
-    ],
-    "value": "mask"
-  },
-  {
-    "__type__": "cc.TargetInfo",
-    "localID": [
-      "a0daVw8DRLi6ToMaTA0VS2"
-    ]
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 6
+    "_prefab": {
+      "__id__": 9
     },
-    "propertyPath": [
-      "_lpos"
-    ],
-    "value": {
+    "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 0,
+      "y": 176.098,
       "z": 0
-    }
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 6
     },
-    "propertyPath": [
-      "_lrot"
-    ],
-    "value": {
+    "_lrot": {
       "__type__": "cc.Quat",
       "x": 0,
       "y": 0,
       "z": 0,
       "w": 1
-    }
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 6
     },
-    "propertyPath": [
-      "_euler"
-    ],
-    "value": {
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 33554432,
+    "_euler": {
       "__type__": "cc.Vec3",
       "x": 0,
       "y": 0,
       "z": 0
-    }
+    },
+    "_id": ""
   },
   {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 11
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 2
     },
-    "propertyPath": [
-      "_contentSize"
-    ],
-    "value": {
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 4
+    },
+    "_contentSize": {
       "__type__": "cc.Size",
-      "width": 720,
-      "height": 1600
-    }
+      "width": 967,
+      "height": 967
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
   },
   {
-    "__type__": "cc.TargetInfo",
-    "localID": [
-      "77N2cid5pKDpXplRH/AWEU"
-    ]
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "b5LYn2Z+hOP5bWLlKY274D"
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 6
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_spriteFrame": {
+      "__uuid__": "5db9fb95-a456-4165-b9cc-a70fbb500162@f9941",
+      "__expectedType__": "cc.SpriteFrame"
+    },
+    "_type": 0,
+    "_fillType": 0,
+    "_sizeMode": 1,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_useGrayscale": false,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "55sK/nqQRJarPP9tzFl9L7"
+  },
+  {
+    "__type__": "cc.Animation",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 8
+    },
+    "playOnLoad": false,
+    "_clips": [
+      {
+        "__uuid__": "62c95173-1005-48b0-bef6-f49a73db295c",
+        "__expectedType__": "cc.AnimationClip"
+      }
+    ],
+    "_defaultClip": {
+      "__uuid__": "62c95173-1005-48b0-bef6-f49a73db295c",
+      "__expectedType__": "cc.AnimationClip"
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "f2eoVqo8xPo6rABaT1CcPL"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "15WkICnwRJrK4y2Mv8W8sA",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
   },
   {
     "__type__": "cc.Node",
@@ -214,32 +247,32 @@
     },
     "_children": [
       {
-        "__id__": 13
+        "__id__": 11
       },
       {
-        "__id__": 19
+        "__id__": 17
       },
       {
-        "__id__": 27
+        "__id__": 25
       },
       {
-        "__id__": 45
+        "__id__": 43
       },
       {
-        "__id__": 59
+        "__id__": 57
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 73
+        "__id__": 71
       },
       {
-        "__id__": 75
+        "__id__": 73
       }
     ],
     "_prefab": {
-      "__id__": 77
+      "__id__": 75
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -276,20 +309,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 12
+      "__id__": 10
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 14
+        "__id__": 12
       },
       {
-        "__id__": 16
+        "__id__": 14
       }
     ],
     "_prefab": {
-      "__id__": 18
+      "__id__": 16
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -326,11 +359,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 13
+      "__id__": 11
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 15
+      "__id__": 13
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -354,11 +387,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 13
+      "__id__": 11
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 17
+      "__id__": 15
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -412,23 +445,23 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 12
+      "__id__": 10
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 20
+        "__id__": 18
       },
       {
-        "__id__": 22
+        "__id__": 20
       },
       {
-        "__id__": 24
+        "__id__": 22
       }
     ],
     "_prefab": {
-      "__id__": 26
+      "__id__": 24
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -465,11 +498,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 19
+      "__id__": 17
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 21
+      "__id__": 19
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -493,11 +526,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 19
+      "__id__": 17
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 23
+      "__id__": 21
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -561,11 +594,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 19
+      "__id__": 17
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 25
+      "__id__": 23
     },
     "_params": [],
     "_dataID": "casheRebate_content",
@@ -594,27 +627,27 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 12
+      "__id__": 10
     },
     "_children": [
       {
-        "__id__": 28
+        "__id__": 26
       },
       {
-        "__id__": 34
+        "__id__": 32
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 40
+        "__id__": 38
       },
       {
-        "__id__": 42
+        "__id__": 40
       }
     ],
     "_prefab": {
-      "__id__": 44
+      "__id__": 42
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -651,20 +684,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 27
+      "__id__": 25
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 29
+        "__id__": 27
       },
       {
-        "__id__": 31
+        "__id__": 29
       }
     ],
     "_prefab": {
-      "__id__": 33
+      "__id__": 31
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -701,11 +734,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 28
+      "__id__": 26
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 30
+      "__id__": 28
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -729,11 +762,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 28
+      "__id__": 26
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 32
+      "__id__": 30
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -810,20 +843,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 27
+      "__id__": 25
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 35
+        "__id__": 33
       },
       {
-        "__id__": 37
+        "__id__": 35
       }
     ],
     "_prefab": {
-      "__id__": 39
+      "__id__": 37
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -860,11 +893,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 34
+      "__id__": 32
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 36
+      "__id__": 34
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -888,11 +921,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 34
+      "__id__": 32
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 38
+      "__id__": 36
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -969,11 +1002,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 27
+      "__id__": 25
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 41
+      "__id__": 39
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -997,11 +1030,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 27
+      "__id__": 25
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 43
+      "__id__": 41
     },
     "_resizeMode": 1,
     "_layoutType": 1,
@@ -1048,27 +1081,27 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 12
+      "__id__": 10
     },
     "_children": [
       {
-        "__id__": 46
+        "__id__": 44
       }
     ],
     "_active": false,
     "_components": [
       {
-        "__id__": 52
+        "__id__": 50
       },
       {
-        "__id__": 54
+        "__id__": 52
       },
       {
-        "__id__": 56
+        "__id__": 54
       }
     ],
     "_prefab": {
-      "__id__": 58
+      "__id__": 56
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1105,20 +1138,20 @@
     "_objFlags": 512,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 45
+      "__id__": 43
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 47
+        "__id__": 45
       },
       {
-        "__id__": 49
+        "__id__": 47
       }
     ],
     "_prefab": {
-      "__id__": 51
+      "__id__": 49
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1155,11 +1188,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 46
+      "__id__": 44
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 48
+      "__id__": 46
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1183,11 +1216,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 46
+      "__id__": 44
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 50
+      "__id__": 48
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1264,11 +1297,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 45
+      "__id__": 43
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 53
+      "__id__": 51
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1292,11 +1325,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 45
+      "__id__": 43
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 55
+      "__id__": 53
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1337,11 +1370,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 45
+      "__id__": 43
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 57
+      "__id__": 55
     },
     "clickEvents": [],
     "_interactable": true,
@@ -1393,7 +1426,7 @@
     "_duration": 0.1,
     "_zoomScale": 1.2,
     "_target": {
-      "__id__": 45
+      "__id__": 43
     },
     "_id": ""
   },
@@ -1420,27 +1453,27 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 12
+      "__id__": 10
     },
     "_children": [
       {
-        "__id__": 60
+        "__id__": 58
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 66
+        "__id__": 64
       },
       {
-        "__id__": 68
+        "__id__": 66
       },
       {
-        "__id__": 70
+        "__id__": 68
       }
     ],
     "_prefab": {
-      "__id__": 72
+      "__id__": 70
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1477,20 +1510,20 @@
     "_objFlags": 512,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 59
+      "__id__": 57
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 61
+        "__id__": 59
       },
       {
-        "__id__": 63
+        "__id__": 61
       }
     ],
     "_prefab": {
-      "__id__": 65
+      "__id__": 63
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1527,11 +1560,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 60
+      "__id__": 58
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 62
+      "__id__": 60
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1555,11 +1588,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 60
+      "__id__": 58
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 64
+      "__id__": 62
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1636,11 +1669,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 59
+      "__id__": 57
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 67
+      "__id__": 65
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1664,11 +1697,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 59
+      "__id__": 57
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 69
+      "__id__": 67
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1709,11 +1742,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 59
+      "__id__": 57
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 71
+      "__id__": 69
     },
     "clickEvents": [],
     "_interactable": true,
@@ -1756,7 +1789,7 @@
     "_duration": 0.1,
     "_zoomScale": 1.2,
     "_target": {
-      "__id__": 59
+      "__id__": 57
     },
     "_id": ""
   },
@@ -1783,11 +1816,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 12
+      "__id__": 10
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 74
+      "__id__": 72
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1811,11 +1844,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 12
+      "__id__": 10
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 76
+      "__id__": 74
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1873,7 +1906,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 79
+      "__id__": 77
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1901,7 +1934,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 81
+      "__id__": 79
     },
     "_alignFlags": 45,
     "_target": null,
@@ -1937,10 +1970,10 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 83
+      "__id__": 81
     },
     "lab_num": {
-      "__id__": 31
+      "__id__": 29
     },
     "_id": ""
   },
@@ -1958,11 +1991,6 @@
     },
     "fileId": "b1VzNJ6G5HWIzB7TmVyQ4Z",
     "instance": null,
-    "targetOverrides": null,
-    "nestedPrefabInstanceRoots": [
-      {
-        "__id__": 2
-      }
-    ]
+    "targetOverrides": null
   }
 ]

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 294 - 435
assets/bundle/gui/eliminate/prefab/cashWithdrawal.prefab


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 379 - 520
assets/bundle/gui/eliminate/prefab/doubleRewards.prefab


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 197 - 340
assets/bundle/gui/eliminate/prefab/doubleSpeed.prefab


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 169 - 355
assets/bundle/gui/eliminate/prefab/gameOver.prefab


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 265 - 406
assets/bundle/gui/eliminate/prefab/gamePass.prefab


+ 109 - 252
assets/bundle/gui/eliminate/prefab/popup/AutoWithdrawBar.prefab

@@ -20,22 +20,19 @@
     "_children": [
       {
         "__id__": 2
-      },
-      {
-        "__id__": 12
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 80
+        "__id__": 70
       },
       {
-        "__id__": 82
+        "__id__": 72
       }
     ],
     "_prefab": {
-      "__id__": 84
+      "__id__": 74
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -68,141 +65,6 @@
   },
   {
     "__type__": "cc.Node",
-    "_objFlags": 0,
-    "_parent": {
-      "__id__": 1
-    },
-    "_prefab": {
-      "__id__": 3
-    },
-    "__editorExtras__": {}
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 2
-    },
-    "asset": {
-      "__uuid__": "142393a8-2641-4775-a79c-cbfe1bd9e5ca",
-      "__expectedType__": "cc.Prefab"
-    },
-    "fileId": "a0daVw8DRLi6ToMaTA0VS2",
-    "instance": {
-      "__id__": 4
-    },
-    "targetOverrides": null
-  },
-  {
-    "__type__": "cc.PrefabInstance",
-    "fileId": "d1cDx7c9dI/bEtdR0zYG4S",
-    "prefabRootNode": {
-      "__id__": 1
-    },
-    "mountedChildren": [],
-    "mountedComponents": [],
-    "propertyOverrides": [
-      {
-        "__id__": 5
-      },
-      {
-        "__id__": 7
-      },
-      {
-        "__id__": 8
-      },
-      {
-        "__id__": 9
-      },
-      {
-        "__id__": 10
-      }
-    ],
-    "removedComponents": []
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 6
-    },
-    "propertyPath": [
-      "_name"
-    ],
-    "value": "mask"
-  },
-  {
-    "__type__": "cc.TargetInfo",
-    "localID": [
-      "a0daVw8DRLi6ToMaTA0VS2"
-    ]
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 6
-    },
-    "propertyPath": [
-      "_lpos"
-    ],
-    "value": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    }
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 6
-    },
-    "propertyPath": [
-      "_lrot"
-    ],
-    "value": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
-    }
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 6
-    },
-    "propertyPath": [
-      "_euler"
-    ],
-    "value": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    }
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 11
-    },
-    "propertyPath": [
-      "_contentSize"
-    ],
-    "value": {
-      "__type__": "cc.Size",
-      "width": 720,
-      "height": 1600
-    }
-  },
-  {
-    "__type__": "cc.TargetInfo",
-    "localID": [
-      "77N2cid5pKDpXplRH/AWEU"
-    ]
-  },
-  {
-    "__type__": "cc.Node",
     "_name": "showNode2",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -211,29 +73,29 @@
     },
     "_children": [
       {
-        "__id__": 13
+        "__id__": 3
       },
       {
-        "__id__": 19
+        "__id__": 9
       },
       {
-        "__id__": 25
+        "__id__": 15
       },
       {
-        "__id__": 55
+        "__id__": 45
       },
       {
-        "__id__": 73
+        "__id__": 63
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 77
+        "__id__": 67
       }
     ],
     "_prefab": {
-      "__id__": 79
+      "__id__": 69
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -270,20 +132,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 12
+      "__id__": 2
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 14
+        "__id__": 4
       },
       {
-        "__id__": 16
+        "__id__": 6
       }
     ],
     "_prefab": {
-      "__id__": 18
+      "__id__": 8
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -320,11 +182,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 13
+      "__id__": 3
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 15
+      "__id__": 5
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -348,11 +210,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 13
+      "__id__": 3
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 17
+      "__id__": 7
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -406,20 +268,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 12
+      "__id__": 2
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 20
+        "__id__": 10
       },
       {
-        "__id__": 22
+        "__id__": 12
       }
     ],
     "_prefab": {
-      "__id__": 24
+      "__id__": 14
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -456,11 +318,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 19
+      "__id__": 9
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 21
+      "__id__": 11
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -484,11 +346,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 19
+      "__id__": 9
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 23
+      "__id__": 13
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -565,30 +427,30 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 12
+      "__id__": 2
     },
     "_children": [
       {
-        "__id__": 26
+        "__id__": 16
       },
       {
-        "__id__": 32
+        "__id__": 22
       },
       {
-        "__id__": 44
+        "__id__": 34
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 50
+        "__id__": 40
       },
       {
-        "__id__": 52
+        "__id__": 42
       }
     ],
     "_prefab": {
-      "__id__": 54
+      "__id__": 44
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -625,20 +487,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 25
+      "__id__": 15
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 27
+        "__id__": 17
       },
       {
-        "__id__": 29
+        "__id__": 19
       }
     ],
     "_prefab": {
-      "__id__": 31
+      "__id__": 21
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -675,11 +537,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 26
+      "__id__": 16
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 28
+      "__id__": 18
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -703,11 +565,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 26
+      "__id__": 16
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 30
+      "__id__": 20
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -761,24 +623,24 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 25
+      "__id__": 15
     },
     "_children": [
       {
-        "__id__": 33
+        "__id__": 23
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 39
+        "__id__": 29
       },
       {
-        "__id__": 41
+        "__id__": 31
       }
     ],
     "_prefab": {
-      "__id__": 43
+      "__id__": 33
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -815,20 +677,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 32
+      "__id__": 22
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 34
+        "__id__": 24
       },
       {
-        "__id__": 36
+        "__id__": 26
       }
     ],
     "_prefab": {
-      "__id__": 38
+      "__id__": 28
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -865,11 +727,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 33
+      "__id__": 23
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 35
+      "__id__": 25
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -893,11 +755,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 33
+      "__id__": 23
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 37
+      "__id__": 27
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -974,11 +836,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 32
+      "__id__": 22
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 40
+      "__id__": 30
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1002,11 +864,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 32
+      "__id__": 22
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 42
+      "__id__": 32
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1060,20 +922,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 25
+      "__id__": 15
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 45
+        "__id__": 35
       },
       {
-        "__id__": 47
+        "__id__": 37
       }
     ],
     "_prefab": {
-      "__id__": 49
+      "__id__": 39
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1110,11 +972,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 44
+      "__id__": 34
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 46
+      "__id__": 36
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1138,11 +1000,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 44
+      "__id__": 34
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 48
+      "__id__": 38
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1196,11 +1058,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 25
+      "__id__": 15
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 51
+      "__id__": 41
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1224,11 +1086,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 25
+      "__id__": 15
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 53
+      "__id__": 43
     },
     "_resizeMode": 1,
     "_layoutType": 1,
@@ -1275,33 +1137,33 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 12
+      "__id__": 2
     },
     "_children": [
       {
-        "__id__": 56
+        "__id__": 46
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 62
+        "__id__": 52
       },
       {
-        "__id__": 64
+        "__id__": 54
       },
       {
-        "__id__": 66
+        "__id__": 56
       },
       {
-        "__id__": 68
+        "__id__": 58
       },
       {
-        "__id__": 70
+        "__id__": 60
       }
     ],
     "_prefab": {
-      "__id__": 72
+      "__id__": 62
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1338,20 +1200,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 55
+      "__id__": 45
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 57
+        "__id__": 47
       },
       {
-        "__id__": 59
+        "__id__": 49
       }
     ],
     "_prefab": {
-      "__id__": 61
+      "__id__": 51
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1388,11 +1250,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 56
+      "__id__": 46
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 58
+      "__id__": 48
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1416,11 +1278,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 56
+      "__id__": 46
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 60
+      "__id__": 50
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1474,11 +1336,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 55
+      "__id__": 45
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 63
+      "__id__": 53
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1502,11 +1364,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 55
+      "__id__": 45
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 65
+      "__id__": 55
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1547,14 +1409,14 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 55
+      "__id__": 45
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 67
+      "__id__": 57
     },
     "_barSprite": {
-      "__id__": 59
+      "__id__": 49
     },
     "_mode": 2,
     "_totalLength": 1,
@@ -1572,11 +1434,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 55
+      "__id__": 45
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 69
+      "__id__": 59
     },
     "controller": false,
     "watchPath": "",
@@ -1600,11 +1462,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 55
+      "__id__": 45
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 71
+      "__id__": 61
     },
     "watchPath": "*.cru_num",
     "foreachChildMode": false,
@@ -1627,7 +1489,7 @@
     "valueComponentActionValue": "",
     "watchNodes": [
       {
-        "__id__": 56
+        "__id__": 46
       }
     ],
     "_id": ""
@@ -1655,17 +1517,17 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 12
+      "__id__": 2
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 74
+        "__id__": 64
       }
     ],
     "_prefab": {
-      "__id__": 76
+      "__id__": 66
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1702,11 +1564,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 73
+      "__id__": 63
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 75
+      "__id__": 65
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1743,11 +1605,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 12
+      "__id__": 2
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 78
+      "__id__": 68
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1788,12 +1650,12 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 81
+      "__id__": 71
     },
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 720,
-      "height": 1600
+      "height": 1600.0000000000002
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1816,7 +1678,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 83
+      "__id__": 73
     },
     "_alignFlags": 45,
     "_target": null,
@@ -1852,11 +1714,6 @@
     },
     "fileId": "c46/YsCPVOJYA4mWEpNYRx",
     "instance": null,
-    "targetOverrides": null,
-    "nestedPrefabInstanceRoots": [
-      {
-        "__id__": 2
-      }
-    ]
+    "targetOverrides": null
   }
 ]

+ 118 - 261
assets/bundle/gui/eliminate/prefab/popup/NextGoalPopup.prefab

@@ -20,22 +20,19 @@
     "_children": [
       {
         "__id__": 2
-      },
-      {
-        "__id__": 12
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 86
+        "__id__": 76
       },
       {
-        "__id__": 88
+        "__id__": 78
       }
     ],
     "_prefab": {
-      "__id__": 90
+      "__id__": 80
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -68,141 +65,6 @@
   },
   {
     "__type__": "cc.Node",
-    "_objFlags": 0,
-    "_parent": {
-      "__id__": 1
-    },
-    "_prefab": {
-      "__id__": 3
-    },
-    "__editorExtras__": {}
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 2
-    },
-    "asset": {
-      "__uuid__": "142393a8-2641-4775-a79c-cbfe1bd9e5ca",
-      "__expectedType__": "cc.Prefab"
-    },
-    "fileId": "a0daVw8DRLi6ToMaTA0VS2",
-    "instance": {
-      "__id__": 4
-    },
-    "targetOverrides": null
-  },
-  {
-    "__type__": "cc.PrefabInstance",
-    "fileId": "d1cDx7c9dI/bEtdR0zYG4S",
-    "prefabRootNode": {
-      "__id__": 1
-    },
-    "mountedChildren": [],
-    "mountedComponents": [],
-    "propertyOverrides": [
-      {
-        "__id__": 5
-      },
-      {
-        "__id__": 7
-      },
-      {
-        "__id__": 8
-      },
-      {
-        "__id__": 9
-      },
-      {
-        "__id__": 10
-      }
-    ],
-    "removedComponents": []
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 6
-    },
-    "propertyPath": [
-      "_name"
-    ],
-    "value": "mask"
-  },
-  {
-    "__type__": "cc.TargetInfo",
-    "localID": [
-      "a0daVw8DRLi6ToMaTA0VS2"
-    ]
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 6
-    },
-    "propertyPath": [
-      "_lpos"
-    ],
-    "value": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    }
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 6
-    },
-    "propertyPath": [
-      "_lrot"
-    ],
-    "value": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
-    }
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 6
-    },
-    "propertyPath": [
-      "_euler"
-    ],
-    "value": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    }
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 11
-    },
-    "propertyPath": [
-      "_contentSize"
-    ],
-    "value": {
-      "__type__": "cc.Size",
-      "width": 720,
-      "height": 1600
-    }
-  },
-  {
-    "__type__": "cc.TargetInfo",
-    "localID": [
-      "77N2cid5pKDpXplRH/AWEU"
-    ]
-  },
-  {
-    "__type__": "cc.Node",
     "_name": "showNode2",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -211,32 +73,32 @@
     },
     "_children": [
       {
-        "__id__": 13
+        "__id__": 3
       },
       {
-        "__id__": 19
+        "__id__": 9
       },
       {
-        "__id__": 25
+        "__id__": 15
       },
       {
-        "__id__": 31
+        "__id__": 21
       },
       {
-        "__id__": 61
+        "__id__": 51
       },
       {
-        "__id__": 79
+        "__id__": 69
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 83
+        "__id__": 73
       }
     ],
     "_prefab": {
-      "__id__": 85
+      "__id__": 75
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -273,20 +135,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 12
+      "__id__": 2
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 14
+        "__id__": 4
       },
       {
-        "__id__": 16
+        "__id__": 6
       }
     ],
     "_prefab": {
-      "__id__": 18
+      "__id__": 8
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -323,11 +185,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 13
+      "__id__": 3
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 15
+      "__id__": 5
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -351,11 +213,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 13
+      "__id__": 3
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 17
+      "__id__": 7
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -409,20 +271,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 12
+      "__id__": 2
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 20
+        "__id__": 10
       },
       {
-        "__id__": 22
+        "__id__": 12
       }
     ],
     "_prefab": {
-      "__id__": 24
+      "__id__": 14
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -459,11 +321,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 19
+      "__id__": 9
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 21
+      "__id__": 11
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -487,11 +349,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 19
+      "__id__": 9
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 23
+      "__id__": 13
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -545,20 +407,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 12
+      "__id__": 2
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 26
+        "__id__": 16
       },
       {
-        "__id__": 28
+        "__id__": 18
       }
     ],
     "_prefab": {
-      "__id__": 30
+      "__id__": 20
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -595,11 +457,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 25
+      "__id__": 15
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 27
+      "__id__": 17
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -623,11 +485,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 25
+      "__id__": 15
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 29
+      "__id__": 19
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -681,30 +543,30 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 12
+      "__id__": 2
     },
     "_children": [
       {
-        "__id__": 32
+        "__id__": 22
       },
       {
-        "__id__": 38
+        "__id__": 28
       },
       {
-        "__id__": 50
+        "__id__": 40
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 56
+        "__id__": 46
       },
       {
-        "__id__": 58
+        "__id__": 48
       }
     ],
     "_prefab": {
-      "__id__": 60
+      "__id__": 50
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -741,20 +603,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 31
+      "__id__": 21
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 33
+        "__id__": 23
       },
       {
-        "__id__": 35
+        "__id__": 25
       }
     ],
     "_prefab": {
-      "__id__": 37
+      "__id__": 27
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -791,11 +653,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 32
+      "__id__": 22
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 34
+      "__id__": 24
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -819,11 +681,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 32
+      "__id__": 22
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 36
+      "__id__": 26
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -900,24 +762,24 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 31
+      "__id__": 21
     },
     "_children": [
       {
-        "__id__": 39
+        "__id__": 29
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 45
+        "__id__": 35
       },
       {
-        "__id__": 47
+        "__id__": 37
       }
     ],
     "_prefab": {
-      "__id__": 49
+      "__id__": 39
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -954,20 +816,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 38
+      "__id__": 28
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 40
+        "__id__": 30
       },
       {
-        "__id__": 42
+        "__id__": 32
       }
     ],
     "_prefab": {
-      "__id__": 44
+      "__id__": 34
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1004,11 +866,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 39
+      "__id__": 29
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 41
+      "__id__": 31
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1032,11 +894,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 39
+      "__id__": 29
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 43
+      "__id__": 33
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1113,11 +975,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 38
+      "__id__": 28
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 46
+      "__id__": 36
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1141,11 +1003,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 38
+      "__id__": 28
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 48
+      "__id__": 38
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1199,20 +1061,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 31
+      "__id__": 21
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 51
+        "__id__": 41
       },
       {
-        "__id__": 53
+        "__id__": 43
       }
     ],
     "_prefab": {
-      "__id__": 55
+      "__id__": 45
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1249,11 +1111,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 50
+      "__id__": 40
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 52
+      "__id__": 42
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1277,11 +1139,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 50
+      "__id__": 40
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 54
+      "__id__": 44
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1358,11 +1220,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 31
+      "__id__": 21
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 57
+      "__id__": 47
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1386,11 +1248,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 31
+      "__id__": 21
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 59
+      "__id__": 49
     },
     "_resizeMode": 1,
     "_layoutType": 1,
@@ -1437,33 +1299,33 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 12
+      "__id__": 2
     },
     "_children": [
       {
-        "__id__": 62
+        "__id__": 52
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 68
+        "__id__": 58
       },
       {
-        "__id__": 70
+        "__id__": 60
       },
       {
-        "__id__": 72
+        "__id__": 62
       },
       {
-        "__id__": 74
+        "__id__": 64
       },
       {
-        "__id__": 76
+        "__id__": 66
       }
     ],
     "_prefab": {
-      "__id__": 78
+      "__id__": 68
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1500,20 +1362,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 61
+      "__id__": 51
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 63
+        "__id__": 53
       },
       {
-        "__id__": 65
+        "__id__": 55
       }
     ],
     "_prefab": {
-      "__id__": 67
+      "__id__": 57
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1550,11 +1412,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 62
+      "__id__": 52
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 64
+      "__id__": 54
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1578,11 +1440,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 62
+      "__id__": 52
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 66
+      "__id__": 56
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1636,11 +1498,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 61
+      "__id__": 51
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 69
+      "__id__": 59
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1664,11 +1526,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 61
+      "__id__": 51
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 71
+      "__id__": 61
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1709,14 +1571,14 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 61
+      "__id__": 51
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 73
+      "__id__": 63
     },
     "_barSprite": {
-      "__id__": 65
+      "__id__": 55
     },
     "_mode": 2,
     "_totalLength": 1,
@@ -1734,11 +1596,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 61
+      "__id__": 51
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 75
+      "__id__": 65
     },
     "controller": false,
     "watchPath": "",
@@ -1762,11 +1624,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 61
+      "__id__": 51
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 77
+      "__id__": 67
     },
     "watchPath": "*.cru_num",
     "foreachChildMode": false,
@@ -1789,7 +1651,7 @@
     "valueComponentActionValue": "",
     "watchNodes": [
       {
-        "__id__": 62
+        "__id__": 52
       }
     ],
     "_id": ""
@@ -1817,17 +1679,17 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 12
+      "__id__": 2
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 80
+        "__id__": 70
       }
     ],
     "_prefab": {
-      "__id__": 82
+      "__id__": 72
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1864,11 +1726,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 79
+      "__id__": 69
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 81
+      "__id__": 71
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1905,11 +1767,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 12
+      "__id__": 2
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 84
+      "__id__": 74
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1950,12 +1812,12 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 87
+      "__id__": 77
     },
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 720,
-      "height": 1600
+      "height": 1600.0000000000002
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1978,7 +1840,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 89
+      "__id__": 79
     },
     "_alignFlags": 45,
     "_target": null,
@@ -2014,11 +1876,6 @@
     },
     "fileId": "c46/YsCPVOJYA4mWEpNYRx",
     "instance": null,
-    "targetOverrides": null,
-    "nestedPrefabInstanceRoots": [
-      {
-        "__id__": 2
-      }
-    ]
+    "targetOverrides": null
   }
 ]

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 326 - 480
assets/bundle/gui/eliminate/prefab/popup/ReservePopup.prefab


+ 50 - 193
assets/bundle/gui/eliminate/prefab/popup/UnlockFunction.prefab

@@ -22,29 +22,26 @@
         "__id__": 2
       },
       {
-        "__id__": 12
-      },
-      {
-        "__id__": 18
+        "__id__": 8
       },
       {
-        "__id__": 24
+        "__id__": 14
       },
       {
-        "__id__": 38
+        "__id__": 28
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 44
+        "__id__": 34
       },
       {
-        "__id__": 46
+        "__id__": 36
       }
     ],
     "_prefab": {
-      "__id__": 48
+      "__id__": 38
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -77,141 +74,6 @@
   },
   {
     "__type__": "cc.Node",
-    "_objFlags": 0,
-    "_parent": {
-      "__id__": 1
-    },
-    "_prefab": {
-      "__id__": 3
-    },
-    "__editorExtras__": {}
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 2
-    },
-    "asset": {
-      "__uuid__": "142393a8-2641-4775-a79c-cbfe1bd9e5ca",
-      "__expectedType__": "cc.Prefab"
-    },
-    "fileId": "a0daVw8DRLi6ToMaTA0VS2",
-    "instance": {
-      "__id__": 4
-    },
-    "targetOverrides": null
-  },
-  {
-    "__type__": "cc.PrefabInstance",
-    "fileId": "ceA9DXdwFMV7+5wNu848DZ",
-    "prefabRootNode": {
-      "__id__": 1
-    },
-    "mountedChildren": [],
-    "mountedComponents": [],
-    "propertyOverrides": [
-      {
-        "__id__": 5
-      },
-      {
-        "__id__": 7
-      },
-      {
-        "__id__": 8
-      },
-      {
-        "__id__": 9
-      },
-      {
-        "__id__": 10
-      }
-    ],
-    "removedComponents": []
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 6
-    },
-    "propertyPath": [
-      "_name"
-    ],
-    "value": "mask"
-  },
-  {
-    "__type__": "cc.TargetInfo",
-    "localID": [
-      "a0daVw8DRLi6ToMaTA0VS2"
-    ]
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 6
-    },
-    "propertyPath": [
-      "_lpos"
-    ],
-    "value": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    }
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 6
-    },
-    "propertyPath": [
-      "_lrot"
-    ],
-    "value": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
-    }
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 6
-    },
-    "propertyPath": [
-      "_euler"
-    ],
-    "value": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    }
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 11
-    },
-    "propertyPath": [
-      "_contentSize"
-    ],
-    "value": {
-      "__type__": "cc.Size",
-      "width": 720,
-      "height": 1600
-    }
-  },
-  {
-    "__type__": "cc.TargetInfo",
-    "localID": [
-      "77N2cid5pKDpXplRH/AWEU"
-    ]
-  },
-  {
-    "__type__": "cc.Node",
     "_name": "title_jsgn",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -222,14 +84,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 13
+        "__id__": 3
       },
       {
-        "__id__": 15
+        "__id__": 5
       }
     ],
     "_prefab": {
-      "__id__": 17
+      "__id__": 7
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -266,11 +128,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 12
+      "__id__": 2
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 14
+      "__id__": 4
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -294,11 +156,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 12
+      "__id__": 2
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 16
+      "__id__": 6
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -358,14 +220,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 19
+        "__id__": 9
       },
       {
-        "__id__": 21
+        "__id__": 11
       }
     ],
     "_prefab": {
-      "__id__": 23
+      "__id__": 13
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -402,11 +264,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 18
+      "__id__": 8
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 20
+      "__id__": 10
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -430,11 +292,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 18
+      "__id__": 8
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 22
+      "__id__": 12
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -492,23 +354,23 @@
     },
     "_children": [
       {
-        "__id__": 25
+        "__id__": 15
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 31
+        "__id__": 21
       },
       {
-        "__id__": 33
+        "__id__": 23
       },
       {
-        "__id__": 35
+        "__id__": 25
       }
     ],
     "_prefab": {
-      "__id__": 37
+      "__id__": 27
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -545,20 +407,20 @@
     "_objFlags": 512,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 24
+      "__id__": 14
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 26
+        "__id__": 16
       },
       {
-        "__id__": 28
+        "__id__": 18
       }
     ],
     "_prefab": {
-      "__id__": 30
+      "__id__": 20
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -595,11 +457,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 25
+      "__id__": 15
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 27
+      "__id__": 17
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -623,11 +485,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 25
+      "__id__": 15
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 29
+      "__id__": 19
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -704,11 +566,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 24
+      "__id__": 14
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 32
+      "__id__": 22
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -732,11 +594,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 24
+      "__id__": 14
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 34
+      "__id__": 24
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -777,11 +639,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 24
+      "__id__": 14
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 36
+      "__id__": 26
     },
     "clickEvents": [],
     "_interactable": true,
@@ -824,7 +686,7 @@
     "_duration": 0.1,
     "_zoomScale": 1.2,
     "_target": {
-      "__id__": 24
+      "__id__": 14
     },
     "_id": ""
   },
@@ -857,14 +719,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 39
+        "__id__": 29
       },
       {
-        "__id__": 41
+        "__id__": 31
       }
     ],
     "_prefab": {
-      "__id__": 43
+      "__id__": 33
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -901,11 +763,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 38
+      "__id__": 28
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 40
+      "__id__": 30
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -929,11 +791,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 38
+      "__id__": 28
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 42
+      "__id__": 32
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -994,7 +856,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 45
+      "__id__": 35
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1022,7 +884,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 47
+      "__id__": 37
     },
     "_id": ""
   },
@@ -1040,11 +902,6 @@
     },
     "fileId": "c46/YsCPVOJYA4mWEpNYRx",
     "instance": null,
-    "targetOverrides": null,
-    "nestedPrefabInstanceRoots": [
-      {
-        "__id__": 2
-      }
-    ]
+    "targetOverrides": null
   }
 ]

+ 87 - 230
assets/bundle/gui/eliminate/prefab/popup/VerifyPopup.prefab

@@ -20,25 +20,22 @@
     "_children": [
       {
         "__id__": 2
-      },
-      {
-        "__id__": 12
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 64
+        "__id__": 54
       },
       {
-        "__id__": 66
+        "__id__": 56
       },
       {
-        "__id__": 68
+        "__id__": 58
       }
     ],
     "_prefab": {
-      "__id__": 70
+      "__id__": 60
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -71,141 +68,6 @@
   },
   {
     "__type__": "cc.Node",
-    "_objFlags": 0,
-    "_parent": {
-      "__id__": 1
-    },
-    "_prefab": {
-      "__id__": 3
-    },
-    "__editorExtras__": {}
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 2
-    },
-    "asset": {
-      "__uuid__": "142393a8-2641-4775-a79c-cbfe1bd9e5ca",
-      "__expectedType__": "cc.Prefab"
-    },
-    "fileId": "a0daVw8DRLi6ToMaTA0VS2",
-    "instance": {
-      "__id__": 4
-    },
-    "targetOverrides": null
-  },
-  {
-    "__type__": "cc.PrefabInstance",
-    "fileId": "0237Z69UBPiLI0ZJXWkaBv",
-    "prefabRootNode": {
-      "__id__": 1
-    },
-    "mountedChildren": [],
-    "mountedComponents": [],
-    "propertyOverrides": [
-      {
-        "__id__": 5
-      },
-      {
-        "__id__": 7
-      },
-      {
-        "__id__": 8
-      },
-      {
-        "__id__": 9
-      },
-      {
-        "__id__": 10
-      }
-    ],
-    "removedComponents": []
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 6
-    },
-    "propertyPath": [
-      "_name"
-    ],
-    "value": "mask"
-  },
-  {
-    "__type__": "cc.TargetInfo",
-    "localID": [
-      "a0daVw8DRLi6ToMaTA0VS2"
-    ]
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 6
-    },
-    "propertyPath": [
-      "_lpos"
-    ],
-    "value": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    }
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 6
-    },
-    "propertyPath": [
-      "_lrot"
-    ],
-    "value": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
-    }
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 6
-    },
-    "propertyPath": [
-      "_euler"
-    ],
-    "value": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    }
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 11
-    },
-    "propertyPath": [
-      "_contentSize"
-    ],
-    "value": {
-      "__type__": "cc.Size",
-      "width": 720,
-      "height": 1600
-    }
-  },
-  {
-    "__type__": "cc.TargetInfo",
-    "localID": [
-      "77N2cid5pKDpXplRH/AWEU"
-    ]
-  },
-  {
-    "__type__": "cc.Node",
     "_name": "showNode2",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -214,35 +76,35 @@
     },
     "_children": [
       {
-        "__id__": 13
+        "__id__": 3
       },
       {
-        "__id__": 19
+        "__id__": 9
       },
       {
-        "__id__": 27
+        "__id__": 17
       },
       {
-        "__id__": 33
+        "__id__": 23
       },
       {
-        "__id__": 47
+        "__id__": 37
       },
       {
-        "__id__": 53
+        "__id__": 43
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 59
+        "__id__": 49
       },
       {
-        "__id__": 61
+        "__id__": 51
       }
     ],
     "_prefab": {
-      "__id__": 63
+      "__id__": 53
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -279,20 +141,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 12
+      "__id__": 2
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 14
+        "__id__": 4
       },
       {
-        "__id__": 16
+        "__id__": 6
       }
     ],
     "_prefab": {
-      "__id__": 18
+      "__id__": 8
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -329,11 +191,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 13
+      "__id__": 3
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 15
+      "__id__": 5
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -357,11 +219,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 13
+      "__id__": 3
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 17
+      "__id__": 7
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -415,23 +277,23 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 12
+      "__id__": 2
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 20
+        "__id__": 10
       },
       {
-        "__id__": 22
+        "__id__": 12
       },
       {
-        "__id__": 24
+        "__id__": 14
       }
     ],
     "_prefab": {
-      "__id__": 26
+      "__id__": 16
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -468,11 +330,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 19
+      "__id__": 9
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 21
+      "__id__": 11
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -496,11 +358,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 19
+      "__id__": 9
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 23
+      "__id__": 13
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -541,11 +403,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 19
+      "__id__": 9
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 25
+      "__id__": 15
     },
     "clickEvents": [],
     "_interactable": true,
@@ -588,7 +450,7 @@
     "_duration": 0.1,
     "_zoomScale": 1.2,
     "_target": {
-      "__id__": 19
+      "__id__": 9
     },
     "_id": ""
   },
@@ -615,20 +477,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 12
+      "__id__": 2
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 28
+        "__id__": 18
       },
       {
-        "__id__": 30
+        "__id__": 20
       }
     ],
     "_prefab": {
-      "__id__": 32
+      "__id__": 22
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -665,11 +527,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 27
+      "__id__": 17
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 29
+      "__id__": 19
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -693,11 +555,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 27
+      "__id__": 17
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 31
+      "__id__": 21
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -774,27 +636,27 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 12
+      "__id__": 2
     },
     "_children": [
       {
-        "__id__": 34
+        "__id__": 24
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 40
+        "__id__": 30
       },
       {
-        "__id__": 42
+        "__id__": 32
       },
       {
-        "__id__": 44
+        "__id__": 34
       }
     ],
     "_prefab": {
-      "__id__": 46
+      "__id__": 36
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -831,20 +693,20 @@
     "_objFlags": 512,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 33
+      "__id__": 23
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 35
+        "__id__": 25
       },
       {
-        "__id__": 37
+        "__id__": 27
       }
     ],
     "_prefab": {
-      "__id__": 39
+      "__id__": 29
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -881,11 +743,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 34
+      "__id__": 24
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 36
+      "__id__": 26
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -909,11 +771,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 34
+      "__id__": 24
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 38
+      "__id__": 28
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -990,11 +852,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 33
+      "__id__": 23
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 41
+      "__id__": 31
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1018,11 +880,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 33
+      "__id__": 23
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 43
+      "__id__": 33
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1063,11 +925,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 33
+      "__id__": 23
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 45
+      "__id__": 35
     },
     "clickEvents": [],
     "_interactable": true,
@@ -1110,7 +972,7 @@
     "_duration": 0.1,
     "_zoomScale": 1.2,
     "_target": {
-      "__id__": 33
+      "__id__": 23
     },
     "_id": ""
   },
@@ -1137,20 +999,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 12
+      "__id__": 2
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 48
+        "__id__": 38
       },
       {
-        "__id__": 50
+        "__id__": 40
       }
     ],
     "_prefab": {
-      "__id__": 52
+      "__id__": 42
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1187,11 +1049,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 47
+      "__id__": 37
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 49
+      "__id__": 39
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1215,11 +1077,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 47
+      "__id__": 37
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 51
+      "__id__": 41
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1296,20 +1158,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 12
+      "__id__": 2
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 54
+        "__id__": 44
       },
       {
-        "__id__": 56
+        "__id__": 46
       }
     ],
     "_prefab": {
-      "__id__": 58
+      "__id__": 48
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1346,11 +1208,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 53
+      "__id__": 43
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 55
+      "__id__": 45
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1374,11 +1236,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 53
+      "__id__": 43
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 57
+      "__id__": 47
     },
     "_lineHeight": 36,
     "_string": "<color =#C13935>$m元</color>的大额提现已成功打款到平台《多宝方块》委托微信官方进行打款安全验证,<color =#C13935>需要预扣$n元手续费。</color>\n\n 仅需再赚$z元,$m元立即到账您的微信余额。",
@@ -1425,11 +1287,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 12
+      "__id__": 2
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 60
+      "__id__": 50
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1453,11 +1315,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 12
+      "__id__": 2
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 62
+      "__id__": 52
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1515,12 +1377,12 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 65
+      "__id__": 55
     },
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 720,
-      "height": 1600
+      "height": 1600.0000000000002
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1543,7 +1405,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 67
+      "__id__": 57
     },
     "_id": ""
   },
@@ -1561,7 +1423,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 69
+      "__id__": 59
     },
     "_alignFlags": 45,
     "_target": null,
@@ -1597,11 +1459,6 @@
     },
     "fileId": "8eHXteLH5FqJPX1e02Xm4t",
     "instance": null,
-    "targetOverrides": null,
-    "nestedPrefabInstanceRoots": [
-      {
-        "__id__": 2
-      }
-    ]
+    "targetOverrides": null
   }
 ]

+ 60 - 235
assets/bundle/gui/eliminate/prefab/popup/WarmReminder.prefab

@@ -22,35 +22,32 @@
         "__id__": 2
       },
       {
-        "__id__": 15
-      },
-      {
-        "__id__": 21
+        "__id__": 8
       },
       {
-        "__id__": 27
+        "__id__": 14
       },
       {
-        "__id__": 33
+        "__id__": 20
       },
       {
-        "__id__": 47
+        "__id__": 34
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 53
+        "__id__": 40
       },
       {
-        "__id__": 55
+        "__id__": 42
       },
       {
-        "__id__": 57
+        "__id__": 44
       }
     ],
     "_prefab": {
-      "__id__": 59
+      "__id__": 46
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -83,173 +80,6 @@
   },
   {
     "__type__": "cc.Node",
-    "_objFlags": 0,
-    "_parent": {
-      "__id__": 1
-    },
-    "_prefab": {
-      "__id__": 3
-    },
-    "__editorExtras__": {}
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 2
-    },
-    "asset": {
-      "__uuid__": "142393a8-2641-4775-a79c-cbfe1bd9e5ca",
-      "__expectedType__": "cc.Prefab"
-    },
-    "fileId": "a0daVw8DRLi6ToMaTA0VS2",
-    "instance": {
-      "__id__": 4
-    },
-    "targetOverrides": null
-  },
-  {
-    "__type__": "cc.PrefabInstance",
-    "fileId": "d5SLIMABtOx6SSETy1dkBf",
-    "prefabRootNode": {
-      "__id__": 1
-    },
-    "mountedChildren": [],
-    "mountedComponents": [],
-    "propertyOverrides": [
-      {
-        "__id__": 5
-      },
-      {
-        "__id__": 7
-      },
-      {
-        "__id__": 8
-      },
-      {
-        "__id__": 9
-      },
-      {
-        "__id__": 10
-      },
-      {
-        "__id__": 12
-      },
-      {
-        "__id__": 14
-      }
-    ],
-    "removedComponents": []
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 6
-    },
-    "propertyPath": [
-      "_name"
-    ],
-    "value": "mask"
-  },
-  {
-    "__type__": "cc.TargetInfo",
-    "localID": [
-      "a0daVw8DRLi6ToMaTA0VS2"
-    ]
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 6
-    },
-    "propertyPath": [
-      "_lpos"
-    ],
-    "value": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    }
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 6
-    },
-    "propertyPath": [
-      "_lrot"
-    ],
-    "value": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
-    }
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 6
-    },
-    "propertyPath": [
-      "_euler"
-    ],
-    "value": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    }
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 11
-    },
-    "propertyPath": [
-      "_contentSize"
-    ],
-    "value": {
-      "__type__": "cc.Size",
-      "width": 720,
-      "height": 1600
-    }
-  },
-  {
-    "__type__": "cc.TargetInfo",
-    "localID": [
-      "77N2cid5pKDpXplRH/AWEU"
-    ]
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 13
-    },
-    "propertyPath": [
-      "_left"
-    ],
-    "value": 0
-  },
-  {
-    "__type__": "cc.TargetInfo",
-    "localID": [
-      "63zNQq8NlBQ5QWzOJ4Kgjs"
-    ]
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 13
-    },
-    "propertyPath": [
-      "_right"
-    ],
-    "value": 0
-  },
-  {
-    "__type__": "cc.Node",
     "_name": "bg8",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -260,14 +90,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 16
+        "__id__": 3
       },
       {
-        "__id__": 18
+        "__id__": 5
       }
     ],
     "_prefab": {
-      "__id__": 20
+      "__id__": 7
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -304,11 +134,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 15
+      "__id__": 2
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 17
+      "__id__": 4
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -332,11 +162,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 15
+      "__id__": 2
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 19
+      "__id__": 6
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -396,14 +226,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 22
+        "__id__": 9
       },
       {
-        "__id__": 24
+        "__id__": 11
       }
     ],
     "_prefab": {
-      "__id__": 26
+      "__id__": 13
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -440,11 +270,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 21
+      "__id__": 8
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 23
+      "__id__": 10
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -468,11 +298,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 21
+      "__id__": 8
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 25
+      "__id__": 12
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -532,14 +362,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 28
+        "__id__": 15
       },
       {
-        "__id__": 30
+        "__id__": 17
       }
     ],
     "_prefab": {
-      "__id__": 32
+      "__id__": 19
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -576,11 +406,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 27
+      "__id__": 14
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 29
+      "__id__": 16
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -604,11 +434,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 27
+      "__id__": 14
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 31
+      "__id__": 18
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -666,23 +496,23 @@
     },
     "_children": [
       {
-        "__id__": 34
+        "__id__": 21
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 40
+        "__id__": 27
       },
       {
-        "__id__": 42
+        "__id__": 29
       },
       {
-        "__id__": 44
+        "__id__": 31
       }
     ],
     "_prefab": {
-      "__id__": 46
+      "__id__": 33
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -719,20 +549,20 @@
     "_objFlags": 512,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 33
+      "__id__": 20
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 35
+        "__id__": 22
       },
       {
-        "__id__": 37
+        "__id__": 24
       }
     ],
     "_prefab": {
-      "__id__": 39
+      "__id__": 26
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -769,11 +599,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 34
+      "__id__": 21
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 36
+      "__id__": 23
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -797,11 +627,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 34
+      "__id__": 21
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 38
+      "__id__": 25
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -878,11 +708,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 33
+      "__id__": 20
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 41
+      "__id__": 28
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -906,11 +736,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 33
+      "__id__": 20
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 43
+      "__id__": 30
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -951,11 +781,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 33
+      "__id__": 20
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 45
+      "__id__": 32
     },
     "clickEvents": [],
     "_interactable": true,
@@ -998,7 +828,7 @@
     "_duration": 0.1,
     "_zoomScale": 1.2,
     "_target": {
-      "__id__": 33
+      "__id__": 20
     },
     "_id": ""
   },
@@ -1031,14 +861,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 48
+        "__id__": 35
       },
       {
-        "__id__": 50
+        "__id__": 37
       }
     ],
     "_prefab": {
-      "__id__": 52
+      "__id__": 39
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1075,11 +905,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 47
+      "__id__": 34
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 49
+      "__id__": 36
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1103,11 +933,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 47
+      "__id__": 34
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 51
+      "__id__": 38
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1168,7 +998,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 54
+      "__id__": 41
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1196,7 +1026,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 56
+      "__id__": 43
     },
     "_alignFlags": 45,
     "_target": null,
@@ -1232,7 +1062,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 58
+      "__id__": 45
     },
     "_id": ""
   },
@@ -1250,11 +1080,6 @@
     },
     "fileId": "c46/YsCPVOJYA4mWEpNYRx",
     "instance": null,
-    "targetOverrides": null,
-    "nestedPrefabInstanceRoots": [
-      {
-        "__id__": 2
-      }
-    ]
+    "targetOverrides": null
   }
 ]

+ 112 - 255
assets/bundle/gui/eliminate/prefab/popup/WelfareThree.prefab

@@ -22,26 +22,23 @@
         "__id__": 2
       },
       {
-        "__id__": 12
-      },
-      {
-        "__id__": 48
+        "__id__": 38
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 80
+        "__id__": 70
       },
       {
-        "__id__": 82
+        "__id__": 72
       },
       {
-        "__id__": 84
+        "__id__": 74
       }
     ],
     "_prefab": {
-      "__id__": 86
+      "__id__": 76
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -74,141 +71,6 @@
   },
   {
     "__type__": "cc.Node",
-    "_objFlags": 0,
-    "_parent": {
-      "__id__": 1
-    },
-    "_prefab": {
-      "__id__": 3
-    },
-    "__editorExtras__": {}
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 2
-    },
-    "asset": {
-      "__uuid__": "142393a8-2641-4775-a79c-cbfe1bd9e5ca",
-      "__expectedType__": "cc.Prefab"
-    },
-    "fileId": "a0daVw8DRLi6ToMaTA0VS2",
-    "instance": {
-      "__id__": 4
-    },
-    "targetOverrides": null
-  },
-  {
-    "__type__": "cc.PrefabInstance",
-    "fileId": "d1cDx7c9dI/bEtdR0zYG4S",
-    "prefabRootNode": {
-      "__id__": 1
-    },
-    "mountedChildren": [],
-    "mountedComponents": [],
-    "propertyOverrides": [
-      {
-        "__id__": 5
-      },
-      {
-        "__id__": 7
-      },
-      {
-        "__id__": 8
-      },
-      {
-        "__id__": 9
-      },
-      {
-        "__id__": 10
-      }
-    ],
-    "removedComponents": []
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 6
-    },
-    "propertyPath": [
-      "_name"
-    ],
-    "value": "mask"
-  },
-  {
-    "__type__": "cc.TargetInfo",
-    "localID": [
-      "a0daVw8DRLi6ToMaTA0VS2"
-    ]
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 6
-    },
-    "propertyPath": [
-      "_lpos"
-    ],
-    "value": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    }
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 6
-    },
-    "propertyPath": [
-      "_lrot"
-    ],
-    "value": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
-    }
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 6
-    },
-    "propertyPath": [
-      "_euler"
-    ],
-    "value": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    }
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 11
-    },
-    "propertyPath": [
-      "_contentSize"
-    ],
-    "value": {
-      "__type__": "cc.Size",
-      "width": 720,
-      "height": 1599.9999999999998
-    }
-  },
-  {
-    "__type__": "cc.TargetInfo",
-    "localID": [
-      "77N2cid5pKDpXplRH/AWEU"
-    ]
-  },
-  {
-    "__type__": "cc.Node",
     "_name": "showNode1",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -217,29 +79,29 @@
     },
     "_children": [
       {
-        "__id__": 13
+        "__id__": 3
       },
       {
-        "__id__": 21
+        "__id__": 11
       },
       {
-        "__id__": 27
+        "__id__": 17
       },
       {
-        "__id__": 33
+        "__id__": 23
       },
       {
-        "__id__": 39
+        "__id__": 29
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 45
+        "__id__": 35
       }
     ],
     "_prefab": {
-      "__id__": 47
+      "__id__": 37
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -276,23 +138,23 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 12
+      "__id__": 2
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 14
+        "__id__": 4
       },
       {
-        "__id__": 16
+        "__id__": 6
       },
       {
-        "__id__": 18
+        "__id__": 8
       }
     ],
     "_prefab": {
-      "__id__": 20
+      "__id__": 10
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -329,16 +191,16 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 13
+      "__id__": 3
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 15
+      "__id__": 5
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 720,
-      "height": 967
+      "width": 968,
+      "height": 968
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -357,11 +219,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 13
+      "__id__": 3
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 17
+      "__id__": 7
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -379,7 +241,7 @@
     },
     "_type": 0,
     "_fillType": 0,
-    "_sizeMode": 1,
+    "_sizeMode": 2,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,
@@ -402,11 +264,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 13
+      "__id__": 3
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 19
+      "__id__": 9
     },
     "playOnLoad": true,
     "_clips": [
@@ -444,20 +306,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 12
+      "__id__": 2
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 22
+        "__id__": 12
       },
       {
-        "__id__": 24
+        "__id__": 14
       }
     ],
     "_prefab": {
-      "__id__": 26
+      "__id__": 16
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -494,11 +356,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 21
+      "__id__": 11
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 23
+      "__id__": 13
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -522,11 +384,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 21
+      "__id__": 11
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 25
+      "__id__": 15
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -580,20 +442,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 12
+      "__id__": 2
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 28
+        "__id__": 18
       },
       {
-        "__id__": 30
+        "__id__": 20
       }
     ],
     "_prefab": {
-      "__id__": 32
+      "__id__": 22
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -630,11 +492,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 27
+      "__id__": 17
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 29
+      "__id__": 19
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -658,11 +520,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 27
+      "__id__": 17
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 31
+      "__id__": 21
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -716,20 +578,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 12
+      "__id__": 2
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 34
+        "__id__": 24
       },
       {
-        "__id__": 36
+        "__id__": 26
       }
     ],
     "_prefab": {
-      "__id__": 38
+      "__id__": 28
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -766,11 +628,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 33
+      "__id__": 23
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 35
+      "__id__": 25
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -794,11 +656,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 33
+      "__id__": 23
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 37
+      "__id__": 27
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -855,20 +717,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 12
+      "__id__": 2
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 40
+        "__id__": 30
       },
       {
-        "__id__": 42
+        "__id__": 32
       }
     ],
     "_prefab": {
-      "__id__": 44
+      "__id__": 34
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -905,11 +767,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 39
+      "__id__": 29
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 41
+      "__id__": 31
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -933,11 +795,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 39
+      "__id__": 29
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 43
+      "__id__": 33
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -991,11 +853,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 12
+      "__id__": 2
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 46
+      "__id__": 36
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1036,29 +898,29 @@
     },
     "_children": [
       {
-        "__id__": 49
+        "__id__": 39
       },
       {
-        "__id__": 57
+        "__id__": 47
       },
       {
-        "__id__": 63
+        "__id__": 53
       },
       {
-        "__id__": 69
+        "__id__": 59
       }
     ],
     "_active": false,
     "_components": [
       {
-        "__id__": 75
+        "__id__": 65
       },
       {
-        "__id__": 77
+        "__id__": 67
       }
     ],
     "_prefab": {
-      "__id__": 79
+      "__id__": 69
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1095,23 +957,23 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 48
+      "__id__": 38
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 50
+        "__id__": 40
       },
       {
-        "__id__": 52
+        "__id__": 42
       },
       {
-        "__id__": 54
+        "__id__": 44
       }
     ],
     "_prefab": {
-      "__id__": 56
+      "__id__": 46
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1148,11 +1010,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 49
+      "__id__": 39
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 51
+      "__id__": 41
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1176,11 +1038,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 49
+      "__id__": 39
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 53
+      "__id__": 43
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1221,11 +1083,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 49
+      "__id__": 39
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 55
+      "__id__": 45
     },
     "playOnLoad": true,
     "_clips": [
@@ -1263,20 +1125,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 48
+      "__id__": 38
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 58
+        "__id__": 48
       },
       {
-        "__id__": 60
+        "__id__": 50
       }
     ],
     "_prefab": {
-      "__id__": 62
+      "__id__": 52
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1313,11 +1175,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 57
+      "__id__": 47
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 59
+      "__id__": 49
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1341,11 +1203,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 57
+      "__id__": 47
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 61
+      "__id__": 51
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1399,20 +1261,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 48
+      "__id__": 38
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 64
+        "__id__": 54
       },
       {
-        "__id__": 66
+        "__id__": 56
       }
     ],
     "_prefab": {
-      "__id__": 68
+      "__id__": 58
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1449,11 +1311,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 63
+      "__id__": 53
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 65
+      "__id__": 55
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1477,11 +1339,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 63
+      "__id__": 53
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 67
+      "__id__": 57
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1535,20 +1397,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 48
+      "__id__": 38
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 70
+        "__id__": 60
       },
       {
-        "__id__": 72
+        "__id__": 62
       }
     ],
     "_prefab": {
-      "__id__": 74
+      "__id__": 64
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1585,11 +1447,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 69
+      "__id__": 59
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 71
+      "__id__": 61
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1613,11 +1475,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 69
+      "__id__": 59
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 73
+      "__id__": 63
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1671,11 +1533,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 48
+      "__id__": 38
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 76
+      "__id__": 66
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1699,11 +1561,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 48
+      "__id__": 38
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 78
+      "__id__": 68
     },
     "playOnLoad": false,
     "_clips": [
@@ -1745,7 +1607,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 81
+      "__id__": 71
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1773,7 +1635,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 83
+      "__id__": 73
     },
     "_alignFlags": 45,
     "_target": null,
@@ -1809,13 +1671,13 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 85
+      "__id__": 75
     },
     "showNode1": {
-      "__id__": 12
+      "__id__": 2
     },
     "showNode2": {
-      "__id__": 48
+      "__id__": 38
     },
     "_id": ""
   },
@@ -1833,11 +1695,6 @@
     },
     "fileId": "c46/YsCPVOJYA4mWEpNYRx",
     "instance": null,
-    "targetOverrides": null,
-    "nestedPrefabInstanceRoots": [
-      {
-        "__id__": 2
-      }
-    ]
+    "targetOverrides": null
   }
 ]

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 262 - 405
assets/bundle/gui/eliminate/prefab/popup/WelfareTwo.prefab


+ 123 - 266
assets/bundle/gui/eliminate/prefab/popup/highValueUsers.prefab

@@ -20,22 +20,19 @@
     "_children": [
       {
         "__id__": 2
-      },
-      {
-        "__id__": 12
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 90
+        "__id__": 80
       },
       {
-        "__id__": 92
+        "__id__": 82
       }
     ],
     "_prefab": {
-      "__id__": 94
+      "__id__": 84
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -68,141 +65,6 @@
   },
   {
     "__type__": "cc.Node",
-    "_objFlags": 0,
-    "_parent": {
-      "__id__": 1
-    },
-    "_prefab": {
-      "__id__": 3
-    },
-    "__editorExtras__": {}
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 2
-    },
-    "asset": {
-      "__uuid__": "142393a8-2641-4775-a79c-cbfe1bd9e5ca",
-      "__expectedType__": "cc.Prefab"
-    },
-    "fileId": "a0daVw8DRLi6ToMaTA0VS2",
-    "instance": {
-      "__id__": 4
-    },
-    "targetOverrides": null
-  },
-  {
-    "__type__": "cc.PrefabInstance",
-    "fileId": "3bvwee03ZIXbGx7qYgMKcO",
-    "prefabRootNode": {
-      "__id__": 1
-    },
-    "mountedChildren": [],
-    "mountedComponents": [],
-    "propertyOverrides": [
-      {
-        "__id__": 5
-      },
-      {
-        "__id__": 7
-      },
-      {
-        "__id__": 8
-      },
-      {
-        "__id__": 9
-      },
-      {
-        "__id__": 10
-      }
-    ],
-    "removedComponents": []
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 6
-    },
-    "propertyPath": [
-      "_name"
-    ],
-    "value": "mask"
-  },
-  {
-    "__type__": "cc.TargetInfo",
-    "localID": [
-      "a0daVw8DRLi6ToMaTA0VS2"
-    ]
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 6
-    },
-    "propertyPath": [
-      "_lpos"
-    ],
-    "value": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    }
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 6
-    },
-    "propertyPath": [
-      "_lrot"
-    ],
-    "value": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
-    }
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 6
-    },
-    "propertyPath": [
-      "_euler"
-    ],
-    "value": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    }
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 11
-    },
-    "propertyPath": [
-      "_contentSize"
-    ],
-    "value": {
-      "__type__": "cc.Size",
-      "width": 720,
-      "height": 1600
-    }
-  },
-  {
-    "__type__": "cc.TargetInfo",
-    "localID": [
-      "77N2cid5pKDpXplRH/AWEU"
-    ]
-  },
-  {
-    "__type__": "cc.Node",
     "_name": "showNode3",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -211,20 +73,20 @@
     },
     "_children": [
       {
-        "__id__": 13
+        "__id__": 3
       },
       {
-        "__id__": 21
+        "__id__": 11
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 87
+        "__id__": 77
       }
     ],
     "_prefab": {
-      "__id__": 89
+      "__id__": 79
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -261,23 +123,23 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 12
+      "__id__": 2
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 14
+        "__id__": 4
       },
       {
-        "__id__": 16
+        "__id__": 6
       },
       {
-        "__id__": 18
+        "__id__": 8
       }
     ],
     "_prefab": {
-      "__id__": 20
+      "__id__": 10
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -314,11 +176,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 13
+      "__id__": 3
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 15
+      "__id__": 5
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -342,11 +204,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 13
+      "__id__": 3
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 17
+      "__id__": 7
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -387,11 +249,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 13
+      "__id__": 3
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 19
+      "__id__": 9
     },
     "playOnLoad": true,
     "_clips": [
@@ -429,39 +291,39 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 12
+      "__id__": 2
     },
     "_children": [
       {
-        "__id__": 22
+        "__id__": 12
       },
       {
-        "__id__": 30
+        "__id__": 20
       },
       {
-        "__id__": 36
+        "__id__": 26
       },
       {
-        "__id__": 42
+        "__id__": 32
       },
       {
-        "__id__": 62
+        "__id__": 52
       },
       {
-        "__id__": 68
+        "__id__": 58
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 82
+        "__id__": 72
       },
       {
-        "__id__": 84
+        "__id__": 74
       }
     ],
     "_prefab": {
-      "__id__": 86
+      "__id__": 76
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -498,23 +360,23 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 21
+      "__id__": 11
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 23
+        "__id__": 13
       },
       {
-        "__id__": 25
+        "__id__": 15
       },
       {
-        "__id__": 27
+        "__id__": 17
       }
     ],
     "_prefab": {
-      "__id__": 29
+      "__id__": 19
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -551,11 +413,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 22
+      "__id__": 12
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 24
+      "__id__": 14
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -579,11 +441,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 22
+      "__id__": 12
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 26
+      "__id__": 16
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -624,11 +486,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 22
+      "__id__": 12
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 28
+      "__id__": 18
     },
     "clickEvents": [],
     "_interactable": true,
@@ -693,20 +555,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 21
+      "__id__": 11
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 31
+        "__id__": 21
       },
       {
-        "__id__": 33
+        "__id__": 23
       }
     ],
     "_prefab": {
-      "__id__": 35
+      "__id__": 25
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -743,11 +605,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 30
+      "__id__": 20
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 32
+      "__id__": 22
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -771,11 +633,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 30
+      "__id__": 20
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 34
+      "__id__": 24
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -829,20 +691,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 21
+      "__id__": 11
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 37
+        "__id__": 27
       },
       {
-        "__id__": 39
+        "__id__": 29
       }
     ],
     "_prefab": {
-      "__id__": 41
+      "__id__": 31
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -879,11 +741,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 36
+      "__id__": 26
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 38
+      "__id__": 28
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -907,11 +769,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 36
+      "__id__": 26
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 40
+      "__id__": 30
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -988,27 +850,27 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 21
+      "__id__": 11
     },
     "_children": [
       {
-        "__id__": 43
+        "__id__": 33
       },
       {
-        "__id__": 51
+        "__id__": 41
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 57
+        "__id__": 47
       },
       {
-        "__id__": 59
+        "__id__": 49
       }
     ],
     "_prefab": {
-      "__id__": 61
+      "__id__": 51
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1045,23 +907,23 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 42
+      "__id__": 32
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 44
+        "__id__": 34
       },
       {
-        "__id__": 46
+        "__id__": 36
       },
       {
-        "__id__": 48
+        "__id__": 38
       }
     ],
     "_prefab": {
-      "__id__": 50
+      "__id__": 40
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1098,11 +960,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 43
+      "__id__": 33
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 45
+      "__id__": 35
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1126,11 +988,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 43
+      "__id__": 33
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 47
+      "__id__": 37
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1194,11 +1056,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 43
+      "__id__": 33
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 49
+      "__id__": 39
     },
     "templateMode": false,
     "watchPath": "",
@@ -1229,20 +1091,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 42
+      "__id__": 32
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 52
+        "__id__": 42
       },
       {
-        "__id__": 54
+        "__id__": 44
       }
     ],
     "_prefab": {
-      "__id__": 56
+      "__id__": 46
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1279,11 +1141,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 51
+      "__id__": 41
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 53
+      "__id__": 43
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1307,11 +1169,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 51
+      "__id__": 41
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 55
+      "__id__": 45
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1388,11 +1250,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 42
+      "__id__": 32
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 58
+      "__id__": 48
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1416,11 +1278,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 42
+      "__id__": 32
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 60
+      "__id__": 50
     },
     "_resizeMode": 1,
     "_layoutType": 1,
@@ -1467,20 +1329,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 21
+      "__id__": 11
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 63
+        "__id__": 53
       },
       {
-        "__id__": 65
+        "__id__": 55
       }
     ],
     "_prefab": {
-      "__id__": 67
+      "__id__": 57
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1517,11 +1379,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 62
+      "__id__": 52
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 64
+      "__id__": 54
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1545,11 +1407,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 62
+      "__id__": 52
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 66
+      "__id__": 56
     },
     "_lineHeight": 25,
     "_string": "金额仅差<color =#FFF07C>{{0}}元</color>付清手续费到账微信",
@@ -1596,27 +1458,27 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 21
+      "__id__": 11
     },
     "_children": [
       {
-        "__id__": 69
+        "__id__": 59
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 75
+        "__id__": 65
       },
       {
-        "__id__": 77
+        "__id__": 67
       },
       {
-        "__id__": 79
+        "__id__": 69
       }
     ],
     "_prefab": {
-      "__id__": 81
+      "__id__": 71
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1653,20 +1515,20 @@
     "_objFlags": 512,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 68
+      "__id__": 58
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 70
+        "__id__": 60
       },
       {
-        "__id__": 72
+        "__id__": 62
       }
     ],
     "_prefab": {
-      "__id__": 74
+      "__id__": 64
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1703,11 +1565,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 69
+      "__id__": 59
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 71
+      "__id__": 61
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1731,11 +1593,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 69
+      "__id__": 59
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 73
+      "__id__": 63
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1812,11 +1674,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 68
+      "__id__": 58
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 76
+      "__id__": 66
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1840,11 +1702,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 68
+      "__id__": 58
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 78
+      "__id__": 68
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1885,11 +1747,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 68
+      "__id__": 58
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 80
+      "__id__": 70
     },
     "clickEvents": [],
     "_interactable": true,
@@ -1932,7 +1794,7 @@
     "_duration": 0.1,
     "_zoomScale": 1.2,
     "_target": {
-      "__id__": 68
+      "__id__": 58
     },
     "_id": ""
   },
@@ -1959,11 +1821,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 21
+      "__id__": 11
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 83
+      "__id__": 73
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1987,11 +1849,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 21
+      "__id__": 11
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 85
+      "__id__": 75
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -2045,11 +1907,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 12
+      "__id__": 2
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 88
+      "__id__": 78
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2090,12 +1952,12 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 91
+      "__id__": 81
     },
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 720,
-      "height": 1600
+      "height": 1600.0000000000002
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -2118,7 +1980,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 93
+      "__id__": 83
     },
     "_alignFlags": 45,
     "_target": null,
@@ -2154,11 +2016,6 @@
     },
     "fileId": "c46/YsCPVOJYA4mWEpNYRx",
     "instance": null,
-    "targetOverrides": null,
-    "nestedPrefabInstanceRoots": [
-      {
-        "__id__": 2
-      }
-    ]
+    "targetOverrides": null
   }
 ]

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 158 - 301
assets/bundle/gui/eliminate/prefab/popup/keepDoubleSpeed.prefab


+ 92 - 235
assets/bundle/gui/eliminate/prefab/popup/wechatPayment.prefab

@@ -20,22 +20,19 @@
     "_children": [
       {
         "__id__": 2
-      },
-      {
-        "__id__": 12
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 70
+        "__id__": 60
       },
       {
-        "__id__": 72
+        "__id__": 62
       }
     ],
     "_prefab": {
-      "__id__": 74
+      "__id__": 64
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -68,141 +65,6 @@
   },
   {
     "__type__": "cc.Node",
-    "_objFlags": 0,
-    "_parent": {
-      "__id__": 1
-    },
-    "_prefab": {
-      "__id__": 3
-    },
-    "__editorExtras__": {}
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 2
-    },
-    "asset": {
-      "__uuid__": "142393a8-2641-4775-a79c-cbfe1bd9e5ca",
-      "__expectedType__": "cc.Prefab"
-    },
-    "fileId": "a0daVw8DRLi6ToMaTA0VS2",
-    "instance": {
-      "__id__": 4
-    },
-    "targetOverrides": null
-  },
-  {
-    "__type__": "cc.PrefabInstance",
-    "fileId": "d1cDx7c9dI/bEtdR0zYG4S",
-    "prefabRootNode": {
-      "__id__": 1
-    },
-    "mountedChildren": [],
-    "mountedComponents": [],
-    "propertyOverrides": [
-      {
-        "__id__": 5
-      },
-      {
-        "__id__": 7
-      },
-      {
-        "__id__": 8
-      },
-      {
-        "__id__": 9
-      },
-      {
-        "__id__": 10
-      }
-    ],
-    "removedComponents": []
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 6
-    },
-    "propertyPath": [
-      "_name"
-    ],
-    "value": "mask"
-  },
-  {
-    "__type__": "cc.TargetInfo",
-    "localID": [
-      "a0daVw8DRLi6ToMaTA0VS2"
-    ]
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 6
-    },
-    "propertyPath": [
-      "_lpos"
-    ],
-    "value": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    }
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 6
-    },
-    "propertyPath": [
-      "_lrot"
-    ],
-    "value": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
-    }
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 6
-    },
-    "propertyPath": [
-      "_euler"
-    ],
-    "value": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    }
-  },
-  {
-    "__type__": "CCPropertyOverrideInfo",
-    "targetInfo": {
-      "__id__": 11
-    },
-    "propertyPath": [
-      "_contentSize"
-    ],
-    "value": {
-      "__type__": "cc.Size",
-      "width": 720,
-      "height": 1600
-    }
-  },
-  {
-    "__type__": "cc.TargetInfo",
-    "localID": [
-      "77N2cid5pKDpXplRH/AWEU"
-    ]
-  },
-  {
-    "__type__": "cc.Node",
     "_name": "showNode4",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -211,26 +73,26 @@
     },
     "_children": [
       {
-        "__id__": 13
+        "__id__": 3
       },
       {
-        "__id__": 19
+        "__id__": 9
       },
       {
-        "__id__": 25
+        "__id__": 15
       },
       {
-        "__id__": 49
+        "__id__": 39
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 67
+        "__id__": 57
       }
     ],
     "_prefab": {
-      "__id__": 69
+      "__id__": 59
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -267,20 +129,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 12
+      "__id__": 2
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 14
+        "__id__": 4
       },
       {
-        "__id__": 16
+        "__id__": 6
       }
     ],
     "_prefab": {
-      "__id__": 18
+      "__id__": 8
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -317,11 +179,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 13
+      "__id__": 3
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 15
+      "__id__": 5
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -345,11 +207,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 13
+      "__id__": 3
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 17
+      "__id__": 7
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -403,20 +265,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 12
+      "__id__": 2
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 20
+        "__id__": 10
       },
       {
-        "__id__": 22
+        "__id__": 12
       }
     ],
     "_prefab": {
-      "__id__": 24
+      "__id__": 14
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -453,11 +315,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 19
+      "__id__": 9
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 21
+      "__id__": 11
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -481,11 +343,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 19
+      "__id__": 9
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 23
+      "__id__": 13
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -539,30 +401,30 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 12
+      "__id__": 2
     },
     "_children": [
       {
-        "__id__": 26
+        "__id__": 16
       },
       {
-        "__id__": 32
+        "__id__": 22
       },
       {
-        "__id__": 38
+        "__id__": 28
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 44
+        "__id__": 34
       },
       {
-        "__id__": 46
+        "__id__": 36
       }
     ],
     "_prefab": {
-      "__id__": 48
+      "__id__": 38
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -599,20 +461,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 25
+      "__id__": 15
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 27
+        "__id__": 17
       },
       {
-        "__id__": 29
+        "__id__": 19
       }
     ],
     "_prefab": {
-      "__id__": 31
+      "__id__": 21
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -649,11 +511,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 26
+      "__id__": 16
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 28
+      "__id__": 18
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -677,11 +539,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 26
+      "__id__": 16
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 30
+      "__id__": 20
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -758,20 +620,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 25
+      "__id__": 15
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 33
+        "__id__": 23
       },
       {
-        "__id__": 35
+        "__id__": 25
       }
     ],
     "_prefab": {
-      "__id__": 37
+      "__id__": 27
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -808,11 +670,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 32
+      "__id__": 22
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 34
+      "__id__": 24
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -836,11 +698,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 32
+      "__id__": 22
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 36
+      "__id__": 26
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -917,20 +779,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 25
+      "__id__": 15
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 39
+        "__id__": 29
       },
       {
-        "__id__": 41
+        "__id__": 31
       }
     ],
     "_prefab": {
-      "__id__": 43
+      "__id__": 33
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -967,11 +829,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 38
+      "__id__": 28
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 40
+      "__id__": 30
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -995,11 +857,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 38
+      "__id__": 28
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 42
+      "__id__": 32
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1076,11 +938,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 25
+      "__id__": 15
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 45
+      "__id__": 35
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1104,11 +966,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 25
+      "__id__": 15
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 47
+      "__id__": 37
     },
     "_resizeMode": 1,
     "_layoutType": 1,
@@ -1155,27 +1017,27 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 12
+      "__id__": 2
     },
     "_children": [
       {
-        "__id__": 50
+        "__id__": 40
       },
       {
-        "__id__": 56
+        "__id__": 46
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 62
+        "__id__": 52
       },
       {
-        "__id__": 64
+        "__id__": 54
       }
     ],
     "_prefab": {
-      "__id__": 66
+      "__id__": 56
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1212,20 +1074,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 49
+      "__id__": 39
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 51
+        "__id__": 41
       },
       {
-        "__id__": 53
+        "__id__": 43
       }
     ],
     "_prefab": {
-      "__id__": 55
+      "__id__": 45
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1262,11 +1124,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 50
+      "__id__": 40
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 52
+      "__id__": 42
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1290,11 +1152,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 50
+      "__id__": 40
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 54
+      "__id__": 44
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1371,20 +1233,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 49
+      "__id__": 39
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 57
+        "__id__": 47
       },
       {
-        "__id__": 59
+        "__id__": 49
       }
     ],
     "_prefab": {
-      "__id__": 61
+      "__id__": 51
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1421,11 +1283,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 56
+      "__id__": 46
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 58
+      "__id__": 48
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1449,11 +1311,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 56
+      "__id__": 46
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 60
+      "__id__": 50
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1530,11 +1392,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 49
+      "__id__": 39
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 63
+      "__id__": 53
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1558,11 +1420,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 49
+      "__id__": 39
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 65
+      "__id__": 55
     },
     "_resizeMode": 1,
     "_layoutType": 1,
@@ -1609,11 +1471,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 12
+      "__id__": 2
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 68
+      "__id__": 58
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1654,12 +1516,12 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 71
+      "__id__": 61
     },
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 720,
-      "height": 1600
+      "height": 1600.0000000000002
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1682,7 +1544,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 73
+      "__id__": 63
     },
     "_alignFlags": 45,
     "_target": null,
@@ -1718,11 +1580,6 @@
     },
     "fileId": "c46/YsCPVOJYA4mWEpNYRx",
     "instance": null,
-    "targetOverrides": null,
-    "nestedPrefabInstanceRoots": [
-      {
-        "__id__": 2
-      }
-    ]
+    "targetOverrides": null
   }
 ]

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 648 - 789
assets/bundle/gui/eliminate/prefab/popup/wechatTransferring.prefab


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 251 - 394
assets/bundle/gui/eliminate/prefab/popup/welfareOne.prefab


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


+ 23 - 23
assets/bundle/gui/eliminate/texture/bg/bg_light.png.meta

@@ -42,12 +42,12 @@
         "trimThreshold": 1,
         "rotated": false,
         "offsetX": 0,
-        "offsetY": 0.5,
+        "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 720,
-        "height": 967,
-        "rawWidth": 720,
+        "width": 968,
+        "height": 968,
+        "rawWidth": 968,
         "rawHeight": 968,
         "borderTop": 0,
         "borderBottom": 0,
@@ -60,17 +60,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -360,
-            -483.5,
+            -484,
+            -484,
             0,
-            360,
-            -483.5,
+            484,
+            -484,
             0,
-            -360,
-            483.5,
+            -484,
+            484,
             0,
-            360,
-            483.5,
+            484,
+            484,
             0
           ],
           "indexes": [
@@ -84,38 +84,38 @@
           "uv": [
             0,
             968,
-            720,
+            968,
             968,
             0,
-            1,
-            720,
-            1
+            0,
+            968,
+            0
           ],
           "nuv": [
             0,
-            0.0010330578512396695,
+            0,
             1,
-            0.0010330578512396695,
+            0,
             0,
             1,
             1,
             1
           ],
           "minPos": [
-            -360,
-            -483.5,
+            -484,
+            -484,
             0
           ],
           "maxPos": [
-            360,
-            483.5,
+            484,
+            484,
             0
           ]
         },
         "isUuid": true,
         "imageUuidOrDatabaseUri": "813602dd-748e-4bfa-ba7a-9ecf401122e9@6c48a",
         "atlasUuid": "",
-        "trimType": "auto"
+        "trimType": "none"
       },
       "ver": "1.0.12",
       "imported": true,

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


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

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "5db9fb95-a456-4165-b9cc-a70fbb500162",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "5db9fb95-a456-4165-b9cc-a70fbb500162@6c48a",
+      "displayName": "bg_light",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "5db9fb95-a456-4165-b9cc-a70fbb500162",
+        "isUuid": true,
+        "visible": false,
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "anisotropy": 0
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "f9941": {
+      "importer": "sprite-frame",
+      "uuid": "5db9fb95-a456-4165-b9cc-a70fbb500162@f9941",
+      "displayName": "bg_light",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": -0.5,
+        "offsetY": 0.5,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 967,
+        "height": 967,
+        "rawWidth": 968,
+        "rawHeight": 968,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -483.5,
+            -483.5,
+            0,
+            483.5,
+            -483.5,
+            0,
+            -483.5,
+            483.5,
+            0,
+            483.5,
+            483.5,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            968,
+            967,
+            968,
+            0,
+            1,
+            967,
+            1
+          ],
+          "nuv": [
+            0,
+            0.0010330578512396695,
+            0.9989669421487604,
+            0.0010330578512396695,
+            0,
+            1,
+            0.9989669421487604,
+            1
+          ],
+          "minPos": [
+            -483.5,
+            -483.5,
+            0
+          ],
+          "maxPos": [
+            483.5,
+            483.5,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "5db9fb95-a456-4165-b9cc-a70fbb500162@6c48a",
+        "atlasUuid": "",
+        "trimType": "auto"
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "5db9fb95-a456-4165-b9cc-a70fbb500162@6c48a"
+  }
+}

+ 2 - 2
assets/bundle/gui/eliminate/texture/load_1.png.meta

@@ -51,8 +51,8 @@
         "rawHeight": 23,
         "borderTop": 0,
         "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
+        "borderLeft": 24,
+        "borderRight": 31,
         "packable": true,
         "pixelsToUnit": 100,
         "pivotX": 0.5,

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


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

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "69f76d34-d8e0-43e7-a286-462c55c826cf",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "69f76d34-d8e0-43e7-a286-462c55c826cf@6c48a",
+      "displayName": "load_5",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "69f76d34-d8e0-43e7-a286-462c55c826cf",
+        "isUuid": true,
+        "visible": false,
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "anisotropy": 0
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "f9941": {
+      "importer": "sprite-frame",
+      "uuid": "69f76d34-d8e0-43e7-a286-462c55c826cf@f9941",
+      "displayName": "load_5",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 604,
+        "height": 22,
+        "rawWidth": 604,
+        "rawHeight": 22,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -302,
+            -11,
+            0,
+            302,
+            -11,
+            0,
+            -302,
+            11,
+            0,
+            302,
+            11,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            22,
+            604,
+            22,
+            0,
+            0,
+            604,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -302,
+            -11,
+            0
+          ],
+          "maxPos": [
+            302,
+            11,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "69f76d34-d8e0-43e7-a286-462c55c826cf@6c48a",
+        "atlasUuid": "",
+        "trimType": "auto"
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "69f76d34-d8e0-43e7-a286-462c55c826cf@6c48a"
+  }
+}

+ 4 - 4
assets/bundle/gui/loading/loading.prefab

@@ -140,7 +140,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 720,
-      "height": 1599.9999999999998
+      "height": 1600
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -176,7 +176,7 @@
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "9b063201-1089-458a-a8c3-9ffb0ea4b1cb@f9941",
+      "__uuid__": "ca535bce-c080-44a6-8188-784ebe4e1249@f9941",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 0,
@@ -1710,7 +1710,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 35,
+      "x": 24.818,
       "y": -0.65,
       "z": 0
     },
@@ -1969,7 +1969,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 720,
-      "height": 1599.9999999999998
+      "height": 1600
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",

BIN
assets/bundle/gui/loading/texture/bg.png


+ 6 - 6
assets/bundle/gui/loading/texture/bg.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.27",
   "importer": "image",
   "imported": true,
-  "uuid": "9b063201-1089-458a-a8c3-9ffb0ea4b1cb",
+  "uuid": "ca535bce-c080-44a6-8188-784ebe4e1249",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "9b063201-1089-458a-a8c3-9ffb0ea4b1cb@6c48a",
+      "uuid": "ca535bce-c080-44a6-8188-784ebe4e1249@6c48a",
       "displayName": "bg",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "9b063201-1089-458a-a8c3-9ffb0ea4b1cb",
+        "imageUuidOrDatabaseUri": "ca535bce-c080-44a6-8188-784ebe4e1249",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "9b063201-1089-458a-a8c3-9ffb0ea4b1cb@f9941",
+      "uuid": "ca535bce-c080-44a6-8188-784ebe4e1249@f9941",
       "displayName": "bg",
       "id": "f9941",
       "name": "spriteFrame",
@@ -113,7 +113,7 @@
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "9b063201-1089-458a-a8c3-9ffb0ea4b1cb@6c48a",
+        "imageUuidOrDatabaseUri": "ca535bce-c080-44a6-8188-784ebe4e1249@6c48a",
         "atlasUuid": "",
         "trimType": "auto"
       },
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "9b063201-1089-458a-a8c3-9ffb0ea4b1cb@6c48a"
+    "redirect": "ca535bce-c080-44a6-8188-784ebe4e1249@6c48a"
   }
 }

+ 16 - 16
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-19 11:56:07
+ * @LastEditTime: 2025-04-21 19:10:15
  */
 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" },
+    [UIID.KindTips]: { layer: LayerType.PopUp, prefab: "common/prefab/KindTips", vacancy: true, 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.UI, prefab: "common/prefab/About" },
+    [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" },
-    [UIID.DoubleRewards]: { layer: LayerType.PopUp, prefab: "gui/eliminate/prefab/DoubleRewards" },
-    [UIID.GamePass]: { layer: LayerType.PopUp, prefab: "gui/eliminate/prefab/GamePass" },
-    [UIID.Verify]: { layer: LayerType.PopUp, prefab: "gui/eliminate/prefab/popup/VerifyPopup" },
+    [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.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" },
-    [UIID.KeepSpeed]: { layer: LayerType.PopUp, prefab: "gui/eliminate/prefab/popup/KeepDoubleSpeed" },
-    [UIID.WarmReminder]: { layer: LayerType.PopUp, prefab: "gui/eliminate/prefab/popup/WarmReminder" },
-    [UIID.WelfareOne]: { layer: LayerType.PopUp, prefab: "gui/eliminate/prefab/popup/WelfareOne" },
-    [UIID.WelfareTwo]: { layer: LayerType.PopUp, prefab: "gui/eliminate/prefab/popup/WelfareTwo" },
-    [UIID.WelfareThree]: { layer: LayerType.PopUp, prefab: "gui/eliminate/prefab/popup/WelfareThree" },
-    [UIID.AutoWithdrawProgress]: { layer: LayerType.PopUp, prefab: "gui/eliminate/prefab/popup/AutoWithdrawProgress" },
-    [UIID.UnlockFunction]: { layer: LayerType.PopUp, prefab: "gui/eliminate/prefab/popup/UnlockFunction" },
-    [UIID.ReservePopup]: { layer: LayerType.PopUp, prefab: "gui/eliminate/prefab/popup/ReservePopup" },
-    [UIID.WechaatTransfer]: { layer: LayerType.PopUp, prefab: "gui/eliminate/prefab/popup/WechatTransferring" },
+    [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 },
 
 
 

+ 10 - 4
assets/script/game/common/manager/LoginHandler.ts

@@ -1,9 +1,15 @@
+/*
+ * @Author: mojunshou 1637302775@qq.com
+ * @Date: 2025-04-11 10:15:45
+ * @LastEditors: mojunshou 1637302775@qq.com
+ * @LastEditTime: 2025-04-22 14:00:23
+ * @Description: 登录管理
+ */
 // LoginHandler.ts
 import { oops } from 'db://oops-framework/core/Oops';
 import { smc } from '../SingletonModuleComp';
-import { ServerHandler } from './ServerHandler';
 import { CocosHandler } from './CocosHandler';
-import { ProtocolEvent } from './ProtocolEvent';
+import { ServerHandler } from './ServerHandler';
 
 export class LoginHandler {
     private static _inst: LoginHandler;
@@ -44,7 +50,7 @@ export class LoginHandler {
         const param = {
             callback: {
                 onSuccess: 'LoginHandler.inst.wechatLoginSuccess',
-                onFaile: 'LoginHandler.inst.wechatLoginFail'
+                onFail: 'LoginHandler.inst.wechatLoginFail'
             }
         };
         const data = {
@@ -61,7 +67,7 @@ export class LoginHandler {
         ServerHandler.inst.wxLogin(str);
     }
 
-    wechatLoginFail(str: string) {
+    wechatLoginFail(str: number) {
         console.log('[微信] 登录失败', str);
         oops.gui.toast('微信登录失败');
     }

+ 18 - 17
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-21 16:23:18
+ * @LastEditTime: 2025-04-22 12:00:51
  * @Description: 
  */
 // ServerHandler.ts
@@ -256,12 +256,11 @@ export class ServerHandler {
             const account = smc.account.AccountModel;
             const game = smc.game.GameModel;
             //全部取小数点后两位
-            account.hbCoin = props['1004'];
-            account.wxCoin = props['1005'];
-            game.changeHbCoin = changes['1004'];
-            game.changeWxCoin = changes['1005'];
+            account.hbCoin = props['1004'] || 0;
+            account.wxCoin = props['1005'] || 0;
+            game.changeHbCoin = changes['1004'] || 0;
+            game.changeWxCoin = changes['1005'] || 0;
             oops.message.dispatchEvent(GameEvent.showCoinAnimation);
-            //还要知道是不是二倍速的
         }
     }
 
@@ -297,10 +296,10 @@ export class ServerHandler {
         console.log('[服务器] 直接领取通关奖励成功返回', str);
         let result = JSON.parse(str);
         //全部取小数点后两位
-        smc.game.GameModel.changeHbCoin = result.changes['1004'];
-        smc.game.GameModel.changeWxCoin = result.changes['1005'];
-        smc.account.AccountModel.hbCoin = result.props["1004"];
-        smc.account.AccountModel.wxCoin = result.props["1005"];
+        smc.game.GameModel.changeHbCoin = result.changes['1004'] || 0;
+        smc.game.GameModel.changeWxCoin = result.changes['1005'] || 0;
+        smc.account.AccountModel.hbCoin = result.props["1004"] || 0;
+        smc.account.AccountModel.wxCoin = result.props["1005"] || 0;
         oops.message.dispatchEvent(GameEvent.showCoinAnimation);
         //请求下一局
 
@@ -329,9 +328,12 @@ export class ServerHandler {
     //少量领取翻倍奖励返回
     onGetDoubleRewards(str: string) {
         console.log('[服务器] 直接领取通关奖励成功返回', str);
+        let result = JSON.parse(str);
+        smc.game.GameModel.changeHbCoin = result.changes['1004'] || 0;
+        smc.game.GameModel.changeWxCoin = result.changes['1005'] || 0;
+        smc.account.AccountModel.hbCoin = result.props["1004"] || 0;
+        smc.account.AccountModel.wxCoin = result.props["1005"] || 0;
         oops.message.dispatchEvent(GameEvent.showCoinAnimation);
-        //下一关事件
-
     }
 
     //获取视频奖励
@@ -369,13 +371,12 @@ export class ServerHandler {
             const changes = result.changes;
             const account = smc.account.AccountModel;
             const game = smc.game.GameModel;
-            account.wxCoin = props['1005'];
-            account.hbCoin = props['1004'];
-            game.changeHbCoin = changes['1004'];
-            game.changeWxCoin = changes['1005'];
+            account.wxCoin = props['1005'] || 0;
+            account.hbCoin = props['1004'] || 0;
+            game.changeHbCoin = changes['1004'] || 0;
+            game.changeWxCoin = changes['1005'] || 0;
             //是不是通关奖励点击的
             if (smc.game.GameModel.viewType == "pass_reward") {
-                //下一关
                 smc.game.GameModel.viewType = "";
                 this.getNextLevel();
             }

+ 1 - 4
assets/script/game/common/setting/SettingViewComp.ts

@@ -2,7 +2,7 @@
  * @Author: mojunshou 1637302775@qq.com
  * @Date: 2025-03-20 15:40:20
  * @LastEditors: mojunshou 1637302775@qq.com
- * @LastEditTime: 2025-04-14 18:01:16
+ * @LastEditTime: 2025-04-21 18:47:35
  * @Description:设置界面 
  */
 import { _decorator } from "cc";
@@ -63,7 +63,6 @@ export class SettingViewComp extends CCVMParentComp {
 
     private btn_about() {
         oops.gui.open(UIID.AboutUs);
-        oops.gui.remove(UIID.Setting);
     }
 
 
@@ -74,8 +73,6 @@ export class SettingViewComp extends CCVMParentComp {
 
     //更新按钮状态
     private updateBtnState() {
-        console.log("updateBtnState");
-
         const music_state = oops.storage.getBoolean("music_state");
         const effect_state = oops.storage.getBoolean("effect_state");
         oops.log.logView(music_state, "music_state");

+ 5 - 3
assets/script/game/common/tips/KindTipsView.ts

@@ -2,7 +2,7 @@
  * @Author: mojunshou 1637302775@qq.com
  * @Date: 2025-03-19 18:02:51
  * @LastEditors: mojunshou 1637302775@qq.com
- * @LastEditTime: 2025-04-15 17:05:08
+ * @LastEditTime: 2025-04-22 11:34:43
  * @Description: 温馨提示弹窗
  */
 import { _decorator } from 'cc';
@@ -27,8 +27,10 @@ export class KindTipsView extends GameComponent {
         if (DeviceUtil.isNative && DeviceUtil.isAndroid) {
             // CocosHandler.inst.ad_interstitial_start();
             LoginHandler.inst.savePrivacyStatus(true);
-            ADHandler.inst.showAd(AD_TYPE.Start);
-            oops.gui.remove(UIID.KindTips);
+            this.scheduleOnce(() => {
+                ADHandler.inst.showAd(AD_TYPE.Start);
+                oops.gui.remove(UIID.KindTips);
+            }, 0.2)
         }
 
 

+ 6 - 3
assets/script/game/common/tips/RetentionView.ts

@@ -2,7 +2,7 @@
  * @Author: mojunshou 1637302775@qq.com
  * @Date: 2025-03-19 18:02:51
  * @LastEditors: mojunshou 1637302775@qq.com
- * @LastEditTime: 2025-04-11 11:23:56
+ * @LastEditTime: 2025-04-22 11:35:10
  * @Description: 隐私挽留弹窗
  */
 import { _decorator, game } from 'cc';
@@ -28,8 +28,11 @@ export class RetentionView extends GameComponent {
         if (DeviceUtil.isNative && DeviceUtil.isAndroid) {
             // CocosHandler.inst.ad_interstitial_start();
             LoginHandler.inst.savePrivacyStatus(true);
-            ADHandler.inst.showAd(AD_TYPE.Start);
-            oops.gui.remove(UIID.Retention);
+            this.scheduleOnce(() => {
+                ADHandler.inst.showAd(AD_TYPE.Start);
+                oops.gui.remove(UIID.Retention);
+            }, 0.2)
+
         }
     }
 

+ 3 - 5
assets/script/game/initialize/view/LoadingViewComp.ts

@@ -2,7 +2,7 @@
  * @Author: mojunshou 1637302775@qq.com
  * @Date: 2025-03-19 16:23:51
  * @LastEditors: mojunshou 1637302775@qq.com
- * @LastEditTime: 2025-04-21 14:29:26
+ * @LastEditTime: 2025-04-22 11:32:32
  * @Description: loading界面
  */
 import { _decorator, Toggle } from "cc";
@@ -152,18 +152,16 @@ export class LoadingViewComp extends CCVMParentComp {
      * @description: 微信登录
      * @return {*}
      */
-    private async btn_wxlogin() {
+    private btn_wxlogin() {
         //是否同意了我们的隐私政策
         const agree = oops.storage.getBoolean("agree");
         if (!agree) {
-            // oops.gui.open(UIID.KindTips);
             oops.gui.toast("请同意隐私政策")
             return;
         }
         //暂时跳过这个登录
         LoginHandler.inst.wechatLogin();
-        //直接获取信息
-        // ServerHandler.inst.getAccountInfo();
+        console.log("点击微信登录");
     }
 
     /**

+ 6 - 15
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-21 17:33:14
+ * @LastEditTime: 2025-04-22 11:50:57
  * @Description: 消除游戏主场景
  */
 import { _decorator, Button, Color, EventTouch, instantiate, JsonAsset, Label, Node, Prefab, randomRangeInt, Sprite, tween, UITransform, Vec2, Vec3, Widget } from "cc";
@@ -531,20 +531,8 @@ export class EliminateViewComp extends CCComp {
         //计算中间的坐标就好
         const lastPos = this.moveNode.getWorldPosition();
         const score = this.score;
-        if (args) {
-            // 添加回调函数,在红包动画完成后显示红包分数增加
-            this.createCoinFlyAnimation(
-                this.redPacketPrefab,
-                lastPos,
-                this.lab_hbCoin.node.getWorldPosition(),
-                5,
-                () => {
-                    // 显示红包分数增加动画
-                    this.showRedPacketScoreAnimation();
-                }
-            );
-            return;
-        } else {
+
+        if (smc.game.GameModel.changeHbCoin > 0) {
             this.createCoinFlyAnimation(
                 this.redPacketPrefab,
                 lastPos,
@@ -555,6 +543,9 @@ export class EliminateViewComp extends CCComp {
                     this.showRedPacketScoreAnimation();
                 }
             );
+        }
+
+        if (smc.game.GameModel.changeWxCoin) {
             // 添加回调函数,在金币动画完成后显示微信分数增加
             this.createCoinFlyAnimation(
                 this.coinPrefab,

+ 2 - 2
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-19 16:32:40
+ * @LastEditTime: 2025-04-22 10:40:14
  * @Description: 福利一
  */
 import { _decorator, Animation, instantiate, Node, Prefab } from 'cc';
@@ -116,7 +116,7 @@ export class WelfareOne extends VMParent {
 
 
 
-    processLevelInfo(levelInfoList: LevelInfo[], totalLength: number = 516): LevelInfo[] {
+    processLevelInfo(levelInfoList: LevelInfo[], totalLength: number = 602): LevelInfo[] {
         if (levelInfoList.length === 0) return [];
         const firstLevel = levelInfoList[0].level;
         const lastLevel = levelInfoList[levelInfoList.length - 1].level;

+ 1 - 5
assets/script/game/view/popup/WelfareTwo.ts

@@ -110,7 +110,7 @@ export class WelfareTwo extends VMParent {
     }
 
 
-    processLevelInfo(levelInfoList: LevelInfo[], totalLength: number = 516): LevelInfo[] {
+    processLevelInfo(levelInfoList: LevelInfo[], totalLength: number = 602): LevelInfo[] {
         if (levelInfoList.length === 0) return [];
         const firstLevel = levelInfoList[0].level;
         const lastLevel = levelInfoList[levelInfoList.length - 1].level;
@@ -118,7 +118,6 @@ export class WelfareTwo extends VMParent {
         const singleLength = totalLength / (lastLevel - 1);
         return levelInfoList.map((item, index) => {
             let foundFirstNotWithdraw = false;
-
             if (index === 0) {
                 item.position = this.progressNode.position.x;
             } else if (index === levelInfoList.length - 1) {
@@ -126,7 +125,6 @@ export class WelfareTwo extends VMParent {
             } else {
                 item.position = this.progressNode.position.x + ((item.level - firstLevel) * singleLength);
             }
-
             // 标记第一个未提现
             if (!foundFirstNotWithdraw && item.withdraw) {
                 item.isFirstNotWithdraw = true;
@@ -134,8 +132,6 @@ export class WelfareTwo extends VMParent {
             } else {
                 item.isFirstNotWithdraw = false;
             }
-
-
             return item;
         });
     }