Merge branch 'master' of http://192.168.5.71:3333/WOSO_H5_01Team/_TakeGoblet

assets/Cup/2goblet.meta

@@ -2,7 +2,7 @@
   "ver": "1.2.0",
   "importer": "directory",
   "imported": true,
-  "uuid": "64aab392-a202-4f23-9ff8-3e1dacc4e8c8",
+  "uuid": "6fb601e8-f909-4fd3-9b8c-86c100826fdf",
   "files": [],
   "subMetas": {},
   "userData": {}

assets/Cup/2goblet/skeleton.atlas

@@ -1,90 +1,90 @@
 
 skeleton.png
-size: 189,899
+size: 1110,149
 format: RGBA8888
 filter: Linear,Linear
 repeat: none
 2goblet
-  rotate: false
-  xy: 2, 313
-  size: 136, 275
-  orig: 136, 275
+  rotate: true
+  xy: 311, 11
+  size: 136, 208
+  orig: 136, 217
   offset: 0, 0
   index: -1
 XiGuan
-  rotate: false
-  xy: 2, 590
+  rotate: true
+  xy: 2, 2
   size: 145, 307
   orig: 145, 307
   offset: 0, 0
   index: -1
 ZhuangShi1
   rotate: false
-  xy: 2, 2
+  xy: 1013, 52
   size: 95, 95
   orig: 95, 95
   offset: 0, 0
   index: -1
 ZhuangShi3
   rotate: true
-  xy: 99, 9
+  xy: 844, 61
   size: 49, 66
   orig: 49, 66
   offset: 0, 0
   index: -1
 botton
   rotate: true
-  xy: 132, 60
+  xy: 945, 4
   size: 106, 55
   orig: 106, 56
   offset: 0, 1
   index: -1
 fallwater
-  rotate: false
-  xy: 149, 621
+  rotate: true
+  xy: 735, 112
   size: 35, 276
   orig: 35, 276
   offset: 0, 0
   index: -1
 lower
-  rotate: true
-  xy: 140, 380
+  rotate: false
+  xy: 840, 9
   size: 103, 41
   orig: 103, 41
   offset: 0, 0
   index: -1
 middle
-  rotate: true
-  xy: 140, 485
+  rotate: false
+  xy: 735, 3
   size: 103, 47
   orig: 103, 47
   offset: 0, 0
   index: -1
 spray_B
-  rotate: false
-  xy: 2, 99
+  rotate: true
+  xy: 521, 19
   size: 128, 110
   orig: 140, 124
   offset: 12, 14
   index: -1
 spray_f
-  rotate: false
-  xy: 2, 211
+  rotate: true
+  xy: 633, 13
   size: 134, 100
   orig: 140, 124
   offset: 0, 0
   index: -1
 top
-  rotate: true
-  xy: 140, 275
+  rotate: false
+  xy: 1002, 9
   size: 103, 41
   orig: 103, 41
   offset: 0, 0
   index: -1
 up
-  rotate: true
-  xy: 138, 168
-  size: 105, 49
-  orig: 105, 49
+  rotate: false
+  xy: 735, 60
+  size: 107, 50
+  orig: 107, 50
   offset: 0, 0
   index: -1

assets/Cup/2goblet/skeleton.atlas.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.1",
   "importer": "*",
   "imported": true,
