Kziwws 1 miesiąc temu
rodzic
commit
fa978f0062
69 zmienionych plików z 2882 dodań i 1294 usunięć
  1. 24 3
      assets/resources/gameui/BoxLayer.prefab
  2. 24 3
      assets/resources/gameui/BuyCoinLayer.prefab
  3. 24 3
      assets/resources/gameui/BuyItemLayer.prefab
  4. 24 3
      assets/resources/gameui/BuyLifeLayer.prefab
  5. 24 3
      assets/resources/gameui/DrawStarLayer.prefab
  6. 24 3
      assets/resources/gameui/FailLayer.prefab
  7. 22 1
      assets/resources/gameui/GameUI.prefab
  8. 366 345
      assets/resources/gameui/HallUI.prefab
  9. 24 3
      assets/resources/gameui/LevelClearLayer.prefab
  10. 24 3
      assets/resources/gameui/LevelLayer.prefab
  11. 24 3
      assets/resources/gameui/NewPackOpenedLayer.prefab
  12. 24 3
      assets/resources/gameui/OutOfBoxLayer.prefab
  13. 24 3
      assets/resources/gameui/PauseLayer.prefab
  14. 24 3
      assets/resources/gameui/SettingLayer.prefab
  15. 184 160
      assets/resources/prefabs/GameNode.prefab
  16. 8 3
      assets/resources/prefabs/Star.prefab
  17. 29 9
      assets/scenes/main.scene
  18. 9 0
      assets/scripts/core/adapter.meta
  19. BIN
      assets/scripts/core/adapter/.DS_Store
  20. 253 0
      assets/scripts/core/adapter/Adapter.ts
  21. 9 0
      assets/scripts/core/adapter/Adapter.ts.meta
  22. 234 0
      assets/scripts/core/adapter/AdapterSafeArea.ts
  23. 9 0
      assets/scripts/core/adapter/AdapterSafeArea.ts.meta
  24. 167 0
      assets/scripts/core/adapter/AdapterSprite.ts
  25. 9 0
      assets/scripts/core/adapter/AdapterSprite.ts.meta
  26. 60 0
      assets/scripts/core/adapter/AdapterView.ts
  27. 9 0
      assets/scripts/core/adapter/AdapterView.ts.meta
  28. BIN
      build/.DS_Store
  29. 0 0
      build/web-mobile/assets/main/import/03/03dfc3267.json
  30. 0 0
      build/web-mobile/assets/main/index.js
  31. 0 0
      build/web-mobile/assets/resources/import/01/011aa0c94.json
  32. 0 0
      build/web-mobile/assets/resources/import/05/057e57cb7.json
  33. 0 0
      build/web-mobile/assets/resources/import/06/061a849fa.json
  34. 0 0
      build/web-mobile/assets/resources/import/08/0841b4bba.json
  35. 0 0
      build/web-mobile/assets/resources/import/08/0841d7158.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. 57 16
      library/.assets-data.json
  46. 79 19
      library/.assets-info1.0.0.json
  47. 24 3
      library/0f/0fe45a30-5541-4ff8-9715-3a7ed22358e6.json
  48. 8 3
      library/36/365cc749-f215-4368-b76e-1be6734f557e.json
  49. 24 3
      library/4c/4cd259f2-fc79-4e93-8d6b-804a5b820fb8.json
  50. 24 3
      library/69/699c6afd-6df5-492b-8b36-1871db71ad16.json
  51. 24 3
      library/6c/6c91161f-a581-4aea-b319-d6d3dead58c3.json
  52. 184 160
      library/6e/6e8c4209-3574-45b0-858d-16cff5eee329.json
  53. 22 1
      library/79/79d5fa5f-cb75-4f1a-8ca4-503a10fc449d.json
  54. 24 3
      library/88/886f5150-93a4-44ea-804c-4ec2e80a3ee4.json
  55. 24 3
      library/9b/9b4f7c25-9b14-4d87-9200-c868813c9a28.json
  56. 366 345
      library/9e/9e12223d-7a81-471d-8295-08a69b25b44b.json
  57. 24 3
      library/a8/a87b5748-2ead-4c6e-9905-efcce6798098.json
  58. 24 3
      library/b6/b608ca62-d03c-4fc2-a51a-772e93f391d0.json
  59. 24 3
      library/b8/b83b568a-13ad-4c2d-b7c1-3abd20518b68.json
  60. 24 3
      library/c7/c7f2ecc5-17bf-4e66-9d0b-dc78789a994e.json
  61. 24 3
      library/e8/e82dd65d-215b-4555-819e-3f08028530ab.json
  62. 24 3
      library/e9/e99a8ee5-e203-4882-b5a1-6314bb453d45.json
  63. 29 9
      library/ee/eeec5720-7028-48a1-9aec-e9bb18f4abbc.json
  64. 18 0
      profiles/v2/packages/adsense-h5g-plugin.json
  65. 4 4
      profiles/v2/packages/builder.json
  66. 5 0
      profiles/v2/packages/cocos-service.json
  67. 4 0
      profiles/v2/packages/engine.json
  68. 146 146
      profiles/v2/packages/scene.json
  69. 16 1
      profiles/v2/packages/web-desktop.json

+ 24 - 3
assets/resources/gameui/BoxLayer.prefab

@@ -35,10 +35,13 @@
       },
       {
         "__id__": 290
+      },
+      {
+        "__id__": 292
       }
     ],
     "_prefab": {
-      "__id__": 292
+      "__id__": 294
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -6663,8 +6666,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 100,
-      "height": 100
+      "width": 750,
+      "height": 1334
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -6713,6 +6716,24 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "97ayv35hhNdKmdOf22ZgCD"
   },
+  {
+    "__type__": "b356cApUdVC8I8CxLJLwlZA",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 293
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "9aS4xJl6BMybUq4qyI8wq9"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {

+ 24 - 3
assets/resources/gameui/BuyCoinLayer.prefab

@@ -35,10 +35,13 @@
       },
       {
         "__id__": 76
+      },
+      {
+        "__id__": 78
       }
     ],
     "_prefab": {
-      "__id__": 78
+      "__id__": 80
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1716,8 +1719,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 100,
-      "height": 100
+      "width": 750,
+      "height": 1334
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1766,6 +1769,24 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "c7OqotDyVG4IZWh++7ImoZ"
   },
+  {
+    "__type__": "b356cApUdVC8I8CxLJLwlZA",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 79
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "2d+10T5Q5AVrh1pT0Atizf"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {

+ 24 - 3
assets/resources/gameui/BuyItemLayer.prefab

@@ -35,10 +35,13 @@
       },
       {
         "__id__": 106
+      },
+      {
+        "__id__": 108
       }
     ],
     "_prefab": {
-      "__id__": 108
+      "__id__": 110
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -2470,8 +2473,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 100,
-      "height": 100
+      "width": 750,
+      "height": 1334
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -2520,6 +2523,24 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "b1JjC/4PNMTJLl6ATsBkp3"
   },
+  {
+    "__type__": "b356cApUdVC8I8CxLJLwlZA",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 109
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "95cCT2kLxC3parRWIeBJnn"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {

+ 24 - 3
assets/resources/gameui/BuyLifeLayer.prefab

@@ -35,10 +35,13 @@
       },
       {
         "__id__": 102
+      },
+      {
+        "__id__": 104
       }
     ],
     "_prefab": {
-      "__id__": 104
+      "__id__": 106
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -2369,8 +2372,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 100,
-      "height": 100
+      "width": 750,
+      "height": 1334
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -2419,6 +2422,24 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "6dengAL7lOjKqZbFoYeF6T"
   },
+  {
+    "__type__": "b356cApUdVC8I8CxLJLwlZA",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 105
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "caH+Za9eZK/p4+eEENXLYr"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {

+ 24 - 3
assets/resources/gameui/DrawStarLayer.prefab

@@ -35,10 +35,13 @@
       },
       {
         "__id__": 142
+      },
+      {
+        "__id__": 144
       }
     ],
     "_prefab": {
-      "__id__": 144
+      "__id__": 146
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -3373,8 +3376,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 100,
-      "height": 100
+      "width": 750,
+      "height": 1334
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -3423,6 +3426,24 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "9f1t5m2KJKkqspYbqB+L/m"
   },
+  {
+    "__type__": "b356cApUdVC8I8CxLJLwlZA",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 145
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "75eaHGPVREurQH3Yz0TL6M"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {

+ 24 - 3
assets/resources/gameui/FailLayer.prefab

@@ -35,10 +35,13 @@
       },
       {
         "__id__": 42
+      },
+      {
+        "__id__": 44
       }
     ],
     "_prefab": {
-      "__id__": 44
+      "__id__": 46
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -912,8 +915,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 100,
-      "height": 100
+      "width": 750,
+      "height": 1334
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -962,6 +965,24 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "cdceTWUVNG2JPxE+ChRidn"
   },
+  {
+    "__type__": "b356cApUdVC8I8CxLJLwlZA",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 45
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "e26xMnUI9ML5KL81/eFT6y"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {

+ 22 - 1
assets/resources/gameui/GameUI.prefab

@@ -47,10 +47,13 @@
       },
       {
         "__id__": 242
+      },
+      {
+        "__id__": 244
       }
     ],
     "_prefab": {
-      "__id__": 244
+      "__id__": 246
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -5851,6 +5854,24 @@
     "__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": {

Plik diff jest za duży
+ 366 - 345
assets/resources/gameui/HallUI.prefab


+ 24 - 3
assets/resources/gameui/LevelClearLayer.prefab

@@ -35,10 +35,13 @@
       },
       {
         "__id__": 100
+      },
+      {
+        "__id__": 102
       }
     ],
     "_prefab": {
-      "__id__": 102
+      "__id__": 104
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -2284,8 +2287,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 100,
-      "height": 100
+      "width": 750,
+      "height": 1334
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -2334,6 +2337,24 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "02zJ5UrRdLU5+qybADx9k3"
   },
+  {
+    "__type__": "b356cApUdVC8I8CxLJLwlZA",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 103
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "3fx5fQceFFqoJSYzTABbDN"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {

+ 24 - 3
assets/resources/gameui/LevelLayer.prefab

@@ -35,10 +35,13 @@
       },
       {
         "__id__": 176
+      },
+      {
+        "__id__": 178
       }
     ],
     "_prefab": {
-      "__id__": 178
+      "__id__": 180
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -4128,8 +4131,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 100,
-      "height": 100
+      "width": 750,
+      "height": 1334
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -4182,6 +4185,24 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "37Z2iibpJH87OdzWSSzUfd"
   },
+  {
+    "__type__": "b356cApUdVC8I8CxLJLwlZA",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 179
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "6bEa995/ZE64bw5AdgTVFL"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {

+ 24 - 3
assets/resources/gameui/NewPackOpenedLayer.prefab

@@ -35,10 +35,13 @@
       },
       {
         "__id__": 151
+      },
+      {
+        "__id__": 153
       }
     ],
     "_prefab": {
-      "__id__": 153
+      "__id__": 155
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -2913,8 +2916,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 100,
-      "height": 100
+      "width": 750,
+      "height": 1334
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -2963,6 +2966,24 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "50USiFumJOGbp6JEg+uRnv"
   },
