调整bg

assets/bundles/game/EffectFreeze.prefab

@@ -102,8 +102,8 @@
     },
     "_lscale": {
       "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
+      "x": 1.1,
+      "y": 1.1,
       "z": 1
     },
     "_mobility": 0,
@@ -130,7 +130,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 720,
+      "width": 760,
       "height": 1600
     },
     "_anchorPoint": {

assets/bundles/game/ShelveLocker.prefab

@@ -87,7 +87,7 @@
       "__id__": 1
     },
     "_children": [],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 3
@@ -250,8 +250,8 @@
     },
     "_lscale": {
       "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
+      "x": 1.5,
+      "y": 1.5,
       "z": 1
     },
     "_mobility": 0,
@@ -320,7 +320,7 @@
     },
     "_type": 0,
     "_fillType": 0,
-    "_sizeMode": 1,
+    "_sizeMode": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,
@@ -414,8 +414,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 21.89,
-      "height": 30
+      "width": 27.19,
+      "height": 36
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -453,10 +453,10 @@
     "_string": "0",
     "_horizontalAlign": 1,
     "_verticalAlign": 1,
-    "_actualFontSize": 24,
-    "_fontSize": 24,
+    "_actualFontSize": 32,
+    "_fontSize": 32,
     "_fontFamily": "Arial",
-    "_lineHeight": 26,
+    "_lineHeight": 32,
     "_overflow": 0,
     "_enableWrapText": false,
     "_font": {

assets/bundles/game/Stage.prefab

@@ -187,7 +187,7 @@
     },
     "_type": 1,
     "_fillType": 0,
-    "_sizeMode": 0,
+    "_sizeMode": 1,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,
@@ -208,7 +208,7 @@
     "fileId": "d8qeTGNgpH5ZgaN91Asi7p"
   },
   {
-    "__type__": "cc.Widget",
+    "__type__": "f46f8LHpmlN5blJiZkBGDOW",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
@@ -219,29 +219,11 @@
     "__prefab": {
       "__id__": 8
     },
-    "_alignFlags": 4,
-    "_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": 0,
-    "_originalHeight": 0,
-    "_alignMode": 2,
-    "_lockFlags": 0,
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "26jrsXJ7ZGUoOsRmK3s3m2"
+    "fileId": "8eL2EKWExGaouAYVR2pN8n"
   },
   {
     "__type__": "cc.PrefabInfo",

assets/bundles/icon/ls/ls16.png.meta

@@ -46,10 +46,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 214,
-        "height": 145,
-        "rawWidth": 214,
-        "rawHeight": 145,
+        "width": 122,
+        "height": 135,
+        "rawWidth": 122,
+        "rawHeight": 135,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -107,
-            -72.5,
+            -61,
+            -67.5,
             0,
-            107,
-            -72.5,
+            61,
+            -67.5,
             0,
-            -107,
-            72.5,
+            -61,
+            67.5,
             0,
-            107,
-            72.5,
+            61,
+            67.5,
             0
           ],
           "indexes": [
@@ -84,12 +84,12 @@
           ],
           "uv": [
             0,
-            145,
-            214,
-            145,
+            135,
+            122,
+            135,
             0,
             0,
-            214,
+            122,
             0
           ],
           "nuv": [
@@ -103,13 +103,13 @@
             1
           ],
           "minPos": [
-            -107,
-            -72.5,
+            -61,
+            -67.5,
             0
           ],
           "maxPos": [
-            107,
-            72.5,
+            61,
+            67.5,
             0
           ]
         },

assets/resources/UILoading.prefab

@@ -302,7 +302,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 720,
+      "width": 936,
       "height": 697
     },
     "_anchorPoint": {
@@ -339,7 +339,7 @@
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "46dd5cd2-93e9-4d1c-ace5-df59a507a45f@f9941",
+      "__uuid__": "d1d60078-91c8-4ab4-be14-73620bbfdea4@f9941",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 0,

assets/resources/logo.png.meta → assets/resources/logo1.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.27",
   "importer": "image",
   "imported": true,
-  "uuid": "46dd5cd2-93e9-4d1c-ace5-df59a507a45f",
+  "uuid": "d1d60078-91c8-4ab4-be14-73620bbfdea4",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "46dd5cd2-93e9-4d1c-ace5-df59a507a45f@6c48a",
-      "displayName": "logo",
+      "uuid": "d1d60078-91c8-4ab4-be14-73620bbfdea4@6c48a",
+      "displayName": "logo1",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "46dd5cd2-93e9-4d1c-ace5-df59a507a45f",
+        "imageUuidOrDatabaseUri": "d1d60078-91c8-4ab4-be14-73620bbfdea4",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,21 +34,20 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "46dd5cd2-93e9-4d1c-ace5-df59a507a45f@f9941",
-      "displayName": "logo",
+      "uuid": "d1d60078-91c8-4ab4-be14-73620bbfdea4@f9941",
+      "displayName": "logo1",
       "id": "f9941",
       "name": "spriteFrame",
       "userData": {
-        "trimType": "auto",
         "trimThreshold": 1,
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 720,
+        "width": 936,
         "height": 697,
-        "rawWidth": 720,
+        "rawWidth": 936,
         "rawHeight": 697,
         "borderTop": 0,
         "borderBottom": 0,
@@ -61,16 +60,16 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -360,
+            -468,
             -348.5,
             0,
-            360,
+            468,
             -348.5,
             0,
-            -360,
+            -468,
             348.5,
             0,
-            360,
+            468,
             348.5,
             0
           ],
@@ -85,11 +84,11 @@
           "uv": [
             0,
             697,
-            720,
+            936,
             697,
             0,
             0,
-            720,
+            936,
             0
           ],
           "nuv": [
@@ -103,19 +102,20 @@
             1
           ],
           "minPos": [
-            -360,
+            -468,
             -348.5,
             0
           ],
           "maxPos": [
-            360,
+            468,
             348.5,
             0
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "46dd5cd2-93e9-4d1c-ace5-df59a507a45f@6c48a",
-        "atlasUuid": ""
+        "imageUuidOrDatabaseUri": "d1d60078-91c8-4ab4-be14-73620bbfdea4@6c48a",
+        "atlasUuid": "",
+        "trimType": "auto"
       },
       "ver": "1.0.12",
       "imported": true,
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "46dd5cd2-93e9-4d1c-ace5-df59a507a45f@6c48a"
+    "redirect": "d1d60078-91c8-4ab4-be14-73620bbfdea4@6c48a"
   }
 }

