Browse Source

2025-05-08 wws

webView浏览器中适配
Kziwws 1 month ago
parent
commit
d3ce3c31b6
66 changed files with 4875 additions and 4596 deletions
  1. 195 156
      assets/resources/gameui/BoxLayer.prefab
  2. 163 106
      assets/resources/gameui/BuyCoinLayer.prefab
  3. 187 148
      assets/resources/gameui/BuyItemLayer.prefab
  4. 201 144
      assets/resources/gameui/BuyLifeLayer.prefab
  5. 191 152
      assets/resources/gameui/DrawStarLayer.prefab
  6. 111 54
      assets/resources/gameui/FailLayer.prefab
  7. 2 23
      assets/resources/gameui/GameUI.prefab
  8. 5 28
      assets/resources/gameui/HallUI.prefab
  9. 199 142
      assets/resources/gameui/LevelClearLayer.prefab
  10. 195 156
      assets/resources/gameui/LevelLayer.prefab
  11. 190 151
      assets/resources/gameui/NewPackOpenedLayer.prefab
  12. 190 151
      assets/resources/gameui/OutOfBoxLayer.prefab
  13. 153 96
      assets/resources/gameui/PauseLayer.prefab
  14. 201 144
      assets/resources/gameui/SettingLayer.prefab
  15. 0 836
      assets/resources/gameui/bg.prefab
  16. 0 13
      assets/resources/gameui/bg.prefab.meta
  17. 1 1
      assets/resources/prefabs/BusyLoading.prefab
  18. 2 2
      assets/resources/prefabs/GameNode.prefab
  19. 31 16
      assets/scenes/loading.scene
  20. 6 11
      assets/scenes/main.scene
  21. 46 0
      assets/scripts/core/adapter/ResolutionAutoFit.ts
  22. 9 0
      assets/scripts/core/adapter/ResolutionAutoFit.ts.meta
  23. 1 1
      assets/scripts/core/component/BaseUI.ts
  24. BIN
      build/.DS_Store
  25. 0 0
      build/web-mobile/assets/main/config.json
  26. 0 0
      build/web-mobile/assets/main/import/03/03dfc3267.json
  27. 1 1
      build/web-mobile/assets/main/index.js
  28. 0 0
      build/web-mobile/assets/resources/config.json
  29. 0 0
      build/web-mobile/assets/resources/import/01/011aa0c94.json
  30. 0 0
      build/web-mobile/assets/resources/import/05/057e57cb7.json
  31. 0 0
      build/web-mobile/assets/resources/import/06/061a849fa.json
  32. 0 0
      build/web-mobile/assets/resources/import/07/072ea5daa.json
  33. 0 0
      build/web-mobile/assets/resources/import/08/0841b4bba.json
  34. 0 0
      build/web-mobile/assets/resources/import/08/0841d7158.json
  35. 0 0
      build/web-mobile/assets/resources/import/09/091a37c32.json
  36. 0 0
      build/web-mobile/assets/resources/import/09/09c9fda80.json
  37. 0 0
      build/web-mobile/assets/resources/import/0a/0a243728a.json
  38. 0 0
      build/web-mobile/assets/resources/import/0b/0be393444.json
  39. 0 0
      build/web-mobile/assets/resources/import/0c/0c0a122a0.json
  40. 0 0
      build/web-mobile/assets/resources/import/0c/0c9354e72.json
  41. 0 0
      build/web-mobile/assets/resources/import/0d/0dffce3d6.json
  42. 0 0
      build/web-mobile/assets/resources/import/0e/0e3df3ee3.json
  43. 0 0
      build/web-mobile/assets/resources/import/0f/0f09586c7.json
  44. 0 0
      build/web-mobile/assets/resources/import/0f/0fccbcdd3.json
  45. 25 41
      library/.assets-data.json
  46. 35 30
      library/.assets-info1.0.0.json
  47. 190 151
      library/0f/0fe45a30-5541-4ff8-9715-3a7ed22358e6.json
  48. 31 16
      library/15/1523702b-f45a-4b86-a2ce-fe6a9634afdf.json
  49. 1 1
      library/26/269aef79-20c0-428a-8aec-5ea29dbc1157.json
  50. 163 106
      library/4c/4cd259f2-fc79-4e93-8d6b-804a5b820fb8.json
  51. 111 54
      library/69/699c6afd-6df5-492b-8b36-1871db71ad16.json
  52. 195 156
      library/6c/6c91161f-a581-4aea-b319-d6d3dead58c3.json
  53. 2 2
      library/6e/6e8c4209-3574-45b0-858d-16cff5eee329.json
  54. 2 23
      library/79/79d5fa5f-cb75-4f1a-8ca4-503a10fc449d.json
  55. 153 96
      library/88/886f5150-93a4-44ea-804c-4ec2e80a3ee4.json
  56. 201 144
      library/9b/9b4f7c25-9b14-4d87-9200-c868813c9a28.json
  57. 5 28
      library/9e/9e12223d-7a81-471d-8295-08a69b25b44b.json
  58. 199 142
      library/a8/a87b5748-2ead-4c6e-9905-efcce6798098.json
  59. 190 151
      library/b6/b608ca62-d03c-4fc2-a51a-772e93f391d0.json
  60. 191 152
      library/b8/b83b568a-13ad-4c2d-b7c1-3abd20518b68.json
  61. 187 148
      library/c7/c7f2ecc5-17bf-4e66-9d0b-dc78789a994e.json
  62. 195 156
      library/e8/e82dd65d-215b-4555-819e-3f08028530ab.json
  63. 201 144
      library/e9/e99a8ee5-e203-4882-b5a1-6314bb453d45.json
  64. 6 11
      library/ee/eeec5720-7028-48a1-9aec-e9bb18f4abbc.json
  65. 3 3
      profiles/v2/packages/builder.json
  66. 309 309
      profiles/v2/packages/scene.json

File diff suppressed because it is too large
+ 195 - 156
assets/resources/gameui/BoxLayer.prefab


+ 163 - 106
assets/resources/gameui/BuyCoinLayer.prefab

@@ -22,14 +22,11 @@
         "__id__": 2
       },
       {
-        "__id__": 10
+        "__id__": 12
       }
     ],
     "_active": true,
     "_components": [
-      {
-        "__id__": 72
-      },
       {
         "__id__": 74
       },
@@ -38,10 +35,13 @@
       },
       {
         "__id__": 78
+      },
+      {
+        "__id__": 80
       }
     ],
     "_prefab": {
-      "__id__": 80
+      "__id__": 82
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -91,10 +91,13 @@
       },
       {
         "__id__": 7
+      },
+      {
+        "__id__": 9
       }
     ],
     "_prefab": {
-      "__id__": 9
+      "__id__": 11
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -139,8 +142,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 1000,
-      "height": 2000
+      "width": 750,
+      "height": 1334
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -216,6 +219,42 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "77ShzfVO5D24pO46in5yH2"
   },
+  {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 10
+    },
+    "_alignFlags": 45,
+    "_target": null,
+    "_left": 0,
+    "_right": 0,
+    "_top": 0,
+    "_bottom": 0,
+    "_horizontalCenter": 0,
+    "_verticalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 1000,
+    "_originalHeight": 2000,
+    "_alignMode": 2,
+    "_lockFlags": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "42wEXM/ahL7LMVa6XSePjW"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -239,31 +278,31 @@
     },
     "_children": [
       {
-        "__id__": 11
+        "__id__": 13
       },
       {
-        "__id__": 17
+        "__id__": 19
       },
       {
-        "__id__": 59
+        "__id__": 61
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 67
+        "__id__": 69
       },
       {
-        "__id__": 69
+        "__id__": 71
       }
     ],
     "_prefab": {
-      "__id__": 71
+      "__id__": 73
     },
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 0,
+      "y": 9.577,
       "z": 0
     },
     "_lrot": {
@@ -295,20 +334,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 10
+      "__id__": 12
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 12
+        "__id__": 14
       },
       {
-        "__id__": 14
+        "__id__": 16
       }
     ],
     "_prefab": {
-      "__id__": 16
+      "__id__": 18
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -345,11 +384,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 11
+      "__id__": 13
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 13
+      "__id__": 15
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -373,11 +412,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 11
+      "__id__": 13
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 15
+      "__id__": 17
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -431,30 +470,30 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 10
+      "__id__": 12
     },
     "_children": [
       {
-        "__id__": 18
+        "__id__": 20
       },
       {
-        "__id__": 38
+        "__id__": 40
       }
     ],
     "_active": true,
     "_components": [
-      {
-        "__id__": 52
-      },
       {
         "__id__": 54
       },
       {
         "__id__": 56
+      },
+      {
+        "__id__": 58
       }
     ],
     "_prefab": {
-      "__id__": 58
+      "__id__": 60
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -491,27 +530,27 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 17
+      "__id__": 19
     },
     "_children": [
       {
-        "__id__": 19
+        "__id__": 21
       },
       {
-        "__id__": 25
+        "__id__": 27
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 33
+        "__id__": 35
       },
       {
-        "__id__": 35
+        "__id__": 37
       }
     ],
     "_prefab": {
-      "__id__": 37
+      "__id__": 39
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -548,20 +587,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 18
+      "__id__": 20
     },
     "_children": [],
     "_active": false,
     "_components": [
       {
-        "__id__": 20
+        "__id__": 22
       },
       {
-        "__id__": 22
+        "__id__": 24
       }
     ],
     "_prefab": {
-      "__id__": 24
+      "__id__": 26
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -598,11 +637,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 19
+      "__id__": 21
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 21
+      "__id__": 23
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -626,11 +665,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 19
+      "__id__": 21
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 23
+      "__id__": 25
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -684,23 +723,23 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 18
+      "__id__": 20
     },
     "_children": [],
     "_active": true,
     "_components": [
-      {
-        "__id__": 26
-      },
       {
         "__id__": 28
       },
       {
         "__id__": 30
+      },
+      {
+        "__id__": 32
       }
     ],
     "_prefab": {
-      "__id__": 32
+      "__id__": 34
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -737,11 +776,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 25
+      "__id__": 27
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 27
+      "__id__": 29
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -765,11 +804,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 25
+      "__id__": 27
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 29
+      "__id__": 31
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -836,11 +875,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 25
+      "__id__": 27
     },
     "_enabled": false,
     "__prefab": {
-      "__id__": 31
+      "__id__": 33
     },
     "_id": ""
   },
@@ -867,11 +906,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 18
+      "__id__": 20
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 34
+      "__id__": 36
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -895,11 +934,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 18
+      "__id__": 20
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 36
+      "__id__": 38
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -953,27 +992,27 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 17
+      "__id__": 19
     },
     "_children": [
       {
-        "__id__": 39
+        "__id__": 41
       }
     ],
     "_active": true,
     "_components": [
-      {
-        "__id__": 45
-      },
       {
         "__id__": 47
       },
       {
         "__id__": 49
+      },
+      {
+        "__id__": 51
       }
     ],
     "_prefab": {
-      "__id__": 51
+      "__id__": 53
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1010,20 +1049,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 38
+      "__id__": 40
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 40
+        "__id__": 42
       },
       {
-        "__id__": 42
+        "__id__": 44
       }
     ],
     "_prefab": {
-      "__id__": 44
+      "__id__": 46
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1060,11 +1099,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 39
+      "__id__": 41
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 41
+      "__id__": 43
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1088,11 +1127,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 39
+      "__id__": 41
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 43
+      "__id__": 45
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1146,11 +1185,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 38
+      "__id__": 40
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 46
+      "__id__": 48
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1174,11 +1213,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 38
+      "__id__": 40
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 48
+      "__id__": 50
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1219,11 +1258,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 38
+      "__id__": 40
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 50
+      "__id__": 52
     },
     "clickEvents": [],
     "_interactable": true,
@@ -1288,11 +1327,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 17
+      "__id__": 19
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 53
+      "__id__": 55
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1316,11 +1355,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 17
+      "__id__": 19
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 55
+      "__id__": 57
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1361,11 +1400,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 17
+      "__id__": 19
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 57
+      "__id__": 59
     },
     "clickEvents": [],
     "_interactable": true,
@@ -1430,23 +1469,23 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 10
+      "__id__": 12
     },
     "_children": [],
     "_active": true,
     "_components": [
-      {
-        "__id__": 60
-      },
       {
         "__id__": 62
       },
       {
         "__id__": 64
+      },
+      {
+        "__id__": 66
       }
     ],
     "_prefab": {
-      "__id__": 66
+      "__id__": 68
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1483,11 +1522,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 59
+      "__id__": 61
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 61
+      "__id__": 63
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1511,11 +1550,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 59
+      "__id__": 61
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 63
+      "__id__": 65
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1556,11 +1595,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 59
+      "__id__": 61
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 65
+      "__id__": 67
     },
     "clickEvents": [],
     "_interactable": true,
@@ -1625,11 +1664,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 10
+      "__id__": 12
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 68
+      "__id__": 70
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1653,11 +1692,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 10
+      "__id__": 12
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 70
+      "__id__": 72
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1715,7 +1754,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 73
+      "__id__": 75
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1743,7 +1782,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 75
+      "__id__": 77
     },
     "_id": ""
   },
@@ -1761,7 +1800,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 77
+      "__id__": 79
     },
     "_id": ""
   },
@@ -1770,7 +1809,7 @@
     "fileId": "c7OqotDyVG4IZWh++7ImoZ"
   },
   {
-    "__type__": "b356cApUdVC8I8CxLJLwlZA",
+    "__type__": "cc.Widget",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -1779,13 +1818,31 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 79
+      "__id__": 81
     },
+    "_alignFlags": 45,
+    "_target": null,
+    "_left": 0,
+    "_right": 0,
+    "_top": 0,
+    "_bottom": 0,
+    "_horizontalCenter": 0,
+    "_verticalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 750,
+    "_originalHeight": 1334,
+    "_alignMode": 1,
+    "_lockFlags": 0,
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "2d+10T5Q5AVrh1pT0Atizf"
+    "fileId": "ec7+5FlZJMrLT49jjBu2Er"
   },
   {
     "__type__": "cc.PrefabInfo",

File diff suppressed because it is too large
+ 187 - 148
assets/resources/gameui/BuyItemLayer.prefab


+ 201 - 144
assets/resources/gameui/BuyLifeLayer.prefab

@@ -22,14 +22,11 @@
         "__id__": 2
       },
       {
-        "__id__": 10
+        "__id__": 12
       }
     ],
     "_active": true,
     "_components": [
-      {
-        "__id__": 98
-      },
       {
         "__id__": 100
       },
@@ -38,10 +35,13 @@
       },
       {
         "__id__": 104
+      },
+      {
+        "__id__": 106
       }
     ],
     "_prefab": {
-      "__id__": 106
+      "__id__": 108
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -91,10 +91,13 @@
       },
       {
         "__id__": 7
+      },
+      {
+        "__id__": 9
       }
     ],
     "_prefab": {
-      "__id__": 9
+      "__id__": 11
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -139,8 +142,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 1000,
-      "height": 2000
+      "width": 750,
+      "height": 1334
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -216,6 +219,42 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "77ShzfVO5D24pO46in5yH2"
   },
+  {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 10
+    },
+    "_alignFlags": 45,
+    "_target": null,
+    "_left": 0,
+    "_right": 0,
+    "_top": 0,
+    "_bottom": 0,
+    "_horizontalCenter": 0,
+    "_verticalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 1000,
+    "_originalHeight": 2000,
+    "_alignMode": 2,
+    "_lockFlags": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "3fIQhzjgdKZ6ZK5Vi4RJ1s"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -239,35 +278,35 @@
     },
     "_children": [
       {
-        "__id__": 11
+        "__id__": 13
       },
       {
-        "__id__": 25
+        "__id__": 27
       },
       {
-        "__id__": 67
+        "__id__": 69
       },
       {
-        "__id__": 75
+        "__id__": 77
       },
       {
-        "__id__": 81
+        "__id__": 83
       },
       {
-        "__id__": 87
+        "__id__": 89
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 93
+        "__id__": 95
       },
       {
-        "__id__": 95
+        "__id__": 97
       }
     ],
     "_prefab": {
-      "__id__": 97
+      "__id__": 99
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -304,24 +343,24 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 10
+      "__id__": 12
     },
     "_children": [
       {
-        "__id__": 12
+        "__id__": 14
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 20
+        "__id__": 22
       },
       {
-        "__id__": 22
+        "__id__": 24
       }
     ],
     "_prefab": {
-      "__id__": 24
+      "__id__": 26
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -358,23 +397,23 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 11
+      "__id__": 13
     },
     "_children": [],
     "_active": true,
     "_components": [
-      {
-        "__id__": 13
-      },
       {
         "__id__": 15
       },
       {
         "__id__": 17
+      },
+      {
+        "__id__": 19
       }
     ],
     "_prefab": {
-      "__id__": 19
+      "__id__": 21
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -411,11 +450,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 12
+      "__id__": 14
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 14
+      "__id__": 16
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -439,11 +478,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 12
+      "__id__": 14
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 16
+      "__id__": 18
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -510,11 +549,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 12
+      "__id__": 14
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 18
+      "__id__": 20
     },
     "_id": ""
   },
@@ -541,11 +580,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 11
+      "__id__": 13
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 21
+      "__id__": 23
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -569,11 +608,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 11
+      "__id__": 13
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 23
+      "__id__": 25
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -627,30 +666,30 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 10
+      "__id__": 12
     },
     "_children": [
       {
-        "__id__": 26
+        "__id__": 28
       },
       {
-        "__id__": 46
+        "__id__": 48
       }
     ],
     "_active": true,
     "_components": [
-      {
-        "__id__": 60
-      },
       {
         "__id__": 62
       },
       {
         "__id__": 64
+      },
+      {
+        "__id__": 66
       }
     ],
     "_prefab": {
-      "__id__": 66
+      "__id__": 68
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -687,27 +726,27 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 25
+      "__id__": 27
     },
     "_children": [
       {
-        "__id__": 27
+        "__id__": 29
       },
       {
-        "__id__": 33
+        "__id__": 35
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 41
+        "__id__": 43
       },
       {
-        "__id__": 43
+        "__id__": 45
       }
     ],
     "_prefab": {
-      "__id__": 45
+      "__id__": 47
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -744,20 +783,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 26
+      "__id__": 28
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 28
+        "__id__": 30
       },
       {
-        "__id__": 30
+        "__id__": 32
       }
     ],
     "_prefab": {
-      "__id__": 32
+      "__id__": 34
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -794,11 +833,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 27
+      "__id__": 29
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 29
+      "__id__": 31
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -822,11 +861,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 27
+      "__id__": 29
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 31
+      "__id__": 33
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -880,23 +919,23 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 26
+      "__id__": 28
     },
     "_children": [],
     "_active": true,
     "_components": [
-      {
-        "__id__": 34
-      },
       {
         "__id__": 36
       },
       {
         "__id__": 38
+      },
+      {
+        "__id__": 40
       }
     ],
     "_prefab": {
-      "__id__": 40
+      "__id__": 42
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -933,11 +972,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 33
+      "__id__": 35
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 35
+      "__id__": 37
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -961,11 +1000,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 33
+      "__id__": 35
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 37
+      "__id__": 39
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1032,11 +1071,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 33
+      "__id__": 35
     },
     "_enabled": false,
     "__prefab": {
-      "__id__": 39
+      "__id__": 41
     },
     "_id": ""
   },
@@ -1063,11 +1102,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 26
+      "__id__": 28
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 42
+      "__id__": 44
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1091,11 +1130,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 26
+      "__id__": 28
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 44
+      "__id__": 46
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1149,27 +1188,27 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 25
+      "__id__": 27
     },
     "_children": [
       {
-        "__id__": 47
+        "__id__": 49
       }
     ],
     "_active": true,
     "_components": [
-      {
-        "__id__": 53
-      },
       {
         "__id__": 55
       },
       {
         "__id__": 57
+      },
+      {
+        "__id__": 59
       }
     ],
     "_prefab": {
-      "__id__": 59
+      "__id__": 61
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1206,20 +1245,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 46
+      "__id__": 48
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 48
+        "__id__": 50
       },
       {
-        "__id__": 50
+        "__id__": 52
       }
     ],
     "_prefab": {
-      "__id__": 52
+      "__id__": 54
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1256,11 +1295,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 47
+      "__id__": 49
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 49
+      "__id__": 51
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1284,11 +1323,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 47
+      "__id__": 49
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 51
+      "__id__": 53
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1342,11 +1381,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 46
+      "__id__": 48
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 54
+      "__id__": 56
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1370,11 +1409,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 46
+      "__id__": 48
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 56
+      "__id__": 58
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1415,11 +1454,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 46
+      "__id__": 48
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 58
+      "__id__": 60
     },
     "clickEvents": [],
     "_interactable": true,
@@ -1484,11 +1523,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 25
+      "__id__": 27
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 61
+      "__id__": 63
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1512,11 +1551,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 25
+      "__id__": 27
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 63
+      "__id__": 65
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1557,11 +1596,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 25
+      "__id__": 27
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 65
+      "__id__": 67
     },
     "clickEvents": [],
     "_interactable": true,
@@ -1626,23 +1665,23 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 10
+      "__id__": 12
     },
     "_children": [],
     "_active": true,
     "_components": [
-      {
-        "__id__": 68
-      },
       {
         "__id__": 70
       },
       {
         "__id__": 72
+      },
+      {
+        "__id__": 74
       }
     ],
     "_prefab": {
-      "__id__": 74
+      "__id__": 76
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1679,11 +1718,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 67
+      "__id__": 69
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 69
+      "__id__": 71
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1707,11 +1746,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 67
+      "__id__": 69
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 71
+      "__id__": 73
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1752,11 +1791,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 67
+      "__id__": 69
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 73
+      "__id__": 75
     },
     "clickEvents": [],
     "_interactable": true,
@@ -1821,20 +1860,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 10
+      "__id__": 12
     },
     "_children": [],
     "_active": false,
     "_components": [
       {
-        "__id__": 76
+        "__id__": 78
       },
       {
-        "__id__": 78
+        "__id__": 80
       }
     ],
     "_prefab": {
-      "__id__": 80
+      "__id__": 82
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1871,11 +1910,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 75
+      "__id__": 77
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 77
+      "__id__": 79
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1899,11 +1938,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 75
+      "__id__": 77
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 79
+      "__id__": 81
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1980,20 +2019,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 10
+      "__id__": 12
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 82
+        "__id__": 84
       },
       {
-        "__id__": 84
+        "__id__": 86
       }
     ],
     "_prefab": {
-      "__id__": 86
+      "__id__": 88
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -2030,11 +2069,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 81
+      "__id__": 83
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 83
+      "__id__": 85
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2058,11 +2097,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 81
+      "__id__": 83
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 85
+      "__id__": 87
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -2116,20 +2155,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 10
+      "__id__": 12
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 88
+        "__id__": 90
       },
       {
-        "__id__": 90
+        "__id__": 92
       }
     ],
     "_prefab": {
-      "__id__": 92
+      "__id__": 94
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -2166,11 +2205,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 87
+      "__id__": 89
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 89
+      "__id__": 91
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2194,11 +2233,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 87
+      "__id__": 89
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 91
+      "__id__": 93
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -2278,11 +2317,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 10
+      "__id__": 12
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 94
+      "__id__": 96
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2306,11 +2345,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 10
+      "__id__": 12
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 96
+      "__id__": 98
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -2368,7 +2407,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 99
+      "__id__": 101
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2396,7 +2435,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 101
+      "__id__": 103
     },
     "_id": ""
   },
@@ -2414,7 +2453,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 103
+      "__id__": 105
     },
     "_id": ""
   },
@@ -2423,7 +2462,7 @@
     "fileId": "6dengAL7lOjKqZbFoYeF6T"
   },
   {
-    "__type__": "b356cApUdVC8I8CxLJLwlZA",
+    "__type__": "cc.Widget",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -2432,13 +2471,31 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 105
+      "__id__": 107
     },