+  {
+    "__type__": "b356cApUdVC8I8CxLJLwlZA",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 154
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "11VOS17QFAP4P+eWXGMSDl"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {

+ 24 - 3
assets/resources/gameui/OutOfBoxLayer.prefab

@@ -35,10 +35,13 @@
       },
       {
         "__id__": 118
+      },
+      {
+        "__id__": 120
       }
     ],
     "_prefab": {
-      "__id__": 120
+      "__id__": 122
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -2631,8 +2634,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 100,
-      "height": 100
+      "width": 750,
+      "height": 1334
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -2681,6 +2684,24 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "0bxlH3fsVJIbt+Skz1FnqX"
   },
+  {
+    "__type__": "b356cApUdVC8I8CxLJLwlZA",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 121
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "84a4L6hdNCL5ufyfo13YmU"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {

+ 24 - 3
assets/resources/gameui/PauseLayer.prefab

@@ -35,10 +35,13 @@
       },
       {
         "__id__": 70
+      },
+      {
+        "__id__": 72
       }
     ],
     "_prefab": {
-      "__id__": 72
+      "__id__": 74
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1586,8 +1589,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 100,
-      "height": 100
+      "width": 750,
+      "height": 1334
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1636,6 +1639,24 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "caPqMF6ytMFpMCDjupzjDl"
   },
+  {
+    "__type__": "b356cApUdVC8I8CxLJLwlZA",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 73
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "52YFvEYFZMdbtU9i1Hqc65"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {

+ 24 - 3
assets/resources/gameui/SettingLayer.prefab

@@ -35,10 +35,13 @@
       },
       {
         "__id__": 98
+      },
+      {
+        "__id__": 100
       }
     ],
     "_prefab": {
-      "__id__": 100
+      "__id__": 102
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -2289,8 +2292,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 100,
-      "height": 100
+      "width": 750,
+      "height": 1334
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -2375,6 +2378,24 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "79lk00MGhOZpRq7VBwxTZm"
   },
+  {
+    "__type__": "b356cApUdVC8I8CxLJLwlZA",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 101
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "d77inZhdhGqIsKtCohMxkr"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {

Plik diff jest za duży
+ 184 - 160
assets/resources/prefabs/GameNode.prefab


+ 8 - 3
assets/resources/prefabs/Star.prefab

@@ -3,13 +3,13 @@
     "__type__": "cc.Prefab",
     "_name": "Star",
     "_objFlags": 0,
+    "__editorExtras__": {},
     "_native": "",
     "data": {
       "__id__": 1
     },
     "optimizationPolicy": 0,
-    "persistent": false,
-    "asyncLoadAssets": false
+    "persistent": false
   },
   {
     "__type__": "cc.Node",
@@ -49,6 +49,7 @@
       "y": 1,
       "z": 1
     },
+    "_mobility": 0,
     "_layer": 33554432,
     "_euler": {
       "__type__": "cc.Vec3",
@@ -62,6 +63,7 @@
     "__type__": "cc.UITransform",
     "_name": "",
     "_objFlags": 0,
+    "__editorExtras__": {},
     "node": {
       "__id__": 1
     },
@@ -89,6 +91,7 @@
     "__type__": "cc.Sprite",
     "_name": "",
     "_objFlags": 0,
+    "__editorExtras__": {},
     "node": {
       "__id__": 1
     },
@@ -137,6 +140,8 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "d45dcdXQhOcrI23uYWvNGl"
+    "fileId": "d45dcdXQhOcrI23uYWvNGl",
+    "instance": null,
+    "targetOverrides": null
   }
 ]

+ 29 - 9
assets/scenes/main.scene

@@ -55,7 +55,7 @@
     },
     "autoReleaseAssets": false,
     "_globals": {
-      "__id__": 20
+      "__id__": 21
     },
     "_id": "eeec5720-7028-48a1-9aec-e9bb18f4abbc"
   },
@@ -187,6 +187,9 @@
       },
       {
         "__id__": 19
+      },
+      {
+        "__id__": 20
       }
     ],
     "_prefab": null,
@@ -569,31 +572,48 @@
     "_volume": 1,
     "_id": "6fNVrFsCdMGZtoc3x7I8YB"
   },