assets/resources/trans/DiTu.png.meta

@@ -45,10 +45,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 720,
-        "height": 1600,
-        "rawWidth": 720,
-        "rawHeight": 1600,
+        "width": 760,
+        "height": 1688,
+        "rawWidth": 760,
+        "rawHeight": 1688,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -60,17 +60,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -360,
-            -800,
+            -380,
+            -844,
             0,
-            360,
-            -800,
+            380,
+            -844,
             0,
-            -360,
-            800,
+            -380,
+            844,
             0,
-            360,
-            800,
+            380,
+            844,
             0
           ],
           "indexes": [
@@ -83,12 +83,12 @@
           ],
           "uv": [
             0,
-            1600,
-            720,
-            1600,
+            1688,
+            760,
+            1688,
             0,
             0,
-            720,
+            760,
             0
           ],
           "nuv": [
@@ -102,13 +102,13 @@
             1
           ],
           "minPos": [
-            -360,
-            -800,
+            -380,
+            -844,
             0
           ],
           "maxPos": [
-            360,
-            800,
+            380,
+            844,
             0
           ]
         },

assets/scenes/main.scene

@@ -32,7 +32,7 @@
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 63
+      "__id__": 62
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -63,7 +63,7 @@
     },
     "autoReleaseAssets": false,
     "_globals": {
-      "__id__": 64
+      "__id__": 63
     },
     "_id": "abb30dd1-dbd3-4ab0-aa8b-0b53e8c186be"
   },
@@ -279,11 +279,14 @@
         "__id__": 37
       },
       {
-        "__id__": 53
+        "__id__": 52
       }
     ],
     "_active": true,
     "_components": [
+      {
+        "__id__": 57
+      },
       {
         "__id__": 58
       },
@@ -295,15 +298,12 @@
       },
       {
         "__id__": 61
-      },
-      {
-        "__id__": 62
       }
     ],
     "_prefab": null,
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 360,
+      "x": 380,
       "y": 800,
       "z": 0
     },
@@ -484,7 +484,7 @@
     "__prefab": null,
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 720,
+      "width": 760,
       "height": 1600
     },
     "_anchorPoint": {
@@ -660,7 +660,7 @@
     "__prefab": null,
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 720,
+      "width": 760,
       "height": 1600
     },
     "_anchorPoint": {
@@ -921,7 +921,7 @@
     "__prefab": null,
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 720,
+      "width": 760,
       "height": 1600
     },
     "_anchorPoint": {
@@ -1021,7 +1021,7 @@
     "__prefab": null,
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 720,
+      "width": 760,
       "height": 1600
     },
     "_anchorPoint": {
@@ -1121,7 +1121,7 @@
     "__prefab": null,
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 720,
+      "width": 760,
       "height": 1600
     },
     "_anchorPoint": {
@@ -1173,7 +1173,7 @@
     "__prefab": null,
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 720,
+      "width": 760,
       "height": 1600
     },
     "_anchorPoint": {
@@ -1241,14 +1241,17 @@
         "__id__": 38
       },
       {
-        "__id__": 42
+        "__id__": 41
       },
       {
-        "__id__": 46
+        "__id__": 45
       }
     ],
     "_active": true,
     "_components": [
+      {
+        "__id__": 48
+      },
       {
         "__id__": 49
       },
@@ -1257,9 +1260,6 @@
       },
       {
         "__id__": 51
-      },
-      {
-        "__id__": 52
       }
     ],
     "_prefab": null,
@@ -1308,9 +1308,6 @@
       },
       {
         "__id__": 40
-      },
-      {
-        "__id__": 41
       }
     ],
     "_prefab": null,