+    "_alignFlags": 45,
+    "_target": null,
+    "_left": 0,
+    "_right": 0,
+    "_top": 0,
+    "_bottom": 0,
+    "_horizontalCenter": 0,
+    "_verticalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 750,
+    "_originalHeight": 1334,
+    "_alignMode": 1,
+    "_lockFlags": 0,
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "caH+Za9eZK/p4+eEENXLYr"
+    "fileId": "25aY+eucVF7JMufkQs6Nb0"
   },
   {
     "__type__": "cc.PrefabInfo",

File diff suppressed because it is too large
+ 191 - 152
assets/resources/gameui/DrawStarLayer.prefab


+ 111 - 54
assets/resources/gameui/FailLayer.prefab

@@ -22,14 +22,11 @@
         "__id__": 2
       },
       {
-        "__id__": 10
+        "__id__": 12
       }
     ],
     "_active": true,
     "_components": [
-      {
-        "__id__": 38
-      },
       {
         "__id__": 40
       },
@@ -38,10 +35,13 @@
       },
       {
         "__id__": 44
+      },
+      {
+        "__id__": 46
       }
     ],
     "_prefab": {
-      "__id__": 46
+      "__id__": 48
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -91,10 +91,13 @@
       },
       {
         "__id__": 7
+      },
+      {
+        "__id__": 9
       }
     ],
     "_prefab": {
-      "__id__": 9
+      "__id__": 11
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -139,8 +142,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 1000,
-      "height": 2000
+      "width": 750,
+      "height": 1334
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -216,6 +219,42 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "77ShzfVO5D24pO46in5yH2"
   },
+  {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 10
+    },
+    "_alignFlags": 45,
+    "_target": null,
+    "_left": 0,
+    "_right": 0,
+    "_top": 0,
+    "_bottom": 0,
+    "_horizontalCenter": 0,
+    "_verticalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 1000,
+    "_originalHeight": 2000,
+    "_alignMode": 2,
+    "_lockFlags": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "a9Fb+ArOBK65A9Jto6YpZD"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -239,26 +278,26 @@
     },
     "_children": [
       {
-        "__id__": 11
+        "__id__": 13
       },
       {
-        "__id__": 17
+        "__id__": 19
       },
       {
-        "__id__": 25
+        "__id__": 27
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 33
+        "__id__": 35
       },
       {
-        "__id__": 35
+        "__id__": 37
       }
     ],
     "_prefab": {
-      "__id__": 37
+      "__id__": 39
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -295,20 +334,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 10
+      "__id__": 12
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 12
+        "__id__": 14
       },
       {
-        "__id__": 14
+        "__id__": 16
       }
     ],
     "_prefab": {
-      "__id__": 16
+      "__id__": 18
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -345,11 +384,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 11
+      "__id__": 13
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 13
+      "__id__": 15
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -373,11 +412,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 11
+      "__id__": 13
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 15
+      "__id__": 17
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -431,23 +470,23 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 10
+      "__id__": 12
     },
     "_children": [],
     "_active": true,
     "_components": [
-      {
-        "__id__": 18
-      },
       {
         "__id__": 20
       },
       {
         "__id__": 22
+      },
+      {
+        "__id__": 24
       }
     ],
     "_prefab": {
-      "__id__": 24
+      "__id__": 26
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -484,11 +523,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 17
+      "__id__": 19
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 19
+      "__id__": 21
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -512,11 +551,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 17
+      "__id__": 19
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 21
+      "__id__": 23
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -557,11 +596,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 17
+      "__id__": 19
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 23
+      "__id__": 25
     },
     "clickEvents": [],
     "_interactable": true,
@@ -626,23 +665,23 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 10
+      "__id__": 12
     },
     "_children": [],
     "_active": true,
     "_components": [
-      {
-        "__id__": 26
-      },
       {
         "__id__": 28
       },
       {
         "__id__": 30
+      },
+      {
+        "__id__": 32
       }
     ],
     "_prefab": {
-      "__id__": 32
+      "__id__": 34
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -679,11 +718,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 25
+      "__id__": 27
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 27
+      "__id__": 29
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -707,11 +746,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 25
+      "__id__": 27
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 29
+      "__id__": 31
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -752,11 +791,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 25
+      "__id__": 27
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 31
+      "__id__": 33
     },
     "clickEvents": [],
     "_interactable": true,
@@ -821,11 +860,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 10
+      "__id__": 12
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 34
+      "__id__": 36
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -849,11 +888,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 10
+      "__id__": 12
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 36
+      "__id__": 38
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -911,7 +950,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 39
+      "__id__": 41
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -939,7 +978,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 41
+      "__id__": 43
     },
     "_id": ""
   },
@@ -957,7 +996,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 43
+      "__id__": 45
     },
     "_id": ""
   },
@@ -966,7 +1005,7 @@
     "fileId": "cdceTWUVNG2JPxE+ChRidn"
   },
   {
-    "__type__": "b356cApUdVC8I8CxLJLwlZA",
+    "__type__": "cc.Widget",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -975,13 +1014,31 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 45
+      "__id__": 47
     },
+    "_alignFlags": 45,
+    "_target": null,
+    "_left": 0,
+    "_right": 0,
+    "_top": 0,
+    "_bottom": 0,
+    "_horizontalCenter": 0,
+    "_verticalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 750,
+    "_originalHeight": 1334,
+    "_alignMode": 1,
+    "_lockFlags": 0,
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "e26xMnUI9ML5KL81/eFT6y"
+    "fileId": "6ampZP31lMnI0EhZIJLhv5"
   },
   {
     "__type__": "cc.PrefabInfo",

+ 2 - 23
assets/resources/gameui/GameUI.prefab

@@ -47,13 +47,10 @@
       },
       {
         "__id__": 242
-      },
-      {
-        "__id__": 244
       }
     ],
     "_prefab": {
-      "__id__": 246
+      "__id__": 244
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -5779,7 +5776,7 @@
     "_isAbsVerticalCenter": true,
     "_originalWidth": 100,
     "_originalHeight": 100,
-    "_alignMode": 2,
+    "_alignMode": 1,
     "_lockFlags": 0,
     "_id": ""
   },
@@ -5854,24 +5851,6 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "e3KhlnPpZOY5l0prGG6qBH"
   },
-  {
-    "__type__": "b356cApUdVC8I8CxLJLwlZA",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 1
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 245
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "c2f6woEbFC4ZfN+AMHQxSd"
-  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {

+ 5 - 28
assets/resources/gameui/HallUI.prefab

@@ -47,13 +47,10 @@
       },
       {
         "__id__": 322
-      },
-      {
-        "__id__": 324
       }
     ],
     "_prefab": {
-      "__id__": 326
+      "__id__": 324
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -5930,7 +5927,7 @@
     "_originalWidth": 211,
     "_originalHeight": 0,
     "_alignMode": 2,
-    "_lockFlags": 41,
+    "_lockFlags": 0,
     "_id": ""
   },
   {
@@ -6137,9 +6134,7 @@
       "__id__": 258
     },
     "_alignFlags": 20,
-    "_target": {
-      "__id__": 1
-    },
+    "_target": null,
     "_left": 0,
     "_right": 0,
     "_top": 0,
@@ -6154,7 +6149,7 @@
     "_isAbsVerticalCenter": true,
     "_originalWidth": 0,
     "_originalHeight": 0,
-    "_alignMode": 1,
+    "_alignMode": 2,
     "_lockFlags": 0,
     "_id": ""
   },
@@ -7623,7 +7618,7 @@
     "_isAbsVerticalCenter": true,
     "_originalWidth": 100,
     "_originalHeight": 100,
-    "_alignMode": 2,
+    "_alignMode": 1,
     "_lockFlags": 0,
     "_id": ""
   },
@@ -7649,24 +7644,6 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "efLBgJ1R1MUo0udhExoE8t"
   },
-  {
-    "__type__": "b356cApUdVC8I8CxLJLwlZA",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 1
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 325
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "8aP3bjJplHJ4c1J4KRKVeD"
-  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {

+ 199 - 142
assets/resources/gameui/LevelClearLayer.prefab

@@ -22,14 +22,11 @@
         "__id__": 2
       },
       {
-        "__id__": 10
+        "__id__": 12
       }
     ],
     "_active": true,
     "_components": [
-      {
-        "__id__": 96
-      },
       {
         "__id__": 98
       },
@@ -38,10 +35,13 @@
       },
       {
         "__id__": 102
+      },
+      {
+        "__id__": 104
       }
     ],
     "_prefab": {
-      "__id__": 104
+      "__id__": 106
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -91,10 +91,13 @@
       },
       {
         "__id__": 7
+      },
+      {
+        "__id__": 9
       }
     ],
     "_prefab": {
-      "__id__": 9
+      "__id__": 11
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -139,8 +142,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 1000,
-      "height": 2000
+      "width": 750,
+      "height": 1334
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -216,6 +219,42 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "77ShzfVO5D24pO46in5yH2"
   },
+  {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 10
+    },
+    "_alignFlags": 45,
+    "_target": null,
+    "_left": 0,
+    "_right": 0,
+    "_top": 0,
+    "_bottom": 0,
+    "_horizontalCenter": 0,
+    "_verticalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 1000,
+    "_originalHeight": 2000,
+    "_alignMode": 2,
+    "_lockFlags": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "c8LgOUJR5Ozrb4Uy0NlJ3T"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -239,29 +278,29 @@
     },
     "_children": [
       {
-        "__id__": 11
+        "__id__": 13
       },
       {
-        "__id__": 57
+        "__id__": 59
       },
       {
-        "__id__": 63
+        "__id__": 65
       },
       {
-        "__id__": 77
+        "__id__": 79
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 91
+        "__id__": 93
       },
       {
-        "__id__": 93
+        "__id__": 95
       }
     ],
     "_prefab": {
-      "__id__": 95
+      "__id__": 97
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -298,30 +337,30 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 10
+      "__id__": 12
     },
     "_children": [
       {
-        "__id__": 12
+        "__id__": 14
       },
       {
-        "__id__": 18
+        "__id__": 20
       },
       {
-        "__id__": 44
+        "__id__": 46
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 52
+        "__id__": 54
       },
       {
-        "__id__": 54
+        "__id__": 56
       }
     ],
     "_prefab": {
-      "__id__": 56
+      "__id__": 58
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -358,20 +397,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 11
+      "__id__": 13
     },
     "_children": [],
     "_active": false,
     "_components": [
       {
-        "__id__": 13
+        "__id__": 15
       },
       {
-        "__id__": 15
+        "__id__": 17
       }
     ],
     "_prefab": {
-      "__id__": 17
+      "__id__": 19
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -408,11 +447,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 12
+      "__id__": 14
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 14
+      "__id__": 16
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -436,11 +475,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 12
+      "__id__": 14
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 16
+      "__id__": 18
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -494,27 +533,27 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 11
+      "__id__": 13
     },
     "_children": [
       {
-        "__id__": 19
+        "__id__": 21
       },
       {
-        "__id__": 33
+        "__id__": 35
       }
     ],
     "_active": false,
     "_components": [
       {
-        "__id__": 39
+        "__id__": 41
       },
       {
-        "__id__": 41
+        "__id__": 43
       }
     ],
     "_prefab": {
-      "__id__": 43
+      "__id__": 45
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -551,27 +590,27 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 18
+      "__id__": 20
     },
     "_children": [
       {
-        "__id__": 20
+        "__id__": 22
       }
     ],
     "_active": true,
     "_components": [
-      {
-        "__id__": 26
-      },
       {
         "__id__": 28
       },
       {
         "__id__": 30
+      },
+      {
+        "__id__": 32
       }
     ],
     "_prefab": {
-      "__id__": 32
+      "__id__": 34
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -608,20 +647,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 19
+      "__id__": 21
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 21
+        "__id__": 23
       },
       {
-        "__id__": 23
+        "__id__": 25
       }
     ],
     "_prefab": {
-      "__id__": 25
+      "__id__": 27
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -658,11 +697,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 20
+      "__id__": 22
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 22
+      "__id__": 24
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -686,11 +725,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 20
+      "__id__": 22
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 24
+      "__id__": 26
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -744,11 +783,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 19
+      "__id__": 21
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 27
+      "__id__": 29
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -772,11 +811,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 19
+      "__id__": 21
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 29
+      "__id__": 31
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -817,14 +856,14 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 19
+      "__id__": 21
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 31
+      "__id__": 33
     },
     "_barSprite": {
-      "__id__": 23
+      "__id__": 25
     },
     "_mode": 2,
     "_totalLength": 1,
@@ -855,20 +894,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 18
+      "__id__": 20
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 34
+        "__id__": 36
       },
       {
-        "__id__": 36
+        "__id__": 38
       }
     ],
     "_prefab": {
-      "__id__": 38
+      "__id__": 40
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -905,11 +944,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 33
+      "__id__": 35
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 35
+      "__id__": 37
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -933,11 +972,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 33
+      "__id__": 35
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 37
+      "__id__": 39
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1014,11 +1053,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 18
+      "__id__": 20
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 40
+      "__id__": 42
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1042,11 +1081,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 18
+      "__id__": 20
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 42
+      "__id__": 44
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1100,23 +1139,23 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 11
+      "__id__": 13
     },
     "_children": [],
     "_active": true,
     "_components": [
-      {
-        "__id__": 45
-      },
       {
         "__id__": 47
       },
       {
         "__id__": 49
+      },
+      {
+        "__id__": 51
       }
     ],
     "_prefab": {
-      "__id__": 51
+      "__id__": 53
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1153,11 +1192,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 44
+      "__id__": 46
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 46
+      "__id__": 48
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1181,11 +1220,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 44
+      "__id__": 46
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 48
+      "__id__": 50
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1252,11 +1291,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 44
+      "__id__": 46
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 50
+      "__id__": 52
     },
     "_alignFlags": 18,
     "_target": null,
@@ -1301,11 +1340,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 11
+      "__id__": 13
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 53
+      "__id__": 55
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1329,11 +1368,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 11
+      "__id__": 13
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 55
+      "__id__": 57
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1387,20 +1426,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 10
+      "__id__": 12
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 58
+        "__id__": 60
       },
       {
-        "__id__": 60
+        "__id__": 62
       }
     ],
     "_prefab": {
-      "__id__": 62
+      "__id__": 64
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1437,11 +1476,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 57
+      "__id__": 59
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 59
+      "__id__": 61
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1465,11 +1504,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 57
+      "__id__": 59
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 61
+      "__id__": 63
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1523,27 +1562,27 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 10
+      "__id__": 12
     },
     "_children": [
       {
-        "__id__": 64
+        "__id__": 66
       }
     ],
     "_active": true,
     "_components": [
-      {
-        "__id__": 70
-      },
       {
         "__id__": 72
       },
       {
         "__id__": 74
+      },
+      {
+        "__id__": 76
       }
     ],
     "_prefab": {
-      "__id__": 76
+      "__id__": 78
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1580,20 +1619,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 63
+      "__id__": 65
     },
     "_children": [],
     "_active": false,
     "_components": [
       {
-        "__id__": 65
+        "__id__": 67
       },
       {
-        "__id__": 67
+        "__id__": 69
       }
     ],
     "_prefab": {
-      "__id__": 69
+      "__id__": 71
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1630,11 +1669,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 64
+      "__id__": 66
     },
     "_enabled": false,
     "__prefab": {
-      "__id__": 66
+      "__id__": 68
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1658,11 +1697,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 64
+      "__id__": 66
     },
     "_enabled": false,
     "__prefab": {
-      "__id__": 68
+      "__id__": 70
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1716,11 +1755,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 63
+      "__id__": 65
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 71
+      "__id__": 73
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1744,11 +1783,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 63
+      "__id__": 65
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 73
+      "__id__": 75
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1789,11 +1828,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 63
+      "__id__": 65
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 75
+      "__id__": 77
     },
     "clickEvents": [],
     "_interactable": true,
@@ -1858,27 +1897,27 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 10
+      "__id__": 12
     },
     "_children": [
       {
-        "__id__": 78
+        "__id__": 80
       }
     ],
     "_active": true,
     "_components": [
-      {
-        "__id__": 84
-      },
       {
         "__id__": 86
       },
       {
         "__id__": 88
+      },
+      {
+        "__id__": 90
       }
     ],
     "_prefab": {
-      "__id__": 90
+      "__id__": 92
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1915,20 +1954,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 77
+      "__id__": 79
     },
     "_children": [],
     "_active": false,
     "_components": [
       {
-        "__id__": 79
+        "__id__": 81
       },
       {
-        "__id__": 81
+        "__id__": 83
       }
     ],
     "_prefab": {
-      "__id__": 83
+      "__id__": 85
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1965,11 +2004,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 78
+      "__id__": 80
     },
     "_enabled": false,
     "__prefab": {
-      "__id__": 80
+      "__id__": 82
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1993,11 +2032,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 78
+      "__id__": 80
     },
     "_enabled": false,
     "__prefab": {
-      "__id__": 82
+      "__id__": 84
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -2051,11 +2090,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 77
+      "__id__": 79
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 85
+      "__id__": 87
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2079,11 +2118,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 77
+      "__id__": 79
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 87
+      "__id__": 89
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -2124,11 +2163,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 77
+      "__id__": 79
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 89
+      "__id__": 91
     },
     "clickEvents": [],
     "_interactable": true,
@@ -2193,11 +2232,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 10
+      "__id__": 12
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 92
+      "__id__": 94
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2221,11 +2260,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 10
+      "__id__": 12
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 94
+      "__id__": 96
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -2283,7 +2322,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 97
+      "__id__": 99
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2311,7 +2350,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 99
+      "__id__": 101
     },
     "_id": ""
   },
@@ -2329,7 +2368,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 101
+      "__id__": 103
     },
     "_id": ""
   },
@@ -2338,7 +2377,7 @@
     "fileId": "02zJ5UrRdLU5+qybADx9k3"
   },
   {
-    "__type__": "b356cApUdVC8I8CxLJLwlZA",
+    "__type__": "cc.Widget",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -2347,13 +2386,31 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 103
+      "__id__": 105
     },
+    "_alignFlags": 45,
+    "_target": null,
+    "_left": 0,
+    "_right": 0,
+    "_top": 0,
+    "_bottom": 0,
+    "_horizontalCenter": 0,
+    "_verticalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 750,
+    "_originalHeight": 1334,
+    "_alignMode": 1,
+    "_lockFlags": 0,
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "3fx5fQceFFqoJSYzTABbDN"
+    "fileId": "92OJqjeolFzLy0ybdzkiPv"
   },
   {
     "__type__": "cc.PrefabInfo",

File diff suppressed because it is too large
+ 195 - 156
assets/resources/gameui/LevelLayer.prefab


File diff suppressed because it is too large
+ 190 - 151
assets/resources/gameui/NewPackOpenedLayer.prefab


File diff suppressed because it is too large
+ 190 - 151
assets/resources/gameui/OutOfBoxLayer.prefab


+ 153 - 96
assets/resources/gameui/PauseLayer.prefab

@@ -22,14 +22,11 @@
         "__id__": 2
       },
       {
-        "__id__": 10
+        "__id__": 12
       }
     ],
     "_active": true,
     "_components": [
-      {
-        "__id__": 66
-      },
       {
         "__id__": 68
       },
@@ -38,10 +35,13 @@
       },
       {
         "__id__": 72
+      },
+      {
+        "__id__": 74
       }
     ],
     "_prefab": {
-      "__id__": 74
+      "__id__": 76
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -91,10 +91,13 @@
       },
       {
         "__id__": 7
+      },
+      {
+        "__id__": 9
       }
     ],
     "_prefab": {
-      "__id__": 9
+      "__id__": 11
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -139,8 +142,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 1000,
-      "height": 2000
+      "width": 750,
+      "height": 1334
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -216,6 +219,42 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "77ShzfVO5D24pO46in5yH2"
   },
+  {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 10
+    },
+    "_alignFlags": 45,
+    "_target": null,
+    "_left": 0,
+    "_right": 0,
+    "_top": 0,
+    "_bottom": 0,
+    "_horizontalCenter": 0,
+    "_verticalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 1000,
+    "_originalHeight": 2000,
+    "_alignMode": 2,
+    "_lockFlags": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "4dBmuoIKxGka03tJkkEExZ"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -239,35 +278,35 @@
     },
     "_children": [
       {
-        "__id__": 11
+        "__id__": 13
       },
       {
-        "__id__": 17
+        "__id__": 19
       },
       {
-        "__id__": 25
+        "__id__": 27
       },
       {
-        "__id__": 33
+        "__id__": 35
       },
       {
-        "__id__": 41
+        "__id__": 43
       },
       {
-        "__id__": 49
+        "__id__": 51
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 61
+        "__id__": 63
       },
       {
-        "__id__": 63
+        "__id__": 65
       }
     ],
     "_prefab": {
-      "__id__": 65
+      "__id__": 67
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -304,20 +343,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 10
+      "__id__": 12
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 12
+        "__id__": 14
       },
       {
-        "__id__": 14
+        "__id__": 16
       }
     ],
     "_prefab": {
-      "__id__": 16
+      "__id__": 18
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -354,11 +393,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 11
+      "__id__": 13
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 13
+      "__id__": 15
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -382,11 +421,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 11
+      "__id__": 13
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 15
+      "__id__": 17
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -440,23 +479,23 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 10
+      "__id__": 12
     },
     "_children": [],
     "_active": false,
     "_components": [
-      {
-        "__id__": 18
-      },
       {
         "__id__": 20
       },
       {
         "__id__": 22
+      },
+      {
+        "__id__": 24
       }
     ],
     "_prefab": {
-      "__id__": 24
+      "__id__": 26
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -493,11 +532,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 17
+      "__id__": 19
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 19
+      "__id__": 21
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -521,11 +560,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 17
+      "__id__": 19
     },
     "_enabled": false,
     "__prefab": {
-      "__id__": 21
+      "__id__": 23
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -589,11 +628,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 17
+      "__id__": 19
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 23
+      "__id__": 25
     },
     "_id": ""
   },
@@ -620,23 +659,23 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 10
+      "__id__": 12
     },
     "_children": [],
     "_active": true,
     "_components": [
-      {
-        "__id__": 26
-      },
       {
         "__id__": 28
       },
       {
         "__id__": 30
+      },
+      {
+        "__id__": 32
       }
     ],
     "_prefab": {
-      "__id__": 32
+      "__id__": 34
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -673,11 +712,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 25
+      "__id__": 27
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 27
+      "__id__": 29
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -701,11 +740,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 25
+      "__id__": 27
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 29
+      "__id__": 31
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -746,11 +785,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 25
+      "__id__": 27
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 31
+      "__id__": 33
     },
     "clickEvents": [],
     "_interactable": true,
@@ -815,23 +854,23 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 10
+      "__id__": 12
     },
     "_children": [],
     "_active": true,
     "_components": [
-      {
-        "__id__": 34
-      },
       {
         "__id__": 36
       },
       {
         "__id__": 38
+      },
+      {
+        "__id__": 40
       }
     ],
     "_prefab": {
-      "__id__": 40
+      "__id__": 42
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -868,11 +907,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 33
+      "__id__": 35
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 35
+      "__id__": 37
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -896,11 +935,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 33
+      "__id__": 35
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 37
+      "__id__": 39
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -941,11 +980,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 33
+      "__id__": 35
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 39
+      "__id__": 41
     },
     "clickEvents": [],
     "_interactable": true,
@@ -1010,23 +1049,23 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 10
+      "__id__": 12
     },
     "_children": [],
     "_active": true,
     "_components": [
-      {
-        "__id__": 42
-      },
       {
         "__id__": 44
       },
       {
         "__id__": 46
+      },
+      {
+        "__id__": 48
       }
     ],
     "_prefab": {
-      "__id__": 48
+      "__id__": 50
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1063,11 +1102,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 41
+      "__id__": 43
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 43
+      "__id__": 45
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1091,11 +1130,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 41
+      "__id__": 43
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 45
+      "__id__": 47
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1136,11 +1175,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 41
+      "__id__": 43
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 47
+      "__id__": 49
     },
     "clickEvents": [],
     "_interactable": true,