+  {
+    "__type__": "5891fc2Al5HLZyJZZxmNT+e",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 5
+    },
+    "_enabled": true,
+    "__prefab": null,
+    "_flags": 0,
+    "_top": 0,
+    "_bottom": 0,
+    "_left": 0,
+    "_right": 0,
+    "_id": "21jdNutnhH6aAqBHNRtNWx"
+  },
   {
     "__type__": "cc.SceneGlobals",
     "ambient": {
-      "__id__": 21
+      "__id__": 22
     },
     "shadows": {
-      "__id__": 22
+      "__id__": 23
     },
     "_skybox": {
-      "__id__": 23
+      "__id__": 24
     },
     "fog": {
-      "__id__": 24
+      "__id__": 25
     },
     "octree": {
-      "__id__": 25
+      "__id__": 26
     },
     "skin": {
-      "__id__": 26
+      "__id__": 27
     },
     "lightProbeInfo": {
-      "__id__": 27
+      "__id__": 28
     },
     "postSettings": {
-      "__id__": 28
+      "__id__": 29
     },
     "bakedWithStationaryMainLight": false,
     "bakedWithHighpLightmap": false

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

@@ -0,0 +1,9 @@
+{
+  "ver": "1.2.0",
+  "importer": "directory",
+  "imported": true,
+  "uuid": "5a0044bf-22a0-4451-9de2-c9770cd5480b",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}

BIN
assets/scripts/core/adapter/.DS_Store


+ 253 - 0
assets/scripts/core/adapter/Adapter.ts

@@ -0,0 +1,253 @@
+
+import { _decorator, Component, UITransform, size, Size, screen, view, v4 } from 'cc';
+import { EDITOR, JSB } from 'cc/env';
+const { ccclass, property } = _decorator;
+/**
+ * @description 该适配方案参考 https://forum.cocos.org/t/cocos-creator/74001
+ */
+
+/**
+ * 屏幕分辨率下 的像素值
+ */
+interface SafeArea {
+    /**
+     * 屏幕分辨率下:画布(屏幕)宽度
+     */
+    width: number;
+
+    /**
+     * 屏幕分辨率下:画布(屏幕)高度
+     */
+    height: number;
+
+    /**@description 屏幕分辨率下:安全区域大小(像素) */
+    safe: Size;
+
+    /**@description 「设计分辨率」 非安全区域的大小(像素)即刘海单边的大小 */
+    outside: Size;
+
+    /**
+     * 「设计分辨率」像素值转换到 「屏幕分辨率」 下的像素比
+     *
+     * e.g.
+     *
+     * * screenPx = designPx * pixelRatio
+     * * designPx = screenPx / pixelRatio
+     */
+    designPxToScreenPxRatio: number;
+}
+
+/**@description 设备方向 */
+enum DeviceDirection {
+    /**@description 未知*/
+    Unknown,
+    /**@description 横屏(即摄像头向左) */
+    LandscapeLeft,
+    /**@description 横屏(即摄像头向右) */
+    LandscapeRight,
+    /**@description 竖屏(即摄像头向上) */
+    Portrait,
+    /**@description 竖屏(即摄像头向下) */
+    UpsideDown,
+}
+
+let SAFE_SIZE = size(0, 0);
+let OUTSIDE_SIZE = size(0, 0);
+export class Adapter extends Component {
+
+    static direction = DeviceDirection;
+
+    protected set width(value: number) {
+        let trans = this.getComponent(UITransform);
+        if (!trans) {
+            return;
+        }
+        trans.width = value;
+    }
+    protected get width() {
+        let trans = this.getComponent(UITransform);
+        if (!trans) {
+            return 0;
+        }
+        return trans.width;
+    }
+
+    protected set height(value: number) {
+        let trans = this.getComponent(UITransform);
+        if (!trans) {
+            return;
+        }
+        trans.height = value;
+    }
+
+    protected get height() {
+        let trans = this.getComponent(UITransform);
+        if (!trans) {
+            return 0;
+        }
+        return trans.height;
+    }
+
+    protected static get windowSize() {
+        if (EDITOR) {
+            return view.getDesignResolutionSize();
+        }
+        return screen.windowSize;
+    }
+
+    protected static get visibleSize() {
+        return view.getVisibleSize();
+    }
+
+    protected _func: any = null;
+
+    /**@description 适配完成回调 */
+    onAdapterComplete: () => void = null!;
+
+    protected doOnAdapterComplete() {
+        if (this.onAdapterComplete) {
+            this.onAdapterComplete();
+        }
+    }
+
+    onLoad() {
+        super.onLoad && super.onLoad();
+        this.onChangeSize();
+    }
+
+    onEnable() {
+        super.onEnable && super.onEnable();
+        this.addEvents();
+    }
+
+    onDisable() {
+        this.removeEvents();
+        super.onDisable && super.onDisable();
+    }
+
+    onDestroy() {
+        this.removeEvents();
+        super.onDestroy && super.onDestroy();
+    }
+
+    protected addEvents() {
+        if (this._func) {
+            return;
+        }
+        this._func = this.onChangeSize.bind(this);
+        window.addEventListener("resize", this._func);
+        window.addEventListener("orientationchange", this._func);
+    }
+
+    protected removeEvents() {
+        if (this._func) {
+            window.removeEventListener("resize", this._func);
+            window.removeEventListener("orientationchange", this._func);
+        }
+        this._func = null;
+    }
+
+    /**
+     * @description 视图发生大小变化
+     */
+    protected onChangeSize() {
+        this.doOnAdapterComplete();
+    }
+
+    /**@description 获取当前设备方向 */
+    get direction() {
+        let str = "未知"
+        let result = DeviceDirection.Unknown;
+        let orientation = window.orientation;
+        if (JSB) {
+            orientation = jsb.device.getDeviceOrientation();
+        }
+        if (orientation != undefined || orientation != null) {
+            if (orientation == 90) {
+                str = `横屏向左`
+                result = DeviceDirection.LandscapeLeft;
+            } else if (orientation == -90) {
+                str = `横屏向右`
+                result = DeviceDirection.LandscapeRight;
+            } else if (orientation == 0) {
+                str = "竖屏向上"
+                result = DeviceDirection.Portrait;
+            } else if (orientation == 180) {
+                str = "竖屏向下"
+                result = DeviceDirection.UpsideDown;
+            }
+        }
+        // console.log(`当前设备方向:${str}`)
+        return result;
+    }
+
+    static get safeAreaEdge() {
+        if (JSB) {
+            return jsb.device.getSafeAreaEdge();
+        } else {
+            return v4(0, 0, 0, 0);
+        }
+    }
+
+    private static _safeArea: SafeArea = null!;
+
+    static set safeArea(value: SafeArea) {
+        this._safeArea = value as any;
+    }
+
+    static screenPxToDesignPx(screenPx: number) {
+        return screenPx / this.safeArea.designPxToScreenPxRatio;
+    }
+
+    static designPxToScreenPx(designPx: number) {
+        return designPx * this.safeArea.designPxToScreenPxRatio;
+    }
+
+    /**
+     * 基于屏幕尺寸的安全区域
+     *
+     * 可以通过 screenPxToDesignPx 转换为基于设计画布尺寸的像素大小
+     */
+    static get safeArea() {
+        if (this._safeArea == null || this._safeArea == undefined) {
+            // 初始屏幕宽高像素
+            let screenWidth = Adapter.windowSize.width;
+            let screenHeight = Adapter.windowSize.height;
+            // 「设计分辨率」像素值转换到 「屏幕分辨率」 下的像素比
+            let designWidth = Adapter.visibleSize.width;
+            let designHeight = Adapter.visibleSize.height;
+            let designPxToScreenPxRatio = Math.min(screenWidth / designWidth, screenHeight / designHeight);
+
+            OUTSIDE_SIZE.width = 0
+            OUTSIDE_SIZE.height = 0
+            SAFE_SIZE.width = screenWidth - OUTSIDE_SIZE.width;
+            SAFE_SIZE.height = screenHeight - OUTSIDE_SIZE.height
+            if (JSB) {
+                OUTSIDE_SIZE.width = (this.safeAreaEdge.y + this.safeAreaEdge.w)
+                OUTSIDE_SIZE.height = (this.safeAreaEdge.x + this.safeAreaEdge.z)
+                SAFE_SIZE.width = screenWidth - OUTSIDE_SIZE.width;
+                SAFE_SIZE.height = screenHeight - OUTSIDE_SIZE.height
+                OUTSIDE_SIZE.width = OUTSIDE_SIZE.width / 2
+                OUTSIDE_SIZE.height = OUTSIDE_SIZE.height / 2
+            }
+
+            this._safeArea = {
+                width: screenWidth,
+                height: screenHeight,
+                outside: OUTSIDE_SIZE,
+                safe: SAFE_SIZE,
+                designPxToScreenPxRatio: designPxToScreenPxRatio,
+            };
+        }
+        return this._safeArea;
+    }
+
+    private _isFullScreenAdaption = true;
+    /** 是否全屏*/
+    public get isFullScreenAdaption() {
+        return this._isFullScreenAdaption;
+    }
+    public set isFullScreenAdaption(value) {
+        this._isFullScreenAdaption = value;
+    }
+}

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

@@ -0,0 +1,9 @@
+{
+  "ver": "4.0.23",
+  "importer": "typescript",
+  "imported": true,
+  "uuid": "6ec1b338-2a74-45b8-b6d5-00e35de13959",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}

+ 234 - 0
assets/scripts/core/adapter/AdapterSafeArea.ts

@@ -0,0 +1,234 @@
+import { Widget, _decorator } from "cc";
+import { EDITOR } from "cc/env";
+import { Adapter } from "./Adapter";
+
+const { ccclass, property, executeInEditMode, menu } = _decorator;
+
+enum Flags {
+    None = 0,
+    TOP = 1 << 0,
+    BOTTOM = 1 << 1,
+    LEFT = 1 << 2,
+    RIGHT = 1 << 3,
+}
+
+/**
+ * @classdesc  安全区域适配Widget , App.isFullScreenAdaption = true 时有效
+ * @description
+ *
+ * 用法:
+ *
+ * 1. 将本组件挂载在节点上即可(注意:该节点上必须挂在 Widget 组件)
+ *
+ * 适配原理:
+ *
+ * 1. 根据安全区域范围,修改widget组件属性
+ * 自动添加刘海宽度,以避免显示到安全区域之外
+ */
+@ccclass("AdapterSafeArea")
+@executeInEditMode
+@menu("Quick适配组件/AdapterSafeArea")
+export default class AdapterSafeArea extends Adapter {
+
+    @property
+    protected _flags: number = Flags.None;
+
+    protected setFlag(flag: Flags, value: boolean) {
+        const current = (this._flags & flag) > 0;
+        if (value == current) {
+            return;
+        }
+        if (value) {
+            this._flags |= flag;
+        } else {
+            this._flags &= ~flag;
+        }
+        this._isDirty = true;
+    }
+
+    @property({ tooltip: EDITOR ? "是否对齐上边" : "" })
+    get isAlignTop() {
+        return (this._flags & Flags.TOP) > 0;
+    }
+    set isAlignTop(v) {
+        this.setFlag(Flags.TOP, v);
+    }
+
+    @property({ tooltip: EDITOR ? "是否对齐下边" : "" })
+    get isAlignBottom() {
+        return (this._flags & Flags.BOTTOM) > 0;
+    }
+    set isAlignBottom(v) {
+        this.setFlag(Flags.BOTTOM, v);
+    }
+
+    @property({ tooltip: EDITOR ? "是否对齐左边" : "" })
+    get isAlignLeft() {
+        return (this._flags & Flags.LEFT) > 0;
+    }
+    set isAlignLeft(v) {
+        this.setFlag(Flags.LEFT, v);
+    }
+
+    @property({ tooltip: EDITOR ? "是否对齐右边" : "" })
+    get isAlignRight() {
+        return (this._flags & Flags.RIGHT) > 0;
+    }
+    set isAlignRight(v) {
+        this.setFlag(Flags.RIGHT, v);
+    }
+
+    @property
+    _top = 0;
+    @property({
+        visible: function (this: AdapterSafeArea) {
+            return this.isAlignTop;
+        }, tooltip: EDITOR ? "本节点顶边和父节点顶边的距离,可填写负值,只有在 isAlignTop 开启时才有作用" : ""
+    })
+    get top() {
+        return this._top;
+    }
+    set top(v) {
+        if (this._top == v) {
+            return;
+        }
+        this._top = v;
+        this._isDirty = true;
+    }
+
+    @property
+    _bottom = 0;
+    @property({
+        visible: function (this: AdapterSafeArea) {
+            return this.isAlignBottom;
+        }, tooltip: EDITOR ? "本节点顶边和父节点底边的距离,可填写负值,只有在 isAlignBottom 开启时才有作用" : ""
+    })
+    get bottom() {
+        return this._bottom;
+    }
+    set bottom(v) {
+        if (this._bottom == v) {
+            return;
+        }
+        this._bottom = v;
+        this._isDirty = true;
+    }
+
+    @property
+    _left = 0;
+    @property({
+        visible: function (this: AdapterSafeArea) {
+            return this.isAlignLeft;
+        }, tooltip: EDITOR ? "本节点顶边和父节点左边的距离,可填写负值,只有在 isAlignLeft 开启时才有作用" : ""
+    })
+    get left() {
+        return this._left;
+    }
+    set left(v) {
+        if (this._left == v) {
+            return;
+        }
+        this._left = v;
+        this._isDirty = true;
+    }
+
+    @property
+    _right = 0;
+    @property({
+        visible: function (this: AdapterSafeArea) {
+            return this.isAlignRight;
+        }, tooltip: EDITOR ? "本节点顶边和父节点右边的距离,可填写负值,只有在 isAlignRight 开启时才有作用" : ""
+    })
+    get right() {
+        return this._right;
+    }
+    set right(v) {
+        if (this._right == v) {
+            return;
+        }
+        this._right = v;
+        this._isDirty = true;
+    }
+
+    protected _isDirty = false;
+
+    protected get widget() {
+        let comp = this.getComponent(Widget);
+        if (comp) {
+            return comp;
+        }
+        return this.addComponent(Widget);
+    }
+
+    resetInEditor() {
+        this.doLayout(true);
+    }
+
+    protected doLayout(isForce = false) {
+        if (this._isDirty || isForce) {
+            let widget = this.widget!;
+            if (EDITOR) {
+                widget.left = this.left;
+                widget.right = this.right;
+                widget.top = this.top;
+                widget.bottom = this.bottom;
+                return;
+            }
+            if (!this.isFullScreenAdaption) {
+                return;
+            }
+            if (!widget || !widget.enabled) {
+                return;
+            }
+            // 屏幕向上时,加上安全区域高度
+            if (widget.isAlignTop && this.isAlignTop) {
+                widget.isAbsoluteTop = true;
+                if (this.direction == Adapter.direction.Portrait) {
+                    widget.top = this.top + Adapter.safeArea.outside.height;
+                } else {
+                    widget.top = this.top;
+                }
+            }
+            // 屏幕向下时,加上安全区域高度
+            if (widget.isAlignBottom && this.isAlignBottom) {
+                widget.isAbsoluteBottom = true;
+                if (this.direction == Adapter.direction.UpsideDown) {
+                    widget.bottom = this.bottom + Adapter.safeArea.outside.height;
+                } else {
+                    widget.bottom = this.bottom;
+                }
+            }
+            // 屏幕向左时,加上安全区域宽度
+            if (widget.isAlignLeft && this.isAlignLeft) {
+                widget.isAbsoluteLeft = true;
+                if (this.direction == Adapter.direction.LandscapeLeft) {
+                    widget.left = this.left + Adapter.safeArea.outside.width;
+                } else {
+                    widget.left = this.left;
+                }
+
+            }
+            // 屏幕向右时,加上安全区域宽度
+            if (widget.isAlignRight && this.isAlignRight) {
+                widget.isAbsoluteRight = true;
+                if (this.direction == Adapter.direction.LandscapeRight) {
+                    widget.right = this.right + Adapter.safeArea.outside.width;
+                } else {
+                    widget.right = this.right;
+                }
+            }
+            widget.updateAlignment();
+            this._isDirty = false;
+            this.doOnAdapterComplete();
+        }
+    }
+
+    protected onChangeSize() {
+        this.doLayout(true);
+    }
+
+    protected update(dt: number) {
+        super.update && super.update(dt);
+        this.doLayout();
+    }
+}

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

@@ -0,0 +1,9 @@
+{
+  "ver": "4.0.23",
+  "importer": "typescript",
+  "imported": true,
+  "uuid": "5891f736-025e-472d-9c89-659c66353f9e",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}

+ 167 - 0
assets/scripts/core/adapter/AdapterSprite.ts

@@ -0,0 +1,167 @@
+import { Enum, Sprite, UITransform, v3, Widget, _decorator } from "cc";
+import { EDITOR } from "cc/env";
+import { Adapter } from "./Adapter";
+
+const { ccclass, property , executeInEditMode,menu} = _decorator;
+
+/**
+ * 缩放方式
+ */
+export enum SpriteScaleType {
+    /**
+     * 缩放到填满父节点(如果父节点有裁剪,图像可能会被裁剪,节点可能会超出父节点)
+     */
+    FILL,
+
+    /**
+     * 缩放到刚好在父节点内部最大化显示(图像会完整显示,但父节点上下或者左右可能会留空)
+     */
+    SUIT,
+}
+
+/**
+ * 对齐方式
+ */
+export enum SpriteAlignType {
+    /**
+     * 缩放后靠左对齐
+     */
+    LEFT,
+
+    /**
+     * 缩放后靠上对齐
+     */
+    TOP,
+
+    /**
+     * 缩放后靠右对齐
+     */
+    RIGHT,
+
+    /**
+     * 缩放后靠下对齐
+     */
+    BOTTOM,
+
+    /**
+     * 缩放后居中对齐
+     */
+    CENTER,
+}
+
+/**
+ * Sprite 适配组件
+ *
+ * @author caizhitao
+ * @created 2020-12-27 21:22:43
+ */
+@ccclass("AdapterSprite")
+@executeInEditMode(true)
+@menu("Quick适配组件/AdapterSprite")
+export default class AdapterSprite extends Adapter {
+    @property({
+        type: Enum(SpriteScaleType),
+        tooltip: `缩放类型:
+        -FILL: 缩放到填满父节点(如果父节点有裁剪,图像可能会被裁剪,节点可能会超出父节点)
+        -SUIT: 缩放到刚好在父节点内部最大化显示(图像会完整显示,但父节点上下或者左右可能会留空)`,
+    })
+    get scaleType(){
+        return this._scaleType;
+    }
+    set scaleType(value){
+        this._scaleType = value;
+        if ( EDITOR ){
+            this.updateSprite(this._scaleType,this.alignType);
+        }
+    }
+    private _scaleType: SpriteScaleType = SpriteScaleType.SUIT;
+
+    @property({
+        type: Enum(SpriteAlignType),
+        tooltip: `齐方式类型:
+        -LEFT: 缩放后靠左对齐
+        -TOP: 缩放后靠上对齐
+        -RIGHT: 缩放后靠右对齐
+        -BOTTOM: 缩放后靠下对齐
+        -CENTER: 缩放后居中对齐`,
+    })
+    get alignType(){
+        return this._alignType;
+    }
+    set alignType(value){
+        this._alignType = value;
+        if ( EDITOR ){
+            this.updateSprite(this._scaleType,this._alignType);
+        }
+    }
+    private _alignType: SpriteAlignType = SpriteAlignType.CENTER;
+
+    private _sprite: Sprite = null!;
+
+    onLoad() {
+        this._sprite = this.node.getComponent(Sprite) as Sprite;
+    }
+
+    start() {
+        this.updateSprite(this.scaleType, this.alignType);
+    }
+
+    protected onChangeSize() {
+        this.updateSprite(this.scaleType, this.alignType);
+    }
+
+    updateSprite(scaleType: SpriteScaleType, alignType: SpriteAlignType) {
+        if (!this._sprite || !this._sprite.enabled || !this._sprite.spriteFrame) {
+            return;
+        }
+        let widget = this.node.parent?.getComponent(Widget);
+        if (widget) {
+            widget.updateAlignment();
+        }
+        this.width = this._sprite.spriteFrame.rect.width;
+        this.height = this._sprite.spriteFrame.rect.height;
+        let trans = this.parentTrans;
+        if (this.width / this.height > trans.width / trans.height) {
+            // 设计分辨率宽高比大于显示分辨率
+            if (scaleType == SpriteScaleType.SUIT) {
+                let scale = trans.width / this.width;
+                this.node.scale = v3(scale,scale);
+            } else if (scaleType == SpriteScaleType.FILL) {
+                let scale = trans.height / this.height;
+                this.node.scale = v3(scale,scale);
+            }
+        } else {
+            // 设计分辨率宽高比小于显示分辨率
+            if (scaleType == SpriteScaleType.SUIT) {
+                let scale = trans.height / this.height;
+                this.node.scale = v3(scale,scale);
+            } else if (scaleType == SpriteScaleType.FILL) {
+                let scale = trans.width / this.width;
+                this.node.scale = v3(scale,scale);
+            }
+        }
+
+        switch (alignType) {
+            case SpriteAlignType.CENTER:
+                this.node.setPosition(v3());
+                break;
+            case SpriteAlignType.LEFT:
+                this.node.setPosition(v3(-0.5 * (trans.width - this.width * this.node.scale.x), 0));
+                break;
+            case SpriteAlignType.RIGHT:
+                this.node.setPosition(v3(0.5 * (trans.width - this.width * this.node.scale.x), 0));
+                break;
+            case SpriteAlignType.TOP:
+                this.node.setPosition(v3(0, 0.5 * (trans.height - this.height * this.node.scale.x)));
+                break;
+            case SpriteAlignType.BOTTOM:
+                this.node.setPosition(v3(0, -0.5 * (trans.height - this.height * this.node.scale.x)));
+                break;
+        }
+        this.doOnAdapterComplete();
+    }
+
+    private get parentTrans(){
+        return this.node.parent?.getComponent(UITransform) as UITransform
+    }
+}

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

@@ -0,0 +1,9 @@
+{
+  "ver": "4.0.23",
+  "importer": "typescript",
+  "imported": true,
+  "uuid": "bda64f6b-c3a7-4358-a182-a379789a205d",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}

+ 60 - 0
assets/scripts/core/adapter/AdapterView.ts

@@ -0,0 +1,60 @@
+/**
+ */
+
+import { v3, _decorator, UITransform } from "cc";
+import { EDITOR } from "cc/env";
+import { Adapter } from "./Adapter";
+// import { Console } from "console";
+
+const { ccclass, property, executeInEditMode, menu } = _decorator;
+/**
+ * 全屏适配
+ * 用法:
+ *
+ * 1. 将本组件挂载在节点上即可(注意该节点不能挂在 Widget 组件)
+ * 2. 3.x版本引擎旋转时不会触屏旋转事件,所以目前只能设置一个方向才是正常的
+ *
+ * 适配原理:
+ *
+ * 1. 将节点的宽高设置为安全区域的宽高
+ */
+@ccclass("AdapterView")
+@executeInEditMode(true)
+@menu("Quick适配组件/AdapterView")
+export default class AdapterView extends Adapter {
+
+    protected onChangeSize() {
+        Adapter.safeArea = null as any;
+        if (this.node) {
+            if (this.isFullScreenAdaption) {
+                // 将屏幕尺寸下的大小,转换为设计分辨率下的大小,重新给节点设置大小
+                this.width = Adapter.safeArea.width / Adapter.safeArea.designPxToScreenPxRatio;
+                this.height = Adapter.safeArea.height / Adapter.safeArea.designPxToScreenPxRatio;
+            } else {
+                // 将屏幕尺寸下的安全区域大小,转换为设计分辨率下的大小,重新给节点设置大小
+                this.width = Adapter.safeArea.safe.width / Adapter.safeArea.designPxToScreenPxRatio;
+                this.height = Adapter.safeArea.safe.height / Adapter.safeArea.designPxToScreenPxRatio;
+
+                switch (this.direction) {
+                    case Adapter.direction.LandscapeLeft:
+                        this.node.setPosition(v3(Adapter.safeArea.outside.width / Adapter.safeArea.designPxToScreenPxRatio, 0));
+                        break;
+                    case Adapter.direction.LandscapeRight:
+                        this.node.setPosition(v3(-Adapter.safeArea.outside.width / Adapter.safeArea.designPxToScreenPxRatio, 0));
+                        break;
+                    case Adapter.direction.Portrait:
+                        this.node.setPosition(v3(0, -Adapter.safeArea.outside.height / Adapter.safeArea.designPxToScreenPxRatio));
+                        break;
+                    case Adapter.direction.UpsideDown:
+                        this.node.setPosition(v3(0, Adapter.safeArea.outside.height / Adapter.safeArea.designPxToScreenPxRatio));
+                        break;
+                    default:
+                        !EDITOR && console.log('获取不到设备方向,直接居中处理');
+                        this.node.setPosition(v3(0, 0));
+                        break;
+                }
+            }
+            this.doOnAdapterComplete();
+        }
+    }
+}

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

@@ -0,0 +1,9 @@
+{
+  "ver": "4.0.23",
+  "importer": "typescript",
+  "imported": true,
+  "uuid": "b356c029-51d5-42f0-8f02-c4b24bc25640",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}

BIN
build/.DS_Store


Plik diff jest za duży
+ 0 - 0
build/web-mobile/assets/main/import/03/03dfc3267.json


Plik diff jest za duży
+ 0 - 0
build/web-mobile/assets/main/index.js


Plik diff jest za duży
+ 0 - 0
build/web-mobile/assets/resources/import/01/011aa0c94.json


Plik diff jest za duży
+ 0 - 0
build/web-mobile/assets/resources/import/05/057e57cb7.json


Plik diff jest za duży
+ 0 - 0
build/web-mobile/assets/resources/import/06/061a849fa.json


Plik diff jest za duży
+ 0 - 0
build/web-mobile/assets/resources/import/08/0841b4bba.json


Plik diff jest za duży
+ 0 - 0
build/web-mobile/assets/resources/import/08/0841d7158.json


Plik diff jest za duży
+ 0 - 0
build/web-mobile/assets/resources/import/09/09c9fda80.json


Plik diff jest za duży
+ 0 - 0
build/web-mobile/assets/resources/import/0a/0a243728a.json


Plik diff jest za duży
+ 0 - 0
build/web-mobile/assets/resources/import/0b/0be393444.json


Plik diff jest za duży
+ 0 - 0
build/web-mobile/assets/resources/import/0c/0c0a122a0.json


Plik diff jest za duży
+ 0 - 0
build/web-mobile/assets/resources/import/0c/0c9354e72.json


Plik diff jest za duży
+ 0 - 0
build/web-mobile/assets/resources/import/0d/0dffce3d6.json


Plik diff jest za duży
+ 0 - 0
build/web-mobile/assets/resources/import/0e/0e3df3ee3.json


Plik diff jest za duży
+ 0 - 0
build/web-mobile/assets/resources/import/0f/0f09586c7.json


Plik diff jest za duży
+ 0 - 0
build/web-mobile/assets/resources/import/0f/0fccbcdd3.json


+ 57 - 16
library/.assets-data.json

@@ -1453,7 +1453,8 @@
         "d032ac98-05e1-4090-88bb-eb640dcb5fc1@b47c0"
       ],
       "dependScripts": [
-        "7675dd59-1a35-40c6-9576-30329ec1852f"
+        "7675dd59-1a35-40c6-9576-30329ec1852f",
+        "5891f736-025e-472d-9c89-659c66353f9e"
       ]
     },
     "versionCode": 0