@@ -1329,7 +1326,7 @@
     },
     "_lscale": {
       "__type__": "cc.Vec3",
-      "x": 1,
+      "x": 1.1,
       "y": 1,
       "z": 1
     },
@@ -1355,8 +1352,8 @@
     "__prefab": null,
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 720,
-      "height": 1600
+      "width": 760,
+      "height": 1688
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1404,36 +1401,6 @@
     "_atlas": null,
     "_id": "25MtsWtMBPG5aXbhcllm1F"
   },
-  {
-    "__type__": "cc.Widget",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 38
-    },
-    "_enabled": true,
-    "__prefab": null,
-    "_alignFlags": 1,
-    "_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": 0,
-    "_originalHeight": 0,
-    "_alignMode": 2,
-    "_lockFlags": 0,
-    "_id": "3fKrNylVRD3o94qcu7e8ha"
-  },
   {
     "__type__": "cc.Node",
     "_name": "gc1",
@@ -1446,13 +1413,13 @@
     "_active": false,
     "_components": [
       {
-        "__id__": 43
+        "__id__": 42
       },
       {
-        "__id__": 44
+        "__id__": 43
       },
       {
-        "__id__": 45
+        "__id__": 44
       }
     ],
     "_prefab": null,
@@ -1491,7 +1458,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 42
+      "__id__": 41
     },
     "_enabled": true,
     "__prefab": null,
@@ -1513,7 +1480,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 42
+      "__id__": 41
     },
     "_enabled": true,
     "__prefab": null,
@@ -1552,7 +1519,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 42
+      "__id__": 41
     },
     "_enabled": true,
     "__prefab": null,
@@ -1588,10 +1555,10 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 47
+        "__id__": 46
       },
       {
-        "__id__": 48
+        "__id__": 47
       }
     ],
     "_prefab": null,
@@ -1630,13 +1597,13 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 46
+      "__id__": 45
     },
     "_enabled": true,
     "__prefab": null,
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 720,
+      "width": 936,
       "height": 697
     },
     "_anchorPoint": {
@@ -1652,7 +1619,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 46
+      "__id__": 45
     },
     "_enabled": true,
     "__prefab": null,
@@ -1667,7 +1634,7 @@
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "46dd5cd2-93e9-4d1c-ace5-df59a507a45f@f9941",
+      "__uuid__": "d1d60078-91c8-4ab4-be14-73620bbfdea4@f9941",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 0,
@@ -1697,7 +1664,7 @@
     "__prefab": null,
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 720,
+      "width": 760,
       "height": 1600
     },
     "_anchorPoint": {
@@ -1760,13 +1727,13 @@
     "_enabled": true,
     "__prefab": null,
     "gc1UiTrans": {
-      "__id__": 43
+      "__id__": 42
     },
     "gc2UiTrans": {
       "__id__": 39
     },
     "logo": {
-      "__id__": 46
+      "__id__": 45
     },
     "_id": "dauD0r/FxF67a5LXkU8D3v"
   },
@@ -1781,6 +1748,9 @@
     "_children": [],
     "_active": true,
     "_components": [
+      {
+        "__id__": 53
+      },
       {
         "__id__": 54
       },
@@ -1789,9 +1759,6 @@
       },
       {
         "__id__": 56
-      },
-      {
-        "__id__": 57
       }
     ],
     "_prefab": null,
@@ -1830,13 +1797,13 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 53
+      "__id__": 52
     },
     "_enabled": true,
     "__prefab": null,
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 720,
+      "width": 760,
       "height": 1600
     },
     "_anchorPoint": {
@@ -1852,7 +1819,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 53
+      "__id__": 52
     },
     "_enabled": true,
     "__prefab": null,
@@ -1864,7 +1831,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 53
+      "__id__": 52
     },
     "_enabled": true,
     "__prefab": null,
@@ -1876,7 +1843,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 53
+      "__id__": 52
     },
     "_enabled": true,
     "__prefab": null,
@@ -1912,7 +1879,7 @@
     "__prefab": null,
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 720,
+      "width": 760,
       "height": 1600
     },
     "_anchorPoint": {
@@ -2003,28 +1970,28 @@
   {
     "__type__": "cc.SceneGlobals",
     "ambient": {
-      "__id__": 65
+      "__id__": 64
     },
     "shadows": {
-      "__id__": 66
+      "__id__": 65
     },
     "_skybox": {
-      "__id__": 67
+      "__id__": 66
     },
     "fog": {
-      "__id__": 68
+      "__id__": 67
     },
     "octree": {
-      "__id__": 69
+      "__id__": 68
     },
     "skin": {
-      "__id__": 70
+      "__id__": 69
     },
     "lightProbeInfo": {
-      "__id__": 71
+      "__id__": 70
     },
     "postSettings": {
-      "__id__": 72
+      "__id__": 71
     },
     "bakedWithStationaryMainLight": false,
     "bakedWithHighpLightmap": false

settings/v2/packages/project.json

@@ -2,7 +2,7 @@
   "__version__": "1.0.6",
   "general": {
     "designResolution": {
-      "width": 720,
+      "width": 760,
       "height": 1600,
       "fitHeight": false,
       "fitWidth": true