更改

8a09e044 · haiyoucuv · 39c589a3 · 8a09e044 · 39c589a3 · 39c589a3
Commit 8a09e044 authored Aug 14, 2024 by haiyoucuv
34 changed files
--- a/assets/Bundles/MainGame/MainGame.scene
+++ b/assets/Bundles/MainGame/MainGame.scene
@@ -119,7 +119,7 @@
    "_prefab": null,
    "_lpos": {
      "__type__": "cc.Vec3",
-      "x": 375.00000000000006,
+      "x": 375,
      "y": 812,
      "z": 0
    },
@@ -261,8 +261,8 @@
    "_prefab": null,
    "_lpos": {
      "__type__": "cc.Vec3",
-      "x": -5.684341886080802e-14,
+      "x": 0,
-      "y": 48.5,
+      "y": 0,
      "z": 0
    },
    "_lrot": {
@@ -301,7 +301,7 @@
    "_contentSize": {
      "__type__": "cc.Size",
      "width": 750,
-      "height": 1527
+      "height": 1624
    },
    "_anchorPoint": {
      "__type__": "cc.Vec2",
@@ -331,7 +331,7 @@
      "a": 255
    },
    "_spriteFrame": {
-      "__uuid__": "558c544e-f5d3-4a15-a30a-145d313ad84c@f9941",
+      "__uuid__": "d00804bf-ccb6-42f5-8772-1ecfbef7120c@f9941",
      "__expectedType__": "cc.SpriteFrame"
    },
    "_type": 0,
@@ -706,8 +706,8 @@
    "__prefab": null,
    "_contentSize": {
      "__type__": "cc.Size",
-      "width": 750,
+      "width": 757.2576,
-      "height": 252
+      "height": 252.6414
    },
    "_anchorPoint": {
      "__type__": "cc.Vec2",
@@ -737,12 +737,12 @@
      "a": 255
    },
    "_spriteFrame": {
-      "__uuid__": "36b0786d-4c97-40ce-bb9a-62ebd61a1021@f9941",
+      "__uuid__": "fb2e9e3b-b316-408f-99ca-060641ffe448@f9941",
      "__expectedType__": "cc.SpriteFrame"
    },
    "_type": 0,
    "_fillType": 0,
-    "_sizeMode": 1,
+    "_sizeMode": 0,
    "_fillCenter": {
      "__type__": "cc.Vec2",
      "x": 0,
@@ -765,12 +765,12 @@
    },
    "_enabled": true,
    "__prefab": null,
-    "_alignFlags": 4,
+    "_alignFlags": 20,
    "_target": null,
    "_left": 0,
    "_right": 0,
    "_top": 0,
-    "_bottom": 0,
+    "_bottom": -0.3207000000000022,
    "_horizontalCenter": 0,
    "_verticalCenter": 0,
    "_isAbsLeft": true,
@@ -836,8 +836,8 @@
    },
    "_size": {
      "__type__": "cc.Size",
-      "width": 750,
+      "width": 757.2576,
-      "height": 252
+      "height": 252.6414
    },
    "_id": "68G2Gd9CBOip7OQ90K2YiJ"
  },