@@ -2035,7 +2036,8 @@
       ],
       "dependScripts": [
         "4b854678-310c-4c32-812f-fb59255479be",
-        "a0a72e44-1ce6-4f80-b2df-980725b9c6c0"
+        "a0a72e44-1ce6-4f80-b2df-980725b9c6c0",
+        "b356c029-51d5-42f0-8f02-c4b24bc25640"
       ]
     },
     "versionCode": 0
@@ -2057,7 +2059,8 @@
       ],
       "dependScripts": [
         "ed0c2a4e-9bab-4aa0-ab9d-457fa22a811f",
-        "a0a72e44-1ce6-4f80-b2df-980725b9c6c0"
+        "a0a72e44-1ce6-4f80-b2df-980725b9c6c0",
+        "b356c029-51d5-42f0-8f02-c4b24bc25640"
       ]
     },
     "versionCode": 0
@@ -2081,7 +2084,8 @@
       ],
       "dependScripts": [
         "319a394d-1f46-4da8-960a-bc1c4fc4891f",
-        "a0a72e44-1ce6-4f80-b2df-980725b9c6c0"
+        "a0a72e44-1ce6-4f80-b2df-980725b9c6c0",
+        "b356c029-51d5-42f0-8f02-c4b24bc25640"
       ]
     },
     "versionCode": 0
@@ -2103,7 +2107,8 @@
       ],
       "dependScripts": [
         "98a55aeb-76ca-4bb0-8de6-9086d13ae230",
-        "a0a72e44-1ce6-4f80-b2df-980725b9c6c0"
+        "a0a72e44-1ce6-4f80-b2df-980725b9c6c0",
+        "b356c029-51d5-42f0-8f02-c4b24bc25640"
       ]
     },
     "versionCode": 0