@@ -1205,24 +1244,24 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 10
+      "__id__": 12
     },
     "_children": [
       {
-        "__id__": 50
+        "__id__": 52
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 56
+        "__id__": 58
       },
       {
-        "__id__": 58
+        "__id__": 60
       }
     ],
     "_prefab": {
-      "__id__": 60
+      "__id__": 62
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1259,20 +1298,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 49
+      "__id__": 51
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 51
+        "__id__": 53
       },
       {
-        "__id__": 53
+        "__id__": 55
       }
     ],
     "_prefab": {
-      "__id__": 55
+      "__id__": 57
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1309,11 +1348,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 50
+      "__id__": 52
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 52
+      "__id__": 54
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1337,11 +1376,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 50
+      "__id__": 52
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 54
+      "__id__": 56
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1395,11 +1434,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 49
+      "__id__": 51
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 57
+      "__id__": 59
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1423,11 +1462,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 49
+      "__id__": 51
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 59
+      "__id__": 61
     },
     "clickEvents": [],
     "_interactable": true,
@@ -1495,11 +1534,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 10
+      "__id__": 12
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 62
+      "__id__": 64
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1523,11 +1562,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 10
+      "__id__": 12
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 64
+      "__id__": 66
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1585,7 +1624,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 67
+      "__id__": 69
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1613,7 +1652,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 69
+      "__id__": 71
     },
     "_id": ""
   },
@@ -1631,7 +1670,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 71
+      "__id__": 73
     },
     "_id": ""
   },
@@ -1640,7 +1679,7 @@
     "fileId": "caPqMF6ytMFpMCDjupzjDl"
   },
   {
-    "__type__": "b356cApUdVC8I8CxLJLwlZA",
+    "__type__": "cc.Widget",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -1649,13 +1688,31 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 73
+      "__id__": 75
     },
+    "_alignFlags": 45,
+    "_target": null,
+    "_left": 0,
+    "_right": 0,
+    "_top": 0,
+    "_bottom": 0,
+    "_horizontalCenter": 0,
+    "_verticalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 750,
+    "_originalHeight": 1334,
+    "_alignMode": 1,
+    "_lockFlags": 0,
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "52YFvEYFZMdbtU9i1Hqc65"
+    "fileId": "b4PFAzliFEGbgcWkrDFVEg"
   },
   {
     "__type__": "cc.PrefabInfo",

+ 201 - 144
assets/resources/gameui/SettingLayer.prefab

@@ -22,14 +22,11 @@
         "__id__": 2
       },
       {
-        "__id__": 10
+        "__id__": 12
       }
     ],
     "_active": true,
     "_components": [
-      {
-        "__id__": 94
-      },
       {
         "__id__": 96
       },
@@ -38,10 +35,13 @@
       },
       {
         "__id__": 100
+      },
+      {
+        "__id__": 102
       }
     ],
     "_prefab": {
-      "__id__": 102
+      "__id__": 104
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -91,10 +91,13 @@
       },
       {
         "__id__": 7
+      },
+      {
+        "__id__": 9
       }
     ],
     "_prefab": {
-      "__id__": 9
+      "__id__": 11
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -139,8 +142,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 1000,
-      "height": 2000
+      "width": 750,
+      "height": 1334
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -216,6 +219,42 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "77ShzfVO5D24pO46in5yH2"
   },
+  {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 10
+    },
+    "_alignFlags": 45,
+    "_target": null,
+    "_left": 0,
+    "_right": 0,
+    "_top": 0,
+    "_bottom": 0,
+    "_horizontalCenter": 0,
+    "_verticalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 1000,
+    "_originalHeight": 2000,
+    "_alignMode": 2,
+    "_lockFlags": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "e2FTcEdWZN/bvnB17EdPdH"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -239,26 +278,26 @@
     },
     "_children": [
       {
-        "__id__": 11
+        "__id__": 13
       },
       {
-        "__id__": 17
+        "__id__": 19
       },
       {
-        "__id__": 31
+        "__id__": 33
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 89
+        "__id__": 91
       },
       {
-        "__id__": 91
+        "__id__": 93
       }
     ],
     "_prefab": {
-      "__id__": 93
+      "__id__": 95
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -295,20 +334,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 10
+      "__id__": 12
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 12
+        "__id__": 14
       },
       {
-        "__id__": 14
+        "__id__": 16
       }
     ],
     "_prefab": {
-      "__id__": 16
+      "__id__": 18
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -345,11 +384,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 11
+      "__id__": 13
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 13
+      "__id__": 15
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -373,11 +412,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 11
+      "__id__": 13
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 15
+      "__id__": 17
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -431,27 +470,27 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 10
+      "__id__": 12
     },
     "_children": [
       {
-        "__id__": 18
+        "__id__": 20
       }
     ],
     "_active": true,
     "_components": [
-      {
-        "__id__": 24
-      },
       {
         "__id__": 26
       },
       {
         "__id__": 28
+      },
+      {
+        "__id__": 30
       }
     ],
     "_prefab": {
-      "__id__": 30
+      "__id__": 32
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -488,20 +527,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 17
+      "__id__": 19
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 19
+        "__id__": 21
       },
       {
-        "__id__": 21
+        "__id__": 23
       }
     ],
     "_prefab": {
-      "__id__": 23
+      "__id__": 25
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -538,11 +577,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 18
+      "__id__": 20
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 20
+      "__id__": 22
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -566,11 +605,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 18
+      "__id__": 20
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 22
+      "__id__": 24
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -650,11 +689,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 17
+      "__id__": 19
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 25
+      "__id__": 27
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -678,11 +717,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 17
+      "__id__": 19
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 27
+      "__id__": 29
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -723,11 +762,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 17
+      "__id__": 19
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 29
+      "__id__": 31
     },
     "clickEvents": [],
     "_interactable": true,
@@ -767,7 +806,7 @@
     "_duration": 0.1,
     "_zoomScale": 1.02,
     "_target": {
-      "__id__": 17
+      "__id__": 19
     },
     "_id": ""
   },
@@ -794,27 +833,27 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 10
+      "__id__": 12
     },
     "_children": [
       {
-        "__id__": 32
+        "__id__": 34
       },
       {
-        "__id__": 58
+        "__id__": 60
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 84
+        "__id__": 86
       },
       {
-        "__id__": 86
+        "__id__": 88
       }
     ],
     "_prefab": {
-      "__id__": 88
+      "__id__": 90
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -851,27 +890,27 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 31
+      "__id__": 33
     },
     "_children": [
       {
-        "__id__": 33
+        "__id__": 35
       },
       {
-        "__id__": 45
+        "__id__": 47
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 53
+        "__id__": 55
       },
       {
-        "__id__": 55
+        "__id__": 57
       }
     ],
     "_prefab": {
-      "__id__": 57
+      "__id__": 59
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -908,24 +947,24 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 32
+      "__id__": 34
     },
     "_children": [
       {
-        "__id__": 34
+        "__id__": 36
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 40
+        "__id__": 42
       },
       {
-        "__id__": 42
+        "__id__": 44
       }
     ],
     "_prefab": {
-      "__id__": 44
+      "__id__": 46
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -962,20 +1001,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 33
+      "__id__": 35
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 35
+        "__id__": 37
       },
       {
-        "__id__": 37
+        "__id__": 39
       }
     ],
     "_prefab": {
-      "__id__": 39
+      "__id__": 41
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1012,11 +1051,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 34
+      "__id__": 36
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 36
+      "__id__": 38
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1040,11 +1079,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 34
+      "__id__": 36
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 38
+      "__id__": 40
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1124,11 +1163,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 33
+      "__id__": 35
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 41
+      "__id__": 43
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1152,11 +1191,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 33
+      "__id__": 35
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 43
+      "__id__": 45
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1210,23 +1249,23 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 32
+      "__id__": 34
     },
     "_children": [],
     "_active": true,
     "_components": [
-      {
-        "__id__": 46
-      },
       {
         "__id__": 48
       },
       {
         "__id__": 50
+      },
+      {
+        "__id__": 52
       }
     ],
     "_prefab": {
-      "__id__": 52
+      "__id__": 54
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1263,11 +1302,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 45
+      "__id__": 47
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 47
+      "__id__": 49
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1291,11 +1330,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 45
+      "__id__": 47
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 49
+      "__id__": 51
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1336,11 +1375,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 45
+      "__id__": 47
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 51
+      "__id__": 53
     },
     "clickEvents": [],
     "_interactable": true,
@@ -1380,7 +1419,7 @@
     "_duration": 0.1,
     "_zoomScale": 1.02,
     "_target": {
-      "__id__": 45
+      "__id__": 47
     },
     "_id": ""
   },
@@ -1407,11 +1446,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 32
+      "__id__": 34
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 54
+      "__id__": 56
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1435,11 +1474,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 32
+      "__id__": 34
     },
     "_enabled": false,
     "__prefab": {
-      "__id__": 56
+      "__id__": 58
     },
     "_resizeMode": 1,
     "_layoutType": 1,
@@ -1486,27 +1525,27 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 31
+      "__id__": 33
     },
     "_children": [
       {
-        "__id__": 59
+        "__id__": 61
       },
       {
-        "__id__": 71
+        "__id__": 73
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 79
+        "__id__": 81
       },
       {
-        "__id__": 81
+        "__id__": 83
       }
     ],
     "_prefab": {
-      "__id__": 83
+      "__id__": 85
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1543,24 +1582,24 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 58
+      "__id__": 60
     },
     "_children": [
       {
-        "__id__": 60
+        "__id__": 62
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 66
+        "__id__": 68
       },
       {
-        "__id__": 68
+        "__id__": 70
       }
     ],
     "_prefab": {
-      "__id__": 70
+      "__id__": 72
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1597,20 +1636,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 59
+      "__id__": 61
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 61
+        "__id__": 63
       },
       {
-        "__id__": 63
+        "__id__": 65
       }
     ],
     "_prefab": {
-      "__id__": 65
+      "__id__": 67
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1647,11 +1686,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 60
+      "__id__": 62
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 62
+      "__id__": 64
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1675,11 +1714,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 60
+      "__id__": 62
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 64
+      "__id__": 66
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1759,11 +1798,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 59
+      "__id__": 61
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 67
+      "__id__": 69
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1787,11 +1826,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 59
+      "__id__": 61
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 69
+      "__id__": 71
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1845,23 +1884,23 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 58
+      "__id__": 60
     },
     "_children": [],
     "_active": true,
     "_components": [
-      {
-        "__id__": 72
-      },
       {
         "__id__": 74
       },
       {
         "__id__": 76
+      },
+      {
+        "__id__": 78
       }
     ],
     "_prefab": {
-      "__id__": 78
+      "__id__": 80
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1898,11 +1937,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 71
+      "__id__": 73
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 73
+      "__id__": 75
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1926,11 +1965,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 71
+      "__id__": 73
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 75
+      "__id__": 77
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1971,11 +2010,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 71
+      "__id__": 73
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 77
+      "__id__": 79
     },
     "clickEvents": [],
     "_interactable": true,
@@ -2040,11 +2079,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 58
+      "__id__": 60
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 80
+      "__id__": 82
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2068,11 +2107,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 58
+      "__id__": 60
     },
     "_enabled": false,
     "__prefab": {
-      "__id__": 82
+      "__id__": 84
     },
     "_resizeMode": 1,
     "_layoutType": 1,
@@ -2119,11 +2158,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 31
+      "__id__": 33
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 85
+      "__id__": 87
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2147,11 +2186,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 31
+      "__id__": 33
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 87
+      "__id__": 89
     },
     "_resizeMode": 1,
     "_layoutType": 2,
@@ -2198,11 +2237,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 10
+      "__id__": 12
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 90
+      "__id__": 92
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2226,11 +2265,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 10
+      "__id__": 12
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 92
+      "__id__": 94
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -2288,7 +2327,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 95
+      "__id__": 97
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2316,7 +2355,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 97
+      "__id__": 99
     },
     "gou_seleted": {
       "__uuid__": "dfe892cd-b592-421f-be76-2854c9028bd3@f9941",
@@ -2335,10 +2374,10 @@
       "__expectedType__": "cc.SpriteFrame"
     },
     "bg_music_sp": {
-      "__id__": 42
+      "__id__": 44
     },
     "bg_music_gou": {
-      "__id__": 48
+      "__id__": 50
     },
     "sound_open": {
       "__uuid__": "d9a555b7-4cdd-426b-bba9-c8694e1f93d5@f9941",
@@ -2349,10 +2388,10 @@
       "__expectedType__": "cc.SpriteFrame"
     },
     "sound_sp": {
-      "__id__": 68
+      "__id__": 70
     },
     "sound_gou_sp": {
-      "__id__": 74
+      "__id__": 76
     },
     "_id": ""
   },
@@ -2370,7 +2409,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 99
+      "__id__": 101
     },
     "_id": ""
   },
@@ -2379,7 +2418,7 @@
     "fileId": "79lk00MGhOZpRq7VBwxTZm"
   },
   {
-    "__type__": "b356cApUdVC8I8CxLJLwlZA",
+    "__type__": "cc.Widget",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -2388,13 +2427,31 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 101
+      "__id__": 103
     },
+    "_alignFlags": 45,
+    "_target": null,
+    "_left": 0,
+    "_right": 0,
+    "_top": 0,
+    "_bottom": 0,
+    "_horizontalCenter": 0,
+    "_verticalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 750,
+    "_originalHeight": 1334,
+    "_alignMode": 1,
+    "_lockFlags": 0,
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "d77inZhdhGqIsKtCohMxkr"
+    "fileId": "5eHfNW8/hOCrs3aqgb9qOJ"
   },
   {
     "__type__": "cc.PrefabInfo",

+ 0 - 836
assets/resources/gameui/bg.prefab

@@ -1,836 +0,0 @@
-[
-  {
-    "__type__": "cc.Prefab",
-    "_name": "bg",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "_native": "",
-    "data": {
-      "__id__": 1
-    },
-    "optimizationPolicy": 0,
-    "persistent": false
-  },
-  {
-    "__type__": "cc.Node",
-    "_name": "bg",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "_parent": null,
-    "_children": [
-      {
-        "__id__": 2
-      },
-      {
-        "__id__": 24
-      }
-    ],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 30
-      },
-      {
-        "__id__": 32
-      },
-      {
-        "__id__": 34
-      }
-    ],
-    "_prefab": {
-      "__id__": 36
-    },
-    "_lpos": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_lrot": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
-    },
-    "_lscale": {
-      "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
-      "z": 1
-    },
-    "_mobility": 0,
-    "_layer": 33554432,
-    "_euler": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.Node",
-    "_name": "progressBar",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "_parent": {
-      "__id__": 1
-    },
-    "_children": [
-      {
-        "__id__": 3
-      },
-      {
-        "__id__": 11
-      }
-    ],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 17
-      },
-      {
-        "__id__": 19
-      },
-      {
-        "__id__": 21
-      }
-    ],
-    "_prefab": {
-      "__id__": 23
-    },
-    "_lpos": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": -544.968,
-      "z": 0
-    },
-    "_lrot": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
-    },
-    "_lscale": {
-      "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
-      "z": 1
-    },
-    "_mobility": 0,
-    "_layer": 33554432,
-    "_euler": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.Node",
-    "_name": "bar",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "_parent": {
-      "__id__": 2
-    },
-    "_children": [],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 4
-      },
-      {
-        "__id__": 6
-      },
-      {
-        "__id__": 8
-      }
-    ],
-    "_prefab": {
-      "__id__": 10
-    },
-    "_lpos": {
-      "__type__": "cc.Vec3",
-      "x": -295,
-      "y": 0,
-      "z": 0
-    },
-    "_lrot": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
-    },
-    "_lscale": {
-      "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
-      "z": 1
-    },
-    "_mobility": 0,
-    "_layer": 33554432,
-    "_euler": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.UITransform",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 3
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 5
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 0,
-      "height": 56
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 0.5
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "a4JeQ8Hi9O+ZvlzA6M+S2y"
-  },
-  {
-    "__type__": "cc.Sprite",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 3
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 7
-    },
-    "_customMaterial": null,
-    "_srcBlendFactor": 2,
-    "_dstBlendFactor": 4,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_spriteFrame": {
-      "__uuid__": "dd128076-9314-4b12-a626-e13a62ec3d96@f9941",
-      "__expectedType__": "cc.SpriteFrame"
-    },
-    "_type": 1,
-    "_fillType": 0,
-    "_sizeMode": 0,
-    "_fillCenter": {
-      "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 0
-    },
-    "_fillStart": 0,
-    "_fillRange": 0,
-    "_isTrimmedMode": true,
-    "_useGrayscale": false,
-    "_atlas": null,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "4dxDcG0z9P8ZC1wakO7Bsv"
-  },
-  {
-    "__type__": "cc.Widget",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 3
-    },
-    "_enabled": false,
-    "__prefab": {
-      "__id__": 9
-    },
-    "_alignFlags": 45,
-    "_target": null,
-    "_left": 15,
-    "_right": 15,
-    "_top": 12,
-    "_bottom": 12,
-    "_horizontalCenter": 0,
-    "_verticalCenter": 0,
-    "_isAbsLeft": true,
-    "_isAbsRight": true,
-    "_isAbsTop": true,
-    "_isAbsBottom": true,
-    "_isAbsHorizontalCenter": true,
-    "_isAbsVerticalCenter": true,
-    "_originalWidth": 150,
-    "_originalHeight": 15,
-    "_alignMode": 2,
-    "_lockFlags": 0,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "b765cOechBu4FTgZL+Prrq"
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__id__": 0
-    },
-    "fileId": "e6exwvxw1GW7JpqFuN5uvx",
-    "instance": null,
-    "targetOverrides": null,
-    "nestedPrefabInstanceRoots": null
-  },
-  {
-    "__type__": "cc.Node",
-    "_name": "load_label",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "_parent": {
-      "__id__": 2
-    },
-    "_children": [],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 12
-      },
-      {
-        "__id__": 14
-      }
-    ],
-    "_prefab": {
-      "__id__": 16
-    },
-    "_lpos": {
-      "__type__": "cc.Vec3",
-      "x": 2.815999999999974,
-      "y": 0,
-      "z": 0
-    },
-    "_lrot": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
-    },
-    "_lscale": {
-      "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
-      "z": 1
-    },
-    "_mobility": 0,
-    "_layer": 33554432,
-    "_euler": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.UITransform",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 11
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 13
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 142.6968994140625,
-      "height": 38.178000000000004
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "74ElR86RZGGq5AebNYRTvu"
-  },
-  {
-    "__type__": "cc.Label",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 11
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 15
-    },
-    "_customMaterial": null,
-    "_srcBlendFactor": 2,
-    "_dstBlendFactor": 4,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_string": "loading...",
-    "_horizontalAlign": 1,
-    "_verticalAlign": 1,
-    "_actualFontSize": 30.3,
-    "_fontSize": 30.3,
-    "_fontFamily": "Arial",
-    "_lineHeight": 30.3,
-    "_overflow": 0,
-    "_enableWrapText": true,
-    "_font": {
-      "__uuid__": "a773a425-e6b8-4ed4-9f7a-8fb8c3fccc4c",
-      "__expectedType__": "cc.TTFFont"
-    },
-    "_isSystemFontUsed": false,
-    "_spacingX": 0,
-    "_isItalic": false,
-    "_isBold": false,
-    "_isUnderline": false,
-    "_underlineHeight": 2,
-    "_cacheMode": 0,
-    "_enableOutline": false,
-    "_outlineColor": {
-      "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
-      "a": 255
-    },
-    "_outlineWidth": 2,
-    "_enableShadow": false,
-    "_shadowColor": {
-      "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
-      "a": 255
-    },
-    "_shadowOffset": {
-      "__type__": "cc.Vec2",
-      "x": 2,
-      "y": 2
-    },
-    "_shadowBlur": 2,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "ac/UEgpIxH26OVX3TsRurd"
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__id__": 0
-    },
-    "fileId": "35esYj1utCsrvpHxuRwdQo",
-    "instance": null,
-    "targetOverrides": null,
-    "nestedPrefabInstanceRoots": null
-  },
-  {
-    "__type__": "cc.UITransform",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 2
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 18
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 620,
-      "height": 80
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "9e7V8dxsNBaZo1CpoQXz0Y"
-  },
-  {
-    "__type__": "cc.Sprite",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 2
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 20
-    },
-    "_customMaterial": null,
-    "_srcBlendFactor": 2,
-    "_dstBlendFactor": 4,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_spriteFrame": {
-      "__uuid__": "73e3099f-d4e1-4574-9222-7470e07aabd7@f9941",
-      "__expectedType__": "cc.SpriteFrame"
-    },
-    "_type": 1,
-    "_fillType": 0,
-    "_sizeMode": 0,
-    "_fillCenter": {
-      "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 0
-    },
-    "_fillStart": 0,
-    "_fillRange": 0,
-    "_isTrimmedMode": true,
-    "_useGrayscale": false,
-    "_atlas": null,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "505OS2bfFBiq69qm7gH5On"
-  },
-  {
-    "__type__": "cc.ProgressBar",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 2
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 22
-    },
-    "_barSprite": {
-      "__id__": 6
-    },
-    "_mode": 0,
-    "_totalLength": 590,
-    "_progress": 0,
-    "_reverse": false,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "264TUeV8pCR701CCnQbu8g"
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__id__": 0
-    },
-    "fileId": "2d+Qc9XBtLp5aa/9eEvuLY",
-    "instance": null,
-    "targetOverrides": null,
-    "nestedPrefabInstanceRoots": null
-  },
-  {
-    "__type__": "cc.Node",
-    "_name": "logo",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "_parent": {
-      "__id__": 1
-    },
-    "_children": [],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 25
-      },
-      {
-        "__id__": 27
-      }
-    ],
-    "_prefab": {
-      "__id__": 29
-    },
-    "_lpos": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 351.785,
-      "z": 0
-    },
-    "_lrot": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
-    },
-    "_lscale": {
-      "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
-      "z": 1
-    },
-    "_mobility": 0,
-    "_layer": 33554432,
-    "_euler": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.UITransform",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 24
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 26
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 720,
-      "height": 445
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "1fYFQIyphAMaocTUlFd4XX"
-  },
-  {
-    "__type__": "cc.Sprite",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 24
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 28
-    },
-    "_customMaterial": null,
-    "_srcBlendFactor": 2,
-    "_dstBlendFactor": 4,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_spriteFrame": {
-      "__uuid__": "1e3b6bf0-a868-4110-81f1-d2de259838a2@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": "c7iLrNYFxNMbhJTDCueK/t"
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__id__": 0
-    },
-    "fileId": "65SC9uch5OwpWWWuiXc9St",
-    "instance": null,
-    "targetOverrides": null,
-    "nestedPrefabInstanceRoots": null
-  },
-  {
-    "__type__": "cc.UITransform",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 1
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 31
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 750,
-      "height": 1600
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "a7QamtlW9GbZi1vDiwdJjD"
-  },
-  {
-    "__type__": "cc.Sprite",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 1
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 33
-    },
-    "_customMaterial": null,
-    "_srcBlendFactor": 2,
-    "_dstBlendFactor": 4,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_spriteFrame": {
-      "__uuid__": "496013bd-c72e-4902-9dec-224e70852b01@f9941",
-      "__expectedType__": "cc.SpriteFrame"
-    },
-    "_type": 0,
-    "_fillType": 0,
-    "_sizeMode": 0,
-    "_fillCenter": {
-      "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 0
-    },
-    "_fillStart": 0,
-    "_fillRange": 0,
-    "_isTrimmedMode": true,
-    "_useGrayscale": false,
-    "_atlas": null,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "84O1f4Rw9ID4/6YWd7C99v"
-  },
-  {
-    "__type__": "cc.Widget",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 1
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 35
-    },
-    "_alignFlags": 45,
-    "_target": null,
-    "_left": 0,
-    "_right": 0,
-    "_top": -133,
-    "_bottom": -133,
-    "_horizontalCenter": 0,
-    "_verticalCenter": 0,
-    "_isAbsLeft": true,
-    "_isAbsRight": true,
-    "_isAbsTop": true,
-    "_isAbsBottom": true,
-    "_isAbsHorizontalCenter": true,
-    "_isAbsVerticalCenter": true,
-    "_originalWidth": 40,
-    "_originalHeight": 36,
-    "_alignMode": 2,
-    "_lockFlags": 0,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "b2wqcHyZtL875YiznHds9w"
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__id__": 0
-    },
-    "fileId": "3dbG97GB9KXa1UQ/G3emRj",
-    "targetOverrides": null
-  }
-]