@@ -901,7 +901,7 @@
    "__prefab": null,
    "_contentSize": {
      "__type__": "cc.Size",
-      "width": 750.0000000000001,
+      "width": 750,
      "height": 1624
    },
    "_anchorPoint": {
@@ -1392,7 +1392,7 @@
    "__prefab": null,
    "_contentSize": {
      "__type__": "cc.Size",
-      "width": 750.0000000000001,
+      "width": 750,
      "height": 1624
    },
    "_anchorPoint": {
@@ -1721,7 +1721,7 @@
    "_prefab": null,
    "_lpos": {
      "__type__": "cc.Vec3",
-      "x": -309.00000000000006,
+      "x": -309,
      "y": -70,
      "z": 0
    },
@@ -1920,8 +1920,8 @@
    "_prefab": null,
    "_lpos": {
      "__type__": "cc.Vec3",
-      "x": 311.99999999999994,
+      "x": 312,
-      "y": -355.5,
+      "y": -104.324,
      "z": 0
    },
    "_lrot": {
@@ -2300,7 +2300,7 @@
    "_target": null,
    "_left": 650,
    "_right": 0,
-    "_top": 311,
+    "_top": 59.824,
    "_bottom": -30,
    "_horizontalCenter": 0,
    "_verticalCenter": 0,
@@ -2397,8 +2397,8 @@
    "_prefab": null,
    "_lpos": {
      "__type__": "cc.Vec3",
-      "x": 312.4979999999999,
+      "x": 312.49800000000005,
-      "y": -471.5,
+      "y": -220.324,
      "z": 0
    },
    "_lrot": {
@@ -2775,9 +2775,9 @@
    "__prefab": null,
    "_alignFlags": 9,
    "_target": null,
-    "_left": 650.4979999999999,
+    "_left": 650.498,
    "_right": 0,
-    "_top": 426,
+    "_top": 174.824,
    "_bottom": -30,
    "_horizontalCenter": 0,
    "_verticalCenter": 0,
@@ -2855,7 +2855,7 @@
    "__prefab": null,
    "_contentSize": {
      "__type__": "cc.Size",
-      "width": 750.0000000000001,
+      "width": 750,
      "height": 0
    },
    "_anchorPoint": {
@@ -4452,7 +4452,7 @@
    "__prefab": null,
    "_contentSize": {
      "__type__": "cc.Size",
-      "width": 750.0000000000001,
+      "width": 750,
      "height": 1624
    },
    "_anchorPoint": {

--- a/assets/Bundles/MainGame/jpg/bg.jpg
+++ b/assets/Bundles/MainGame/jpg/bg.jpg
--- a/assets/Bundles/MainGame/png/bottom.png
+++ b/assets/Bundles/MainGame/png/bottom.png
--- a/assets/Bundles/MainGame/png/bottom.png.meta
+++ b/assets/Bundles/MainGame/png/bottom.png.meta
@@ -2,7 +2,7 @@
  "ver": "1.0.27",
  "importer": "image",
  "imported": true,
-  "uuid": "36b0786d-4c97-40ce-bb9a-62ebd61a1021",
+  "uuid": "fb2e9e3b-b316-408f-99ca-060641ffe448",
  "files": [
    ".json",
    ".png"
@@ -10,14 +10,14 @@
  "subMetas": {
    "6c48a": {
      "importer": "texture",
-      "uuid": "36b0786d-4c97-40ce-bb9a-62ebd61a1021@6c48a",
+      "uuid": "fb2e9e3b-b316-408f-99ca-060641ffe448@6c48a",
      "displayName": "bottom",
      "id": "6c48a",
      "name": "texture",
      "userData": {
        "wrapModeS": "clamp-to-edge",
        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "36b0786d-4c97-40ce-bb9a-62ebd61a1021",
+        "imageUuidOrDatabaseUri": "fb2e9e3b-b316-408f-99ca-060641ffe448",
        "isUuid": true,
        "visible": false,
        "minfilter": "linear",
@@ -34,7 +34,7 @@
    },
    "f9941": {
      "importer": "sprite-frame",
-      "uuid": "36b0786d-4c97-40ce-bb9a-62ebd61a1021@f9941",
+      "uuid": "fb2e9e3b-b316-408f-99ca-060641ffe448@f9941",
      "displayName": "bottom",
      "id": "f9941",
      "name": "spriteFrame",
@@ -46,10 +46,10 @@
        "offsetY": 0,
        "trimX": 0,
        "trimY": 0,
-        "width": 750,
+        "width": 1136,
-        "height": 252,
+        "height": 379,
-        "rawWidth": 750,
+        "rawWidth": 1136,
-        "rawHeight": 252,
+        "rawHeight": 379,
        "borderTop": 0,
        "borderBottom": 0,
        "borderLeft": 0,
@@ -61,17 +61,17 @@
        "meshType": 0,
        "vertices": {
          "rawPosition": [
-            -375,
+            -568,
-            -126,
+            -189.5,
            0,
-            375,
+            568,
-            -126,
+            -189.5,
            0,
-            -375,
+            -568,
-            126,
+            189.5,
            0,
-            375,
+            568,
-            126,
+            189.5,
            0
          ],
          "indexes": [
@@ -84,12 +84,12 @@
          ],
          "uv": [
            0,
-            252,
+            379,
-            750,
+            1136,
-            252,
+            379,
            0,
            0,
-            750,
+            1136,
            0
          ],
          "nuv": [
@@ -103,18 +103,18 @@
            1
          ],
          "minPos": [
-            -375,
+            -568,
-            -126,
+            -189.5,
            0
          ],
          "maxPos": [
-            375,
+            568,
-            126,
+            189.5,
            0
          ]
        },
        "isUuid": true,
-        "imageUuidOrDatabaseUri": "36b0786d-4c97-40ce-bb9a-62ebd61a1021@6c48a",
+        "imageUuidOrDatabaseUri": "fb2e9e3b-b316-408f-99ca-060641ffe448@6c48a",
        "atlasUuid": ""
      },
      "ver": "1.0.12",
@@ -129,6 +129,6 @@
    "type": "sprite-frame",
    "hasAlpha": false,
    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "36b0786d-4c97-40ce-bb9a-62ebd61a1021@6c48a"
+    "redirect": "fb2e9e3b-b316-408f-99ca-060641ffe448@6c48a"
  }
 }
--- a/assets/Bundles/MainGame/png/球/0.png
+++ b/assets/Bundles/MainGame/png/球/0.png
--- a/assets/Bundles/MainGame/png/球/0.png.meta
+++ b/assets/Bundles/MainGame/png/球/0.png.meta
@@ -44,12 +44,12 @@
        "rotated": false,
        "offsetX": 0,
        "offsetY": 0,
-        "trimX": 0,
+        "trimX": 3,
-        "trimY": 0,
+        "trimY": 3,
-        "width": 107,
+        "width": 180,
-        "height": 107,
+        "height": 180,
-        "rawWidth": 107,
+        "rawWidth": 186,
-        "rawHeight": 107,
+        "rawHeight": 186,
        "borderTop": 0,
        "borderBottom": 0,
        "borderLeft": 0,
@@ -61,17 +61,17 @@
        "meshType": 0,
        "vertices": {
          "rawPosition": [
-            -53.5,
+            -90,
-            -53.5,
+            -90,
            0,
-            53.5,
+            90,
-            -53.5,
+            -90,
            0,
-            -53.5,
+            -90,
-            53.5,
+            90,
            0,
-            53.5,
+            90,
-            53.5,
+            90,
            0
          ],
          "indexes": [
@@ -83,33 +83,33 @@
            3
          ],
          "uv": [
-            0,
+            3,
-            107,
+            183,
-            107,
+            183,
-            107,
+            183,
-            0,
+            3,
-            0,
+            3,
-            107,
+            183,
-            0
+            3
          ],
          "nuv": [
-            0,
+            0.016129032258064516,
-            0,
+            0.016129032258064516,
-            1,
+            0.9838709677419355,
-            0,
+            0.016129032258064516,
-            0,
+            0.016129032258064516,
-            1,
+            0.9838709677419355,
-            1,
+            0.9838709677419355,
-            1
+            0.9838709677419355
          ],
          "minPos": [
-            -53.5,
+            -90,
-            -53.5,
+            -90,
            0
          ],
          "maxPos": [
-            53.5,
+            90,
-            53.5,
+            90,
            0
          ]
        },

--- a/assets/Bundles/MainGame/png/球/10.png
+++ b/assets/Bundles/MainGame/png/球/10.png
--- a/assets/Bundles/MainGame/jpg/bg.jpg.meta
+++ b/assets/Bundles/MainGame/jpg/bg.jpg.meta
@@ -2,22 +2,22 @@
  "ver": "1.0.27",
  "importer": "image",
  "imported": true,
-  "uuid": "558c544e-f5d3-4a15-a30a-145d313ad84c",
+  "uuid": "688de945-7e98-449b-ad40-a9e38bbb3b9c",
  "files": [
-    ".jpg",
+    ".json",
-    ".json"
+    ".png"
  ],
  "subMetas": {
    "6c48a": {
      "importer": "texture",
-      "uuid": "558c544e-f5d3-4a15-a30a-145d313ad84c@6c48a",
+      "uuid": "688de945-7e98-449b-ad40-a9e38bbb3b9c@6c48a",
-      "displayName": "bg",
+      "displayName": "10",
      "id": "6c48a",
      "name": "texture",
      "userData": {
        "wrapModeS": "clamp-to-edge",
        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "558c544e-f5d3-4a15-a30a-145d313ad84c",
+        "imageUuidOrDatabaseUri": "688de945-7e98-449b-ad40-a9e38bbb3b9c",
        "isUuid": true,
        "visible": false,
        "minfilter": "linear",
@@ -34,8 +34,8 @@
    },
    "f9941": {
      "importer": "sprite-frame",
-      "uuid": "558c544e-f5d3-4a15-a30a-145d313ad84c@f9941",
+      "uuid": "688de945-7e98-449b-ad40-a9e38bbb3b9c@f9941",
-      "displayName": "bg",
+      "displayName": "10",
      "id": "f9941",
      "name": "spriteFrame",
      "userData": {
@@ -46,10 +46,10 @@
        "offsetY": 0,
        "trimX": 0,
        "trimY": 0,
-        "width": 750,
+        "width": 520,
-        "height": 1527,
+        "height": 520,
-        "rawWidth": 750,
+        "rawWidth": 520,
-        "rawHeight": 1527,
+        "rawHeight": 520,
        "borderTop": 0,
        "borderBottom": 0,
        "borderLeft": 0,
@@ -61,17 +61,17 @@
        "meshType": 0,
        "vertices": {
          "rawPosition": [
-            -375,
+            -260,
-            -763.5,
+            -260,
            0,
-            375,
+            260,
-            -763.5,
+            -260,
            0,
-            -375,
+            -260,
-            763.5,
+            260,
            0,
-            375,
+            260,
-            763.5,
+            260,
            0
          ],
          "indexes": [
@@ -84,12 +84,12 @@
          ],
          "uv": [
            0,
-            1527,
+            520,
-            750,
+            520,
-            1527,
+            520,
            0,
            0,
-            750,
+            520,
            0
          ],
          "nuv": [
@@ -103,18 +103,18 @@
            1
          ],
          "minPos": [
-            -375,
+            -260,
-            -763.5,
+            -260,
            0
          ],
          "maxPos": [
-            375,
+            260,
-            763.5,
+            260,
            0
          ]
        },
        "isUuid": true,
-        "imageUuidOrDatabaseUri": "558c544e-f5d3-4a15-a30a-145d313ad84c@6c48a",
+        "imageUuidOrDatabaseUri": "688de945-7e98-449b-ad40-a9e38bbb3b9c@6c48a",
        "atlasUuid": ""
      },
      "ver": "1.0.12",
@@ -127,8 +127,8 @@
  },
  "userData": {
    "type": "sprite-frame",
-    "hasAlpha": false,
+    "hasAlpha": true,
    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "558c544e-f5d3-4a15-a30a-145d313ad84c@6c48a"
+    "redirect": "688de945-7e98-449b-ad40-a9e38bbb3b9c@6c48a"
  }
 }
--- a/assets/Bundles/MainGame/png/球/2.png
+++ b/assets/Bundles/MainGame/png/球/2.png
--- a/assets/Bundles/MainGame/png/球/2.png.meta
+++ b/assets/Bundles/MainGame/png/球/2.png.meta
@@ -44,12 +44,12 @@
        "rotated": false,
        "offsetX": 0,
        "offsetY": 0,
-        "trimX": 1,
+        "trimX": 2,
-        "trimY": 1,
+        "trimY": 2,
-        "width": 207,
+        "width": 310,
-        "height": 207,
+        "height": 310,
-        "rawWidth": 209,
+        "rawWidth": 314,
-        "rawHeight": 209,
+        "rawHeight": 314,
        "borderTop": 0,
        "borderBottom": 0,
        "borderLeft": 0,
@@ -61,17 +61,17 @@
        "meshType": 0,
        "vertices": {
          "rawPosition": [
-            -103.5,
+            -155,
-            -103.5,
+            -155,
            0,
-            103.5,
+            155,
-            -103.5,
+            -155,
            0,
-            -103.5,
+            -155,
-            103.5,
+            155,
            0,
-            103.5,
+            155,
-            103.5,
+            155,
            0
          ],
          "indexes": [
@@ -83,33 +83,33 @@
            3
          ],
          "uv": [
-            1,
+            2,
-            208,
+            312,
-            208,
+            312,
-            208,
+            312,
-            1,
+            2,
-            1,
+            2,
-            208,
+            312,
-            1
+            2
          ],
          "nuv": [
-            0.004784688995215311,
+            0.006369426751592357,
-            0.004784688995215311,
+            0.006369426751592357,
-            0.9952153110047847,
+            0.9936305732484076,
-            0.004784688995215311,
+            0.006369426751592357,
-            0.004784688995215311,
+            0.006369426751592357,
-            0.9952153110047847,
+            0.9936305732484076,
-            0.9952153110047847,
+            0.9936305732484076,
-            0.9952153110047847
+            0.9936305732484076
          ],
          "minPos": [
-            -103.5,
+            -155,
-            -103.5,
+            -155,
            0
          ],
          "maxPos": [
-            103.5,
+            155,
-            103.5,
+            155,
            0
          ]
        },

--- a/assets/Bundles/MainGame/png/球/3.png
+++ b/assets/Bundles/MainGame/png/球/3.png
--- a/assets/Bundles/MainGame/png/球/3.png.meta
+++ b/assets/Bundles/MainGame/png/球/3.png.meta
@@ -46,10 +46,10 @@
        "offsetY": 0,
        "trimX": 0,
        "trimY": 0,
-        "width": 201,
+        "width": 301,
-        "height": 200,
+        "height": 300,
-        "rawWidth": 201,
+        "rawWidth": 301,
-        "rawHeight": 200,
+        "rawHeight": 300,
        "borderTop": 0,
        "borderBottom": 0,
        "borderLeft": 0,
@@ -61,17 +61,17 @@
        "meshType": 0,
        "vertices": {
          "rawPosition": [
-            -100.5,
+            -150.5,
-            -100,
+            -150,
            0,
-            100.5,
+            150.5,
-            -100,
+            -150,
            0,
-            -100.5,
+            -150.5,
-            100,
+            150,
            0,
-            100.5,
+            150.5,
-            100,
+            150,
            0
          ],
          "indexes": [
@@ -84,12 +84,12 @@
          ],
          "uv": [
            0,
-            200,
+            300,
-            201,
+            301,
-            200,
+            300,
            0,
            0,
-            201,
+            301,
            0
          ],
          "nuv": [
@@ -103,13 +103,13 @@
            1
          ],
          "minPos": [
-            -100.5,
+            -150.5,
-            -100,
+            -150,
            0
          ],
          "maxPos": [
-            100.5,
+            150.5,
-            100,
+            150,
            0
          ]
        },

--- a/assets/Bundles/MainGame/png/球/4.png
+++ b/assets/Bundles/MainGame/png/球/4.png
--- a/assets/Bundles/MainGame/png/球/4.png.meta
+++ b/assets/Bundles/MainGame/png/球/4.png.meta
@@ -46,10 +46,10 @@
        "offsetY": 0,
        "trimX": 1,
        "trimY": 1,
-        "width": 268,
+        "width": 403,
-        "height": 268,
+        "height": 403,
-        "rawWidth": 270,
+        "rawWidth": 405,
-        "rawHeight": 270,
+        "rawHeight": 405,
        "borderTop": 0,
        "borderBottom": 0,
        "borderLeft": 0,
@@ -61,17 +61,17 @@
        "meshType": 0,
        "vertices": {
          "rawPosition": [
-            -134,
+            -201.5,
-            -134,
+            -201.5,
            0,
-            134,
+            201.5,
-            -134,
+            -201.5,
            0,
-            -134,
+            -201.5,
-            134,
+            201.5,
            0,
-            134,
+            201.5,
-            134,
+            201.5,
            0
          ],
          "indexes": [
@@ -84,32 +84,32 @@
          ],
          "uv": [
            1,
-            269,
+            404,
-            269,
+            404,
-            269,
+            404,
            1,
            1,
-            269,
+            404,
            1
          ],
          "nuv": [
-            0.003703703703703704,
+            0.0024691358024691358,
-            0.003703703703703704,
+            0.0024691358024691358,
-            0.9962962962962963,
+            0.9975308641975309,
-            0.003703703703703704,
+            0.0024691358024691358,
-            0.003703703703703704,
+            0.0024691358024691358,
-            0.9962962962962963,
+            0.9975308641975309,
-            0.9962962962962963,
+            0.9975308641975309,
-            0.9962962962962963
+            0.9975308641975309
          ],
          "minPos": [
-            -134,
+            -201.5,
-            -134,
+            -201.5,
            0
          ],
          "maxPos": [
-            134,
+            201.5,
-            134,
+            201.5,
            0
          ]
        },

--- a/assets/Bundles/MainGame/png/球/5.png
+++ b/assets/Bundles/MainGame/png/球/5.png
--- a/assets/Bundles/MainGame/png/球/5.png.meta
+++ b/assets/Bundles/MainGame/png/球/5.png.meta
@@ -46,10 +46,10 @@
        "offsetY": 0,
        "trimX": 0,
        "trimY": 0,
-        "width": 267,
+        "width": 401,
-        "height": 268,
+        "height": 401,
-        "rawWidth": 267,
+        "rawWidth": 401,
-        "rawHeight": 268,
+        "rawHeight": 401,
        "borderTop": 0,
        "borderBottom": 0,
        "borderLeft": 0,
@@ -61,17 +61,17 @@
        "meshType": 0,
        "vertices": {
          "rawPosition": [
-            -133.5,
+            -200.5,
-            -134,
+            -200.5,
            0,
-            133.5,
+            200.5,
-            -134,
+            -200.5,
            0,
-            -133.5,
+            -200.5,
-            134,
+            200.5,
            0,
-            133.5,
+            200.5,
-            134,
+            200.5,
            0
          ],
          "indexes": [
@@ -84,12 +84,12 @@
          ],
          "uv": [
            0,
-            268,
+            401,
-            267,
+            401,
-            268,
+            401,
            0,
            0,
-            267,
+            401,
            0
          ],
          "nuv": [
@@ -103,13 +103,13 @@
            1
          ],
          "minPos": [
-            -133.5,
+            -200.5,
-            -134,
+            -200.5,
            0
          ],
          "maxPos": [
-            133.5,
+            200.5,
-            134,
+            200.5,
            0
          ]
        },

--- a/assets/Bundles/MainGame/png/球/6.png
+++ b/assets/Bundles/MainGame/png/球/6.png
--- a/assets/Bundles/MainGame/png/球/6.png.meta
+++ b/assets/Bundles/MainGame/png/球/6.png.meta
@@ -44,12 +44,12 @@
        "rotated": false,
        "offsetX": 0,
        "offsetY": 0,
-        "trimX": 1,
+        "trimX": 2,
-        "trimY": 1,
+        "trimY": 2,
-        "width": 312,
+        "width": 467,
-        "height": 312,
+        "height": 467,
-        "rawWidth": 314,
+        "rawWidth": 471,
-        "rawHeight": 314,
+        "rawHeight": 471,
        "borderTop": 0,
        "borderBottom": 0,
        "borderLeft": 0,
@@ -61,17 +61,17 @@
        "meshType": 0,
        "vertices": {
          "rawPosition": [
-            -156,
+            -233.5,
-            -156,
+            -233.5,
            0,
-            156,
+            233.5,
-            -156,
+            -233.5,
            0,
-            -156,
+            -233.5,
-            156,
+            233.5,
            0,
-            156,
+            233.5,
-            156,
+            233.5,
            0
          ],
          "indexes": [
@@ -83,33 +83,33 @@
            3
          ],
          "uv": [
-            1,
+            2,
-            313,
+            469,
-            313,
+            469,
-            313,
+            469,
-            1,
+            2,
-            1,
+            2,
-            313,
+            469,
-            1
+            2
          ],
          "nuv": [
-            0.0031847133757961785,
+            0.004246284501061571,
-            0.0031847133757961785,
+            0.004246284501061571,
-            0.9968152866242038,
+            0.9957537154989384,
-            0.0031847133757961785,
+            0.004246284501061571,
-            0.0031847133757961785,
+            0.004246284501061571,
-            0.9968152866242038,
+            0.9957537154989384,
-            0.9968152866242038,
+            0.9957537154989384,
-            0.9968152866242038
+            0.9957537154989384
          ],
          "minPos": [
-            -156,
+            -233.5,
-            -156,
+            -233.5,
            0
          ],
          "maxPos": [
-            156,
+            233.5,
-            156,
+            233.5,
            0
          ]
        },

--- a/assets/Bundles/MainGame/png/球/7.png
+++ b/assets/Bundles/MainGame/png/球/7.png
--- a/assets/Bundles/MainGame/png/球/7.png.meta
+++ b/assets/Bundles/MainGame/png/球/7.png.meta
@@ -44,12 +44,12 @@
        "rotated": false,
        "offsetX": 0,
        "offsetY": 0,
-        "trimX": 2,
+        "trimX": 1,
-        "trimY": 2,
+        "trimY": 1,
-        "width": 312,
+        "width": 472,
-        "height": 312,
+        "height": 472,
-        "rawWidth": 316,
+        "rawWidth": 474,
-        "rawHeight": 316,
+        "rawHeight": 474,
        "borderTop": 0,
        "borderBottom": 0,
        "borderLeft": 0,
@@ -61,17 +61,17 @@
        "meshType": 0,
        "vertices": {
          "rawPosition": [
-            -156,
+            -236,
-            -156,
+            -236,
            0,
-            156,
+            236,
-            -156,
+            -236,
            0,
-            -156,
+            -236,
-            156,
+            236,
            0,
-            156,
+            236,
-            156,
+            236,
            0
          ],
          "indexes": [
@@ -83,33 +83,33 @@
            3
          ],
          "uv": [
-            2,
+            1,
-            314,
+            473,
-            314,
+            473,
-            314,
+            473,
-            2,
+            1,
-            2,
+            1,
-            314,
+            473,
-            2
+            1
          ],
          "nuv": [
-            0.006329113924050633,
+            0.002109704641350211,
-            0.006329113924050633,
+            0.002109704641350211,
-            0.9936708860759493,
+            0.9978902953586498,
-            0.006329113924050633,
+            0.002109704641350211,
-            0.006329113924050633,
+            0.002109704641350211,
-            0.9936708860759493,
+            0.9978902953586498,
-            0.9936708860759493,
+            0.9978902953586498,
-            0.9936708860759493
+            0.9978902953586498
          ],
          "minPos": [
-            -156,
+            -236,
-            -156,
+            -236,
            0
          ],
          "maxPos": [
-            156,
+            236,
-            156,
+            236,
            0
          ]
        },

--- a/assets/Bundles/MainGame/png/球/8.png
+++ b/assets/Bundles/MainGame/png/球/8.png
--- a/assets/Bundles/MainGame/png/球/8.png.meta
+++ b/assets/Bundles/MainGame/png/球/8.png.meta
@@ -46,10 +46,10 @@
        "offsetY": -0.5,
        "trimX": 1,
        "trimY": 1,
-        "width": 347,
+        "width": 522,
-        "height": 348,
+        "height": 523,
-        "rawWidth": 349,
+        "rawWidth": 524,
-        "rawHeight": 349,
+        "rawHeight": 524,
        "borderTop": 0,
        "borderBottom": 0,
        "borderLeft": 0,
@@ -61,17 +61,17 @@
        "meshType": 0,
        "vertices": {
          "rawPosition": [
-            -173.5,
+            -261,
-            -174,
+            -261.5,
            0,
-            173.5,
+            261,
-            -174,
+            -261.5,
            0,
-            -173.5,
+            -261,
-            174,
+            261.5,
            0,
-            173.5,
+            261,
-            174,
+            261.5,
            0
          ],
          "indexes": [
@@ -84,32 +84,32 @@
          ],
          "uv": [
            1,
-            348,
+            523,
-            348,
+            523,
-            348,
+            523,
            1,
            0,
-            348,
+            523,
            0
          ],
          "nuv": [
-            0.0028653295128939827,
+            0.0019083969465648854,
            0,
-            0.997134670487106,
+            0.9980916030534351,
            0,
-            0.0028653295128939827,
+            0.0019083969465648854,
-            0.997134670487106,
+            0.9980916030534351,
-            0.997134670487106,
+            0.9980916030534351,
-            0.997134670487106
+            0.9980916030534351
          ],
          "minPos": [
-            -173.5,
+            -261,
-            -174,
+            -261.5,
            0
          ],
          "maxPos": [
-            173.5,
+            261,
-            174,
+            261.5,
            0
          ]
        },

--- a/assets/Bundles/MainGame/png/球/9.png
+++ b/assets/Bundles/MainGame/png/球/9.png
--- a/assets/Bundles/MainGame/png/球/9.png.meta
+++ b/assets/Bundles/MainGame/png/球/9.png.meta
@@ -46,10 +46,10 @@
        "offsetY": 0,
        "trimX": 0,
        "trimY": 0,
-        "width": 347,
+        "width": 520,
-        "height": 347,
+        "height": 520,
-        "rawWidth": 347,
+        "rawWidth": 520,
-        "rawHeight": 347,
+        "rawHeight": 520,
        "borderTop": 0,
        "borderBottom": 0,
        "borderLeft": 0,
@@ -61,17 +61,17 @@
        "meshType": 0,
        "vertices": {
          "rawPosition": [
-            -173.5,
+            -260,
-            -173.5,
+            -260,
            0,
-            173.5,
+            260,
-            -173.5,
+            -260,
            0,
-            -173.5,
+            -260,
-            173.5,
+            260,
            0,
-            173.5,
+            260,
-            173.5,
+            260,
            0
          ],
          "indexes": [
@@ -84,12 +84,12 @@
          ],
          "uv": [
            0,
-            347,
+            520,
-            347,
+            520,
-            347,
+            520,
            0,
            0,
-            347,
+            520,
            0
          ],
          "nuv": [
@@ -103,13 +103,13 @@
            1
          ],
          "minPos": [
-            -173.5,
+            -260,
-            -173.5,
+            -260,
            0
          ],
          "maxPos": [
-            173.5,
+            260,
-            173.5,
+            260,
            0
          ]
        },

--- a/assets/Bundles/MainGame/png/球/万能.png
+++ b/assets/Bundles/MainGame/png/球/万能.png
--- a/assets/Bundles/MainGame/png/球/万能.png.meta
+++ b/assets/Bundles/MainGame/png/球/万能.png.meta
@@ -46,10 +46,10 @@
        "offsetY": 0,
        "trimX": 0,
        "trimY": 0,
-        "width": 67,
+        "width": 100,
-        "height": 67,
+        "height": 100,
-        "rawWidth": 67,
+        "rawWidth": 100,
-        "rawHeight": 67,
+        "rawHeight": 100,
        "borderTop": 0,
        "borderBottom": 0,
        "borderLeft": 0,
@@ -61,17 +61,17 @@
        "meshType": 0,
        "vertices": {
          "rawPosition": [
-            -33.5,
+            -50,
-            -33.5,
+            -50,
            0,
-            33.5,
+            50,
-            -33.5,
+            -50,
            0,
-            -33.5,
+            -50,
-            33.5,
+            50,
            0,
-            33.5,
+            50,
-            33.5,
+            50,
            0
          ],
          "indexes": [
@@ -84,12 +84,12 @@
          ],
          "uv": [
            0,
-            67,
+            100,
-            67,
+            100,
-            67,
+            100,
            0,
            0,
-            67,
+            100,
            0
          ],
          "nuv": [
@@ -103,13 +103,13 @@
            1
          ],
          "minPos": [
-            -33.5,
+            -50,
-            -33.5,
+            -50,
            0
          ],
          "maxPos": [
-            33.5,
+            50,
-            33.5,
+            50,
            0
          ]
        },

--- a/assets/Bundles/MainGame/prefab/7.prefab
+++ b/assets/Bundles/MainGame/prefab/7.prefab
@@ -82,8 +82,8 @@
    },
    "_contentSize": {
      "__type__": "cc.Size",
-      "width": 312,
+      "width": 306.36,
-      "height": 312
+      "height": 306.36
    },
    "_anchorPoint": {
      "__type__": "cc.Vec2",
@@ -124,7 +124,7 @@
    },
    "_type": 0,
    "_fillType": 0,
-    "_sizeMode": 1,
+    "_sizeMode": 0,
    "_fillCenter": {
      "__type__": "cc.Vec2",
      "x": 0,
@@ -198,7 +198,7 @@
      "x": 0,
      "y": 0
    },
-    "_radius": 156,
+    "_radius": 149,
    "_id": ""
  },
  {

--- a/assets/Bundles/MainGame/prefab/万能.prefab
+++ b/assets/Bundles/MainGame/prefab/万能.prefab
@@ -82,8 +82,8 @@
    },
    "_contentSize": {
      "__type__": "cc.Size",
-      "width": 67,
+      "width": 66.6,
-      "height": 67
+      "height": 66.6
    },
    "_anchorPoint": {
      "__type__": "cc.Vec2",
@@ -124,7 +124,7 @@
    },
    "_type": 0,
    "_fillType": 0,
-    "_sizeMode": 1,
+    "_sizeMode": 0,
    "_fillCenter": {
      "__type__": "cc.Vec2",
      "x": 0,

--- a/assets/Bundles/MainGame/prefab/消失.prefab
+++ b/assets/Bundles/MainGame/prefab/消失.prefab
@@ -173,6 +173,7 @@
      "__id__": 0
    },
    "fileId": "0cv3ICSuNPRqN7X8+trHyg",
+    "instance": null,
    "targetOverrides": null
  }
 ]
\ No newline at end of file
--- a/assets/resources/MergeMaxPanel/MergeMaxPanel.prefab
+++ b/assets/resources/MergeMaxPanel/MergeMaxPanel.prefab
--- a/assets/resources/PrizeScene/jpg/bg.jpg
+++ b/assets/resources/PrizeScene/jpg/bg.jpg
--- a/assets/resources/PrizeScene/jpg/bg.jpg.meta
+++ b/assets/resources/PrizeScene/jpg/bg.jpg.meta
--- a/build/web-mobile/index.html
+++ b/build/web-mobile/index.html
@@ -54,7 +54,7 @@
    <script src="//yun.duiba.com.cn/polaris/SVGA.Lite.v2.1.1.d3a67cbc13c591c53c6f87ab34c57ce387010374.js" crossorigin="anonymous"></script>
    <script src="//yun.duiba.com.cn/aurora/assets/2403d1edf2acd15b179306b6ddaa5f0967d78a8f.js"></script>
-    <link rel="stylesheet" type="text/css" href="//yun.duiba.com.cn/db_games/ccc_game/template3d/1723602803212/style.css"/>
+    <link rel="stylesheet" type="text/css" href="//yun.duiba.com.cn/db_games/ccc_game/template3d/1723604099901/style.css"/>
    <style>
        .sui-captcha {
@@ -114,16 +114,16 @@
 </script>
 <!-- Polyfills bundle. -->
-<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1723602803212/src/polyfills.bundle.js" charset="utf-8"></script>
+<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1723604099901/src/polyfills.bundle.js" charset="utf-8"></script>
 <!-- SystemJS support. -->
-<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1723602803212/src/system.bundle.js" charset="utf-8"></script>
+<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1723604099901/src/system.bundle.js" charset="utf-8"></script>
 <!-- Import map -->
-<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1723602803212/src/import-map.json" type="systemjs-importmap" charset="utf-8"></script>
+<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1723604099901/src/import-map.json" type="systemjs-importmap" charset="utf-8"></script>
 <script>
-  System.import('//yun.duiba.com.cn/db_games/ccc_game/template3d/1723602803212/index.js').catch(function (err) {
+  System.import('//yun.duiba.com.cn/db_games/ccc_game/template3d/1723604099901/index.js').catch(function (err) {
    console.error(err);
  })
 </script>

--- a/settings/v2/packages/engine.json
+++ b/settings/v2/packages/engine.json
@@ -140,7 +140,7 @@
      "gfx-webgl2",
      "intersection-2d",
      "marionette",
-      "physics-2d-box2d",
+      "physics-2d-box2d-wasm",
      "procedural-animation",
      "profiler",
      "skeletal-animation",
@@ -151,5 +151,9 @@
      "value": true,
      "version": ""
    }
+  },
+  "macroConfig": {
+    "BATCHER2D_MEM_INCREMENT": 1440,
+    "ENABLE_WEBGL_ANTIALIAS": false
  }
 }