-  "uuid": "e310715b-0c84-4cfc-a187-6daf6a0fe546",
+  "uuid": "ebc8c9d3-b75b-4f0e-bb88-0d783c2d4620",
   "files": [
     ".atlas",
     ".json"

assets/Cup/2goblet/skeleton.json.meta

@@ -2,7 +2,7 @@
   "ver": "1.2.6",
   "importer": "spine-data",
   "imported": true,
-  "uuid": "92ba5eaf-ee18-45d4-b600-6716ea009b7d",
+  "uuid": "22e77e7c-66b6-416b-a472-4e3726f68e41",
   "files": [
     ".json"
   ],

assets/Cup/2goblet/skeleton.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.26",
   "importer": "image",
   "imported": true,
-  "uuid": "b91a046d-8003-4610-8419-9da304635df6",
+  "uuid": "70401912-065c-4a99-b6c2-42a61d13f1d9",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "b91a046d-8003-4610-8419-9da304635df6@6c48a",
+      "uuid": "70401912-065c-4a99-b6c2-42a61d13f1d9@6c48a",
       "displayName": "skeleton",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "b91a046d-8003-4610-8419-9da304635df6",
+        "imageUuidOrDatabaseUri": "70401912-065c-4a99-b6c2-42a61d13f1d9",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "b91a046d-8003-4610-8419-9da304635df6@f9941",
+      "uuid": "70401912-065c-4a99-b6c2-42a61d13f1d9@f9941",
       "displayName": "skeleton",
       "id": "f9941",
       "name": "spriteFrame",
@@ -43,13 +43,13 @@
         "trimThreshold": 1,
         "rotated": false,
         "offsetX": 0,
-        "offsetY": 0,
+        "offsetY": -0.5,
         "trimX": 2,
-        "trimY": 2,
-        "width": 185,
-        "height": 895,
-        "rawWidth": 189,
-        "rawHeight": 899,
+        "trimY": 3,
+        "width": 1106,
+        "height": 144,
+        "rawWidth": 1110,
+        "rawHeight": 149,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -92.5,
-            -447.5,
+            -553,
+            -72,
             0,
-            92.5,
-            -447.5,
+            553,
+            -72,
             0,
-            -92.5,
-            447.5,
+            -553,
+            72,
             0,
-            92.5,
-            447.5,
+            553,
+            72,
             0
           ],
           "indexes": [
@@ -84,37 +84,37 @@
           ],
           "uv": [
             2,
-            897,
-            187,
-            897,
+            146,
+            1108,
+            146,
             2,
             2,
-            187,
+            1108,
             2
           ],
           "nuv": [
-            0.010582010582010581,
-            0.002224694104560623,
-            0.9894179894179894,
-            0.002224694104560623,
-            0.010582010582010581,
-            0.9977753058954394,
-            0.9894179894179894,
-            0.9977753058954394
+            0.0018018018018018018,
+            0.013422818791946308,
+            0.9981981981981982,
+            0.013422818791946308,
+            0.0018018018018018018,
+            0.9798657718120806,
+            0.9981981981981982,
+            0.9798657718120806
           ],
           "minPos": [
-            -92.5,
-            -447.5,
+            -553,
+            -72,
             0
           ],
           "maxPos": [
-            92.5,
-            447.5,
+            553,
+            72,
             0
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "b91a046d-8003-4610-8419-9da304635df6@6c48a",
+        "imageUuidOrDatabaseUri": "70401912-065c-4a99-b6c2-42a61d13f1d9@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "b91a046d-8003-4610-8419-9da304635df6@f9941"
+    "redirect": "70401912-065c-4a99-b6c2-42a61d13f1d9@f9941"
   }
 }

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

