问好图片修改

assets/Cup/3color/Black/Black01.png.meta

@@ -42,14 +42,14 @@
         "trimType": "auto",
         "trimThreshold": 1,
         "rotated": false,
-        "offsetX": 0.5,
-        "offsetY": 41,
-        "trimX": 6,
-        "trimY": 28,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
         "width": 96,
-        "height": 81,
-        "rawWidth": 107,
-        "rawHeight": 219,
+        "height": 80,
+        "rawWidth": 96,
+        "rawHeight": 80,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -62,16 +62,16 @@
         "vertices": {
           "rawPosition": [
             -48,
-            -40.5,
+            -40,
             0,
             48,
-            -40.5,
+            -40,
             0,
             -48,
-            40.5,
+            40,
             0,
             48,
-            40.5,
+            40,
             0
           ],
           "indexes": [
@@ -83,33 +83,33 @@
             3
           ],
           "uv": [
-            6,
-            191,
-            102,
-            191,
-            6,
-            110,
-            102,
-            110
+            0,
+            80,
+            96,
+            80,
+            0,
+            0,
+            96,
+            0
           ],
           "nuv": [
-            0.056074766355140186,
-            0.502283105022831,
-            0.9532710280373832,
-            0.502283105022831,
-            0.056074766355140186,
-            0.8721461187214612,
-            0.9532710280373832,
-            0.8721461187214612
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
           ],
           "minPos": [
             -48,
-            -40.5,
+            -40,
             0
           ],
           "maxPos": [
             48,
-            40.5,
+            40,
             0
           ]
         },

assets/Cup/3color/Black/Black02.png.meta

@@ -42,14 +42,14 @@
         "trimType": "auto",
         "trimThreshold": 1,
         "rotated": false,
-        "offsetX": 1.5,
-        "offsetY": -9.5,
-        "trimX": 7,
-        "trimY": 89,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
         "width": 96,
         "height": 60,
-        "rawWidth": 107,
-        "rawHeight": 219,
+        "rawWidth": 96,
+        "rawHeight": 60,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -83,24 +83,24 @@
             3
           ],
           "uv": [
-            7,
-            130,
-            103,
-            130,
-            7,
-            70,
-            103,
-            70
+            0,
+            60,
+            96,
+            60,
+            0,
+            0,
+            96,
+            0
           ],
           "nuv": [
-            0.06542056074766354,
-            0.319634703196347,
-            0.9626168224299065,
-            0.319634703196347,
-            0.06542056074766354,
-            0.593607305936073,
-            0.9626168224299065,
-            0.593607305936073
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
           ],
           "minPos": [
             -48,

assets/Cup/3color/Black/Black03.png.meta

@@ -42,14 +42,14 @@
         "trimType": "auto",
         "trimThreshold": 1,
         "rotated": false,
-        "offsetX": 2,
-        "offsetY": -49.5,
-        "trimX": 14,
-        "trimY": 132,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
         "width": 83,
         "height": 54,
-        "rawWidth": 107,
-        "rawHeight": 219,
+        "rawWidth": 83,
+        "rawHeight": 54,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -83,24 +83,24 @@
             3
           ],
           "uv": [
-            14,
-            87,
-            97,
-            87,
-            14,
-            33,
-            97,
-            33
+            0,
+            54,
+            83,
+            54,
+            0,
+            0,
+            83,
+            0
           ],
           "nuv": [
-            0.1308411214953271,
-            0.1506849315068493,
-            0.9065420560747663,
-            0.1506849315068493,
-            0.1308411214953271,
-            0.3972602739726027,
-            0.9065420560747663,
-            0.3972602739726027
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
           ],
           "minPos": [
             -41.5,

assets/Cup/4color/black/black01.png.meta

@@ -43,13 +43,13 @@
         "trimThreshold": 1,
         "rotated": false,
         "offsetX": 0,
-        "offsetY": 61,
-        "trimX": 5,
-        "trimY": 25,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
         "width": 97,
         "height": 82,
-        "rawWidth": 107,
-        "rawHeight": 254,
+        "rawWidth": 97,
+        "rawHeight": 82,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -83,24 +83,24 @@
             3
           ],
           "uv": [
-            5,
-            229,
-            102,
-            229,
-            5,
-            147,
-            102,
-            147
+            0,
+            82,
+            97,
+            82,
+            0,
+            0,
+            97,
+            0
           ],
           "nuv": [
-            0.04672897196261682,
-            0.5787401574803149,
-            0.9532710280373832,
-            0.5787401574803149,
-            0.04672897196261682,
-            0.9015748031496063,
-            0.9532710280373832,
-            0.9015748031496063
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
           ],
           "minPos": [
             -48.5,

assets/Cup/4color/black/black02.png.meta

@@ -43,13 +43,13 @@
         "trimThreshold": 1,
         "rotated": false,
         "offsetX": 0,
-        "offsetY": 8,
-        "trimX": 6,
-        "trimY": 90,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
         "width": 95,
         "height": 58,
-        "rawWidth": 107,
-        "rawHeight": 254,
+        "rawWidth": 95,
+        "rawHeight": 58,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -83,24 +83,24 @@
             3
           ],
           "uv": [
-            6,
-            164,
-            101,
-            164,
-            6,
-            106,
-            101,
-            106
+            0,
+            58,
+            95,
+            58,
+            0,
+            0,
+            95,
+            0
           ],
           "nuv": [
-            0.056074766355140186,
-            0.41732283464566927,
-            0.9439252336448598,
-            0.41732283464566927,
-            0.056074766355140186,
-            0.6456692913385826,
-            0.9439252336448598,
-            0.6456692913385826
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
           ],
           "minPos": [
             -47.5,

assets/Cup/4color/black/black03.png.meta

@@ -43,13 +43,13 @@
         "trimThreshold": 1,
         "rotated": false,
         "offsetX": 0,
-        "offsetY": -29.5,
-        "trimX": 6,
-        "trimY": 129,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
         "width": 95,
         "height": 55,
-        "rawWidth": 107,
-        "rawHeight": 254,
+        "rawWidth": 95,
+        "rawHeight": 55,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -83,24 +83,24 @@
             3
           ],
           "uv": [
-            6,
-            125,
-            101,
-            125,
-            6,
-            70,
-            101,
-            70
+            0,
+            55,
+            95,
+            55,
+            0,
+            0,
+            95,
+            0
           ],
           "nuv": [
-            0.056074766355140186,
-            0.2755905511811024,
-            0.9439252336448598,
-            0.2755905511811024,
-            0.056074766355140186,
-            0.4921259842519685,
-            0.9439252336448598,
-            0.4921259842519685
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
           ],
           "minPos": [
             -47.5,

assets/Cup/4color/black/black04.png.meta

@@ -42,14 +42,14 @@
         "trimType": "auto",
         "trimThreshold": 1,
         "rotated": false,
-        "offsetX": 0.5,
-        "offsetY": -68,
-        "trimX": 13,
-        "trimY": 169,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
         "width": 82,
         "height": 52,
-        "rawWidth": 107,
-        "rawHeight": 254,
+        "rawWidth": 82,
+        "rawHeight": 52,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -83,24 +83,24 @@
             3
           ],
           "uv": [
-            13,
-            85,
-            95,
-            85,
-            13,
-            33,
-            95,
-            33
+            0,
+            52,
+            82,
+            52,
+            0,
+            0,
+            82,
+            0
           ],
           "nuv": [
-            0.12149532710280374,
-            0.12992125984251968,
-            0.8878504672897196,
-            0.12992125984251968,
-            0.12149532710280374,
-            0.3346456692913386,
-            0.8878504672897196,
-            0.3346456692913386
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
           ],
           "minPos": [
             -41,

assets/Cup/test.scene

@@ -925,7 +925,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 0,
+      "y": 61.581,
       "z": 0
     },
     "_lrot": {
@@ -963,8 +963,8 @@
     "__prefab": null,
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 107,
-      "height": 254
+      "width": 97,
+      "height": 82
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -999,7 +999,7 @@
     },
     "_type": 0,
     "_fillType": 0,