+ 0 - 13
assets/resources/gameui/bg.prefab.meta

@@ -1,13 +0,0 @@
-{
-  "ver": "1.1.50",
-  "importer": "prefab",
-  "imported": true,
-  "uuid": "4ef6eae0-69d3-43c3-8e51-37751cbbdeed",
-  "files": [
-    ".json"
-  ],
-  "subMetas": {},
-  "userData": {
-    "syncNodeName": "bg"
-  }
-}

+ 1 - 1
assets/resources/prefabs/BusyLoading.prefab

@@ -620,7 +620,7 @@
     "_isAbsVerticalCenter": true,
     "_originalWidth": 100,
     "_originalHeight": 100,
-    "_alignMode": 2,
+    "_alignMode": 1,
     "_lockFlags": 0,
     "_id": ""
   },

+ 2 - 2
assets/resources/prefabs/GameNode.prefab

@@ -5836,7 +5836,7 @@
     "fileId": "59ekBZY8pPIo7CQl4gOh73"
   },
   {
-    "__type__": "b356cApUdVC8I8CxLJLwlZA",
+    "__type__": "098c3AnIRFCboUOouPK86e3",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -5851,7 +5851,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "2c94TJN4NAFbZ0Pfgy1nKc"
+    "fileId": "e0k3hpFmtBGqFgATvk4TWi"
   },
   {
     "__type__": "cc.PrefabInfo",

+ 31 - 16
assets/scenes/loading.scene

@@ -29,7 +29,7 @@
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 35
+      "__id__": 36
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -60,7 +60,7 @@
     },
     "autoReleaseAssets": false,
     "_globals": {
-      "__id__": 36
+      "__id__": 37
     },
     "_id": "1523702b-f45a-4b86-a2ce-fe6a9634afdf"
   },
@@ -280,13 +280,16 @@
       },
       {
         "__id__": 34
+      },
+      {
+        "__id__": 35
       }
     ],
     "_prefab": null,
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 374.99999999999994,
-      "y": 800,
+      "x": 375,
+      "y": 667,
       "z": 0
     },
     "_lrot": {
@@ -998,7 +1001,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 750,
-      "height": 1866
+      "height": 1600
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1091,7 +1094,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 750,
-      "height": 1600
+      "height": 1334
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1140,8 +1143,8 @@
     },
     "_alignFlags": 45,
     "_target": null,
-    "_left": -5.684341886080802e-14,
-    "_right": -5.684341886080802e-14,
+    "_left": 0,
+    "_right": 0,
     "_top": 0,
     "_bottom": 0,
     "_horizontalCenter": 0,
@@ -1174,6 +1177,18 @@
     "__prefab": null,
     "_id": "10K1QOryJBno/VStCN2sFN"
   },
+  {
+    "__type__": "098c3AnIRFCboUOouPK86e3",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 7
+    },
+    "_enabled": true,
+    "__prefab": null,
+    "_id": "dfjJPh9EtGF6JzB2vwwHmi"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": null,
@@ -1185,28 +1200,28 @@
   {
     "__type__": "cc.SceneGlobals",
     "ambient": {
-      "__id__": 37
+      "__id__": 38
     },
     "shadows": {
-      "__id__": 38
+      "__id__": 39
     },
     "_skybox": {
-      "__id__": 39
+      "__id__": 40
     },
     "fog": {
-      "__id__": 40
+      "__id__": 41
     },
     "octree": {
-      "__id__": 41
+      "__id__": 42
     },
     "skin": {
-      "__id__": 42
+      "__id__": 43
     },
     "lightProbeInfo": {
-      "__id__": 43
+      "__id__": 44
     },
     "postSettings": {
-      "__id__": 44
+      "__id__": 45
     },
     "bakedWithStationaryMainLight": false,
     "bakedWithHighpLightmap": false

+ 6 - 11
assets/scenes/main.scene

@@ -350,9 +350,9 @@
     },
     "_lscale": {
       "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
-      "z": 1
+      "x": 0.83375,
+      "y": 0.83375,
+      "z": 0
     },
     "_mobility": 0,
     "_layer": 33554432,
@@ -376,7 +376,7 @@
     "__prefab": null,
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 750,
+      "width": 899.5502248875563,
       "height": 1600
     },
     "_anchorPoint": {
@@ -573,7 +573,7 @@
     "_id": "6fNVrFsCdMGZtoc3x7I8YB"
   },
   {
-    "__type__": "5891fc2Al5HLZyJZZxmNT+e",
+    "__type__": "098c3AnIRFCboUOouPK86e3",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -582,12 +582,7 @@
     },
     "_enabled": true,
     "__prefab": null,
-    "_flags": 0,
-    "_top": 0,
-    "_bottom": 0,
-    "_left": 0,
-    "_right": 0,
-    "_id": "21jdNutnhH6aAqBHNRtNWx"
+    "_id": "9dLXiwWolEio5sLb/QZhkI"
   },
   {
     "__type__": "cc.SceneGlobals",

+ 46 - 0
assets/scripts/core/adapter/ResolutionAutoFit.ts

@@ -0,0 +1,46 @@
+import { _decorator, Component, find, Node, ResolutionPolicy, screen,Size, size, UITransform, view } from 'cc';
+const { ccclass, property } = _decorator;
+
+const CHECK_INTERVAL = 0.1;
+
+@ccclass('ResolutionAutoFit')
+export class ResolutionAutoFit extends Component {
+    private _oldSize:Size = size();
+    start() {
+        this.adjustResolutionPolicy();
+    }
+
+    private lastCheckTime = 0;
+    update(deltaTime: number) {
+        this.lastCheckTime+=deltaTime;
+        if(this.lastCheckTime < CHECK_INTERVAL){
+            return;
+        }
+        this.lastCheckTime = 0;
+
+        this.adjustResolutionPolicy();
+    }
+
+    adjustResolutionPolicy(){
+        let winSize = screen.windowSize;
+        if(!this._oldSize.equals(winSize)){
+            let ratio = winSize.width / winSize.height;
+            let drs = view.getDesignResolutionSize();
+            let drsRatio = drs.width / drs.height;
+            let splash: Node = find("Canvas/SpriteSplash");
+            if(splash) {
+               splash.getComponent(UITransform).contentSize = new Size(drs.width,drs.height);
+            }
+            if(ratio > drsRatio){
+                //wider than desgin. fixed height
+                view.setResolutionPolicy(ResolutionPolicy.FIXED_HEIGHT);
+            }
+            else{
+                //
+                view.setResolutionPolicy(ResolutionPolicy.FIXED_WIDTH);
+            }
+            this._oldSize.set(winSize);
+        }
+    }
+}
+

+ 9 - 0
assets/scripts/core/adapter/ResolutionAutoFit.ts.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "4.0.23",
+  "importer": "typescript",
+  "imported": true,
+  "uuid": "098c3027-2111-426e-850e-a2e3caf3a7b7",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}

+ 1 - 1
assets/scripts/core/component/BaseUI.ts

@@ -1,4 +1,4 @@
-import { _decorator, Component, Node,  js, Button, warn, EventHandler, isValid, find, Skeleton, SpriteFrame, Sprite, Label, ProgressBar, EditBox, Slider } from 'cc';
+import { _decorator, Component, Node,  js, Button, warn, EventHandler, isValid, find, Skeleton, SpriteFrame, Sprite, Label, ProgressBar, EditBox, Slider, UITransform, size, Size } from 'cc';
 
 import { ComponentEx } from './ComponentEx';
 import { initAutoBindings } from '../extend/AutoBind';

BIN
build/.DS_Store


File diff suppressed because it is too large
+ 0 - 0
build/web-mobile/assets/main/config.json


File diff suppressed because it is too large
+ 0 - 0
build/web-mobile/assets/main/import/03/03dfc3267.json


File diff suppressed because it is too large
+ 1 - 1
build/web-mobile/assets/main/index.js


File diff suppressed because it is too large
+ 0 - 0
build/web-mobile/assets/resources/config.json


File diff suppressed because it is too large
+ 0 - 0
build/web-mobile/assets/resources/import/01/011aa0c94.json


File diff suppressed because it is too large
+ 0 - 0
build/web-mobile/assets/resources/import/05/057e57cb7.json


File diff suppressed because it is too large
+ 0 - 0
build/web-mobile/assets/resources/import/06/061a849fa.json


File diff suppressed because it is too large
+ 0 - 0
build/web-mobile/assets/resources/import/07/072ea5daa.json


File diff suppressed because it is too large
+ 0 - 0
build/web-mobile/assets/resources/import/08/0841b4bba.json


File diff suppressed because it is too large
+ 0 - 0
build/web-mobile/assets/resources/import/08/0841d7158.json


File diff suppressed because it is too large
+ 0 - 0
build/web-mobile/assets/resources/import/09/091a37c32.json


File diff suppressed because it is too large
+ 0 - 0
build/web-mobile/assets/resources/import/09/09c9fda80.json


File diff suppressed because it is too large
+ 0 - 0
build/web-mobile/assets/resources/import/0a/0a243728a.json


File diff suppressed because it is too large
+ 0 - 0
build/web-mobile/assets/resources/import/0b/0be393444.json


File diff suppressed because it is too large
+ 0 - 0
build/web-mobile/assets/resources/import/0c/0c0a122a0.json


File diff suppressed because it is too large
+ 0 - 0
build/web-mobile/assets/resources/import/0c/0c9354e72.json


File diff suppressed because it is too large
+ 0 - 0
build/web-mobile/assets/resources/import/0d/0dffce3d6.json


File diff suppressed because it is too large
+ 0 - 0
build/web-mobile/assets/resources/import/0e/0e3df3ee3.json


File diff suppressed because it is too large
+ 0 - 0
build/web-mobile/assets/resources/import/0f/0f09586c7.json


File diff suppressed because it is too large
+ 0 - 0
build/web-mobile/assets/resources/import/0f/0fccbcdd3.json


+ 25 - 41
library/.assets-data.json

@@ -1439,7 +1439,8 @@
         "496013bd-c72e-4902-9dec-224e70852b01@f9941"
       ],
       "dependScripts": [
-        "3e27b2e9-415f-4b8d-9807-c47e4d6f6534"
+        "3e27b2e9-415f-4b8d-9807-c47e4d6f6534",
+        "098c3027-2111-426e-850e-a2e3caf3a7b7"
       ]
     },
     "versionCode": 0
@@ -1454,7 +1455,7 @@
       ],
       "dependScripts": [
         "7675dd59-1a35-40c6-9576-30329ec1852f",
-        "5891f736-025e-472d-9c89-659c66353f9e"
+        "098c3027-2111-426e-850e-a2e3caf3a7b7"
       ]
     },
     "versionCode": 0
@@ -2036,8 +2037,7 @@
       ],
       "dependScripts": [
         "4b854678-310c-4c32-812f-fb59255479be",
-        "a0a72e44-1ce6-4f80-b2df-980725b9c6c0",
-        "b356c029-51d5-42f0-8f02-c4b24bc25640"
+        "a0a72e44-1ce6-4f80-b2df-980725b9c6c0"
       ]
     },
     "versionCode": 0
@@ -2059,8 +2059,7 @@
       ],
       "dependScripts": [
         "ed0c2a4e-9bab-4aa0-ab9d-457fa22a811f",
-        "a0a72e44-1ce6-4f80-b2df-980725b9c6c0",
-        "b356c029-51d5-42f0-8f02-c4b24bc25640"
+        "a0a72e44-1ce6-4f80-b2df-980725b9c6c0"
       ]
     },
     "versionCode": 0
@@ -2084,8 +2083,7 @@
       ],
       "dependScripts": [
         "319a394d-1f46-4da8-960a-bc1c4fc4891f",
-        "a0a72e44-1ce6-4f80-b2df-980725b9c6c0",
-        "b356c029-51d5-42f0-8f02-c4b24bc25640"
+        "a0a72e44-1ce6-4f80-b2df-980725b9c6c0"
       ]
     },
     "versionCode": 0
@@ -2107,8 +2105,7 @@
       ],
       "dependScripts": [
         "98a55aeb-76ca-4bb0-8de6-9086d13ae230",
-        "a0a72e44-1ce6-4f80-b2df-980725b9c6c0",
-        "b356c029-51d5-42f0-8f02-c4b24bc25640"
+        "a0a72e44-1ce6-4f80-b2df-980725b9c6c0"
       ]
     },
     "versionCode": 0
@@ -2130,8 +2127,7 @@
       "dependScripts": [
         "c4c1ac57-37e3-4be2-8610-12bd8ce2a9f6",
         "7afe5a2a-fe7f-43c2-b28d-3655141119bd",
-        "a0a72e44-1ce6-4f80-b2df-980725b9c6c0",
-        "b356c029-51d5-42f0-8f02-c4b24bc25640"
+        "a0a72e44-1ce6-4f80-b2df-980725b9c6c0"
       ]
     },
     "versionCode": 0
@@ -2148,8 +2144,7 @@
       ],
       "dependScripts": [
         "26913ddd-91ad-4a60-979e-07aa9362f5ee",
-        "a0a72e44-1ce6-4f80-b2df-980725b9c6c0",
-        "b356c029-51d5-42f0-8f02-c4b24bc25640"
+        "a0a72e44-1ce6-4f80-b2df-980725b9c6c0"
       ]
     },
     "versionCode": 0
@@ -2184,8 +2179,7 @@
         "47441279-2428-4a54-a41d-c028aa170c96"
       ],
       "dependScripts": [
-        "77bd12a7-e4d5-439a-b7dc-2a2da8cc7df7",
-        "b356c029-51d5-42f0-8f02-c4b24bc25640"
+        "77bd12a7-e4d5-439a-b7dc-2a2da8cc7df7"
       ]
     },
     "versionCode": 0
@@ -2215,8 +2209,7 @@
       ],
       "dependScripts": [
         "c4c1ac57-37e3-4be2-8610-12bd8ce2a9f6",
-        "de92eacc-389a-4ccf-aeed-3177d23ea0ab",
-        "b356c029-51d5-42f0-8f02-c4b24bc25640"
+        "de92eacc-389a-4ccf-aeed-3177d23ea0ab"
       ]
     },
     "versionCode": 0
@@ -2240,8 +2233,7 @@
       ],
       "dependScripts": [
         "93baaef4-dac6-45c1-b64b-814374f038f3",
-        "a0a72e44-1ce6-4f80-b2df-980725b9c6c0",
-        "b356c029-51d5-42f0-8f02-c4b24bc25640"
+        "a0a72e44-1ce6-4f80-b2df-980725b9c6c0"
       ]
     },
     "versionCode": 0
@@ -2266,8 +2258,7 @@
       "dependScripts": [
         "c4c1ac57-37e3-4be2-8610-12bd8ce2a9f6",
         "72e803a1-e6d7-4958-97ec-7dd6fc3a493c",
-        "a0a72e44-1ce6-4f80-b2df-980725b9c6c0",
-        "b356c029-51d5-42f0-8f02-c4b24bc25640"
+        "a0a72e44-1ce6-4f80-b2df-980725b9c6c0"
       ]
     },
     "versionCode": 0
@@ -2286,8 +2277,7 @@
         "c4c1ac57-37e3-4be2-8610-12bd8ce2a9f6",
         "3bf69b2d-24b3-48c5-8ca9-a26cd266337b",
         "95f08ea4-cc64-41ed-9c11-3950fa1aaa83",
-        "a0a72e44-1ce6-4f80-b2df-980725b9c6c0",
-        "b356c029-51d5-42f0-8f02-c4b24bc25640"
+        "a0a72e44-1ce6-4f80-b2df-980725b9c6c0"
       ]
     },
     "versionCode": 0
@@ -2312,8 +2302,7 @@
       "dependScripts": [
         "c4c1ac57-37e3-4be2-8610-12bd8ce2a9f6",
         "9ac6a2cb-3277-42bb-913c-e630e2218be7",
-        "a0a72e44-1ce6-4f80-b2df-980725b9c6c0",
-        "b356c029-51d5-42f0-8f02-c4b24bc25640"
+        "a0a72e44-1ce6-4f80-b2df-980725b9c6c0"
       ]
     },
     "versionCode": 0
@@ -2333,8 +2322,7 @@
       ],
       "dependScripts": [
         "93de81c2-0c8a-4ca2-8e6e-2bf15afbf764",
-        "a0a72e44-1ce6-4f80-b2df-980725b9c6c0",
-        "b356c029-51d5-42f0-8f02-c4b24bc25640"
+        "a0a72e44-1ce6-4f80-b2df-980725b9c6c0"
       ]
     },
     "versionCode": 0
@@ -2357,8 +2345,7 @@
       ],
       "dependScripts": [
         "c06a8490-1e52-4afa-b4d5-80d23962f72b",
-        "a0a72e44-1ce6-4f80-b2df-980725b9c6c0",
-        "b356c029-51d5-42f0-8f02-c4b24bc25640"
+        "a0a72e44-1ce6-4f80-b2df-980725b9c6c0"
       ]
     },
     "versionCode": 0
@@ -2409,7 +2396,8 @@
       "dependScripts": [
         "b356c029-51d5-42f0-8f02-c4b24bc25640",
         "CC3eba29-7abb-723a-f7ab-ae275e2277e8",
-        "a2d9348f-41f2-4353-86ea-3491aafcf9c0"
+        "a2d9348f-41f2-4353-86ea-3491aafcf9c0",
+        "098c3027-2111-426e-850e-a2e3caf3a7b7"
       ]
     },
     "versionCode": 0
@@ -8201,16 +8189,7 @@
   },
   "4ef6eae0-69d3-43c3-8e51-37751cbbdeed": {
     "url": "db://assets/resources/gameui/bg.prefab",
-    "value": {
-      "depends": [
-        "dd128076-9314-4b12-a626-e13a62ec3d96@f9941",
-        "a773a425-e6b8-4ed4-9f7a-8fb8c3fccc4c",
-        "73e3099f-d4e1-4574-9222-7470e07aabd7@f9941",
-        "1e3b6bf0-a868-4110-81f1-d2de259838a2@f9941",
-        "496013bd-c72e-4902-9dec-224e70852b01@f9941"
-      ],
-      "dependScripts": []
-    },
+    "value": {},
     "versionCode": 0
   },
   "5a0044bf-22a0-4451-9de2-c9770cd5480b": {
@@ -8237,5 +8216,10 @@
     "url": "db://assets/scripts/core/adapter/AdapterView.ts",
     "value": {},
     "versionCode": 0
+  },
+  "098c3027-2111-426e-850e-a2e3caf3a7b7": {
+    "url": "db://assets/scripts/core/adapter/ResolutionAutoFit.ts",
+    "value": {},
+    "versionCode": 0
   }
 }

+ 35 - 30
library/.assets-info1.0.0.json