@@ -11,7 +11,7 @@
     "6c48a": {
       "importer": "texture",
       "uuid": "5e9470d5-7d78-4f18-afcf-02fd58142b6f@6c48a",
-      "displayName": "Black01",
+      "displayName": "black01",
       "id": "6c48a",
       "name": "texture",
       "userData": {
@@ -35,7 +35,7 @@
     "f9941": {
       "importer": "sprite-frame",
       "uuid": "5e9470d5-7d78-4f18-afcf-02fd58142b6f@f9941",
-      "displayName": "Black01",
+      "displayName": "black01",
       "id": "f9941",
       "name": "spriteFrame",
       "userData": {

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

@@ -11,7 +11,7 @@
     "6c48a": {
       "importer": "texture",
       "uuid": "fc3422c3-4bbc-4687-9e39-16d19f6cde5f@6c48a",
-      "displayName": "Black02",
+      "displayName": "black02",
       "id": "6c48a",
       "name": "texture",
       "userData": {
@@ -35,7 +35,7 @@
     "f9941": {
       "importer": "sprite-frame",
       "uuid": "fc3422c3-4bbc-4687-9e39-16d19f6cde5f@f9941",
-      "displayName": "Black02",
+      "displayName": "black02",
       "id": "f9941",
       "name": "spriteFrame",
       "userData": {

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

@@ -11,7 +11,7 @@
     "6c48a": {
       "importer": "texture",
       "uuid": "4fe8a5d1-95c1-4dba-b16a-4582782c2908@6c48a",
-      "displayName": "Black03",
+      "displayName": "black03",
       "id": "6c48a",
       "name": "texture",
       "userData": {
@@ -35,7 +35,7 @@
     "f9941": {
       "importer": "sprite-frame",
       "uuid": "4fe8a5d1-95c1-4dba-b16a-4582782c2908@f9941",
-      "displayName": "Black03",
+      "displayName": "black03",
       "id": "f9941",
       "name": "spriteFrame",
       "userData": {

assets/Cup/3goblet.meta

@@ -2,7 +2,7 @@
   "ver": "1.2.0",
   "importer": "directory",
   "imported": true,
-  "uuid": "f32824d8-7e03-45af-accf-665d27c12a54",
+  "uuid": "5a0ac207-026d-44fc-b51d-efd84557ac95",
   "files": [],
   "subMetas": {},
   "userData": {}

assets/Cup/3goblet/skeleton.atlas

@@ -1,90 +1,90 @@
 
 skeleton.png
-size: 189,899
+size: 1130,149
 format: RGBA8888
 filter: Linear,Linear
 repeat: none
 3goblet
-  rotate: false
-  xy: 2, 313
-  size: 136, 275
-  orig: 136, 275
+  rotate: true
+  xy: 311, 11
+  size: 136, 228
+  orig: 136, 246
   offset: 0, 0
   index: -1
 XiGuan
-  rotate: false
-  xy: 2, 590
+  rotate: true
+  xy: 2, 2
   size: 145, 307
   orig: 145, 307
   offset: 0, 0
   index: -1
 ZhuangShi1
   rotate: false
-  xy: 2, 2
+  xy: 1033, 52
   size: 95, 95
   orig: 95, 95
   offset: 0, 0
   index: -1
 ZhuangShi3
   rotate: true
-  xy: 99, 9
+  xy: 864, 61
   size: 49, 66
   orig: 49, 66
   offset: 0, 0
   index: -1
 botton
   rotate: true
-  xy: 132, 60
+  xy: 965, 4
   size: 106, 55
   orig: 106, 56
   offset: 0, 1
   index: -1
 fallwater
-  rotate: false
-  xy: 149, 621
+  rotate: true
+  xy: 755, 112
   size: 35, 276
   orig: 35, 276
   offset: 0, 0
   index: -1
 lower
-  rotate: true
-  xy: 140, 380
+  rotate: false
+  xy: 860, 9
   size: 103, 41
   orig: 103, 41
   offset: 0, 0
   index: -1
 middle
-  rotate: true
-  xy: 140, 485
+  rotate: false
+  xy: 755, 3
   size: 103, 47
   orig: 103, 47
   offset: 0, 0
   index: -1
 spray_B
-  rotate: false
-  xy: 2, 99
+  rotate: true
+  xy: 541, 19
   size: 128, 110
   orig: 140, 124
   offset: 12, 14
   index: -1
 spray_f
-  rotate: false
-  xy: 2, 211
+  rotate: true
+  xy: 653, 13
   size: 134, 100
   orig: 140, 124
   offset: 0, 0
   index: -1
 top
-  rotate: true
-  xy: 140, 275
+  rotate: false
+  xy: 1022, 9
   size: 103, 41
   orig: 103, 41
   offset: 0, 0
   index: -1
 up
-  rotate: true
-  xy: 138, 168
-  size: 105, 49
-  orig: 105, 49
+  rotate: false
+  xy: 755, 60
+  size: 107, 50
+  orig: 107, 50
   offset: 0, 0
   index: -1

assets/Cup/3goblet/skeleton.atlas.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.1",
   "importer": "*",
   "imported": true,
-  "uuid": "20d8ab8c-95ca-41a7-a47a-aff397cfc55a",
+  "uuid": "9eeb17b1-0c49-4254-8af7-6b9b57d78dc2",
   "files": [
     ".atlas",
     ".json"

assets/Cup/3goblet/skeleton.json.meta

@@ -2,7 +2,7 @@
   "ver": "1.2.6",
   "importer": "spine-data",
   "imported": true,
-  "uuid": "23fcc44a-7f86-4510-8d91-3b6482e366ac",
+  "uuid": "8d914329-c1dc-4fb0-be81-037f75cefb18",
   "files": [
     ".json"
   ],

assets/Cup/3goblet/skeleton.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.26",
   "importer": "image",
   "imported": true,
-  "uuid": "4e559a05-1d7d-40c0-ab95-49fac5152ae1",
+  "uuid": "09ee1da0-9838-4d1b-872e-967643f10731",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "4e559a05-1d7d-40c0-ab95-49fac5152ae1@6c48a",
+      "uuid": "09ee1da0-9838-4d1b-872e-967643f10731@6c48a",
       "displayName": "skeleton",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "4e559a05-1d7d-40c0-ab95-49fac5152ae1",
+        "imageUuidOrDatabaseUri": "09ee1da0-9838-4d1b-872e-967643f10731",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "4e559a05-1d7d-40c0-ab95-49fac5152ae1@f9941",
+      "uuid": "09ee1da0-9838-4d1b-872e-967643f10731@f9941",
       "displayName": "skeleton",
       "id": "f9941",
       "name": "spriteFrame",
@@ -43,13 +43,13 @@
         "trimThreshold": 1,
         "rotated": false,
         "offsetX": 0,
-        "offsetY": 0,
+        "offsetY": -0.5,
         "trimX": 2,
-        "trimY": 2,
-        "width": 185,
-        "height": 895,
-        "rawWidth": 189,
-        "rawHeight": 899,
+        "trimY": 3,
+        "width": 1126,
+        "height": 144,
+        "rawWidth": 1130,
+        "rawHeight": 149,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -92.5,
-            -447.5,
+            -563,
+            -72,
             0,
-            92.5,
-            -447.5,
+            563,
+            -72,
             0,
-            -92.5,
-            447.5,
+            -563,
+            72,
             0,
-            92.5,
-            447.5,
+            563,
+            72,
             0
           ],
           "indexes": [
@@ -84,37 +84,37 @@
           ],
           "uv": [
             2,
-            897,
-            187,
-            897,
+            146,
+            1128,
+            146,
             2,
             2,
-            187,
+            1128,
             2
           ],
           "nuv": [
-            0.010582010582010581,
-            0.002224694104560623,
-            0.9894179894179894,
-            0.002224694104560623,
-            0.010582010582010581,
-            0.9977753058954394,
-            0.9894179894179894,
-            0.9977753058954394
+            0.0017699115044247787,
+            0.013422818791946308,
+            0.9982300884955753,
+            0.013422818791946308,
+            0.0017699115044247787,
+            0.9798657718120806,
+            0.9982300884955753,
+            0.9798657718120806
           ],
           "minPos": [
-            -92.5,
-            -447.5,
+            -563,
+            -72,
             0
           ],
           "maxPos": [
-            92.5,
-            447.5,
+            563,
+            72,
             0
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "4e559a05-1d7d-40c0-ab95-49fac5152ae1@6c48a",
+        "imageUuidOrDatabaseUri": "09ee1da0-9838-4d1b-872e-967643f10731@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "4e559a05-1d7d-40c0-ab95-49fac5152ae1@f9941"
+    "redirect": "09ee1da0-9838-4d1b-872e-967643f10731@f9941"
   }
 }

assets/Cup/4goblet.meta

@@ -2,7 +2,7 @@
   "ver": "1.2.0",
   "importer": "directory",
   "imported": true,
-  "uuid": "f7e0a4ab-710e-4134-b0c5-3dce4c359ced",
+  "uuid": "9a134ddc-ac35-4ecd-a149-94aa53817f7c",
   "files": [],
   "subMetas": {},
   "userData": {}

assets/Cup/4goblet/skeleton.atlas

@@ -1,90 +1,90 @@
 
 skeleton.png
-size: 189,899
+size: 190,894
 format: RGBA8888
 filter: Linear,Linear
 repeat: none
 XiGuan
   rotate: false
-  xy: 2, 590
+  xy: 2, 585
   size: 145, 307
   orig: 145, 307
   offset: 0, 0
   index: -1
 ZhuangShi1
   rotate: false
-  xy: 2, 2
+  xy: 2, 16
   size: 95, 95
   orig: 95, 95
   offset: 0, 0
   index: -1
 ZhuangShi3
   rotate: true
-  xy: 99, 9
+  xy: 99, 2
   size: 49, 66
   orig: 49, 66
   offset: 0, 0
   index: -1
 botton
   rotate: true
-  xy: 132, 60
+  xy: 132, 53
   size: 106, 55
   orig: 106, 56
   offset: 0, 1
   index: -1
 fallwater
   rotate: false
-  xy: 149, 621
+  xy: 149, 616
   size: 35, 276
   orig: 35, 276
   offset: 0, 0
   index: -1
 goblet
   rotate: false
-  xy: 2, 313
-  size: 136, 275
+  xy: 2, 327
+  size: 136, 256
   orig: 136, 275
   offset: 0, 0
   index: -1
 lower
   rotate: true
-  xy: 140, 380
+  xy: 140, 375
   size: 103, 41
   orig: 103, 41
   offset: 0, 0
   index: -1
 middle
   rotate: true
-  xy: 140, 485
+  xy: 140, 480
   size: 103, 47
   orig: 103, 47
   offset: 0, 0
   index: -1
 spray_B
   rotate: false
-  xy: 2, 99
+  xy: 2, 113
   size: 128, 110
   orig: 140, 124
   offset: 12, 14
   index: -1
 spray_f
   rotate: false
-  xy: 2, 211
+  xy: 2, 225
   size: 134, 100
   orig: 140, 124
   offset: 0, 0
   index: -1
 top
   rotate: true
-  xy: 140, 275
+  xy: 140, 270
   size: 103, 41
   orig: 103, 41
   offset: 0, 0
   index: -1
 up
   rotate: true
-  xy: 138, 168
-  size: 105, 49
-  orig: 105, 49
+  xy: 138, 161
+  size: 107, 50
+  orig: 107, 50
   offset: 0, 0
   index: -1

assets/Cup/4goblet/skeleton.atlas.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.1",
   "importer": "*",
   "imported": true,
-  "uuid": "62ad2615-8c14-4435-83c0-de40afc2e2c4",
+  "uuid": "90727d22-c638-46d7-a022-31e727f61fe7",
   "files": [
     ".atlas",
     ".json"

assets/Cup/4goblet/skeleton.json.meta

@@ -2,7 +2,7 @@
   "ver": "1.2.6",
   "importer": "spine-data",
   "imported": true,
-  "uuid": "c49a0e9d-8281-4caf-8303-91def6d39a8c",
+  "uuid": "465898ec-e707-4456-bdea-77827ae403fa",
   "files": [
     ".json"
   ],

assets/Cup/4goblet/skeleton.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.26",
   "importer": "image",
   "imported": true,
-  "uuid": "af2ad5e0-e999-4370-917e-852bc04461f1",
+  "uuid": "bae2acca-8c21-49e8-b132-04129e67e984",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "af2ad5e0-e999-4370-917e-852bc04461f1@6c48a",
+      "uuid": "bae2acca-8c21-49e8-b132-04129e67e984@6c48a",
       "displayName": "skeleton",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "af2ad5e0-e999-4370-917e-852bc04461f1",
+        "imageUuidOrDatabaseUri": "bae2acca-8c21-49e8-b132-04129e67e984",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "af2ad5e0-e999-4370-917e-852bc04461f1@f9941",
+      "uuid": "bae2acca-8c21-49e8-b132-04129e67e984@f9941",
       "displayName": "skeleton",
       "id": "f9941",
       "name": "spriteFrame",
@@ -46,10 +46,10 @@
         "offsetY": 0,
         "trimX": 2,
         "trimY": 2,
-        "width": 185,
-        "height": 895,
-        "rawWidth": 189,
-        "rawHeight": 899,
+        "width": 186,
+        "height": 890,
+        "rawWidth": 190,
+        "rawHeight": 894,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -92.5,
-            -447.5,
+            -93,
+            -445,
             0,
-            92.5,
-            -447.5,
+            93,
+            -445,
             0,
-            -92.5,
-            447.5,
+            -93,
+            445,
             0,
-            92.5,
-            447.5,
+            93,
+            445,
             0
           ],
           "indexes": [
@@ -84,37 +84,37 @@
           ],
           "uv": [
             2,
-            897,
-            187,
-            897,
+            892,
+            188,
+            892,
             2,
             2,
-            187,
+            188,
             2
           ],
           "nuv": [
-            0.010582010582010581,
-            0.002224694104560623,
-            0.9894179894179894,
-            0.002224694104560623,
-            0.010582010582010581,
-            0.9977753058954394,
-            0.9894179894179894,
-            0.9977753058954394
+            0.010526315789473684,
+            0.0022371364653243847,
+            0.9894736842105263,
+            0.0022371364653243847,
+            0.010526315789473684,
+            0.9977628635346756,
+            0.9894736842105263,
+            0.9977628635346756
           ],
           "minPos": [
-            -92.5,
-            -447.5,
+            -93,
+            -445,
             0
           ],
           "maxPos": [
-            92.5,
-            447.5,
+            93,
+            445,
             0
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "af2ad5e0-e999-4370-917e-852bc04461f1@6c48a",
+        "imageUuidOrDatabaseUri": "bae2acca-8c21-49e8-b132-04129e67e984@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "af2ad5e0-e999-4370-917e-852bc04461f1@f9941"
+    "redirect": "bae2acca-8c21-49e8-b132-04129e67e984@f9941"
   }
 }