@@ -2125,7 +2130,8 @@
       "dependScripts": [
         "c4c1ac57-37e3-4be2-8610-12bd8ce2a9f6",
         "7afe5a2a-fe7f-43c2-b28d-3655141119bd",
-        "a0a72e44-1ce6-4f80-b2df-980725b9c6c0"
+        "a0a72e44-1ce6-4f80-b2df-980725b9c6c0",
+        "b356c029-51d5-42f0-8f02-c4b24bc25640"
       ]
     },
     "versionCode": 0
@@ -2142,7 +2148,8 @@
       ],
       "dependScripts": [
         "26913ddd-91ad-4a60-979e-07aa9362f5ee",
-        "a0a72e44-1ce6-4f80-b2df-980725b9c6c0"
+        "a0a72e44-1ce6-4f80-b2df-980725b9c6c0",
+        "b356c029-51d5-42f0-8f02-c4b24bc25640"
       ]
     },
     "versionCode": 0
@@ -2177,7 +2184,8 @@
         "47441279-2428-4a54-a41d-c028aa170c96"
       ],
       "dependScripts": [
-        "77bd12a7-e4d5-439a-b7dc-2a2da8cc7df7"
+        "77bd12a7-e4d5-439a-b7dc-2a2da8cc7df7",
+        "b356c029-51d5-42f0-8f02-c4b24bc25640"
       ]
     },
     "versionCode": 0
@@ -2201,13 +2209,14 @@
         "7981d4b0-dd28-4d1c-8871-eb2f651d01c8@f9941",
         "aece5342-6163-45d6-9e38-0fb340c2915e@f9941",
         "dfe8b3c5-4d3a-4b28-ac6d-f3076ae46763@f9941",
-        "6f70e4f9-cce3-445c-aafb-8806c3977e64@f9941",
         "456cb79e-0cd4-4bb7-a1e4-86934e8c9407@f9941",
+        "6f70e4f9-cce3-445c-aafb-8806c3977e64@f9941",
         "bd1bcaba-bd7d-4a71-b143-997c882383e4@f9941"
       ],
       "dependScripts": [
         "c4c1ac57-37e3-4be2-8610-12bd8ce2a9f6",
-        "de92eacc-389a-4ccf-aeed-3177d23ea0ab"
+        "de92eacc-389a-4ccf-aeed-3177d23ea0ab",
+        "b356c029-51d5-42f0-8f02-c4b24bc25640"
       ]
     },
     "versionCode": 0
@@ -2231,7 +2240,8 @@
       ],
       "dependScripts": [
         "93baaef4-dac6-45c1-b64b-814374f038f3",
-        "a0a72e44-1ce6-4f80-b2df-980725b9c6c0"
+        "a0a72e44-1ce6-4f80-b2df-980725b9c6c0",
+        "b356c029-51d5-42f0-8f02-c4b24bc25640"
       ]
     },
     "versionCode": 0
@@ -2256,7 +2266,8 @@
       "dependScripts": [
         "c4c1ac57-37e3-4be2-8610-12bd8ce2a9f6",
         "72e803a1-e6d7-4958-97ec-7dd6fc3a493c",
-        "a0a72e44-1ce6-4f80-b2df-980725b9c6c0"
+        "a0a72e44-1ce6-4f80-b2df-980725b9c6c0",
+        "b356c029-51d5-42f0-8f02-c4b24bc25640"
       ]
     },
     "versionCode": 0
@@ -2275,7 +2286,8 @@
         "c4c1ac57-37e3-4be2-8610-12bd8ce2a9f6",
         "3bf69b2d-24b3-48c5-8ca9-a26cd266337b",
         "95f08ea4-cc64-41ed-9c11-3950fa1aaa83",
-        "a0a72e44-1ce6-4f80-b2df-980725b9c6c0"
+        "a0a72e44-1ce6-4f80-b2df-980725b9c6c0",
+        "b356c029-51d5-42f0-8f02-c4b24bc25640"
       ]
     },
     "versionCode": 0
@@ -2300,7 +2312,8 @@
       "dependScripts": [
         "c4c1ac57-37e3-4be2-8610-12bd8ce2a9f6",
         "9ac6a2cb-3277-42bb-913c-e630e2218be7",
-        "a0a72e44-1ce6-4f80-b2df-980725b9c6c0"
+        "a0a72e44-1ce6-4f80-b2df-980725b9c6c0",
+        "b356c029-51d5-42f0-8f02-c4b24bc25640"
       ]
     },
     "versionCode": 0
@@ -2320,7 +2333,8 @@
       ],
       "dependScripts": [
         "93de81c2-0c8a-4ca2-8e6e-2bf15afbf764",
-        "a0a72e44-1ce6-4f80-b2df-980725b9c6c0"
+        "a0a72e44-1ce6-4f80-b2df-980725b9c6c0",
+        "b356c029-51d5-42f0-8f02-c4b24bc25640"
       ]
     },
     "versionCode": 0
@@ -2343,7 +2357,8 @@
       ],
       "dependScripts": [
         "c06a8490-1e52-4afa-b4d5-80d23962f72b",
-        "a0a72e44-1ce6-4f80-b2df-980725b9c6c0"
+        "a0a72e44-1ce6-4f80-b2df-980725b9c6c0",
+        "b356c029-51d5-42f0-8f02-c4b24bc25640"
       ]
     },
     "versionCode": 0
@@ -2392,6 +2407,7 @@
         "1263d74c-8167-4928-91a6-4e2672411f47@a804a"
       ],
       "dependScripts": [
+        "b356c029-51d5-42f0-8f02-c4b24bc25640",
         "CC3eba29-7abb-723a-f7ab-ae275e2277e8",
         "a2d9348f-41f2-4353-86ea-3491aafcf9c0"
       ]
@@ -8196,5 +8212,30 @@
       "dependScripts": []
     },
     "versionCode": 0
+  },
+  "5a0044bf-22a0-4451-9de2-c9770cd5480b": {
+    "url": "db://assets/scripts/core/adapter",
+    "value": {},
+    "versionCode": 0
+  },
+  "6ec1b338-2a74-45b8-b6d5-00e35de13959": {
+    "url": "db://assets/scripts/core/adapter/Adapter.ts",
+    "value": {},
+    "versionCode": 0
+  },
+  "5891f736-025e-472d-9c89-659c66353f9e": {
+    "url": "db://assets/scripts/core/adapter/AdapterSafeArea.ts",
+    "value": {},
+    "versionCode": 0
+  },
+  "bda64f6b-c3a7-4358-a182-a379789a205d": {
+    "url": "db://assets/scripts/core/adapter/AdapterSprite.ts",
+    "value": {},
+    "versionCode": 0
+  },
+  "b356c029-51d5-42f0-8f02-c4b24bc25640": {
+    "url": "db://assets/scripts/core/adapter/AdapterView.ts",
+    "value": {},
+    "versionCode": 0
   }
 }

+ 79 - 19
library/.assets-info1.0.0.json