@@ -5207,7 +5207,7 @@
       "uuid": "bcfabf20-5eed-4b13-af1f-d6d171bc4ea9"
     },
     "/Users/wenshuang/Desktop/公司游戏/CatchDoll/assets/resources/gameui": {
-      "time": 1745725693306.3298,
+      "time": 1746686005609.668,
       "uuid": "5a36d6f3-cd01-4d97-8e4a-14200d44e0df"
     },
     "/Users/wenshuang/Desktop/公司游戏/CatchDoll/assets/resources/prefabs": {
@@ -5407,7 +5407,7 @@
       "uuid": "3bf69b2d-24b3-48c5-8ca9-a26cd266337b"
     },
     "/Users/wenshuang/Desktop/公司游戏/CatchDoll/assets/scripts/gameui/SettingLayer.ts": {
-      "time": 1745228716250.5583,
+      "time": 1746687519026.1108,
       "uuid": "c06a8490-1e52-4afa-b4d5-80d23962f72b"
     },
     "/Users/wenshuang/Desktop/公司游戏/CatchDoll/assets/scripts/loading/Loading.ts": {
@@ -5467,7 +5467,7 @@
       "uuid": "7b279f54-6f87-4325-a364-46b0214afd5f"
     },
     "/Users/wenshuang/Desktop/公司游戏/CatchDoll/assets/scripts/core/component/BaseUI.ts": {
-      "time": 1745386569034.5618,
+      "time": 1746687520280.5422,
       "uuid": "b891a3ff-4206-447c-a91b-9a887a2e994f"
     },
     "/Users/wenshuang/Desktop/公司游戏/CatchDoll/assets/scripts/core/component/ComponentEx.ts": {
@@ -6202,11 +6202,11 @@
       "uuid": "bbe02abb-120d-46fe-907e-6ba5856d0b09"
     },
     "/Users/wenshuang/Desktop/公司游戏/CatchDoll/assets/scenes/loading.scene": {
-      "time": 1745732283099.675,
+      "time": 1746686027518.5774,
       "uuid": "1523702b-f45a-4b86-a2ce-fe6a9634afdf"
     },
     "/Users/wenshuang/Desktop/公司游戏/CatchDoll/assets/scenes/main.scene": {
-      "time": 1746672228562.362,
+      "time": 1746685891832.8188,
       "uuid": "eeec5720-7028-48a1-9aec-e9bb18f4abbc"
     },
     "/Users/wenshuang/Desktop/公司游戏/CatchDoll/assets/shader/gray.mtl": {
@@ -6378,63 +6378,63 @@
       "uuid": "db1b73cf-fcdc-4071-af23-1c99f1e041ec"
     },
     "/Users/wenshuang/Desktop/公司游戏/CatchDoll/assets/resources/gameui/BoxLayer.prefab": {
-      "time": 1746672013898.216,
+      "time": 1746688277952.5847,
       "uuid": "e82dd65d-215b-4555-819e-3f08028530ab"
     },
     "/Users/wenshuang/Desktop/公司游戏/CatchDoll/assets/resources/gameui/BuyCoinLayer.prefab": {
-      "time": 1746672410047.8347,
+      "time": 1746688286294.054,
       "uuid": "4cd259f2-fc79-4e93-8d6b-804a5b820fb8"
     },
     "/Users/wenshuang/Desktop/公司游戏/CatchDoll/assets/resources/gameui/BuyItemLayer.prefab": {
-      "time": 1746672416630.1448,
+      "time": 1746688296559.3696,
       "uuid": "c7f2ecc5-17bf-4e66-9d0b-dc78789a994e"
     },
     "/Users/wenshuang/Desktop/公司游戏/CatchDoll/assets/resources/gameui/BuyLifeLayer.prefab": {
-      "time": 1746672424482.593,
+      "time": 1746688304584.4521,
       "uuid": "e99a8ee5-e203-4882-b5a1-6314bb453d45"
     },
     "/Users/wenshuang/Desktop/公司游戏/CatchDoll/assets/resources/gameui/DrawStarLayer.prefab": {
-      "time": 1746672431366.1628,
+      "time": 1746688312495.0562,
       "uuid": "b83b568a-13ad-4c2d-b7c1-3abd20518b68"
     },
     "/Users/wenshuang/Desktop/公司游戏/CatchDoll/assets/resources/gameui/FailLayer.prefab": {
-      "time": 1746672441544.3357,
+      "time": 1746688321971.1873,
       "uuid": "699c6afd-6df5-492b-8b36-1871db71ad16"
     },
     "/Users/wenshuang/Desktop/公司游戏/CatchDoll/assets/resources/gameui/GameUI.prefab": {
-      "time": 1746673476683.5615,
+      "time": 1746688329322.6902,
       "uuid": "79d5fa5f-cb75-4f1a-8ca4-503a10fc449d"
     },
     "/Users/wenshuang/Desktop/公司游戏/CatchDoll/assets/resources/gameui/HallUI.prefab": {
-      "time": 1746674553759.2727,
+      "time": 1746688335416.5132,
       "uuid": "9e12223d-7a81-471d-8295-08a69b25b44b"
     },
     "/Users/wenshuang/Desktop/公司游戏/CatchDoll/assets/resources/gameui/LevelClearLayer.prefab": {
-      "time": 1746672471797.9695,
+      "time": 1746688344891.32,
       "uuid": "a87b5748-2ead-4c6e-9905-efcce6798098"
     },
     "/Users/wenshuang/Desktop/公司游戏/CatchDoll/assets/resources/gameui/LevelLayer.prefab": {
-      "time": 1746672480723.7996,
+      "time": 1746688364205.3325,
       "uuid": "6c91161f-a581-4aea-b319-d6d3dead58c3"
     },
     "/Users/wenshuang/Desktop/公司游戏/CatchDoll/assets/resources/gameui/NewPackOpenedLayer.prefab": {
-      "time": 1746672488036.2488,
+      "time": 1746688378710.0168,
       "uuid": "0fe45a30-5541-4ff8-9715-3a7ed22358e6"
     },
     "/Users/wenshuang/Desktop/公司游戏/CatchDoll/assets/resources/gameui/OutOfBoxLayer.prefab": {
-      "time": 1746672494852.6902,
+      "time": 1746688391758.5872,
       "uuid": "b608ca62-d03c-4fc2-a51a-772e93f391d0"
     },
     "/Users/wenshuang/Desktop/公司游戏/CatchDoll/assets/resources/gameui/PauseLayer.prefab": {
-      "time": 1746672502381.4075,
+      "time": 1746688403691.6963,
       "uuid": "886f5150-93a4-44ea-804c-4ec2e80a3ee4"
     },
     "/Users/wenshuang/Desktop/公司游戏/CatchDoll/assets/resources/gameui/SettingLayer.prefab": {
-      "time": 1746672511152.288,
+      "time": 1746688408748.9873,
       "uuid": "9b4f7c25-9b14-4d87-9200-c868813c9a28"
     },
     "/Users/wenshuang/Desktop/公司游戏/CatchDoll/assets/resources/prefabs/BusyLoading.prefab": {
-      "time": 1744809777986.9866,
+      "time": 1746688260041.594,
       "uuid": "269aef79-20c0-428a-8aec-5ea29dbc1157"
     },
     "/Users/wenshuang/Desktop/公司游戏/CatchDoll/assets/resources/prefabs/Coin.prefab": {
@@ -6442,7 +6442,7 @@
       "uuid": "e54f9ea5-e13e-456a-bc6a-77122f1dd3eb"
     },
     "/Users/wenshuang/Desktop/公司游戏/CatchDoll/assets/resources/prefabs/GameNode.prefab": {
-      "time": 1746674430260.1497,
+      "time": 1746686672227.0356,
       "uuid": "6e8c4209-3574-45b0-858d-16cff5eee329"
     },
     "/Users/wenshuang/Desktop/公司游戏/CatchDoll/assets/resources/prefabs/Life.prefab": {
@@ -6450,7 +6450,7 @@
       "uuid": "5ecb7f44-b5d2-42a8-b80b-126ae0959712"
     },
     "/Users/wenshuang/Desktop/公司游戏/CatchDoll/assets/resources/prefabs/MsgHints.prefab": {
-      "time": 1745391638990.3245,
+      "time": 1746686456961.736,
       "uuid": "40d92b5b-17f4-42e9-b20b-1e4c326eedcf"
     },
     "/Users/wenshuang/Desktop/公司游戏/CatchDoll/assets/resources/prefabs/Star.prefab": {
@@ -8188,18 +8188,11 @@
     "/Users/wenshuang/Desktop/公司游戏/CatchDoll/assets/textures/setting/ok_btn.png.meta": {
       "time": 1745226276826.5513
     },
-    "/Users/wenshuang/Desktop/公司游戏/CatchDoll/assets/resources/gameui/bg.prefab.meta": {
-      "time": 1745725693310.2817
-    },
-    "/Users/wenshuang/Desktop/公司游戏/CatchDoll/assets/resources/gameui/bg.prefab": {
-      "time": 1745725693308.0518,
-      "uuid": "4ef6eae0-69d3-43c3-8e51-37751cbbdeed"
-    },
     "/Users/wenshuang/Desktop/公司游戏/CatchDoll/assets/scripts/core/adapter.meta": {
       "time": 1746671344631.723
     },
     "/Users/wenshuang/Desktop/公司游戏/CatchDoll/assets/scripts/core/adapter": {
-      "time": 1746671344629.9583,
+      "time": 1746685640182.6646,
       "uuid": "5a0044bf-22a0-4451-9de2-c9770cd5480b"
     },
     "/Users/wenshuang/Desktop/公司游戏/CatchDoll/assets/scripts/core/adapter/Adapter.ts.meta": {
@@ -8229,6 +8222,13 @@
     "/Users/wenshuang/Desktop/公司游戏/CatchDoll/assets/scripts/core/adapter/AdapterView.ts": {
       "time": 1746671386901.3682,
       "uuid": "b356c029-51d5-42f0-8f02-c4b24bc25640"
+    },
+    "/Users/wenshuang/Desktop/公司游戏/CatchDoll/assets/scripts/core/adapter/ResolutionAutoFit.ts.meta": {
+      "time": 1746685640185.6584
+    },
+    "/Users/wenshuang/Desktop/公司游戏/CatchDoll/assets/scripts/core/adapter/ResolutionAutoFit.ts": {
+      "time": 1746687982682.3472,
+      "uuid": "098c3027-2111-426e-850e-a2e3caf3a7b7"
     }
   },
   "missing": {
@@ -8766,6 +8766,11 @@
       "path": "/Users/wenshuang/Desktop/公司游戏/CatchDoll/assets/scripts/core/base/adapter/AdapterView.ts",
       "time": 1746671344622.4653,
       "removeTime": 1746671347312
+    },
+    "4ef6eae0-69d3-43c3-8e51-37751cbbdeed": {
+      "path": "/Users/wenshuang/Desktop/公司游戏/CatchDoll/assets/resources/gameui/bg.prefab",
+      "time": 1745725693308.0518,
+      "removeTime": 1746686005611
     }
   }
 }

File diff suppressed because it is too large
+ 190 - 151
library/0f/0fe45a30-5541-4ff8-9715-3a7ed22358e6.json


+ 31 - 16
library/15/1523702b-f45a-4b86-a2ce-fe6a9634afdf.json

@@ -29,7 +29,7 @@
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 35
+      "__id__": 36
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -60,7 +60,7 @@
     },
     "autoReleaseAssets": false,
     "_globals": {
-      "__id__": 36
+      "__id__": 37
     },
     "_id": "1523702b-f45a-4b86-a2ce-fe6a9634afdf"
   },
@@ -280,13 +280,16 @@
       },
       {
         "__id__": 34
+      },
+      {
+        "__id__": 35
       }
     ],
     "_prefab": null,
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 374.99999999999994,
-      "y": 800,
+      "x": 375,
+      "y": 667,
       "z": 0
     },
     "_lrot": {
@@ -998,7 +1001,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 750,
-      "height": 1866
+      "height": 1600
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1091,7 +1094,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 750,
-      "height": 1600
+      "height": 1334
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1140,8 +1143,8 @@
     },
     "_alignFlags": 45,
     "_target": null,
-    "_left": -5.684341886080802e-14,
-    "_right": -5.684341886080802e-14,
+    "_left": 0,
+    "_right": 0,
     "_top": 0,
     "_bottom": 0,
     "_horizontalCenter": 0,
@@ -1174,6 +1177,18 @@
     "__prefab": null,
     "_id": "10K1QOryJBno/VStCN2sFN"
   },
+  {
+    "__type__": "098c3AnIRFCboUOouPK86e3",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 7
+    },
+    "_enabled": true,
+    "__prefab": null,
+    "_id": "dfjJPh9EtGF6JzB2vwwHmi"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": null,
@@ -1185,28 +1200,28 @@
   {
     "__type__": "cc.SceneGlobals",
     "ambient": {
-      "__id__": 37
+      "__id__": 38
     },
     "shadows": {
-      "__id__": 38
+      "__id__": 39
     },
     "_skybox": {
-      "__id__": 39
+      "__id__": 40
     },
     "fog": {
-      "__id__": 40
+      "__id__": 41
     },
     "octree": {
-      "__id__": 41
+      "__id__": 42
     },
     "skin": {
-      "__id__": 42
+      "__id__": 43
     },
     "lightProbeInfo": {
-      "__id__": 43
+      "__id__": 44
     },
     "postSettings": {
-      "__id__": 44
+      "__id__": 45
     },
     "bakedWithStationaryMainLight": false,
     "bakedWithHighpLightmap": false

+ 1 - 1
library/26/269aef79-20c0-428a-8aec-5ea29dbc1157.json

@@ -620,7 +620,7 @@
     "_isAbsVerticalCenter": true,
     "_originalWidth": 100,
     "_originalHeight": 100,
-    "_alignMode": 2,
+    "_alignMode": 1,
     "_lockFlags": 0,
     "_id": ""
   },

+ 163 - 106
library/4c/4cd259f2-fc79-4e93-8d6b-804a5b820fb8.json

@@ -22,14 +22,11 @@
         "__id__": 2
       },
       {
-        "__id__": 10
+        "__id__": 12
       }
     ],
     "_active": true,
     "_components": [
-      {
-        "__id__": 72
-      },
       {
         "__id__": 74
       },
@@ -38,10 +35,13 @@
       },
       {
         "__id__": 78
+      },
+      {
+        "__id__": 80
       }
     ],
     "_prefab": {
-      "__id__": 80
+      "__id__": 82
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -91,10 +91,13 @@
       },
       {
         "__id__": 7
+      },
+      {
+        "__id__": 9
       }
     ],
     "_prefab": {
-      "__id__": 9
+      "__id__": 11
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -139,8 +142,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 1000,
-      "height": 2000
+      "width": 750,
+      "height": 1334
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -216,6 +219,42 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "77ShzfVO5D24pO46in5yH2"
   },
+  {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 10
+    },
+    "_alignFlags": 45,
+    "_target": null,
+    "_left": 0,
+    "_right": 0,
+    "_top": 0,
+    "_bottom": 0,
+    "_horizontalCenter": 0,
+    "_verticalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 1000,
+    "_originalHeight": 2000,
+    "_alignMode": 2,
+    "_lockFlags": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "42wEXM/ahL7LMVa6XSePjW"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -239,31 +278,31 @@
     },
     "_children": [
       {
-        "__id__": 11
+        "__id__": 13
       },
       {
-        "__id__": 17
+        "__id__": 19
       },
       {
-        "__id__": 59
+        "__id__": 61
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 67
+        "__id__": 69
       },
       {
-        "__id__": 69
+        "__id__": 71
       }
     ],
     "_prefab": {
-      "__id__": 71
+      "__id__": 73
     },
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 0,
+      "y": 9.577,
       "z": 0
     },
     "_lrot": {
@@ -295,20 +334,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 10
+      "__id__": 12
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 12
+        "__id__": 14
       },
       {
-        "__id__": 14
+        "__id__": 16
       }
     ],
     "_prefab": {
-      "__id__": 16
+      "__id__": 18
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -345,11 +384,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 11
+      "__id__": 13
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 13
+      "__id__": 15
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -373,11 +412,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 11
+      "__id__": 13
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 15
+      "__id__": 17
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -431,30 +470,30 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 10
+      "__id__": 12
     },
     "_children": [
       {
-        "__id__": 18
+        "__id__": 20
       },
       {
-        "__id__": 38
+        "__id__": 40
       }
     ],
     "_active": true,
     "_components": [
-      {
-        "__id__": 52
-      },
       {
         "__id__": 54
       },
       {
         "__id__": 56
+      },
+      {
+        "__id__": 58
       }
     ],
     "_prefab": {
-      "__id__": 58
+      "__id__": 60
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -491,27 +530,27 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 17
+      "__id__": 19
     },
     "_children": [
       {
-        "__id__": 19
+        "__id__": 21
       },
       {
-        "__id__": 25
+        "__id__": 27
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 33
+        "__id__": 35
       },
       {
-        "__id__": 35
+        "__id__": 37
       }
     ],
     "_prefab": {
-      "__id__": 37
+      "__id__": 39
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -548,20 +587,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 18
+      "__id__": 20
     },
     "_children": [],
     "_active": false,
     "_components": [
       {
-        "__id__": 20
+        "__id__": 22
       },
       {
-        "__id__": 22
+        "__id__": 24
       }
     ],
     "_prefab": {
-      "__id__": 24
+      "__id__": 26
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -598,11 +637,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 19
+      "__id__": 21
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 21
+      "__id__": 23
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -626,11 +665,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 19
+      "__id__": 21
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 23
+      "__id__": 25
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -684,23 +723,23 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 18
+      "__id__": 20
     },
     "_children": [],
     "_active": true,
     "_components": [
-      {
-        "__id__": 26
-      },
       {
         "__id__": 28
       },
       {
         "__id__": 30
+      },
+      {
+        "__id__": 32
       }
     ],
     "_prefab": {
-      "__id__": 32
+      "__id__": 34
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -737,11 +776,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 25
+      "__id__": 27
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 27
+      "__id__": 29
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -765,11 +804,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 25
+      "__id__": 27
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 29
+      "__id__": 31
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -836,11 +875,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 25
+      "__id__": 27
     },
     "_enabled": false,
     "__prefab": {
-      "__id__": 31
+      "__id__": 33
     },
     "_id": ""
   },
@@ -867,11 +906,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 18
+      "__id__": 20
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 34
+      "__id__": 36
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -895,11 +934,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 18
+      "__id__": 20
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 36
+      "__id__": 38
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -953,27 +992,27 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 17
+      "__id__": 19
     },
     "_children": [
       {
-        "__id__": 39
+        "__id__": 41
       }
     ],
     "_active": true,
     "_components": [
-      {
-        "__id__": 45
-      },
       {
         "__id__": 47
       },
       {
         "__id__": 49
+      },
+      {
+        "__id__": 51
       }
     ],
     "_prefab": {
-      "__id__": 51
+      "__id__": 53
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1010,20 +1049,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 38
+      "__id__": 40
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 40
+        "__id__": 42
       },
       {
-        "__id__": 42
+        "__id__": 44
       }
     ],
     "_prefab": {
-      "__id__": 44
+      "__id__": 46
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1060,11 +1099,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 39
+      "__id__": 41
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 41
+      "__id__": 43
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1088,11 +1127,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 39
+      "__id__": 41
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 43
+      "__id__": 45
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1146,11 +1185,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 38
+      "__id__": 40
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 46
+      "__id__": 48
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1174,11 +1213,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 38
+      "__id__": 40
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 48
+      "__id__": 50
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1219,11 +1258,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 38
+      "__id__": 40
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 50
+      "__id__": 52
     },
     "clickEvents": [],
     "_interactable": true,
@@ -1288,11 +1327,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 17
+      "__id__": 19
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 53
+      "__id__": 55
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1316,11 +1355,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 17
+      "__id__": 19
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 55
+      "__id__": 57
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1361,11 +1400,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 17
+      "__id__": 19
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 57
+      "__id__": 59
     },
     "clickEvents": [],
     "_interactable": true,
@@ -1430,23 +1469,23 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 10
+      "__id__": 12
     },
     "_children": [],
     "_active": true,
     "_components": [
-      {
-        "__id__": 60
-      },
       {
         "__id__": 62
       },
       {
         "__id__": 64
+      },
+      {
+        "__id__": 66
       }
     ],
     "_prefab": {
-      "__id__": 66
+      "__id__": 68
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1483,11 +1522,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 59
+      "__id__": 61
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 61
+      "__id__": 63
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1511,11 +1550,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 59
+      "__id__": 61
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 63
+      "__id__": 65
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1556,11 +1595,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 59
+      "__id__": 61
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 65
+      "__id__": 67
     },
     "clickEvents": [],
     "_interactable": true,
@@ -1625,11 +1664,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 10
+      "__id__": 12
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 68
+      "__id__": 70
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1653,11 +1692,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 10
+      "__id__": 12
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 70
+      "__id__": 72
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1715,7 +1754,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 73
+      "__id__": 75
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1743,7 +1782,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 75
+      "__id__": 77
     },
     "_id": ""
   },
@@ -1761,7 +1800,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 77
+      "__id__": 79
     },
     "_id": ""
   },
@@ -1770,7 +1809,7 @@
     "fileId": "c7OqotDyVG4IZWh++7ImoZ"
   },
   {
-    "__type__": "b356cApUdVC8I8CxLJLwlZA",
+    "__type__": "cc.Widget",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -1779,13 +1818,31 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 79
+      "__id__": 81
     },
+    "_alignFlags": 45,
+    "_target": null,
+    "_left": 0,
+    "_right": 0,
+    "_top": 0,
+    "_bottom": 0,
+    "_horizontalCenter": 0,
+    "_verticalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 750,
+    "_originalHeight": 1334,
+    "_alignMode": 1,
+    "_lockFlags": 0,
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "2d+10T5Q5AVrh1pT0Atizf"
+    "fileId": "ec7+5FlZJMrLT49jjBu2Er"
   },
   {
     "__type__": "cc.PrefabInfo",

+ 111 - 54
library/69/699c6afd-6df5-492b-8b36-1871db71ad16.json

@@ -22,14 +22,11 @@
         "__id__": 2
       },
       {
-        "__id__": 10
+        "__id__": 12
       }
     ],
     "_active": true,
     "_components": [
-      {
-        "__id__": 38
-      },
       {
         "__id__": 40
       },
@@ -38,10 +35,13 @@
       },
       {
         "__id__": 44
+      },
+      {
+        "__id__": 46
       }
     ],
     "_prefab": {
-      "__id__": 46
+      "__id__": 48
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -91,10 +91,13 @@
       },
       {
         "__id__": 7
+      },
+      {
+        "__id__": 9
       }
     ],
     "_prefab": {
-      "__id__": 9
+      "__id__": 11
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -139,8 +142,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 1000,
-      "height": 2000
+      "width": 750,
+      "height": 1334
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -216,6 +219,42 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "77ShzfVO5D24pO46in5yH2"
   },
+  {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 10
+    },
+    "_alignFlags": 45,
+    "_target": null,
+    "_left": 0,
+    "_right": 0,
+    "_top": 0,
+    "_bottom": 0,
+    "_horizontalCenter": 0,
+    "_verticalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 1000,
+    "_originalHeight": 2000,
+    "_alignMode": 2,
+    "_lockFlags": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "a9Fb+ArOBK65A9Jto6YpZD"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -239,26 +278,26 @@
     },
     "_children": [
       {
-        "__id__": 11
+        "__id__": 13
       },
       {
-        "__id__": 17
+        "__id__": 19
       },
       {
-        "__id__": 25
+        "__id__": 27
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 33
+        "__id__": 35
       },
       {
-        "__id__": 35
+        "__id__": 37
       }
     ],
     "_prefab": {
-      "__id__": 37
+      "__id__": 39
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -295,20 +334,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 10
+      "__id__": 12
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 12
+        "__id__": 14
       },
       {
-        "__id__": 14
+        "__id__": 16
       }
     ],
     "_prefab": {
-      "__id__": 16
+      "__id__": 18
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -345,11 +384,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 11
+      "__id__": 13
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 13
+      "__id__": 15
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -373,11 +412,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 11
+      "__id__": 13
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 15
+      "__id__": 17
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -431,23 +470,23 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 10
+      "__id__": 12
     },
     "_children": [],
     "_active": true,
     "_components": [
-      {
-        "__id__": 18
-      },
       {
         "__id__": 20
       },
       {
         "__id__": 22
+      },
+      {
+        "__id__": 24
       }
     ],
     "_prefab": {
-      "__id__": 24
+      "__id__": 26
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -484,11 +523,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 17
+      "__id__": 19
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 19
+      "__id__": 21
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -512,11 +551,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 17
+      "__id__": 19
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 21
+      "__id__": 23
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -557,11 +596,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 17
+      "__id__": 19
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 23
+      "__id__": 25
     },
     "clickEvents": [],
     "_interactable": true,
@@ -626,23 +665,23 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 10
+      "__id__": 12
     },
     "_children": [],
     "_active": true,
     "_components": [
-      {
-        "__id__": 26
-      },
       {
         "__id__": 28
       },
       {
         "__id__": 30
+      },
+      {
+        "__id__": 32
       }
     ],
     "_prefab": {
-      "__id__": 32
+      "__id__": 34
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -679,11 +718,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 25
+      "__id__": 27
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 27
+      "__id__": 29
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -707,11 +746,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 25
+      "__id__": 27
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 29
+      "__id__": 31
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -752,11 +791,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 25
+      "__id__": 27
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 31
+      "__id__": 33
     },
     "clickEvents": [],
     "_interactable": true,
@@ -821,11 +860,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 10
+      "__id__": 12
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 34
+      "__id__": 36
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -849,11 +888,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 10
+      "__id__": 12
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 36
+      "__id__": 38
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -911,7 +950,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 39
+      "__id__": 41
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -939,7 +978,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 41
+      "__id__": 43
     },
     "_id": ""
   },
@@ -957,7 +996,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 43
+      "__id__": 45
     },
     "_id": ""
   },
@@ -966,7 +1005,7 @@
     "fileId": "cdceTWUVNG2JPxE+ChRidn"
   },
   {
-    "__type__": "b356cApUdVC8I8CxLJLwlZA",
+    "__type__": "cc.Widget",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -975,13 +1014,31 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 45
+      "__id__": 47
     },
+    "_alignFlags": 45,
+    "_target": null,
+    "_left": 0,
+    "_right": 0,
+    "_top": 0,
+    "_bottom": 0,
+    "_horizontalCenter": 0,
+    "_verticalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 750,
+    "_originalHeight": 1334,
+    "_alignMode": 1,
+    "_lockFlags": 0,
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "e26xMnUI9ML5KL81/eFT6y"
+    "fileId": "6ampZP31lMnI0EhZIJLhv5"
   },
   {
     "__type__": "cc.PrefabInfo",

File diff suppressed because it is too large
+ 195 - 156
library/6c/6c91161f-a581-4aea-b319-d6d3dead58c3.json


+ 2 - 2
library/6e/6e8c4209-3574-45b0-858d-16cff5eee329.json

@@ -5836,7 +5836,7 @@
     "fileId": "59ekBZY8pPIo7CQl4gOh73"
   },
   {
-    "__type__": "b356cApUdVC8I8CxLJLwlZA",
+    "__type__": "098c3AnIRFCboUOouPK86e3",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -5851,7 +5851,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "2c94TJN4NAFbZ0Pfgy1nKc"
+    "fileId": "e0k3hpFmtBGqFgATvk4TWi"
   },
   {
     "__type__": "cc.PrefabInfo",

+ 2 - 23
library/79/79d5fa5f-cb75-4f1a-8ca4-503a10fc449d.json

@@ -47,13 +47,10 @@
       },
       {
         "__id__": 242
-      },
-      {
-        "__id__": 244
       }
     ],
     "_prefab": {
-      "__id__": 246
+      "__id__": 244
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -5779,7 +5776,7 @@
     "_isAbsVerticalCenter": true,
     "_originalWidth": 100,
     "_originalHeight": 100,
-    "_alignMode": 2,
+    "_alignMode": 1,
     "_lockFlags": 0,
     "_id": ""
   },
@@ -5854,24 +5851,6 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "e3KhlnPpZOY5l0prGG6qBH"
   },