-    "_sizeMode": 2,
+    "_sizeMode": 1,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,
@@ -1034,7 +1034,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 0,
+      "y": 8.383,
       "z": 0
     },
     "_lrot": {
@@ -1047,7 +1047,7 @@
     "_lscale": {
       "__type__": "cc.Vec3",
       "x": 1,
-      "y": 1,
+      "y": 1.036,
       "z": 1
     },
     "_mobility": 0,
@@ -1072,8 +1072,8 @@
     "__prefab": null,
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 107,
-      "height": 254
+      "width": 95,
+      "height": 58
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1108,7 +1108,7 @@
     },
     "_type": 0,
     "_fillType": 0,
-    "_sizeMode": 2,
+    "_sizeMode": 1,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,
@@ -1143,7 +1143,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 0,
+      "y": -28.064,
       "z": 0
     },
     "_lrot": {
@@ -1181,8 +1181,8 @@
     "__prefab": null,
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 107,
-      "height": 254
+      "width": 95,
+      "height": 55
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1217,7 +1217,7 @@
     },
     "_type": 0,
     "_fillType": 0,
-    "_sizeMode": 2,
+    "_sizeMode": 1,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,
@@ -1251,8 +1251,8 @@
     "_prefab": null,
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
+      "x": 0.532,
+      "y": -66.193,
       "z": 0
     },
     "_lrot": {
@@ -1290,8 +1290,8 @@
     "__prefab": null,
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 107,
-      "height": 254
+      "width": 82,
+      "height": 52
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1326,7 +1326,7 @@
     },
     "_type": 0,
     "_fillType": 0,
-    "_sizeMode": 2,
+    "_sizeMode": 1,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,
@@ -2065,8 +2065,8 @@
     "_prefab": null,
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 20.185,
+      "x": 0.803,
+      "y": 61.404,
       "z": 0
     },
     "_lrot": {
@@ -2104,8 +2104,8 @@
     "__prefab": null,
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 107,
-      "height": 219
+      "width": 96,
+      "height": 80
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -2140,7 +2140,7 @@
     },
     "_type": 0,
     "_fillType": 0,
-    "_sizeMode": 2,
+    "_sizeMode": 1,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,
@@ -2174,8 +2174,8 @@
     "_prefab": null,
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 18.488,
+      "x": 0.803,
+      "y": 9.981,
       "z": 0
     },
     "_lrot": {
@@ -2187,7 +2187,7 @@
     },
     "_lscale": {
       "__type__": "cc.Vec3",
-      "x": 1,
+      "x": 1.048,
       "y": 1,
       "z": 1
     },
@@ -2213,8 +2213,8 @@
     "__prefab": null,
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 107,
-      "height": 219
+      "width": 96,
+      "height": 60
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -2249,7 +2249,7 @@
     },
     "_type": 0,
     "_fillType": 0,
-    "_sizeMode": 2,
+    "_sizeMode": 1,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,
@@ -2283,8 +2283,8 @@
     "_prefab": null,
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 20.525,
+      "x": 0.991,
+      "y": -30.487,
       "z": 0
     },
     "_lrot": {
@@ -2322,8 +2322,8 @@
     "__prefab": null,
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 107,
-      "height": 219
+      "width": 83,
+      "height": 54
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -2358,7 +2358,7 @@
     },
     "_type": 0,
     "_fillType": 0,
-    "_sizeMode": 2,
+    "_sizeMode": 1,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,