@@ -5223,7 +5223,7 @@
       "uuid": "847f4dbf-252a-4603-b08f-adfdb49d409f"
     },
     "/Users/wenshuang/Desktop/公司游戏/CatchDoll/assets/scripts/core": {
-      "time": 1744794081294.4639,
+      "time": 1746671347310.2078,
       "uuid": "84f998d9-45d7-443d-a5b7-019c94a3fe44"
     },
     "/Users/wenshuang/Desktop/公司游戏/CatchDoll/assets/scripts/game": {
@@ -5287,7 +5287,7 @@
       "uuid": "c67acc45-1667-4ee6-bf9a-7644647a7fef"
     },
     "/Users/wenshuang/Desktop/公司游戏/CatchDoll/assets/scripts/core/base": {
-      "time": 1744939487648.9243,
+      "time": 1746671347310.208,
       "uuid": "776e4336-d1a4-4c67-a1e7-bc23a42af90e"
     },
     "/Users/wenshuang/Desktop/公司游戏/CatchDoll/assets/scripts/core/common": {
@@ -6206,7 +6206,7 @@
       "uuid": "1523702b-f45a-4b86-a2ce-fe6a9634afdf"
     },
     "/Users/wenshuang/Desktop/公司游戏/CatchDoll/assets/scenes/main.scene": {
-      "time": 1745482253537.531,
+      "time": 1746672228562.362,
       "uuid": "eeec5720-7028-48a1-9aec-e9bb18f4abbc"
     },
     "/Users/wenshuang/Desktop/公司游戏/CatchDoll/assets/shader/gray.mtl": {
@@ -6378,59 +6378,59 @@
       "uuid": "db1b73cf-fcdc-4071-af23-1c99f1e041ec"
     },
     "/Users/wenshuang/Desktop/公司游戏/CatchDoll/assets/resources/gameui/BoxLayer.prefab": {
-      "time": 1745401307116.5825,
+      "time": 1746672013898.216,
       "uuid": "e82dd65d-215b-4555-819e-3f08028530ab"
     },
     "/Users/wenshuang/Desktop/公司游戏/CatchDoll/assets/resources/gameui/BuyCoinLayer.prefab": {
-      "time": 1745390363823.503,
+      "time": 1746672410047.8347,
       "uuid": "4cd259f2-fc79-4e93-8d6b-804a5b820fb8"
     },
     "/Users/wenshuang/Desktop/公司游戏/CatchDoll/assets/resources/gameui/BuyItemLayer.prefab": {
-      "time": 1745390115950.8425,
+      "time": 1746672416630.1448,
       "uuid": "c7f2ecc5-17bf-4e66-9d0b-dc78789a994e"
     },
     "/Users/wenshuang/Desktop/公司游戏/CatchDoll/assets/resources/gameui/BuyLifeLayer.prefab": {
-      "time": 1745225294671.9854,
+      "time": 1746672424482.593,
       "uuid": "e99a8ee5-e203-4882-b5a1-6314bb453d45"
     },
     "/Users/wenshuang/Desktop/公司游戏/CatchDoll/assets/resources/gameui/DrawStarLayer.prefab": {
-      "time": 1745460306496.1057,
+      "time": 1746672431366.1628,
       "uuid": "b83b568a-13ad-4c2d-b7c1-3abd20518b68"
     },
     "/Users/wenshuang/Desktop/公司游戏/CatchDoll/assets/resources/gameui/FailLayer.prefab": {
-      "time": 1745225607083.9678,
+      "time": 1746672441544.3357,
       "uuid": "699c6afd-6df5-492b-8b36-1871db71ad16"
     },
     "/Users/wenshuang/Desktop/公司游戏/CatchDoll/assets/resources/gameui/GameUI.prefab": {
-      "time": 1746611525794.9863,
+      "time": 1746673476683.5615,
       "uuid": "79d5fa5f-cb75-4f1a-8ca4-503a10fc449d"
     },
     "/Users/wenshuang/Desktop/公司游戏/CatchDoll/assets/resources/gameui/HallUI.prefab": {
-      "time": 1746611228631.8223,
+      "time": 1746674553759.2727,
       "uuid": "9e12223d-7a81-471d-8295-08a69b25b44b"
     },
     "/Users/wenshuang/Desktop/公司游戏/CatchDoll/assets/resources/gameui/LevelClearLayer.prefab": {
-      "time": 1745311115076.4678,
+      "time": 1746672471797.9695,
       "uuid": "a87b5748-2ead-4c6e-9905-efcce6798098"
     },
     "/Users/wenshuang/Desktop/公司游戏/CatchDoll/assets/resources/gameui/LevelLayer.prefab": {
-      "time": 1745462349689.241,
+      "time": 1746672480723.7996,
       "uuid": "6c91161f-a581-4aea-b319-d6d3dead58c3"
     },
     "/Users/wenshuang/Desktop/公司游戏/CatchDoll/assets/resources/gameui/NewPackOpenedLayer.prefab": {
-      "time": 1745213608431.8298,
+      "time": 1746672488036.2488,
       "uuid": "0fe45a30-5541-4ff8-9715-3a7ed22358e6"
     },
     "/Users/wenshuang/Desktop/公司游戏/CatchDoll/assets/resources/gameui/OutOfBoxLayer.prefab": {
-      "time": 1745291188150.556,
+      "time": 1746672494852.6902,
       "uuid": "b608ca62-d03c-4fc2-a51a-772e93f391d0"
     },
     "/Users/wenshuang/Desktop/公司游戏/CatchDoll/assets/resources/gameui/PauseLayer.prefab": {
-      "time": 1745218052889.203,
+      "time": 1746672502381.4075,
       "uuid": "886f5150-93a4-44ea-804c-4ec2e80a3ee4"
     },
     "/Users/wenshuang/Desktop/公司游戏/CatchDoll/assets/resources/gameui/SettingLayer.prefab": {
-      "time": 1745227541303.527,
+      "time": 1746672511152.288,
       "uuid": "9b4f7c25-9b14-4d87-9200-c868813c9a28"
     },
     "/Users/wenshuang/Desktop/公司游戏/CatchDoll/assets/resources/prefabs/BusyLoading.prefab": {
@@ -6442,7 +6442,7 @@
       "uuid": "e54f9ea5-e13e-456a-bc6a-77122f1dd3eb"
     },
     "/Users/wenshuang/Desktop/公司游戏/CatchDoll/assets/resources/prefabs/GameNode.prefab": {
-      "time": 1745466052578.591,
+      "time": 1746674430260.1497,
       "uuid": "6e8c4209-3574-45b0-858d-16cff5eee329"
     },
     "/Users/wenshuang/Desktop/公司游戏/CatchDoll/assets/resources/prefabs/Life.prefab": {
@@ -6454,7 +6454,7 @@
       "uuid": "40d92b5b-17f4-42e9-b20b-1e4c326eedcf"
     },
     "/Users/wenshuang/Desktop/公司游戏/CatchDoll/assets/resources/prefabs/Star.prefab": {
-      "time": 1744792783690.6924,
+      "time": 1746673843227.9363,
       "uuid": "365cc749-f215-4368-b76e-1be6734f557e"
     },
     "/Users/wenshuang/Desktop/公司游戏/CatchDoll/assets/resources/spine/effect_hecheng.atlas": {
@@ -8194,6 +8194,41 @@
     "/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,
+      "uuid": "5a0044bf-22a0-4451-9de2-c9770cd5480b"
+    },
+    "/Users/wenshuang/Desktop/公司游戏/CatchDoll/assets/scripts/core/adapter/Adapter.ts.meta": {
+      "time": 1746671344632.6262
+    },
+    "/Users/wenshuang/Desktop/公司游戏/CatchDoll/assets/scripts/core/adapter/Adapter.ts": {
+      "time": 1746671344625.352,
+      "uuid": "6ec1b338-2a74-45b8-b6d5-00e35de13959"
+    },
+    "/Users/wenshuang/Desktop/公司游戏/CatchDoll/assets/scripts/core/adapter/AdapterSafeArea.ts.meta": {
+      "time": 1746671344633.22
+    },
+    "/Users/wenshuang/Desktop/公司游戏/CatchDoll/assets/scripts/core/adapter/AdapterSafeArea.ts": {
+      "time": 1746671344624.4297,
+      "uuid": "5891f736-025e-472d-9c89-659c66353f9e"
+    },
+    "/Users/wenshuang/Desktop/公司游戏/CatchDoll/assets/scripts/core/adapter/AdapterSprite.ts.meta": {
+      "time": 1746671344633.6746
+    },
+    "/Users/wenshuang/Desktop/公司游戏/CatchDoll/assets/scripts/core/adapter/AdapterSprite.ts": {
+      "time": 1746671344623.57,
+      "uuid": "bda64f6b-c3a7-4358-a182-a379789a205d"
+    },
+    "/Users/wenshuang/Desktop/公司游戏/CatchDoll/assets/scripts/core/adapter/AdapterView.ts.meta": {
+      "time": 1746671344634.12
+    },
+    "/Users/wenshuang/Desktop/公司游戏/CatchDoll/assets/scripts/core/adapter/AdapterView.ts": {
+      "time": 1746671386901.3682,
+      "uuid": "b356c029-51d5-42f0-8f02-c4b24bc25640"
     }
   },
   "missing": {
@@ -8706,6 +8741,31 @@
       "path": "/Users/wenshuang/Desktop/公司游戏/CatchDoll/assets/resources/gameui/node_ui.prefab",
       "time": 1745718990412.8628,
       "removeTime": 1745719003027
+    },
+    "5a0044bf-22a0-4451-9de2-c9770cd5480b": {
+      "path": "/Users/wenshuang/Desktop/公司游戏/CatchDoll/assets/scripts/core/base/adapter",
+      "time": 1746671344629.9583,
+      "removeTime": 1746671347311
+    },
+    "6ec1b338-2a74-45b8-b6d5-00e35de13959": {
+      "path": "/Users/wenshuang/Desktop/公司游戏/CatchDoll/assets/scripts/core/base/adapter/Adapter.ts",
+      "time": 1746671344625.352,
+      "removeTime": 1746671347311
+    },
+    "5891f736-025e-472d-9c89-659c66353f9e": {
+      "path": "/Users/wenshuang/Desktop/公司游戏/CatchDoll/assets/scripts/core/base/adapter/AdapterSafeArea.ts",
+      "time": 1746671344624.4297,
+      "removeTime": 1746671347312
+    },
+    "bda64f6b-c3a7-4358-a182-a379789a205d": {
+      "path": "/Users/wenshuang/Desktop/公司游戏/CatchDoll/assets/scripts/core/base/adapter/AdapterSprite.ts",
+      "time": 1746671344623.57,
+      "removeTime": 1746671347312
+    },
+    "b356c029-51d5-42f0-8f02-c4b24bc25640": {
+      "path": "/Users/wenshuang/Desktop/公司游戏/CatchDoll/assets/scripts/core/base/adapter/AdapterView.ts",
+      "time": 1746671344622.4653,
+      "removeTime": 1746671347312
     }
   }
 }

+ 24 - 3
library/0f/0fe45a30-5541-4ff8-9715-3a7ed22358e6.json

@@ -35,10 +35,13 @@
       },
       {
         "__id__": 151
+      },
+      {
+        "__id__": 153
       }
     ],
     "_prefab": {
-      "__id__": 153
+      "__id__": 155
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -2913,8 +2916,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 100,
-      "height": 100
+      "width": 750,
+      "height": 1334
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -2963,6 +2966,24 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "50USiFumJOGbp6JEg+uRnv"
   },
+  {
+    "__type__": "b356cApUdVC8I8CxLJLwlZA",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 154
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "11VOS17QFAP4P+eWXGMSDl"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {

+ 8 - 3
library/36/365cc749-f215-4368-b76e-1be6734f557e.json

@@ -3,13 +3,13 @@
     "__type__": "cc.Prefab",
     "_name": "Star",
     "_objFlags": 0,
+    "__editorExtras__": {},
     "_native": "",
     "data": {
       "__id__": 1
     },
     "optimizationPolicy": 0,
-    "persistent": false,
-    "asyncLoadAssets": false
+    "persistent": false
   },
   {
     "__type__": "cc.Node",
@@ -49,6 +49,7 @@
       "y": 1,
       "z": 1
     },
+    "_mobility": 0,
     "_layer": 33554432,
     "_euler": {
       "__type__": "cc.Vec3",
@@ -62,6 +63,7 @@
     "__type__": "cc.UITransform",
     "_name": "",
     "_objFlags": 0,
+    "__editorExtras__": {},
     "node": {
       "__id__": 1
     },
@@ -89,6 +91,7 @@
     "__type__": "cc.Sprite",
     "_name": "",
     "_objFlags": 0,
+    "__editorExtras__": {},
     "node": {
       "__id__": 1
     },
@@ -137,6 +140,8 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "d45dcdXQhOcrI23uYWvNGl"
+    "fileId": "d45dcdXQhOcrI23uYWvNGl",
+    "instance": null,
+    "targetOverrides": null
   }
 ]

+ 24 - 3
library/4c/4cd259f2-fc79-4e93-8d6b-804a5b820fb8.json

@@ -35,10 +35,13 @@
       },
       {
         "__id__": 76
+      },
+      {
+        "__id__": 78
       }
     ],
     "_prefab": {
-      "__id__": 78
+      "__id__": 80
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1716,8 +1719,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 100,
-      "height": 100
+      "width": 750,
+      "height": 1334
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1766,6 +1769,24 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "c7OqotDyVG4IZWh++7ImoZ"
   },
+  {
+    "__type__": "b356cApUdVC8I8CxLJLwlZA",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 79
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "2d+10T5Q5AVrh1pT0Atizf"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {

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

@@ -35,10 +35,13 @@
       },
       {
         "__id__": 42
+      },
+      {
+        "__id__": 44
       }
     ],
     "_prefab": {
-      "__id__": 44
+      "__id__": 46
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -912,8 +915,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 100,
-      "height": 100
+      "width": 750,
+      "height": 1334
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -962,6 +965,24 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "cdceTWUVNG2JPxE+ChRidn"
   },
+  {
+    "__type__": "b356cApUdVC8I8CxLJLwlZA",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 45
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "e26xMnUI9ML5KL81/eFT6y"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {

+ 24 - 3
library/6c/6c91161f-a581-4aea-b319-d6d3dead58c3.json

@@ -35,10 +35,13 @@
       },
       {
         "__id__": 176
+      },
+      {
+        "__id__": 178
       }
     ],
     "_prefab": {
-      "__id__": 178
+      "__id__": 180
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -4128,8 +4131,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 100,
-      "height": 100
+      "width": 750,
+      "height": 1334
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -4182,6 +4185,24 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "37Z2iibpJH87OdzWSSzUfd"
   },
+  {
+    "__type__": "b356cApUdVC8I8CxLJLwlZA",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 179
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "6bEa995/ZE64bw5AdgTVFL"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {

Plik diff jest za duży
+ 184 - 160
library/6e/6e8c4209-3574-45b0-858d-16cff5eee329.json


+ 22 - 1
library/79/79d5fa5f-cb75-4f1a-8ca4-503a10fc449d.json

@@ -47,10 +47,13 @@
       },
       {
         "__id__": 242
+      },
+      {
+        "__id__": 244
       }
     ],
     "_prefab": {
-      "__id__": 244
+      "__id__": 246
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -5851,6 +5854,24 @@
     "__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": {

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

@@ -35,10 +35,13 @@
       },
       {
         "__id__": 70
+      },
+      {
+        "__id__": 72
       }
     ],
     "_prefab": {
-      "__id__": 72
+      "__id__": 74
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1586,8 +1589,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 100,
-      "height": 100
+      "width": 750,
+      "height": 1334
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1636,6 +1639,24 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "caPqMF6ytMFpMCDjupzjDl"
   },