-  {
-    "__type__": "b356cApUdVC8I8CxLJLwlZA",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 1
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 245
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "c2f6woEbFC4ZfN+AMHQxSd"
-  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {

+ 153 - 96
library/88/886f5150-93a4-44ea-804c-4ec2e80a3ee4.json

@@ -22,14 +22,11 @@
         "__id__": 2
       },
       {
-        "__id__": 10
+        "__id__": 12
       }
     ],
     "_active": true,
     "_components": [
-      {
-        "__id__": 66
-      },
       {
         "__id__": 68
       },
@@ -38,10 +35,13 @@
       },
       {
         "__id__": 72
+      },
+      {
+        "__id__": 74
       }
     ],
     "_prefab": {
-      "__id__": 74
+      "__id__": 76
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -91,10 +91,13 @@
       },
       {
         "__id__": 7
+      },
+      {
+        "__id__": 9
       }
     ],
     "_prefab": {
-      "__id__": 9
+      "__id__": 11
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -139,8 +142,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 1000,
-      "height": 2000
+      "width": 750,
+      "height": 1334
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -216,6 +219,42 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "77ShzfVO5D24pO46in5yH2"
   },
+  {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 10
+    },
+    "_alignFlags": 45,
+    "_target": null,
+    "_left": 0,
+    "_right": 0,
+    "_top": 0,
+    "_bottom": 0,
+    "_horizontalCenter": 0,
+    "_verticalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 1000,
+    "_originalHeight": 2000,
+    "_alignMode": 2,
+    "_lockFlags": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "4dBmuoIKxGka03tJkkEExZ"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -239,35 +278,35 @@
     },
     "_children": [
       {
-        "__id__": 11
+        "__id__": 13
       },
       {
-        "__id__": 17
+        "__id__": 19
       },
       {
-        "__id__": 25
+        "__id__": 27
       },
       {
-        "__id__": 33
+        "__id__": 35
       },
       {
-        "__id__": 41
+        "__id__": 43
       },
       {
-        "__id__": 49
+        "__id__": 51
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 61
+        "__id__": 63
       },
       {
-        "__id__": 63
+        "__id__": 65
       }
     ],
     "_prefab": {
-      "__id__": 65
+      "__id__": 67
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -304,20 +343,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 10
+      "__id__": 12
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 12
+        "__id__": 14
       },
       {
-        "__id__": 14
+        "__id__": 16
       }
     ],
     "_prefab": {
-      "__id__": 16
+      "__id__": 18
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -354,11 +393,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 11
+      "__id__": 13
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 13
+      "__id__": 15
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -382,11 +421,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 11
+      "__id__": 13
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 15
+      "__id__": 17
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -440,23 +479,23 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 10
+      "__id__": 12
     },
     "_children": [],
     "_active": false,
     "_components": [
-      {
-        "__id__": 18
-      },
       {
         "__id__": 20
       },
       {
         "__id__": 22
+      },
+      {
+        "__id__": 24
       }
     ],
     "_prefab": {
-      "__id__": 24
+      "__id__": 26
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -493,11 +532,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 17
+      "__id__": 19
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 19
+      "__id__": 21
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -521,11 +560,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 17
+      "__id__": 19
     },
     "_enabled": false,
     "__prefab": {
-      "__id__": 21
+      "__id__": 23
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -589,11 +628,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 17
+      "__id__": 19
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 23
+      "__id__": 25
     },
     "_id": ""
   },
@@ -620,23 +659,23 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 10
+      "__id__": 12
     },
     "_children": [],
     "_active": true,
     "_components": [
-      {
-        "__id__": 26
-      },
       {
         "__id__": 28
       },
       {
         "__id__": 30
+      },
+      {
+        "__id__": 32
       }
     ],
     "_prefab": {
-      "__id__": 32
+      "__id__": 34
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -673,11 +712,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 25
+      "__id__": 27
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 27
+      "__id__": 29
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -701,11 +740,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 25
+      "__id__": 27
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 29
+      "__id__": 31
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -746,11 +785,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 25
+      "__id__": 27
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 31
+      "__id__": 33
     },
     "clickEvents": [],
     "_interactable": true,
@@ -815,23 +854,23 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 10
+      "__id__": 12
     },
     "_children": [],
     "_active": true,
     "_components": [
-      {
-        "__id__": 34
-      },
       {
         "__id__": 36
       },
       {
         "__id__": 38
+      },
+      {
+        "__id__": 40
       }
     ],
     "_prefab": {
-      "__id__": 40
+      "__id__": 42
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -868,11 +907,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 33
+      "__id__": 35
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 35
+      "__id__": 37
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -896,11 +935,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 33
+      "__id__": 35
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 37
+      "__id__": 39
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -941,11 +980,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 33
+      "__id__": 35
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 39
+      "__id__": 41
     },
     "clickEvents": [],
     "_interactable": true,
@@ -1010,23 +1049,23 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 10
+      "__id__": 12
     },
     "_children": [],
     "_active": true,
     "_components": [
-      {
-        "__id__": 42
-      },
       {
         "__id__": 44
       },
       {
         "__id__": 46
+      },
+      {
+        "__id__": 48
       }
     ],
     "_prefab": {
-      "__id__": 48
+      "__id__": 50
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1063,11 +1102,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 41
+      "__id__": 43
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 43
+      "__id__": 45
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1091,11 +1130,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 41
+      "__id__": 43
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 45
+      "__id__": 47
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1136,11 +1175,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 41
+      "__id__": 43
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 47
+      "__id__": 49
     },
     "clickEvents": [],
     "_interactable": true,
@@ -1205,24 +1244,24 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 10
+      "__id__": 12
     },
     "_children": [
       {
-        "__id__": 50
+        "__id__": 52
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 56
+        "__id__": 58
       },
       {
-        "__id__": 58
+        "__id__": 60
       }
     ],
     "_prefab": {
-      "__id__": 60
+      "__id__": 62
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1259,20 +1298,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 49
+      "__id__": 51
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 51
+        "__id__": 53
       },
       {
-        "__id__": 53
+        "__id__": 55
       }
     ],
     "_prefab": {
-      "__id__": 55
+      "__id__": 57
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1309,11 +1348,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 50
+      "__id__": 52
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 52
+      "__id__": 54
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1337,11 +1376,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 50
+      "__id__": 52
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 54
+      "__id__": 56
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1395,11 +1434,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 49
+      "__id__": 51
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 57
+      "__id__": 59
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1423,11 +1462,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 49
+      "__id__": 51
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 59
+      "__id__": 61
     },
     "clickEvents": [],
     "_interactable": true,
@@ -1495,11 +1534,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 10
+      "__id__": 12
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 62
+      "__id__": 64
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1523,11 +1562,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 10
+      "__id__": 12
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 64
+      "__id__": 66
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1585,7 +1624,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 67
+      "__id__": 69
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1613,7 +1652,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 69
+      "__id__": 71
     },
     "_id": ""
   },
@@ -1631,7 +1670,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 71
+      "__id__": 73
     },
     "_id": ""
   },
@@ -1640,7 +1679,7 @@
     "fileId": "caPqMF6ytMFpMCDjupzjDl"
   },
   {
-    "__type__": "b356cApUdVC8I8CxLJLwlZA",
+    "__type__": "cc.Widget",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -1649,13 +1688,31 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 73
+      "__id__": 75
     },
+    "_alignFlags": 45,
+    "_target": null,
+    "_left": 0,
+    "_right": 0,
+    "_top": 0,
+    "_bottom": 0,
+    "_horizontalCenter": 0,
+    "_verticalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 750,
+    "_originalHeight": 1334,
+    "_alignMode": 1,
+    "_lockFlags": 0,
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "52YFvEYFZMdbtU9i1Hqc65"
+    "fileId": "b4PFAzliFEGbgcWkrDFVEg"
   },
   {
     "__type__": "cc.PrefabInfo",

+ 201 - 144
library/9b/9b4f7c25-9b14-4d87-9200-c868813c9a28.json

@@ -22,14 +22,11 @@
         "__id__": 2
       },
       {
-        "__id__": 10
+        "__id__": 12
       }
     ],
     "_active": true,
     "_components": [
-      {
-        "__id__": 94
-      },
       {
         "__id__": 96
       },
@@ -38,10 +35,13 @@
       },
       {
         "__id__": 100
+      },
+      {
+        "__id__": 102
       }
     ],
     "_prefab": {
-      "__id__": 102
+      "__id__": 104
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -91,10 +91,13 @@
       },
       {
         "__id__": 7
+      },
+      {
+        "__id__": 9
       }
     ],
     "_prefab": {
-      "__id__": 9
+      "__id__": 11
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -139,8 +142,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 1000,
-      "height": 2000
+      "width": 750,
+      "height": 1334
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -216,6 +219,42 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "77ShzfVO5D24pO46in5yH2"
   },
+  {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 10
+    },
+    "_alignFlags": 45,
+    "_target": null,
+    "_left": 0,
+    "_right": 0,
+    "_top": 0,
+    "_bottom": 0,
+    "_horizontalCenter": 0,
+    "_verticalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 1000,
+    "_originalHeight": 2000,
+    "_alignMode": 2,
+    "_lockFlags": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "e2FTcEdWZN/bvnB17EdPdH"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -239,26 +278,26 @@
     },
     "_children": [
       {
-        "__id__": 11
+        "__id__": 13
       },
       {
-        "__id__": 17
+        "__id__": 19
       },
       {
-        "__id__": 31
+        "__id__": 33
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 89
+        "__id__": 91
       },
       {
-        "__id__": 91
+        "__id__": 93
       }
     ],
     "_prefab": {
-      "__id__": 93
+      "__id__": 95
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -295,20 +334,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 10
+      "__id__": 12
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 12
+        "__id__": 14
       },
       {
-        "__id__": 14
+        "__id__": 16
       }
     ],
     "_prefab": {
-      "__id__": 16
+      "__id__": 18
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -345,11 +384,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 11
+      "__id__": 13
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 13
+      "__id__": 15
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -373,11 +412,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 11
+      "__id__": 13
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 15
+      "__id__": 17
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -431,27 +470,27 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 10
+      "__id__": 12
     },
     "_children": [
       {
-        "__id__": 18
+        "__id__": 20
       }
     ],
     "_active": true,
     "_components": [
-      {
-        "__id__": 24
-      },
       {
         "__id__": 26
       },
       {
         "__id__": 28
+      },
+      {
+        "__id__": 30
       }
     ],
     "_prefab": {
-      "__id__": 30
+      "__id__": 32
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -488,20 +527,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 17
+      "__id__": 19
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 19
+        "__id__": 21
       },
       {
-        "__id__": 21
+        "__id__": 23
       }
     ],
     "_prefab": {
-      "__id__": 23
+      "__id__": 25
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -538,11 +577,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 18
+      "__id__": 20
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 20
+      "__id__": 22
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -566,11 +605,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 18
+      "__id__": 20
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 22
+      "__id__": 24
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -650,11 +689,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 17
+      "__id__": 19
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 25
+      "__id__": 27
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -678,11 +717,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 17
+      "__id__": 19
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 27
+      "__id__": 29
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -723,11 +762,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 17
+      "__id__": 19
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 29
+      "__id__": 31
     },
     "clickEvents": [],
     "_interactable": true,
@@ -767,7 +806,7 @@
     "_duration": 0.1,
     "_zoomScale": 1.02,
     "_target": {
-      "__id__": 17
+      "__id__": 19
     },
     "_id": ""
   },
@@ -794,27 +833,27 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 10
+      "__id__": 12
     },
     "_children": [
       {
-        "__id__": 32
+        "__id__": 34
       },
       {
-        "__id__": 58
+        "__id__": 60
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 84
+        "__id__": 86
       },
       {
-        "__id__": 86
+        "__id__": 88
       }
     ],
     "_prefab": {
-      "__id__": 88
+      "__id__": 90
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -851,27 +890,27 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 31
+      "__id__": 33
     },
     "_children": [
       {
-        "__id__": 33
+        "__id__": 35
       },
       {
-        "__id__": 45
+        "__id__": 47
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 53
+        "__id__": 55
       },
       {
-        "__id__": 55
+        "__id__": 57
       }
     ],
     "_prefab": {
-      "__id__": 57
+      "__id__": 59
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -908,24 +947,24 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 32
+      "__id__": 34
     },
     "_children": [
       {
-        "__id__": 34
+        "__id__": 36
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 40
+        "__id__": 42
       },
       {
-        "__id__": 42
+        "__id__": 44
       }
     ],
     "_prefab": {
-      "__id__": 44
+      "__id__": 46
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -962,20 +1001,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 33
+      "__id__": 35
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 35
+        "__id__": 37
       },
       {
-        "__id__": 37
+        "__id__": 39
       }
     ],
     "_prefab": {
-      "__id__": 39
+      "__id__": 41
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1012,11 +1051,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 34
+      "__id__": 36
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 36
+      "__id__": 38
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1040,11 +1079,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 34
+      "__id__": 36
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 38
+      "__id__": 40
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1124,11 +1163,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 33
+      "__id__": 35
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 41
+      "__id__": 43
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1152,11 +1191,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 33
+      "__id__": 35
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 43
+      "__id__": 45
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1210,23 +1249,23 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 32
+      "__id__": 34
     },
     "_children": [],
     "_active": true,
     "_components": [
-      {
-        "__id__": 46
-      },
       {
         "__id__": 48
       },
       {
         "__id__": 50
+      },
+      {
+        "__id__": 52
       }
     ],
     "_prefab": {
-      "__id__": 52
+      "__id__": 54
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1263,11 +1302,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 45
+      "__id__": 47
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 47
+      "__id__": 49
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1291,11 +1330,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 45
+      "__id__": 47
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 49
+      "__id__": 51
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1336,11 +1375,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 45
+      "__id__": 47
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 51
+      "__id__": 53
     },
     "clickEvents": [],
     "_interactable": true,
@@ -1380,7 +1419,7 @@
     "_duration": 0.1,
     "_zoomScale": 1.02,
     "_target": {
-      "__id__": 45
+      "__id__": 47
     },
     "_id": ""
   },
@@ -1407,11 +1446,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 32
+      "__id__": 34
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 54
+      "__id__": 56
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1435,11 +1474,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 32
+      "__id__": 34
     },
     "_enabled": false,
     "__prefab": {
-      "__id__": 56
+      "__id__": 58
     },
     "_resizeMode": 1,
     "_layoutType": 1,
@@ -1486,27 +1525,27 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 31
+      "__id__": 33
     },
     "_children": [
       {
-        "__id__": 59
+        "__id__": 61
       },
       {
-        "__id__": 71
+        "__id__": 73
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 79
+        "__id__": 81
       },
       {
-        "__id__": 81
+        "__id__": 83
       }
     ],
     "_prefab": {
-      "__id__": 83
+      "__id__": 85
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1543,24 +1582,24 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 58
+      "__id__": 60
     },
     "_children": [
       {
-        "__id__": 60
+        "__id__": 62
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 66
+        "__id__": 68
       },
       {
-        "__id__": 68
+        "__id__": 70
       }
     ],
     "_prefab": {
-      "__id__": 70
+      "__id__": 72
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1597,20 +1636,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 59
+      "__id__": 61
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 61
+        "__id__": 63
       },
       {
-        "__id__": 63
+        "__id__": 65
       }
     ],
     "_prefab": {
-      "__id__": 65
+      "__id__": 67
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1647,11 +1686,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 60
+      "__id__": 62
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 62
+      "__id__": 64
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1675,11 +1714,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 60
+      "__id__": 62
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 64
+      "__id__": 66
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1759,11 +1798,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 59
+      "__id__": 61
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 67
+      "__id__": 69
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1787,11 +1826,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 59
+      "__id__": 61
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 69
+      "__id__": 71
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1845,23 +1884,23 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 58
+      "__id__": 60
     },
     "_children": [],
     "_active": true,
     "_components": [
-      {
-        "__id__": 72
-      },
       {
         "__id__": 74
       },
       {
         "__id__": 76
+      },
+      {
+        "__id__": 78
       }
     ],
     "_prefab": {
-      "__id__": 78
+      "__id__": 80
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1898,11 +1937,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 71
+      "__id__": 73
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 73
+      "__id__": 75
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1926,11 +1965,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 71
+      "__id__": 73
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 75
+      "__id__": 77
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1971,11 +2010,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 71
+      "__id__": 73
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 77
+      "__id__": 79
     },
     "clickEvents": [],
     "_interactable": true,
@@ -2040,11 +2079,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 58
+      "__id__": 60
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 80
+      "__id__": 82
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2068,11 +2107,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 58
+      "__id__": 60
     },
     "_enabled": false,
     "__prefab": {
-      "__id__": 82
+      "__id__": 84
     },
     "_resizeMode": 1,
     "_layoutType": 1,
@@ -2119,11 +2158,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 31
+      "__id__": 33
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 85
+      "__id__": 87
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2147,11 +2186,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 31
+      "__id__": 33
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 87
+      "__id__": 89
     },
     "_resizeMode": 1,
     "_layoutType": 2,
@@ -2198,11 +2237,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 10
+      "__id__": 12
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 90
+      "__id__": 92
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2226,11 +2265,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 10
+      "__id__": 12
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 92
+      "__id__": 94
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -2288,7 +2327,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 95
+      "__id__": 97
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2316,7 +2355,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 97
+      "__id__": 99
     },
     "gou_seleted": {
       "__uuid__": "dfe892cd-b592-421f-be76-2854c9028bd3@f9941",
@@ -2335,10 +2374,10 @@
       "__expectedType__": "cc.SpriteFrame"
     },
     "bg_music_sp": {
-      "__id__": 42
+      "__id__": 44
     },
     "bg_music_gou": {
-      "__id__": 48
+      "__id__": 50
     },
     "sound_open": {
       "__uuid__": "d9a555b7-4cdd-426b-bba9-c8694e1f93d5@f9941",
@@ -2349,10 +2388,10 @@
       "__expectedType__": "cc.SpriteFrame"
     },
     "sound_sp": {
-      "__id__": 68
+      "__id__": 70
     },
     "sound_gou_sp": {
-      "__id__": 74
+      "__id__": 76
     },
     "_id": ""
   },
@@ -2370,7 +2409,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 99
+      "__id__": 101
     },
     "_id": ""
   },
@@ -2379,7 +2418,7 @@
     "fileId": "79lk00MGhOZpRq7VBwxTZm"
   },
   {
-    "__type__": "b356cApUdVC8I8CxLJLwlZA",
+    "__type__": "cc.Widget",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -2388,13 +2427,31 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 101
+      "__id__": 103
     },
+    "_alignFlags": 45,
+    "_target": null,
+    "_left": 0,
+    "_right": 0,
+    "_top": 0,
+    "_bottom": 0,
+    "_horizontalCenter": 0,
+    "_verticalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 750,
+    "_originalHeight": 1334,
+    "_alignMode": 1,
+    "_lockFlags": 0,
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "d77inZhdhGqIsKtCohMxkr"
+    "fileId": "5eHfNW8/hOCrs3aqgb9qOJ"
   },
   {
     "__type__": "cc.PrefabInfo",

+ 5 - 28
library/9e/9e12223d-7a81-471d-8295-08a69b25b44b.json

@@ -47,13 +47,10 @@
       },
       {
         "__id__": 322
-      },
-      {
-        "__id__": 324
       }
     ],
     "_prefab": {
-      "__id__": 326
+      "__id__": 324
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -5930,7 +5927,7 @@
     "_originalWidth": 211,
     "_originalHeight": 0,
     "_alignMode": 2,
-    "_lockFlags": 41,
+    "_lockFlags": 0,
     "_id": ""
   },
   {
@@ -6137,9 +6134,7 @@
       "__id__": 258
     },
     "_alignFlags": 20,
-    "_target": {
-      "__id__": 1
-    },
+    "_target": null,
     "_left": 0,
     "_right": 0,
     "_top": 0,
@@ -6154,7 +6149,7 @@
     "_isAbsVerticalCenter": true,
     "_originalWidth": 0,
     "_originalHeight": 0,
-    "_alignMode": 1,
+    "_alignMode": 2,
     "_lockFlags": 0,
     "_id": ""
   },
@@ -7623,7 +7618,7 @@
     "_isAbsVerticalCenter": true,
     "_originalWidth": 100,
     "_originalHeight": 100,
-    "_alignMode": 2,
+    "_alignMode": 1,
     "_lockFlags": 0,
     "_id": ""
   },
@@ -7649,24 +7644,6 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "efLBgJ1R1MUo0udhExoE8t"
   },
-  {
-    "__type__": "b356cApUdVC8I8CxLJLwlZA",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 1
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 325
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "8aP3bjJplHJ4c1J4KRKVeD"
-  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {

+ 199 - 142
library/a8/a87b5748-2ead-4c6e-9905-efcce6798098.json

@@ -22,14 +22,11 @@
         "__id__": 2
       },
       {
-        "__id__": 10
+        "__id__": 12
       }
     ],
     "_active": true,
     "_components": [
-      {
-        "__id__": 96
-      },
       {
         "__id__": 98
       },
@@ -38,10 +35,13 @@
       },
       {
         "__id__": 102
+      },
+      {
+        "__id__": 104
       }
     ],
     "_prefab": {
-      "__id__": 104
+      "__id__": 106
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -91,10 +91,13 @@
       },
       {
         "__id__": 7
+      },
+      {
+        "__id__": 9
       }
     ],
     "_prefab": {
-      "__id__": 9
+      "__id__": 11
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -139,8 +142,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 1000,
-      "height": 2000
+      "width": 750,
+      "height": 1334
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -216,6 +219,42 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "77ShzfVO5D24pO46in5yH2"
   },
+  {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 10
+    },
+    "_alignFlags": 45,
+    "_target": null,
+    "_left": 0,
+    "_right": 0,
+    "_top": 0,
+    "_bottom": 0,
+    "_horizontalCenter": 0,
+    "_verticalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 1000,
+    "_originalHeight": 2000,
+    "_alignMode": 2,
+    "_lockFlags": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "c8LgOUJR5Ozrb4Uy0NlJ3T"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -239,29 +278,29 @@
     },
     "_children": [
       {
-        "__id__": 11
+        "__id__": 13
       },
       {
-        "__id__": 57
+        "__id__": 59
       },
       {
-        "__id__": 63
+        "__id__": 65
       },
       {
-        "__id__": 77
+        "__id__": 79
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 91
+        "__id__": 93
       },
       {
-        "__id__": 93
+        "__id__": 95
       }
     ],
     "_prefab": {
-      "__id__": 95
+      "__id__": 97
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -298,30 +337,30 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 10
+      "__id__": 12
     },
     "_children": [
       {
-        "__id__": 12
+        "__id__": 14
       },
       {
-        "__id__": 18
+        "__id__": 20
       },
       {
-        "__id__": 44
+        "__id__": 46
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 52
+        "__id__": 54
       },
       {
-        "__id__": 54
+        "__id__": 56
       }
     ],
     "_prefab": {
-      "__id__": 56
+      "__id__": 58
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -358,20 +397,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 11
+      "__id__": 13
     },
     "_children": [],
     "_active": false,
     "_components": [
       {
-        "__id__": 13
+        "__id__": 15
       },
       {
-        "__id__": 15
+        "__id__": 17
       }
     ],
     "_prefab": {
-      "__id__": 17
+      "__id__": 19
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -408,11 +447,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 12
+      "__id__": 14
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 14
+      "__id__": 16
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -436,11 +475,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 12
+      "__id__": 14
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 16
+      "__id__": 18
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -494,27 +533,27 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 11
+      "__id__": 13
     },
     "_children": [
       {
-        "__id__": 19
+        "__id__": 21
       },
       {
-        "__id__": 33
+        "__id__": 35
       }
     ],
     "_active": false,
     "_components": [
       {
-        "__id__": 39
+        "__id__": 41
       },
       {
-        "__id__": 41
+        "__id__": 43
       }
     ],
     "_prefab": {
-      "__id__": 43
+      "__id__": 45
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -551,27 +590,27 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 18
+      "__id__": 20
     },
     "_children": [
       {
-        "__id__": 20
+        "__id__": 22
       }
     ],
     "_active": true,
     "_components": [
-      {
-        "__id__": 26
-      },
       {
         "__id__": 28
       },
       {
         "__id__": 30
+      },
+      {
+        "__id__": 32
       }
     ],
     "_prefab": {
-      "__id__": 32
+      "__id__": 34
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -608,20 +647,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 19
+      "__id__": 21
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 21
+        "__id__": 23
       },
       {
-        "__id__": 23
+        "__id__": 25
       }
     ],
     "_prefab": {
-      "__id__": 25
+      "__id__": 27
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -658,11 +697,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 20
+      "__id__": 22
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 22
+      "__id__": 24
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -686,11 +725,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 20
+      "__id__": 22
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 24
+      "__id__": 26
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -744,11 +783,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 19
+      "__id__": 21
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 27
+      "__id__": 29
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -772,11 +811,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 19
+      "__id__": 21
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 29
+      "__id__": 31
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -817,14 +856,14 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 19
+      "__id__": 21
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 31
+      "__id__": 33
     },
     "_barSprite": {
-      "__id__": 23
+      "__id__": 25
     },
     "_mode": 2,
     "_totalLength": 1,