+  {
+    "__type__": "b356cApUdVC8I8CxLJLwlZA",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 73
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "52YFvEYFZMdbtU9i1Hqc65"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {

+ 24 - 3
library/9b/9b4f7c25-9b14-4d87-9200-c868813c9a28.json

@@ -35,10 +35,13 @@
       },
       {
         "__id__": 98
+      },
+      {
+        "__id__": 100
       }
     ],
     "_prefab": {
-      "__id__": 100
+      "__id__": 102
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -2289,8 +2292,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 100,
-      "height": 100
+      "width": 750,
+      "height": 1334
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -2375,6 +2378,24 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "79lk00MGhOZpRq7VBwxTZm"
   },
+  {
+    "__type__": "b356cApUdVC8I8CxLJLwlZA",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 101
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "d77inZhdhGqIsKtCohMxkr"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {

Plik diff jest za duży
+ 366 - 345
library/9e/9e12223d-7a81-471d-8295-08a69b25b44b.json


+ 24 - 3
library/a8/a87b5748-2ead-4c6e-9905-efcce6798098.json

@@ -35,10 +35,13 @@
       },
       {
         "__id__": 100
+      },
+      {
+        "__id__": 102
       }
     ],
     "_prefab": {
-      "__id__": 102
+      "__id__": 104
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -2284,8 +2287,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 100,
-      "height": 100
+      "width": 750,
+      "height": 1334
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -2334,6 +2337,24 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "02zJ5UrRdLU5+qybADx9k3"
   },
+  {
+    "__type__": "b356cApUdVC8I8CxLJLwlZA",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 103
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "3fx5fQceFFqoJSYzTABbDN"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {

+ 24 - 3
library/b6/b608ca62-d03c-4fc2-a51a-772e93f391d0.json

@@ -35,10 +35,13 @@
       },
       {
         "__id__": 118
+      },
+      {
+        "__id__": 120
       }
     ],
     "_prefab": {
-      "__id__": 120
+      "__id__": 122
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -2631,8 +2634,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 100,
-      "height": 100
+      "width": 750,
+      "height": 1334
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -2681,6 +2684,24 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "0bxlH3fsVJIbt+Skz1FnqX"
   },
+  {
+    "__type__": "b356cApUdVC8I8CxLJLwlZA",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 121
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "84a4L6hdNCL5ufyfo13YmU"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {

+ 24 - 3
library/b8/b83b568a-13ad-4c2d-b7c1-3abd20518b68.json

@@ -35,10 +35,13 @@
       },
       {
         "__id__": 142
+      },
+      {
+        "__id__": 144
       }
     ],
     "_prefab": {
-      "__id__": 144
+      "__id__": 146
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -3373,8 +3376,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 100,
-      "height": 100
+      "width": 750,
+      "height": 1334
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -3423,6 +3426,24 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "9f1t5m2KJKkqspYbqB+L/m"
   },
+  {
+    "__type__": "b356cApUdVC8I8CxLJLwlZA",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 145
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "75eaHGPVREurQH3Yz0TL6M"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {

+ 24 - 3
library/c7/c7f2ecc5-17bf-4e66-9d0b-dc78789a994e.json

@@ -35,10 +35,13 @@
       },
       {
         "__id__": 106
+      },
+      {
+        "__id__": 108
       }
     ],
     "_prefab": {
-      "__id__": 108
+      "__id__": 110
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -2470,8 +2473,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 100,
-      "height": 100
+      "width": 750,
+      "height": 1334
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -2520,6 +2523,24 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "b1JjC/4PNMTJLl6ATsBkp3"
   },
+  {
+    "__type__": "b356cApUdVC8I8CxLJLwlZA",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 109
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "95cCT2kLxC3parRWIeBJnn"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {

+ 24 - 3
library/e8/e82dd65d-215b-4555-819e-3f08028530ab.json

@@ -35,10 +35,13 @@
       },
       {
         "__id__": 290
+      },
+      {
+        "__id__": 292
       }
     ],
     "_prefab": {
-      "__id__": 292
+      "__id__": 294
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -6663,8 +6666,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 100,
-      "height": 100
+      "width": 750,
+      "height": 1334
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -6713,6 +6716,24 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "97ayv35hhNdKmdOf22ZgCD"
   },
+  {
+    "__type__": "b356cApUdVC8I8CxLJLwlZA",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 293
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "9aS4xJl6BMybUq4qyI8wq9"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {

+ 24 - 3
library/e9/e99a8ee5-e203-4882-b5a1-6314bb453d45.json

@@ -35,10 +35,13 @@
       },
       {
         "__id__": 102
+      },
+      {
+        "__id__": 104
       }
     ],
     "_prefab": {
-      "__id__": 104
+      "__id__": 106
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -2369,8 +2372,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 100,
-      "height": 100
+      "width": 750,
+      "height": 1334
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -2419,6 +2422,24 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "6dengAL7lOjKqZbFoYeF6T"
   },
+  {
+    "__type__": "b356cApUdVC8I8CxLJLwlZA",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 105
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "caH+Za9eZK/p4+eEENXLYr"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {

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

@@ -55,7 +55,7 @@
     },
     "autoReleaseAssets": false,
     "_globals": {
-      "__id__": 20
+      "__id__": 21
     },
     "_id": "eeec5720-7028-48a1-9aec-e9bb18f4abbc"
   },
@@ -187,6 +187,9 @@
       },
       {
         "__id__": 19
+      },
+      {
+        "__id__": 20
       }
     ],
     "_prefab": null,
@@ -569,31 +572,48 @@
     "_volume": 1,
     "_id": "6fNVrFsCdMGZtoc3x7I8YB"
   },
+  {
+    "__type__": "5891fc2Al5HLZyJZZxmNT+e",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 5
+    },
+    "_enabled": true,
+    "__prefab": null,
+    "_flags": 0,
+    "_top": 0,
+    "_bottom": 0,
+    "_left": 0,
+    "_right": 0,
+    "_id": "21jdNutnhH6aAqBHNRtNWx"
+  },
   {
     "__type__": "cc.SceneGlobals",
     "ambient": {
-      "__id__": 21
+      "__id__": 22
     },
     "shadows": {
-      "__id__": 22
+      "__id__": 23
     },
     "_skybox": {
-      "__id__": 23
+      "__id__": 24
     },
     "fog": {
-      "__id__": 24
+      "__id__": 25
     },
     "octree": {
-      "__id__": 25
+      "__id__": 26
     },
     "skin": {
-      "__id__": 26
+      "__id__": 27
     },
     "lightProbeInfo": {
-      "__id__": 27
+      "__id__": 28
     },
     "postSettings": {
-      "__id__": 28
+      "__id__": 29
     },
     "bakedWithStationaryMainLight": false,
     "bakedWithHighpLightmap": false

+ 18 - 0
profiles/v2/packages/adsense-h5g-plugin.json

@@ -18,6 +18,15 @@
         "otherAFPHostPropertyCode": "",
         "otherAFPDomain": "",
         "__version__": "1.0.1"
+      },
+      "1746667804879": {
+        "enableAdsense": false,
+        "enableTestAd": false,
+        "__version__": "1.0.1",
+        "AFPHostPropertyCode": "ca-host-pub-5396158963872751",
+        "AFPHostDomain": "douyougame.com",
+        "otherAFPHostPropertyCode": "",
+        "otherAFPDomain": ""
       }
     },
     "__version__": "1.3.7",
@@ -29,6 +38,15 @@
         "AFPHostDomain": "douyougame.com",
         "otherAFPHostPropertyCode": "",
         "otherAFPDomain": ""
+      },
+      "web-desktop": {
+        "enableAdsense": false,
+        "enableTestAd": false,
+        "__version__": "1.0.1",
+        "AFPHostPropertyCode": "ca-host-pub-5396158963872751",
+        "AFPHostDomain": "douyougame.com",
+        "otherAFPHostPropertyCode": "",
+        "otherAFPDomain": ""
       }
     }
   }

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

@@ -6,9 +6,9 @@
     "polyfills": {
       "asyncFunctions": true
     },
-    "outputName": "web-mobile-001",
+    "outputName": "web-desktop",
     "mainBundleCompressionType": "merge_dep",
-    "platform": "web-mobile",
+    "platform": "web-desktop",
     "replaceSplashScreen": true,
     "buildPath": "project://build",
     "name": "xfk3D",
@@ -78,7 +78,7 @@
         "progress": 1,
         "state": "success",
         "stage": "run",
-        "message": "2025-5-7 17:53:53 run package /Users/wenshuang/Desktop/公司游戏/CatchDoll/build/web-mobile-001 success!",
+        "message": "2025-5-8 11:25:15 run package /Users/wenshuang/Desktop/公司游戏/CatchDoll/build/web-mobile-001 success!",
         "options": {
           "name": "xfk3D",
           "server": "",
@@ -123,7 +123,7 @@
           "buildMode": "normal",
           "logDest": "project://temp/builder/log/web-mobile4-24-2025 16-19.log"
         },
-        "time": "5-7-2025 17:52:12",
+        "time": "5-8-2025 11:22:37",
         "dirty": false
       }
     }

+ 5 - 0
profiles/v2/packages/cocos-service.json

@@ -30,6 +30,11 @@
         "configID": "151a1e",
         "services": [],
         "__version__": "3.0.7"
+      },
+      "1746667804879": {
+        "configID": "151a1e",
+        "services": [],
+        "__version__": "3.0.7"
       }
     },
     "__version__": "1.3.7",

+ 4 - 0
profiles/v2/packages/engine.json

@@ -8,6 +8,10 @@
       "1745482788553": {
         "cleanupImageCache": "inheritProjectSetting",
         "__version__": "1.0.8"
+      },
+      "1746667804879": {
+        "cleanupImageCache": "inheritProjectSetting",
+        "__version__": "1.0.8"
       }
     },
     "__version__": "1.3.7"

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

@@ -1,6 +1,6 @@
 {
   "gizmos-infos": {
-    "is2D": true,
+    "is2D": false,
     "is3DIcon": false,
     "iconSize": 2,
     "gridVisible": true,
@@ -58,31 +58,6 @@
         "z": 0
       }
     },
-    "94944f7b-9ccf-45fc-85e1-4c591e07c5e3": {
-      "position": {
-        "x": -1.1909159719816458,
-        "y": 7.085835481663629,
-        "z": 6.945105737413961
-      },
-      "rotation": {
-        "x": -0.38258631916724517,
-        "y": -0.07830892043649809,
-        "z": -0.03256446702368164,
-        "w": 0.9200190089631803
-      },
-      "viewCenter": {
-        "x": 0,
-        "y": 0,
-        "z": 0
-      },
-      "contentRect": {
-        "x": 0,
-        "y": 0,
-        "width": 1625,
-        "height": 829
-      },
-      "scale": 1
-    },
     "57b9af2e-5897-4f14-bfb7-66f0b279a66f": {
       "position": {
         "x": 5.106731198529985,
@@ -858,81 +833,6 @@
       },
       "scale": 1
     },
-    "e82dd65d-215b-4555-819e-3f08028530ab": {
-      "position": {
-        "x": -361.0541310383321,
-        "y": 1294.5651525688563,
-        "z": 5000
-      },
-      "rotation": {
-        "x": 0,
-        "y": 0,
-        "z": 0,
-        "w": 1
-      },
-      "viewCenter": {
-        "x": 0,
-        "y": 0,
-        "z": 0
-      },
-      "contentRect": {
-        "x": -1097.2362161315054,
-        "y": -177.79901761749073,
-        "width": 448,
-        "height": 896
-      },
-      "scale": 0.296801571818127
-    },
-    "4cd259f2-fc79-4e93-8d6b-804a5b820fb8": {
-      "position": {
-        "x": 150.56941307152647,
-        "y": 633.2758579055736,
-        "z": 5000
-      },
-      "rotation": {
-        "x": 0,
-        "y": 0,
-        "z": 0,
-        "w": 1
-      },
-      "viewCenter": {
-        "x": 0,
-        "y": 0,
-        "z": 0
-      },
-      "contentRect": {
-        "x": -164.55643482421976,
-        "y": 3.0241621140813715,
-        "width": 448,
-        "height": 896
-      },
-      "scale": 0.7108271234992646
-    },
-    "c7f2ecc5-17bf-4e66-9d0b-dc78789a994e": {
-      "position": {
-        "x": 362.41418764302057,
-        "y": 641.8283752860413,
-        "z": 5000
-      },
-      "rotation": {
-        "x": 0,
-        "y": 0,
-        "z": 0,
-        "w": 1
-      },
-      "viewCenter": {
-        "x": 0,
-        "y": 0,
-        "z": 0
-      },
-      "contentRect": {
-        "x": -150.1716247139588,
-        "y": -383.3432494279176,
-        "width": 437,
-        "height": 874
-      },
-      "scale": 0.437
-    },
     "e99a8ee5-e203-4882-b5a1-6314bb453d45": {
       "position": {
         "x": 862.4141876430206,
@@ -1183,10 +1083,10 @@
       },
       "scale": 1
     },
-    "9e12223d-7a81-471d-8295-08a69b25b44b": {
+    "9b4f7c25-9b14-4d87-9200-c868813c9a28": {
       "position": {
-        "x": 375,
-        "y": 667,
+        "x": 622.2975389297928,
+        "y": 646.0277705501234,
         "z": 5000
       },
       "rotation": {
@@ -1201,17 +1101,42 @@
         "z": 0
       },
       "contentRect": {
-        "x": -125,
-        "y": -332.99999999999994,
-        "width": 437,
-        "height": 874
+        "x": 221.76362039183084,
+        "y": -208.44458899752874,
+        "width": 540,
+        "height": 667
       },
-      "scale": 0.437
+      "scale": 0.5336626690199799
+    },
+    "1523702b-f45a-4b86-a2ce-fe6a9634afdf": {
+      "position": {
+        "x": 797.9029856998659,
+        "y": 608.8445545817796,
+        "z": 5000
+      },
+      "rotation": {
+        "x": 0,
+        "y": 0,
+        "z": 0,
+        "w": 1
+      },
+      "viewCenter": {
+        "x": 0,
+        "y": 0,
+        "z": 0
+      },
+      "contentRect": {
+        "x": 392.0687440027235,
+        "y": -256.93516103879097,
+        "width": 518.4375,
+        "height": 1106
+      },
+      "scale": 0.6387306032038677
     },
     "79d5fa5f-cb75-4f1a-8ca4-503a10fc449d": {
       "position": {
-        "x": 823.296061664918,
-        "y": 867.8257989230101,
+        "x": 1219.1786242059995,
+        "y": 792.963420081315,
         "z": 5000
       },
       "rotation": {
@@ -1226,17 +1151,17 @@
         "z": 0
       },
       "contentRect": {
-        "x": 823.2960616649182,
-        "y": 867.8257989230101,
+        "x": 1219.1786242059998,
+        "y": 792.9634200813152,
         "width": 0,
         "height": 0
       },
-      "scale": 0.39338122267678377
+      "scale": 0.23915203952296904
     },
-    "9b4f7c25-9b14-4d87-9200-c868813c9a28": {
+    "9e12223d-7a81-471d-8295-08a69b25b44b": {
       "position": {
-        "x": 622.2975389297928,
-        "y": 646.0277705501234,
+        "x": 330.58459291554016,
+        "y": 542.0841252736062,
         "z": 5000
       },
       "rotation": {
@@ -1251,17 +1176,17 @@
         "z": 0
       },
       "contentRect": {
-        "x": 221.76362039183084,
-        "y": -208.44458899752874,
-        "width": 540,
-        "height": 667
+        "x": 330.5845929155402,
+        "y": 542.0841252736062,
+        "width": 437,
+        "height": 874
       },
-      "scale": 0.5336626690199799
+      "scale": 0.6120431122277088
     },
-    "eeec5720-7028-48a1-9aec-e9bb18f4abbc": {
+    "4ef6eae0-69d3-43c3-8e51-37751cbbdeed": {
       "position": {
-        "x": 2585.8034436941994,
-        "y": 1893.9959112502795,
+        "x": 433.9059674502712,
+        "y": 834.8119349005424,
         "z": 5000
       },
       "rotation": {
@@ -1276,17 +1201,42 @@
         "z": 0
       },
       "contentRect": {
-        "x": 1166.716973605806,
-        "y": -1133.3885582716264,
-        "width": 377.8125,
-        "height": 806
+        "x": 160.623869801085,
+        "y": 251.81012658227846,
+        "width": 518.4375,
+        "height": 1106
       },
-      "scale": 0.13311820948319888
+      "scale": 0.69125
     },
-    "1523702b-f45a-4b86-a2ce-fe6a9634afdf": {
+    "c7f2ecc5-17bf-4e66-9d0b-dc78789a994e": {
+      "position": {
+        "x": 318.45736168365994,
+        "y": 668.6186055543276,
+        "z": 5000
+      },
+      "rotation": {
+        "x": 0,
+        "y": 0,
+        "z": 0,
+        "w": 1
+      },
+      "viewCenter": {
+        "x": 0,
+        "y": 0,
+        "z": 0
+      },
+      "contentRect": {
+        "x": -162.7574370709382,
+        "y": -408.51487414187636,
+        "width": 437,
+        "height": 874
+      },
+      "scale": 0.437
+    },
+    "e82dd65d-215b-4555-819e-3f08028530ab": {
       "position": {
-        "x": -26623.38258392374,
-        "y": -30528.89865017587,
+        "x": 628.3340867992766,
+        "y": 1128.1211573236887,
         "z": 5000
       },
       "rotation": {
@@ -1301,16 +1251,65 @@
         "z": 0
       },
       "contentRect": {
-        "x": -60962.898712956,
-        "y": -58178.89865017587,
-        "width": 580,
-        "height": 290
+        "x": 233.2165461121157,
+        "y": 337.88607594936695,
+        "width": 553,
+        "height": 1106
       },
-      "scale": 0.02
+      "scale": 0.553
+    },
+    "4cd259f2-fc79-4e93-8d6b-804a5b820fb8": {
+      "position": {
+        "x": 375,
+        "y": 666.9999999999999,
+        "z": 5000
+      },
+      "rotation": {
+        "x": 0,
+        "y": 0,
+        "z": 0,
+        "w": 1
+      },
+      "viewCenter": {
+        "x": 0,
+        "y": 0,
+        "z": 0
+      },
+      "contentRect": {
+        "x": -124.99999999999999,
+        "y": -333,
+        "width": 553,
+        "height": 1106
+      },
+      "scale": 0.553
+    },
+    "eeec5720-7028-48a1-9aec-e9bb18f4abbc": {
+      "position": {
+        "x": 1689.5930437218408,
+        "y": -2050.455292027456,
+        "z": 5000
+      },
+      "rotation": {
+        "x": 0,
+        "y": 0,
+        "z": 0,
+        "w": 1
+      },
+      "viewCenter": {
+        "x": 0,
+        "y": 0,
+        "z": 0
+      },
+      "contentRect": {
+        "x": -86.33305312794828,
+        "y": -5602.307485727036,
+        "width": 377.8125,
+        "height": 806
+      },
+      "scale": 0.15569341567223266
     }
   },
   "camera-uuids": [
-    "94944f7b-9ccf-45fc-85e1-4c591e07c5e3",
     "57b9af2e-5897-4f14-bfb7-66f0b279a66f",
     "eec620d0-89a8-4bdb-918b-f63a1775f7ec",
     "22ee6eff-3a1e-4e51-8690-23b343d4e3bd",
@@ -1342,9 +1341,6 @@
     "886f5150-93a4-44ea-804c-4ec2e80a3ee4",
     "a87b5748-2ead-4c6e-9905-efcce6798098",
     "f46876e4-e81b-4931-b493-6d367be385e7",
-    "e82dd65d-215b-4555-819e-3f08028530ab",
-    "4cd259f2-fc79-4e93-8d6b-804a5b820fb8",
-    "c7f2ecc5-17bf-4e66-9d0b-dc78789a994e",
     "e99a8ee5-e203-4882-b5a1-6314bb453d45",
     "b83b568a-13ad-4c2d-b7c1-3abd20518b68",
     "0fe45a30-5541-4ff8-9715-3a7ed22358e6",
@@ -1355,11 +1351,15 @@
     "c4bfb51c-5b23-496e-9ce7-7066f9042369",
     "6c1e69ee-a7af-4972-950b-34f1fb6516b2",
     "f5e48bba-876c-4a3c-85f1-050e4862a4bf",
-    "9e12223d-7a81-471d-8295-08a69b25b44b",
-    "79d5fa5f-cb75-4f1a-8ca4-503a10fc449d",
     "9b4f7c25-9b14-4d87-9200-c868813c9a28",
-    "eeec5720-7028-48a1-9aec-e9bb18f4abbc",
-    "1523702b-f45a-4b86-a2ce-fe6a9634afdf"
+    "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",
+    "e82dd65d-215b-4555-819e-3f08028530ab",
+    "4cd259f2-fc79-4e93-8d6b-804a5b820fb8",
+    "eeec5720-7028-48a1-9aec-e9bb18f4abbc"
   ],
   "scene": {
     "native": false

+ 16 - 1
profiles/v2/packages/web-desktop.json

@@ -4,7 +4,22 @@
     "common": {
       "polyfills": {
         "asyncFunctions": true
+      },
+      "buildPath": "project://build",
+      "outputName": "web-desktop",
+      "mainBundleCompressionType": "merge_dep",
+      "platform": "web-desktop"
+    },
+    "taskOptionsMap": {
+      "1746667804879": {
+        "resolution": {
+          "designWidth": 1280,
+          "designHeight": 960
+        },
+        "cullEngineAsmJsModule": false,
+        "__version__": "1.0.1"
       }
-    }
+    },
+    "__version__": "1.3.7"
   }
 }

Niektóre pliki nie zostały wyświetlone z powodu dużej ilości zmienionych plików