@@ -855,20 +894,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 18
+      "__id__": 20
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 34
+        "__id__": 36
       },
       {
-        "__id__": 36
+        "__id__": 38
       }
     ],
     "_prefab": {
-      "__id__": 38
+      "__id__": 40
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -905,11 +944,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 33
+      "__id__": 35
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 35
+      "__id__": 37
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -933,11 +972,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 33
+      "__id__": 35
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 37
+      "__id__": 39
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1014,11 +1053,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 18
+      "__id__": 20
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 40
+      "__id__": 42
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1042,11 +1081,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 18
+      "__id__": 20
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 42
+      "__id__": 44
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1100,23 +1139,23 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 11
+      "__id__": 13
     },
     "_children": [],
     "_active": true,
     "_components": [
-      {
-        "__id__": 45
-      },
       {
         "__id__": 47
       },
       {
         "__id__": 49
+      },
+      {
+        "__id__": 51
       }
     ],
     "_prefab": {
-      "__id__": 51
+      "__id__": 53
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1153,11 +1192,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 44
+      "__id__": 46
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 46
+      "__id__": 48
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1181,11 +1220,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 44
+      "__id__": 46
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 48
+      "__id__": 50
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1252,11 +1291,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 44
+      "__id__": 46
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 50
+      "__id__": 52
     },
     "_alignFlags": 18,
     "_target": null,
@@ -1301,11 +1340,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 11
+      "__id__": 13
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 53
+      "__id__": 55
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1329,11 +1368,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 11
+      "__id__": 13
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 55
+      "__id__": 57
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1387,20 +1426,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 10
+      "__id__": 12
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 58
+        "__id__": 60
       },
       {
-        "__id__": 60
+        "__id__": 62
       }
     ],
     "_prefab": {
-      "__id__": 62
+      "__id__": 64
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1437,11 +1476,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 57
+      "__id__": 59
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 59
+      "__id__": 61
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1465,11 +1504,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 57
+      "__id__": 59
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 61
+      "__id__": 63
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1523,27 +1562,27 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 10
+      "__id__": 12
     },
     "_children": [
       {
-        "__id__": 64
+        "__id__": 66
       }
     ],
     "_active": true,
     "_components": [
-      {
-        "__id__": 70
-      },
       {
         "__id__": 72
       },
       {
         "__id__": 74
+      },
+      {
+        "__id__": 76
       }
     ],
     "_prefab": {
-      "__id__": 76
+      "__id__": 78
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1580,20 +1619,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 63
+      "__id__": 65
     },
     "_children": [],
     "_active": false,
     "_components": [
       {
-        "__id__": 65
+        "__id__": 67
       },
       {
-        "__id__": 67
+        "__id__": 69
       }
     ],
     "_prefab": {
-      "__id__": 69
+      "__id__": 71
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1630,11 +1669,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 64
+      "__id__": 66
     },
     "_enabled": false,
     "__prefab": {
-      "__id__": 66
+      "__id__": 68
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1658,11 +1697,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 64
+      "__id__": 66
     },
     "_enabled": false,
     "__prefab": {
-      "__id__": 68
+      "__id__": 70
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1716,11 +1755,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 63
+      "__id__": 65
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 71
+      "__id__": 73
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1744,11 +1783,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 63
+      "__id__": 65
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 73
+      "__id__": 75
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1789,11 +1828,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 63
+      "__id__": 65
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 75
+      "__id__": 77
     },
     "clickEvents": [],
     "_interactable": true,
@@ -1858,27 +1897,27 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 10
+      "__id__": 12
     },
     "_children": [
       {
-        "__id__": 78
+        "__id__": 80
       }
     ],
     "_active": true,
     "_components": [
-      {
-        "__id__": 84
-      },
       {
         "__id__": 86
       },
       {
         "__id__": 88
+      },
+      {
+        "__id__": 90
       }
     ],
     "_prefab": {
-      "__id__": 90
+      "__id__": 92
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1915,20 +1954,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 77
+      "__id__": 79
     },
     "_children": [],
     "_active": false,
     "_components": [
       {
-        "__id__": 79
+        "__id__": 81
       },
       {
-        "__id__": 81
+        "__id__": 83
       }
     ],
     "_prefab": {
-      "__id__": 83
+      "__id__": 85
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1965,11 +2004,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 78
+      "__id__": 80
     },
     "_enabled": false,
     "__prefab": {
-      "__id__": 80
+      "__id__": 82
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1993,11 +2032,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 78
+      "__id__": 80
     },
     "_enabled": false,
     "__prefab": {
-      "__id__": 82
+      "__id__": 84
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -2051,11 +2090,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 77
+      "__id__": 79
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 85
+      "__id__": 87
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2079,11 +2118,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 77
+      "__id__": 79
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 87
+      "__id__": 89
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -2124,11 +2163,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 77
+      "__id__": 79
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 89
+      "__id__": 91
     },
     "clickEvents": [],
     "_interactable": true,
@@ -2193,11 +2232,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 10
+      "__id__": 12
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 92
+      "__id__": 94
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2221,11 +2260,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 10
+      "__id__": 12
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 94
+      "__id__": 96
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -2283,7 +2322,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 97
+      "__id__": 99
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2311,7 +2350,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 99
+      "__id__": 101
     },
     "_id": ""
   },
@@ -2329,7 +2368,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 101
+      "__id__": 103
     },
     "_id": ""
   },
@@ -2338,7 +2377,7 @@
     "fileId": "02zJ5UrRdLU5+qybADx9k3"
   },
   {
-    "__type__": "b356cApUdVC8I8CxLJLwlZA",
+    "__type__": "cc.Widget",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -2347,13 +2386,31 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 103
+      "__id__": 105
     },
+    "_alignFlags": 45,
+    "_target": null,
+    "_left": 0,
+    "_right": 0,
+    "_top": 0,
+    "_bottom": 0,
+    "_horizontalCenter": 0,
+    "_verticalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 750,
+    "_originalHeight": 1334,
+    "_alignMode": 1,
+    "_lockFlags": 0,
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "3fx5fQceFFqoJSYzTABbDN"
+    "fileId": "92OJqjeolFzLy0ybdzkiPv"
   },
   {
     "__type__": "cc.PrefabInfo",

File diff suppressed because it is too large
+ 190 - 151
library/b6/b608ca62-d03c-4fc2-a51a-772e93f391d0.json


File diff suppressed because it is too large
+ 191 - 152
library/b8/b83b568a-13ad-4c2d-b7c1-3abd20518b68.json


File diff suppressed because it is too large
+ 187 - 148
library/c7/c7f2ecc5-17bf-4e66-9d0b-dc78789a994e.json


File diff suppressed because it is too large
+ 195 - 156
library/e8/e82dd65d-215b-4555-819e-3f08028530ab.json


+ 201 - 144
library/e9/e99a8ee5-e203-4882-b5a1-6314bb453d45.json

@@ -22,14 +22,11 @@
         "__id__": 2
       },
       {
-        "__id__": 10
+        "__id__": 12
       }
     ],
     "_active": true,
     "_components": [
-      {
-        "__id__": 98
-      },
       {
         "__id__": 100
       },
@@ -38,10 +35,13 @@
       },
       {
         "__id__": 104
+      },
+      {
+        "__id__": 106
       }
     ],
     "_prefab": {
-      "__id__": 106
+      "__id__": 108
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -91,10 +91,13 @@
       },
       {
         "__id__": 7
+      },
+      {
+        "__id__": 9
       }
     ],
     "_prefab": {
-      "__id__": 9
+      "__id__": 11
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -139,8 +142,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 1000,
-      "height": 2000
+      "width": 750,
+      "height": 1334
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -216,6 +219,42 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "77ShzfVO5D24pO46in5yH2"
   },
+  {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 10
+    },
+    "_alignFlags": 45,
+    "_target": null,
+    "_left": 0,
+    "_right": 0,
+    "_top": 0,
+    "_bottom": 0,
+    "_horizontalCenter": 0,
+    "_verticalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 1000,
+    "_originalHeight": 2000,
+    "_alignMode": 2,
+    "_lockFlags": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "3fIQhzjgdKZ6ZK5Vi4RJ1s"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -239,35 +278,35 @@
     },
     "_children": [
       {
-        "__id__": 11
+        "__id__": 13
       },
       {
-        "__id__": 25
+        "__id__": 27
       },
       {
-        "__id__": 67
+        "__id__": 69
       },
       {
-        "__id__": 75
+        "__id__": 77
       },
       {
-        "__id__": 81
+        "__id__": 83
       },
       {
-        "__id__": 87
+        "__id__": 89
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 93
+        "__id__": 95
       },
       {
-        "__id__": 95
+        "__id__": 97
       }
     ],
     "_prefab": {
-      "__id__": 97
+      "__id__": 99
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -304,24 +343,24 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 10
+      "__id__": 12
     },
     "_children": [
       {
-        "__id__": 12
+        "__id__": 14
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 20
+        "__id__": 22
       },
       {
-        "__id__": 22
+        "__id__": 24
       }
     ],
     "_prefab": {
-      "__id__": 24
+      "__id__": 26
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -358,23 +397,23 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 11
+      "__id__": 13
     },
     "_children": [],
     "_active": true,
     "_components": [
-      {
-        "__id__": 13
-      },
       {
         "__id__": 15
       },
       {
         "__id__": 17
+      },
+      {
+        "__id__": 19
       }
     ],
     "_prefab": {
-      "__id__": 19
+      "__id__": 21
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -411,11 +450,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 12
+      "__id__": 14
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 14
+      "__id__": 16
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -439,11 +478,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 12
+      "__id__": 14
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 16
+      "__id__": 18
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -510,11 +549,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 12
+      "__id__": 14
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 18
+      "__id__": 20
     },
     "_id": ""
   },
@@ -541,11 +580,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 11
+      "__id__": 13
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 21
+      "__id__": 23
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -569,11 +608,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 11
+      "__id__": 13
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 23
+      "__id__": 25
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -627,30 +666,30 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 10
+      "__id__": 12
     },
     "_children": [
       {
-        "__id__": 26
+        "__id__": 28
       },
       {
-        "__id__": 46
+        "__id__": 48
       }
     ],
     "_active": true,
     "_components": [
-      {
-        "__id__": 60
-      },
       {
         "__id__": 62
       },
       {
         "__id__": 64
+      },
+      {
+        "__id__": 66
       }
     ],
     "_prefab": {
-      "__id__": 66
+      "__id__": 68
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -687,27 +726,27 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 25
+      "__id__": 27
     },
     "_children": [
       {
-        "__id__": 27
+        "__id__": 29
       },
       {
-        "__id__": 33
+        "__id__": 35
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 41
+        "__id__": 43
       },
       {
-        "__id__": 43
+        "__id__": 45
       }
     ],
     "_prefab": {
-      "__id__": 45
+      "__id__": 47
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -744,20 +783,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 26
+      "__id__": 28
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 28
+        "__id__": 30
       },
       {
-        "__id__": 30
+        "__id__": 32
       }
     ],
     "_prefab": {
-      "__id__": 32
+      "__id__": 34
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -794,11 +833,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 27
+      "__id__": 29
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 29
+      "__id__": 31
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -822,11 +861,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 27
+      "__id__": 29
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 31
+      "__id__": 33
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -880,23 +919,23 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 26
+      "__id__": 28
     },
     "_children": [],
     "_active": true,
     "_components": [
-      {
-        "__id__": 34
-      },
       {
         "__id__": 36
       },
       {
         "__id__": 38
+      },
+      {
+        "__id__": 40
       }
     ],
     "_prefab": {
-      "__id__": 40
+      "__id__": 42
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -933,11 +972,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 33
+      "__id__": 35
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 35
+      "__id__": 37
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -961,11 +1000,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 33
+      "__id__": 35
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 37
+      "__id__": 39
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1032,11 +1071,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 33
+      "__id__": 35
     },
     "_enabled": false,
     "__prefab": {
-      "__id__": 39
+      "__id__": 41
     },
     "_id": ""
   },
@@ -1063,11 +1102,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 26
+      "__id__": 28
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 42
+      "__id__": 44
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1091,11 +1130,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 26
+      "__id__": 28
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 44
+      "__id__": 46
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1149,27 +1188,27 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 25
+      "__id__": 27
     },
     "_children": [
       {
-        "__id__": 47
+        "__id__": 49
       }
     ],
     "_active": true,
     "_components": [
-      {
-        "__id__": 53
-      },
       {
         "__id__": 55
       },
       {
         "__id__": 57
+      },
+      {
+        "__id__": 59
       }
     ],
     "_prefab": {
-      "__id__": 59
+      "__id__": 61
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1206,20 +1245,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 46
+      "__id__": 48
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 48
+        "__id__": 50
       },
       {
-        "__id__": 50
+        "__id__": 52
       }
     ],
     "_prefab": {
-      "__id__": 52
+      "__id__": 54
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1256,11 +1295,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 47
+      "__id__": 49
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 49
+      "__id__": 51
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1284,11 +1323,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 47
+      "__id__": 49
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 51
+      "__id__": 53
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1342,11 +1381,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 46
+      "__id__": 48
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 54
+      "__id__": 56
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1370,11 +1409,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 46
+      "__id__": 48
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 56
+      "__id__": 58
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1415,11 +1454,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 46
+      "__id__": 48
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 58
+      "__id__": 60
     },
     "clickEvents": [],
     "_interactable": true,
@@ -1484,11 +1523,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 25
+      "__id__": 27
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 61
+      "__id__": 63
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1512,11 +1551,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 25
+      "__id__": 27
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 63
+      "__id__": 65
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1557,11 +1596,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 25
+      "__id__": 27
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 65
+      "__id__": 67
     },
     "clickEvents": [],
     "_interactable": true,
@@ -1626,23 +1665,23 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 10
+      "__id__": 12
     },
     "_children": [],
     "_active": true,
     "_components": [
-      {
-        "__id__": 68
-      },
       {
         "__id__": 70
       },
       {
         "__id__": 72
+      },
+      {
+        "__id__": 74
       }
     ],
     "_prefab": {
-      "__id__": 74
+      "__id__": 76
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1679,11 +1718,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 67
+      "__id__": 69
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 69
+      "__id__": 71
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1707,11 +1746,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 67
+      "__id__": 69
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 71
+      "__id__": 73
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1752,11 +1791,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 67
+      "__id__": 69
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 73
+      "__id__": 75
     },
     "clickEvents": [],
     "_interactable": true,
@@ -1821,20 +1860,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 10
+      "__id__": 12
     },
     "_children": [],
     "_active": false,
     "_components": [
       {
-        "__id__": 76
+        "__id__": 78
       },
       {
-        "__id__": 78
+        "__id__": 80
       }
     ],
     "_prefab": {
-      "__id__": 80
+      "__id__": 82
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1871,11 +1910,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 75
+      "__id__": 77
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 77
+      "__id__": 79
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1899,11 +1938,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 75
+      "__id__": 77
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 79
+      "__id__": 81
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1980,20 +2019,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 10
+      "__id__": 12
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 82
+        "__id__": 84
       },
       {
-        "__id__": 84
+        "__id__": 86
       }
     ],
     "_prefab": {
-      "__id__": 86
+      "__id__": 88
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -2030,11 +2069,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 81
+      "__id__": 83
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 83
+      "__id__": 85
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2058,11 +2097,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 81
+      "__id__": 83
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 85
+      "__id__": 87
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -2116,20 +2155,20 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 10
+      "__id__": 12
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 88
+        "__id__": 90
       },
       {
-        "__id__": 90
+        "__id__": 92
       }
     ],
     "_prefab": {
-      "__id__": 92
+      "__id__": 94
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -2166,11 +2205,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 87
+      "__id__": 89
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 89
+      "__id__": 91
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2194,11 +2233,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 87
+      "__id__": 89
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 91
+      "__id__": 93
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -2278,11 +2317,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 10
+      "__id__": 12
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 94
+      "__id__": 96
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2306,11 +2345,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 10
+      "__id__": 12
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 96
+      "__id__": 98
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -2368,7 +2407,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 99
+      "__id__": 101
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -2396,7 +2435,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 101
+      "__id__": 103
     },
     "_id": ""
   },
@@ -2414,7 +2453,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 103
+      "__id__": 105
     },
     "_id": ""
   },
@@ -2423,7 +2462,7 @@
     "fileId": "6dengAL7lOjKqZbFoYeF6T"
   },
   {
-    "__type__": "b356cApUdVC8I8CxLJLwlZA",
+    "__type__": "cc.Widget",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -2432,13 +2471,31 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 105
+      "__id__": 107
     },
+    "_alignFlags": 45,
+    "_target": null,
+    "_left": 0,
+    "_right": 0,
+    "_top": 0,
+    "_bottom": 0,
+    "_horizontalCenter": 0,
+    "_verticalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 750,
+    "_originalHeight": 1334,
+    "_alignMode": 1,
+    "_lockFlags": 0,
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "caH+Za9eZK/p4+eEENXLYr"
+    "fileId": "25aY+eucVF7JMufkQs6Nb0"
   },
   {
     "__type__": "cc.PrefabInfo",

+ 6 - 11
library/ee/eeec5720-7028-48a1-9aec-e9bb18f4abbc.json

@@ -350,9 +350,9 @@
     },
     "_lscale": {
       "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
-      "z": 1
+      "x": 0.83375,
+      "y": 0.83375,
+      "z": 0
     },
     "_mobility": 0,
     "_layer": 33554432,
@@ -376,7 +376,7 @@
     "__prefab": null,
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 750,
+      "width": 899.5502248875563,
       "height": 1600
     },
     "_anchorPoint": {
@@ -573,7 +573,7 @@
     "_id": "6fNVrFsCdMGZtoc3x7I8YB"
   },
   {
-    "__type__": "5891fc2Al5HLZyJZZxmNT+e",
+    "__type__": "098c3AnIRFCboUOouPK86e3",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -582,12 +582,7 @@
     },
     "_enabled": true,
     "__prefab": null,
-    "_flags": 0,
-    "_top": 0,
-    "_bottom": 0,
-    "_left": 0,
-    "_right": 0,
-    "_id": "21jdNutnhH6aAqBHNRtNWx"
+    "_id": "9dLXiwWolEio5sLb/QZhkI"
   },
   {
     "__type__": "cc.SceneGlobals",

+ 3 - 3
profiles/v2/packages/builder.json

@@ -77,8 +77,8 @@
         "id": "1745482788553",
         "progress": 1,
         "state": "success",
-        "stage": "run",
-        "message": "2025-5-8 11:25:15 run package /Users/wenshuang/Desktop/公司游戏/CatchDoll/build/web-mobile-001 success!",
+        "stage": "build",
+        "message": "2025-5-8 15:15:16 build success in 1 min 41 s!",
         "options": {
           "name": "xfk3D",
           "server": "",
@@ -123,7 +123,7 @@
           "buildMode": "normal",
           "logDest": "project://temp/builder/log/web-mobile4-24-2025 16-19.log"
         },
-        "time": "5-8-2025 11:22:37",
+        "time": "5-8-2025 15:13:33",
         "dirty": false
       }
     }

+ 309 - 309
profiles/v2/packages/scene.json

@@ -1,6 +1,6 @@
 {
   "gizmos-infos": {
-    "is2D": false,
+    "is2D": true,
     "is3DIcon": false,
     "iconSize": 2,
     "gridVisible": true,
@@ -58,31 +58,6 @@
         "z": 0
       }
     },
-    "57b9af2e-5897-4f14-bfb7-66f0b279a66f": {
-      "position": {
-        "x": 5.106731198529985,
-        "y": 4.3199180153144425,
-        "z": 1.7468293868751061
-      },
-      "rotation": {
-        "x": -0.2693755694580068,
-        "y": 0.5487221170176537,
-        "z": 0.19255553577562717,
-        "w": 0.7676348132523694
-      },
-      "viewCenter": {
-        "x": 0,
-        "y": 0,
-        "z": 0
-      },
-      "contentRect": {
-        "x": 0,
-        "y": 0,
-        "width": 1128,
-        "height": 1008
-      },
-      "scale": 1
-    },
     "eec620d0-89a8-4bdb-918b-f63a1775f7ec": {
       "position": {
         "x": 0,
@@ -133,81 +108,6 @@
       },
       "scale": 1
     },
-    "269aef79-20c0-428a-8aec-5ea29dbc1157": {
-      "position": {
-        "x": 374.9999999999998,
-        "y": 667,
-        "z": 5000
-      },
-      "rotation": {
-        "x": 0,
-        "y": 0,
-        "z": 0,
-        "w": 1
-      },
-      "viewCenter": {
-        "x": -1.101673048127365,
-        "y": -260.57349667147355,
-        "z": -643.92761819583
-      },
-      "contentRect": {
-        "x": 283.4527736131934,
-        "y": 5,
-        "width": 1128,
-        "height": 1008
-      },
-      "scale": 1
-    },
-    "e54f9ea5-e13e-456a-bc6a-77122f1dd3eb": {
-      "position": {
-        "x": 397.5,
-        "y": 690.5,
-        "z": 5000
-      },
-      "rotation": {
-        "x": 0,
-        "y": 0,
-        "z": 0,
-        "w": 1
-      },
-      "viewCenter": {
-        "x": -1.101673048127365,
-        "y": -260.57349667147355,
-        "z": -643.92761819583
-      },
-      "contentRect": {
-        "x": 283.4527736131934,
-        "y": 5,
-        "width": 1128,
-        "height": 1008
-      },
-      "scale": 1
-    },
-    "5ecb7f44-b5d2-42a8-b80b-126ae0959712": {
-      "position": {
-        "x": 375,
-        "y": 667,
-        "z": 205.46307658185287
-      },
-      "rotation": {
-        "x": 0,
-        "y": 0,
-        "z": 0,
-        "w": 1
-      },
-      "viewCenter": {
-        "x": 375,
-        "y": 667,
-        "z": 0
-      },
-      "contentRect": {
-        "x": 283.4527736131934,
-        "y": 5,
-        "width": 1128,
-        "height": 1008
-      },
-      "scale": 1
-    },
     "cab57ad4-2ec3-4e43-9979-fbbaa8c91f2e": {
       "position": {
         "x": 3.0850281874525427,
@@ -708,10 +608,10 @@
       },
       "scale": 1
     },
-    "40d92b5b-17f4-42e9-b20b-1e4c326eedcf": {
+    "637ebedd-e426-404c-bcad-297286eab70b": {
       "position": {
-        "x": 375,
-        "y": 822.317,
+        "x": -542.816,
+        "y": -473.4000000000001,
         "z": 5000
       },
       "rotation": {
@@ -726,18 +626,18 @@
         "z": 0
       },
       "contentRect": {
-        "x": 239.79999999999995,
-        "y": 759.9169999999999,
-        "width": 600,
-        "height": 37.799999999999955
+        "x": -747.65975,
+        "y": -910.4,
+        "width": 0,
+        "height": 0
       },
       "scale": 1
     },
-    "b608ca62-d03c-4fc2-a51a-772e93f391d0": {
+    "c4bfb51c-5b23-496e-9ce7-7066f9042369": {
       "position": {
-        "x": 375,
-        "y": 667,
-        "z": 5000
+        "x": 0,
+        "y": 0,
+        "z": 10.142708629441586
       },
       "rotation": {
         "x": 0,
@@ -751,17 +651,42 @@
         "z": 0
       },
       "contentRect": {
-        "x": -915.6178489702518,
-        "y": -486.3180778032036,
-        "width": 437,
-        "height": 874
+        "x": 0,
+        "y": 0,
+        "width": 0,
+        "height": 0
       },
-      "scale": 0.437
+      "scale": 1
     },
-    "886f5150-93a4-44ea-804c-4ec2e80a3ee4": {
+    "6c1e69ee-a7af-4972-950b-34f1fb6516b2": {
       "position": {
-        "x": 505.5803571428571,
-        "y": 928.1607142857143,
+        "x": 0.19627439070752334,
+        "y": 2.422081463640721,
+        "z": 9.916788504024211
+      },
+      "rotation": {
+        "x": -0.11946089840295476,
+        "y": 0.00982374962301819,
+        "z": 0.0011820772048186442,
+        "w": 0.992789600262606
+      },
+      "viewCenter": {
+        "x": 0,
+        "y": 0,
+        "z": 0
+      },
+      "contentRect": {
+        "x": 0,
+        "y": 0,
+        "width": 0,
+        "height": 0
+      },
+      "scale": 1
+    },
+    "f5e48bba-876c-4a3c-85f1-050e4862a4bf": {
+      "position": {
+        "x": 0,
+        "y": 0,
         "z": 5000
       },
       "rotation": {
@@ -776,17 +701,17 @@
         "z": 0
       },
       "contentRect": {
-        "x": 17.857142857142858,
-        "y": -47.28571428571428,
-        "width": 448,
-        "height": 896
+        "x": 0,
+        "y": 0,
+        "width": 0,
+        "height": 0
       },
-      "scale": 0.448
+      "scale": 1
     },
-    "a87b5748-2ead-4c6e-9905-efcce6798098": {
+    "4ef6eae0-69d3-43c3-8e51-37751cbbdeed": {
       "position": {
-        "x": 1318.739955357143,
-        "y": 2617.892857142857,
+        "x": 433.9059674502712,
+        "y": 834.8119349005424,
         "z": 5000
       },
       "rotation": {
@@ -801,24 +726,24 @@
         "z": 0
       },
       "contentRect": {
-        "x": 1318.7399553571427,
-        "y": 2617.8928571428573,
-        "width": 448,
-        "height": 896
+        "x": 160.623869801085,
+        "y": 251.81012658227846,
+        "width": 518.4375,
+        "height": 1106
       },
-      "scale": 0.448
+      "scale": 0.69125
     },
-    "f46876e4-e81b-4931-b493-6d367be385e7": {
+    "c7f2ecc5-17bf-4e66-9d0b-dc78789a994e": {
       "position": {
-        "x": 21.101145154147915,
-        "y": 21.10114515414791,
-        "z": 21.101145154147908
+        "x": 337.2425629290617,
+        "y": 591.4851258581235,
+        "z": 5000
       },
       "rotation": {
-        "x": -0.27984814233312133,
-        "y": 0.3647051996310009,
-        "z": 0.11591689595929512,
-        "w": 0.8804762392171493
+        "x": 0,
+        "y": 0,
+        "z": 0,
+        "w": 1
       },
       "viewCenter": {
         "x": 0,
@@ -826,12 +751,12 @@
         "z": 0
       },
       "contentRect": {
-        "x": 0,
-        "y": 0,
-        "width": 382,
-        "height": 680
+        "x": -295.4805491990847,
+        "y": -673.9610983981693,
+        "width": 437,
+        "height": 874
       },
-      "scale": 1
+      "scale": 0.437
     },
     "e99a8ee5-e203-4882-b5a1-6314bb453d45": {
       "position": {
@@ -860,7 +785,7 @@
     },
     "b83b568a-13ad-4c2d-b7c1-3abd20518b68": {
       "position": {
-        "x": 875,
+        "x": 874.9999999999999,
         "y": 1667,
         "z": 5000
       },
@@ -883,10 +808,10 @@
       },
       "scale": 0.437
     },
-    "0fe45a30-5541-4ff8-9715-3a7ed22358e6": {
+    "a87b5748-2ead-4c6e-9905-efcce6798098": {
       "position": {
-        "x": -25.204500000000053,
-        "y": -22,
+        "x": 1818.7399553571427,
+        "y": 3617.892857142857,
         "z": 5000
       },
       "rotation": {
@@ -901,16 +826,16 @@
         "z": 0
       },
       "contentRect": {
-        "x": -243.70450000000005,
-        "y": -459,
-        "width": 0,
-        "height": 0
+        "x": 1331.0167410714284,
+        "y": 2642.4464285714284,
+        "width": 448,
+        "height": 896
       },
-      "scale": 1
+      "scale": 0.448
     },
     "6c91161f-a581-4aea-b319-d6d3dead58c3": {
       "position": {
-        "x": 949.1936439728903,
+        "x": 949.1936439728905,
         "y": 549.6710541446732,
         "z": 5000
       },
@@ -926,17 +851,17 @@
         "z": 0
       },
       "contentRect": {
-        "x": 376.43469498301255,
-        "y": -595.8468438350826,
+        "x": 362.01742166747795,
+        "y": -624.6813904661519,
         "width": 437,
         "height": 874
       },
       "scale": 0.3814868373254548
     },
-    "699c6afd-6df5-492b-8b36-1871db71ad16": {
+    "0fe45a30-5541-4ff8-9715-3a7ed22358e6": {
       "position": {
-        "x": 672.5407311615038,
-        "y": 603.4857548814643,
+        "x": -243.70449999999994,
+        "y": -459,
         "z": 5000
       },
       "rotation": {
@@ -951,17 +876,17 @@
         "z": 0
       },
       "contentRect": {
-        "x": 0,
-        "y": 0,
+        "x": -462.20450000000005,
+        "y": -896,
         "width": 0,
         "height": 0
       },
       "scale": 1
     },
-    "6e8c4209-3574-45b0-858d-16cff5eee329": {
+    "b608ca62-d03c-4fc2-a51a-772e93f391d0": {
       "position": {
-        "x": -218.5,
-        "y": -437,
+        "x": -415.61784897025177,
+        "y": 513.6819221967963,
         "z": 5000
       },
       "rotation": {
@@ -976,17 +901,17 @@
         "z": 0
       },
       "contentRect": {
-        "x": -409.5,
-        "y": -777,
-        "width": 0,
-        "height": 0
+        "x": -415.6178489702517,
+        "y": 513.6819221967964,
+        "width": 437,
+        "height": 874
       },
-      "scale": 1
+      "scale": 0.437
     },
-    "637ebedd-e426-404c-bcad-297286eab70b": {
+    "886f5150-93a4-44ea-804c-4ec2e80a3ee4": {
       "position": {
-        "x": -542.816,
-        "y": -473.4000000000001,
+        "x": 517.8571428571429,
+        "y": 952.7142857142857,
         "z": 5000
       },
       "rotation": {
@@ -1001,18 +926,18 @@
         "z": 0
       },
       "contentRect": {
-        "x": -747.65975,
-        "y": -910.4,
-        "width": 0,
-        "height": 0
+        "x": 30.13392857142857,
+        "y": -22.73214285714285,
+        "width": 448,
+        "height": 896
       },
-      "scale": 1
+      "scale": 0.448
     },
-    "c4bfb51c-5b23-496e-9ce7-7066f9042369": {
+    "e82dd65d-215b-4555-819e-3f08028530ab": {
       "position": {
-        "x": 0,
-        "y": 0,
-        "z": 10.142708629441586
+        "x": 906.0307302657662,
+        "y": 717.8724517745579,
+        "z": 5000
       },
       "rotation": {
         "x": 0,
@@ -1026,24 +951,24 @@
         "z": 0
       },
       "contentRect": {
-        "x": 0,
-        "y": 0,
-        "width": 0,
-        "height": 0
+        "x": 496.4963833634719,
+        "y": 818.898734177215,
+        "width": 553,
+        "height": 1106
       },
-      "scale": 1
+      "scale": 0.553
     },
-    "6c1e69ee-a7af-4972-950b-34f1fb6516b2": {
+    "9b4f7c25-9b14-4d87-9200-c868813c9a28": {
       "position": {
-        "x": 0.19627439070752334,
-        "y": 2.422081463640721,
-        "z": 9.916788504024211
+        "x": 723.2932016920668,
+        "y": 410.7339459963173,
+        "z": 5000
       },
       "rotation": {
-        "x": -0.11946089840295476,
-        "y": 0.00982374962301819,
-        "z": 0.0011820772048186442,
-        "w": 0.992789600262606
+        "x": 0,
+        "y": 0,
+        "z": 0,
+        "w": 1
       },
       "viewCenter": {
         "x": 0,
@@ -1051,17 +976,42 @@
         "z": 0
       },
       "contentRect": {
-        "x": 0,
-        "y": 0,
-        "width": 0,
-        "height": 0
+        "x": -49.96991855655067,
+        "y": -544.3892043848455,
+        "width": 540,
+        "height": 667
       },
-      "scale": 1
+      "scale": 0.34916963311684945
     },
-    "f5e48bba-876c-4a3c-85f1-050e4862a4bf": {
+    "269aef79-20c0-428a-8aec-5ea29dbc1157": {
       "position": {
+        "x": 374.9999999999998,
+        "y": 667,
+        "z": 5000
+      },
+      "rotation": {
         "x": 0,
         "y": 0,
+        "z": 0,
+        "w": 1
+      },
+      "viewCenter": {
+        "x": -1.101673048127365,
+        "y": -260.57349667147355,
+        "z": -643.92761819583
+      },
+      "contentRect": {
+        "x": 353.08021865964014,
+        "y": 585.1150053861909,
+        "width": 117,
+        "height": 108
+      },
+      "scale": 0.35208605672802024
+    },
+    "e54f9ea5-e13e-456a-bc6a-77122f1dd3eb": {
+      "position": {
+        "x": 397.5,
+        "y": 690.5,
         "z": 5000
       },
       "rotation": {
@@ -1071,22 +1021,47 @@
         "w": 1
       },
       "viewCenter": {
+        "x": -1.101673048127365,
+        "y": -260.57349667147355,
+        "z": -643.92761819583
+      },
+      "contentRect": {
+        "x": 353.08021865964014,
+        "y": 585.1150053861909,
+        "width": 117,
+        "height": 108
+      },
+      "scale": 0.35208605672802024
+    },
+    "5ecb7f44-b5d2-42a8-b80b-126ae0959712": {
+      "position": {
+        "x": 375,
+        "y": 667,
+        "z": 205.46307658185287
+      },
+      "rotation": {
         "x": 0,
         "y": 0,
+        "z": 0,
+        "w": 1
+      },
+      "viewCenter": {
+        "x": 375,
+        "y": 667,
         "z": 0
       },
       "contentRect": {
-        "x": 0,
-        "y": 0,
-        "width": 0,
-        "height": 0
+        "x": 353.08021865964014,
+        "y": 585.1150053861909,
+        "width": 117,
+        "height": 108
       },
-      "scale": 1
+      "scale": 0.35208605672802024
     },
-    "9b4f7c25-9b14-4d87-9200-c868813c9a28": {
+    "40d92b5b-17f4-42e9-b20b-1e4c326eedcf": {
       "position": {
-        "x": 622.2975389297928,
-        "y": 646.0277705501234,
+        "x": 375,
+        "y": 822.317,
         "z": 5000
       },
       "rotation": {
@@ -1101,18 +1076,18 @@
         "z": 0
       },
       "contentRect": {
-        "x": 221.76362039183084,
-        "y": -208.44458899752874,
-        "width": 540,
-        "height": 667
+        "x": 353.08021865964014,
+        "y": 585.1150053861909,
+        "width": 117,
+        "height": 108
       },
-      "scale": 0.5336626690199799
+      "scale": 0.35208605672802024
     },
-    "1523702b-f45a-4b86-a2ce-fe6a9634afdf": {
+    "365cc749-f215-4368-b76e-1be6734f557e": {
       "position": {
-        "x": 797.9029856998659,
-        "y": 608.8445545817796,
-        "z": 5000
+        "x": 375,
+        "y": 667,
+        "z": 181.54261677496743
       },
       "rotation": {
         "x": 0,
@@ -1120,23 +1095,48 @@
         "z": 0,
         "w": 1
       },
+      "viewCenter": {
+        "x": 375,
+        "y": 667,
+        "z": 0
+      },
+      "contentRect": {
+        "x": 353.08021865964014,
+        "y": 585.1150053861909,
+        "width": 117,
+        "height": 108
+      },
+      "scale": 0.35208605672802024
+    },
+    "6e8c4209-3574-45b0-858d-16cff5eee329": {
+      "position": {
+        "x": -0.13628447936646654,
+        "y": 110.56620725411744,
+        "z": -11.36192679678449
+      },
+      "rotation": {
+        "x": 0.7423579383018424,
+        "y": -0.004017986476278434,
+        "z": -0.004452071736664857,
+        "w": -0.6699766609981023
+      },
       "viewCenter": {
         "x": 0,
         "y": 0,
         "z": 0
       },
       "contentRect": {
-        "x": 392.0687440027235,
-        "y": -256.93516103879097,
-        "width": 518.4375,
-        "height": 1106
+        "x": 353.08021865964014,
+        "y": 585.1150053861909,
+        "width": 117,
+        "height": 108
       },
-      "scale": 0.6387306032038677
+      "scale": 0.35208605672802024
     },
-    "79d5fa5f-cb75-4f1a-8ca4-503a10fc449d": {
+    "699c6afd-6df5-492b-8b36-1871db71ad16": {
       "position": {
-        "x": 1219.1786242059995,
-        "y": 792.963420081315,
+        "x": 431.42352861614995,
+        "y": 291.18411856971034,
         "z": 5000
       },
       "rotation": {
@@ -1146,22 +1146,22 @@
         "w": 1
       },
       "viewCenter": {
-        "x": 0,
-        "y": 0,
+        "x": 375,
+        "y": 667,
         "z": 0
       },
       "contentRect": {
-        "x": 1219.1786242059998,
-        "y": 792.9634200813152,
+        "x": 310.2975325267089,
+        "y": 179.37550679484156,
         "width": 0,
         "height": 0
       },
-      "scale": 0.23915203952296904
+      "scale": 0.4829681644624228
     },
-    "9e12223d-7a81-471d-8295-08a69b25b44b": {
+    "4cd259f2-fc79-4e93-8d6b-804a5b820fb8": {
       "position": {
-        "x": 330.58459291554016,
-        "y": 542.0841252736062,
+        "x": 374.9999999999999,
+        "y": 666.9999999999999,
         "z": 5000
       },
       "rotation": {
@@ -1171,22 +1171,22 @@
         "w": 1
       },
       "viewCenter": {
-        "x": 0,
-        "y": 0,
+        "x": 375,
+        "y": 667,
         "z": 0
       },
       "contentRect": {
-        "x": 330.5845929155402,
-        "y": 542.0841252736062,
-        "width": 437,
-        "height": 874
+        "x": 374.99999999999994,
+        "y": 666.9999999999999,
+        "width": 553,
+        "height": 1106
       },
-      "scale": 0.6120431122277088
+      "scale": 0.553
     },
-    "4ef6eae0-69d3-43c3-8e51-37751cbbdeed": {
+    "79d5fa5f-cb75-4f1a-8ca4-503a10fc449d": {
       "position": {
-        "x": 433.9059674502712,
-        "y": 834.8119349005424,
+        "x": 519.2327796092211,
+        "y": 738.4866001088809,
         "z": 5000
       },
       "rotation": {
@@ -1196,22 +1196,22 @@
         "w": 1
       },
       "viewCenter": {
-        "x": 0,
-        "y": 0,
+        "x": 375,
+        "y": 667,
         "z": 0
       },
       "contentRect": {
-        "x": 160.623869801085,
-        "y": 251.81012658227846,
-        "width": 518.4375,
-        "height": 1106
+        "x": 353.08021865964014,
+        "y": 585.1150053861909,
+        "width": 117,
+        "height": 108
       },
-      "scale": 0.69125
+      "scale": 0.35208605672802024
     },
-    "c7f2ecc5-17bf-4e66-9d0b-dc78789a994e": {
+    "f46876e4-e81b-4931-b493-6d367be385e7": {
       "position": {
-        "x": 318.45736168365994,
-        "y": 668.6186055543276,
+        "x": 0,
+        "y": 0,
         "z": 5000
       },
       "rotation": {
@@ -1226,17 +1226,17 @@
         "z": 0
       },
       "contentRect": {
-        "x": -162.7574370709382,
-        "y": -408.51487414187636,
-        "width": 437,
-        "height": 874
+        "x": 1500,
+        "y": 1000,
+        "width": 2985,
+        "height": 1990
       },
-      "scale": 0.437
+      "scale": 0.995
     },
-    "e82dd65d-215b-4555-819e-3f08028530ab": {
+    "9e12223d-7a81-471d-8295-08a69b25b44b": {
       "position": {
-        "x": 628.3340867992766,
-        "y": 1128.1211573236887,
+        "x": 1751.2869088995967,
+        "y": 962.245350502325,
         "z": 5000
       },
       "rotation": {
@@ -1246,22 +1246,22 @@
         "w": 1
       },
       "viewCenter": {
-        "x": 0,
-        "y": 0,
+        "x": 375,
+        "y": 667,
         "z": 0
       },
       "contentRect": {
-        "x": 233.2165461121157,
-        "y": 337.88607594936695,
-        "width": 553,
+        "x": -24.08934409469766,
+        "y": -745.7890446197719,
+        "width": 1149.605734767025,
         "height": 1106
       },
-      "scale": 0.553
+      "scale": 0.3237639719547155
     },
-    "4cd259f2-fc79-4e93-8d6b-804a5b820fb8": {
+    "eeec5720-7028-48a1-9aec-e9bb18f4abbc": {
       "position": {
-        "x": 375,
-        "y": 666.9999999999999,
+        "x": 659.1689168961345,
+        "y": 604.22501244109,
         "z": 5000
       },
       "rotation": {
@@ -1271,22 +1271,22 @@
         "w": 1
       },
       "viewCenter": {
-        "x": 0,
-        "y": 0,
+        "x": 375,
+        "y": 667,
         "z": 0
       },
       "contentRect": {
-        "x": -124.99999999999999,
-        "y": -333,
-        "width": 553,
-        "height": 1106
+        "x": -237.80576163760534,
+        "y": -258.7264886310254,
+        "width": 0,
+        "height": 0
       },
-      "scale": 0.553
+      "scale": 0.640823962080097
     },
-    "eeec5720-7028-48a1-9aec-e9bb18f4abbc": {
+    "1523702b-f45a-4b86-a2ce-fe6a9634afdf": {
       "position": {
-        "x": 1689.5930437218408,
-        "y": -2050.455292027456,
+        "x": 191,
+        "y": 340,
         "z": 5000
       },
       "rotation": {
@@ -1296,26 +1296,22 @@
         "w": 1
       },
       "viewCenter": {
-        "x": 0,
-        "y": 0,
+        "x": 375,
+        "y": 667,
         "z": 0
       },
       "contentRect": {
-        "x": -86.33305312794828,
-        "y": -5602.307485727036,
-        "width": 377.8125,
-        "height": 806
+        "x": 191,
+        "y": 340,
+        "width": 372,
+        "height": 662.1989528795812
       },
-      "scale": 0.15569341567223266
+      "scale": 0.9738219895287958
     }
   },
   "camera-uuids": [
-    "57b9af2e-5897-4f14-bfb7-66f0b279a66f",
     "eec620d0-89a8-4bdb-918b-f63a1775f7ec",
     "22ee6eff-3a1e-4e51-8690-23b343d4e3bd",
-    "269aef79-20c0-428a-8aec-5ea29dbc1157",
-    "e54f9ea5-e13e-456a-bc6a-77122f1dd3eb",
-    "5ecb7f44-b5d2-42a8-b80b-126ae0959712",
     "cab57ad4-2ec3-4e43-9979-fbbaa8c91f2e",
     "f987b460-d5a6-4e2f-b415-38eb30707f79",
     "93309b49-fb5c-4ec4-ad46-f1fb9d1a074d",
@@ -1336,30 +1332,34 @@
     "f223ef56-41d1-4a11-be95-be23074d3555",
     "d64e9972-ad0b-4b09-9432-82eb99b04a36",
     "8efc7954-7a27-4d53-9488-5ab1ce227a83",
-    "40d92b5b-17f4-42e9-b20b-1e4c326eedcf",
-    "b608ca62-d03c-4fc2-a51a-772e93f391d0",
-    "886f5150-93a4-44ea-804c-4ec2e80a3ee4",
-    "a87b5748-2ead-4c6e-9905-efcce6798098",
-    "f46876e4-e81b-4931-b493-6d367be385e7",
-    "e99a8ee5-e203-4882-b5a1-6314bb453d45",
-    "b83b568a-13ad-4c2d-b7c1-3abd20518b68",
-    "0fe45a30-5541-4ff8-9715-3a7ed22358e6",
-    "6c91161f-a581-4aea-b319-d6d3dead58c3",
-    "699c6afd-6df5-492b-8b36-1871db71ad16",
-    "6e8c4209-3574-45b0-858d-16cff5eee329",
     "637ebedd-e426-404c-bcad-297286eab70b",
     "c4bfb51c-5b23-496e-9ce7-7066f9042369",
     "6c1e69ee-a7af-4972-950b-34f1fb6516b2",
     "f5e48bba-876c-4a3c-85f1-050e4862a4bf",
-    "9b4f7c25-9b14-4d87-9200-c868813c9a28",
-    "1523702b-f45a-4b86-a2ce-fe6a9634afdf",
-    "79d5fa5f-cb75-4f1a-8ca4-503a10fc449d",
-    "9e12223d-7a81-471d-8295-08a69b25b44b",
     "4ef6eae0-69d3-43c3-8e51-37751cbbdeed",
     "c7f2ecc5-17bf-4e66-9d0b-dc78789a994e",
+    "e99a8ee5-e203-4882-b5a1-6314bb453d45",
+    "b83b568a-13ad-4c2d-b7c1-3abd20518b68",
+    "a87b5748-2ead-4c6e-9905-efcce6798098",
+    "6c91161f-a581-4aea-b319-d6d3dead58c3",
+    "0fe45a30-5541-4ff8-9715-3a7ed22358e6",
+    "b608ca62-d03c-4fc2-a51a-772e93f391d0",
+    "886f5150-93a4-44ea-804c-4ec2e80a3ee4",
     "e82dd65d-215b-4555-819e-3f08028530ab",
+    "9b4f7c25-9b14-4d87-9200-c868813c9a28",
+    "269aef79-20c0-428a-8aec-5ea29dbc1157",
+    "e54f9ea5-e13e-456a-bc6a-77122f1dd3eb",
+    "5ecb7f44-b5d2-42a8-b80b-126ae0959712",
+    "40d92b5b-17f4-42e9-b20b-1e4c326eedcf",
+    "365cc749-f215-4368-b76e-1be6734f557e",
+    "6e8c4209-3574-45b0-858d-16cff5eee329",
+    "699c6afd-6df5-492b-8b36-1871db71ad16",
     "4cd259f2-fc79-4e93-8d6b-804a5b820fb8",
-    "eeec5720-7028-48a1-9aec-e9bb18f4abbc"
+    "79d5fa5f-cb75-4f1a-8ca4-503a10fc449d",
+    "f46876e4-e81b-4931-b493-6d367be385e7",
+    "9e12223d-7a81-471d-8295-08a69b25b44b",
+    "eeec5720-7028-48a1-9aec-e9bb18f4abbc",
+    "1523702b-f45a-4b86-a2ce-fe6a9634afdf"
   ],
   "scene": {
     "native": false

Some files were not shown because too many files changed in this diff