فهرست منبع

动画删减修改

vene 3 ماه پیش
والد
کامیت
f2e0aae1ab
100فایلهای تغییر یافته به همراه193 افزوده شده و 5596 حذف شده
  1. 9 39
      assets/Cup/2water/Anim/c_idle_pour.anim
  2. 12 92
      assets/Cup/2water/Anim/c_pour_01.anim
  3. 15 105
      assets/Cup/2water/Anim/c_pour_02.anim
  4. 8 38
      assets/Cup/2water/Anim/w1_idle_pour.anim
  5. 10 60
      assets/Cup/2water/Anim/w1_pour_01.anim
  6. 8 38
      assets/Cup/2water/Anim/w2_idle_pour.anim
  7. 12 92
      assets/Cup/2water/Anim/w2_pour_01.anim
  8. 11 66
      assets/Cup/2water/Anim/w2_pour_02.anim
  9. 6 6
      assets/Cup/2water/cup/c_00000.png.meta
  10. BIN
      assets/Cup/2water/cup/c_00001.png
  11. 0 134
      assets/Cup/2water/cup/c_00001.png.meta
  12. 6 6
      assets/Cup/2water/cup/c_00002.png.meta
  13. BIN
      assets/Cup/2water/cup/c_00003.png
  14. 0 134
      assets/Cup/2water/cup/c_00003.png.meta
  15. 6 6
      assets/Cup/2water/cup/c_00004.png.meta
  16. BIN
      assets/Cup/2water/cup/c_00005.png
  17. 0 134
      assets/Cup/2water/cup/c_00005.png.meta
  18. 6 6
      assets/Cup/2water/cup/c_00006.png.meta
  19. BIN
      assets/Cup/2water/cup/c_00007.png
  20. 0 134
      assets/Cup/2water/cup/c_00007.png.meta
  21. 6 6
      assets/Cup/2water/cup/c_00008.png.meta
  22. BIN
      assets/Cup/2water/cup/c_00009.png
  23. 0 134
      assets/Cup/2water/cup/c_00009.png.meta
  24. 6 6
      assets/Cup/2water/cup/c_00010.png.meta
  25. BIN
      assets/Cup/2water/cup/c_00011.png
  26. 0 134
      assets/Cup/2water/cup/c_00011.png.meta
  27. 6 6
      assets/Cup/2water/cup/c_00016.png.meta
  28. BIN
      assets/Cup/2water/cup/c_00017.png
  29. 0 134
      assets/Cup/2water/cup/c_00017.png.meta
  30. BIN
      assets/Cup/2water/cup/c_00018.png
  31. 0 134
      assets/Cup/2water/cup/c_00018.png.meta
  32. BIN
      assets/Cup/2water/cup/c_00019.png
  33. 0 134
      assets/Cup/2water/cup/c_00019.png.meta
  34. 6 6
      assets/Cup/2water/cup/c_00020.png.meta
  35. BIN
      assets/Cup/2water/cup/c_00021.png
  36. 0 134
      assets/Cup/2water/cup/c_00021.png.meta
  37. BIN
      assets/Cup/2water/cup/c_00022.png
  38. 0 134
      assets/Cup/2water/cup/c_00022.png.meta
  39. BIN
      assets/Cup/2water/cup/c_00023.png
  40. 0 134
      assets/Cup/2water/cup/c_00023.png.meta
  41. 6 6
      assets/Cup/2water/cup/c_00024.png.meta
  42. BIN
      assets/Cup/2water/cup/c_00025.png
  43. 0 134
      assets/Cup/2water/cup/c_00025.png.meta
  44. BIN
      assets/Cup/2water/cup/c_00026.png
  45. 0 134
      assets/Cup/2water/cup/c_00026.png.meta
  46. BIN
      assets/Cup/2water/cup/c_00027.png
  47. 0 134
      assets/Cup/2water/cup/c_00027.png.meta
  48. 6 6
      assets/Cup/2water/cup/c_00028.png.meta
  49. BIN
      assets/Cup/2water/cup/c_00029.png
  50. 0 134
      assets/Cup/2water/cup/c_00029.png.meta
  51. BIN
      assets/Cup/2water/cup/c_00030.png
  52. 0 134
      assets/Cup/2water/cup/c_00030.png.meta
  53. BIN
      assets/Cup/2water/cup/c_00031.png
  54. 0 134
      assets/Cup/2water/cup/c_00031.png.meta
  55. 6 6
      assets/Cup/2water/cup/c_00032.png.meta
  56. BIN
      assets/Cup/2water/cup/c_00033.png
  57. 0 134
      assets/Cup/2water/cup/c_00033.png.meta
  58. BIN
      assets/Cup/2water/cup/c_00034.png
  59. 0 134
      assets/Cup/2water/cup/c_00034.png.meta
  60. BIN
      assets/Cup/2water/cup/c_00035.png
  61. 0 134
      assets/Cup/2water/cup/c_00035.png.meta
  62. 6 6
      assets/Cup/2water/cup/c_00036.png.meta
  63. BIN
      assets/Cup/2water/cup/c_00037.png
  64. 0 134
      assets/Cup/2water/cup/c_00037.png.meta
  65. BIN
      assets/Cup/2water/cup/c_00038.png
  66. 0 134
      assets/Cup/2water/cup/c_00038.png.meta
  67. 6 6
      assets/Cup/2water/cup/c_00039.png.meta
  68. 6 6
      assets/Cup/2water/cup/c_00044.png.meta
  69. BIN
      assets/Cup/2water/cup/c_00045.png
  70. 0 134
      assets/Cup/2water/cup/c_00045.png.meta
  71. BIN
      assets/Cup/2water/cup/c_00046.png
  72. 0 134
      assets/Cup/2water/cup/c_00046.png.meta
  73. BIN
      assets/Cup/2water/cup/c_00047.png
  74. 0 134
      assets/Cup/2water/cup/c_00047.png.meta
  75. 6 6
      assets/Cup/2water/cup/c_00048.png.meta
  76. BIN
      assets/Cup/2water/cup/c_00049.png
  77. 0 134
      assets/Cup/2water/cup/c_00049.png.meta
  78. BIN
      assets/Cup/2water/cup/c_00050.png
  79. 0 134
      assets/Cup/2water/cup/c_00050.png.meta
  80. BIN
      assets/Cup/2water/cup/c_00051.png
  81. 0 134
      assets/Cup/2water/cup/c_00051.png.meta
  82. 6 6
      assets/Cup/2water/cup/c_00052.png.meta
  83. BIN
      assets/Cup/2water/cup/c_00053.png
  84. 0 134
      assets/Cup/2water/cup/c_00053.png.meta
  85. BIN
      assets/Cup/2water/cup/c_00054.png
  86. 0 134
      assets/Cup/2water/cup/c_00054.png.meta
  87. BIN
      assets/Cup/2water/cup/c_00055.png
  88. 0 134
      assets/Cup/2water/cup/c_00055.png.meta
  89. 6 6
      assets/Cup/2water/cup/c_00056.png.meta
  90. BIN
      assets/Cup/2water/cup/c_00057.png
  91. 0 134
      assets/Cup/2water/cup/c_00057.png.meta
  92. BIN
      assets/Cup/2water/cup/c_00058.png
  93. 0 134
      assets/Cup/2water/cup/c_00058.png.meta
  94. BIN
      assets/Cup/2water/cup/c_00059.png
  95. 0 134
      assets/Cup/2water/cup/c_00059.png.meta
  96. 6 6
      assets/Cup/2water/cup/c_00060.png.meta
  97. BIN
      assets/Cup/2water/cup/c_00061.png
  98. 0 134
      assets/Cup/2water/cup/c_00061.png.meta
  99. BIN
      assets/Cup/2water/cup/c_00062.png
  100. 0 134
      assets/Cup/2water/cup/c_00062.png.meta

+ 9 - 39
assets/Cup/2water/Anim/c_idle_pour.anim

@@ -8,10 +8,10 @@
     },
     "_native": "",
     "sample": 60,
-    "speed": 0.8,
+    "speed": 1,
     "wrapMode": 2,
     "enableTrsBlending": false,
-    "_duration": 0.2,
+    "_duration": 0.18333333333333332,
     "_hash": 500763545,
     "_tracks": [
       {
@@ -62,65 +62,35 @@
     "__type__": "cc.ObjectCurve",
     "_times": [
       0,
-      0.016666666666666666,
       0.03333333333333333,
-      0.05,
       0.06666666666666667,
-      0.08333333333333333,
       0.1,
-      0.11666666666666667,
       0.13333333333333333,
-      0.15,
-      0.16666666666666666,
-      0.18333333333333332
+      0.16666666666666666
     ],
     "_values": [
       {
-        "__uuid__": "a9f36ae5-ff68-4767-af02-cba0be326446@f9941",
+        "__uuid__": "3ccd3794-2ef8-4ab4-9b1b-3d027d5e4351@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "9cb00efd-504c-4856-8cfc-8ec155347c3f@f9941",
+        "__uuid__": "fb43c660-2006-4664-b177-c79fe734eb0a@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "e74930ec-0e6d-4a5e-8d2e-db49ef1d15a1@f9941",
+        "__uuid__": "7260851f-963f-458a-b675-b87b609c1f67@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "345f63a8-f433-42c1-b04d-6e99f22c0d31@f9941",
+        "__uuid__": "06078af2-ebbc-4ac3-a0e5-cc1860e5459c@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "b3b050a7-5417-4d9a-946b-f8c59c31a43a@f9941",
+        "__uuid__": "7e3219e8-3a12-4f63-bd7d-e841ded036b1@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "2a58823a-be41-4aba-a115-9c84bd667e25@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "6f8e880a-12dd-4249-aa30-fb9f25e6c64d@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "ff12ac04-a805-4b3e-81e0-b804dbc1f996@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "9cd15236-91ad-4dbd-87d6-074c80796316@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "652c3f6a-9282-4c28-9b51-fca8abd8573a@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "61843eef-ebc9-4b84-8e19-518fb45fa6a6@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "058220aa-9cc6-4689-a64a-ffc3a26b2638@f9941",
+        "__uuid__": "e44e1489-d811-4476-a2a5-a382c03a3211@f9941",
         "__expectedType__": "cc.SpriteFrame"
       }
     ]

+ 12 - 92
assets/Cup/2water/Anim/c_pour_01.anim

@@ -8,10 +8,10 @@
     },
     "_native": "",
     "sample": 60,
-    "speed": 0.4,
+    "speed": 1,
     "wrapMode": 1,
     "enableTrsBlending": false,
-    "_duration": 0.4,
+    "_duration": 0.48333333333333334,
     "_hash": 500763545,
     "_tracks": [
       {
@@ -62,125 +62,45 @@
     "__type__": "cc.ObjectCurve",
     "_times": [
       0,
-      0.016666666666666666,
-      0.03333333333333333,
-      0.05,
       0.06666666666666667,
-      0.08333333333333333,
-      0.1,
-      0.11666666666666667,
       0.13333333333333333,
-      0.15,
-      0.16666666666666666,
-      0.18333333333333332,
       0.2,
-      0.21666666666666667,
-      0.23333333333333334,
-      0.25,
       0.26666666666666666,
-      0.2833333333333333,
-      0.3,
-      0.31666666666666665,
       0.3333333333333333,
-      0.35,
-      0.36666666666666664,
-      0.38333333333333336
+      0.4,
+      0.4666666666666667
     ],
     "_values": [
       {
-        "__uuid__": "c46a2e2b-779b-42d5-8dc4-f1f82490003f@f9941",
+        "__uuid__": "6cae4cd1-ffc2-49c7-b931-dc684877b96d@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "1c9e6cae-5557-44c3-a8ae-ddd13a1df176@f9941",
+        "__uuid__": "48a6beea-bfcf-4813-8464-f5cd81308fd9@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "c53d6255-a9c0-4ef4-a8d5-9344cf6388d7@f9941",
+        "__uuid__": "c3d9cbce-f531-43e1-abfd-3f82eca05465@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "641b9f62-b6c9-49bc-b864-493e1b36fc54@f9941",
+        "__uuid__": "54e76d69-6418-4ce5-a5e2-3c605833ab4f@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "7086ede4-ab4f-40b3-be37-9047211cd204@f9941",
+        "__uuid__": "976c17b6-1c95-49c1-8d54-891cd2146822@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "fa5d429d-5987-46b2-a35e-5440f33707f8@f9941",
+        "__uuid__": "80474d6a-4c03-42f3-b608-c0e657d377e7@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "bd22736b-d0de-4253-9d7c-e6963a3920cf@f9941",
+        "__uuid__": "02062c82-e7a3-4875-92d6-1ef91844636d@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "1a5ce336-f503-4cc4-ae16-d85992cf0e96@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "1d1af7c7-7421-4eaf-bd31-1141e6835dd9@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "a48c4242-0fa9-499c-abfa-e6e2972cbd41@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "b7c1a822-a8bc-459d-966a-17c04a42ea75@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "a01633ca-4041-4b6a-8661-cfe50c78ff4a@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "0df941a4-7885-4b2f-99df-4a1d79e430d0@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "3872da16-ed2a-47b6-977f-41e5ba91fc93@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "a9b35afa-ca7f-47da-bfa3-aea2324f8784@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "9fc3b22a-b223-4086-9876-dcf94b369142@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "a030693c-4c8c-4d03-adb1-63bc0f25347b@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "cc55287d-2463-42be-a610-28fdeb39444c@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "6915ce1a-2f02-4f3c-ac02-7f07050b11d2@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "78809fa2-d732-4cd4-a902-404508122383@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "eb3f56f0-4bc7-4b5d-917b-d7b653333b8e@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "b8684932-2436-4ca9-859b-adacb75d63a7@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "92787807-730f-48f0-8b7b-704f171d5a59@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "abf1864d-199a-428b-88a5-ceffc8af000d@f9941",
+        "__uuid__": "6cae4cd1-ffc2-49c7-b931-dc684877b96d@f9941",
         "__expectedType__": "cc.SpriteFrame"
       }
     ]

+ 15 - 105
assets/Cup/2water/Anim/c_pour_02.anim

@@ -8,10 +8,10 @@
     },
     "_native": "",
     "sample": 60,
-    "speed": 0.5,
+    "speed": 1,
     "wrapMode": 1,
     "enableTrsBlending": false,
-    "_duration": 0.4666666666666667,
+    "_duration": 0.6166666666666667,
     "_hash": 500763545,
     "_tracks": [
       {
@@ -62,145 +62,55 @@
     "__type__": "cc.ObjectCurve",
     "_times": [
       0,
-      0.016666666666666666,
-      0.03333333333333333,
-      0.05,
       0.06666666666666667,
-      0.08333333333333333,
-      0.1,
-      0.11666666666666667,
       0.13333333333333333,
-      0.15,
-      0.16666666666666666,
-      0.18333333333333332,
       0.2,
-      0.21666666666666667,
-      0.23333333333333334,
-      0.25,
       0.26666666666666666,
-      0.2833333333333333,
-      0.3,
-      0.31666666666666665,
       0.3333333333333333,
-      0.35,
-      0.36666666666666664,
-      0.38333333333333336,
       0.4,
-      0.4166666666666667,
-      0.43333333333333335,
-      0.45
+      0.4666666666666667,
+      0.5333333333333333,
+      0.6
     ],
     "_values": [
       {
-        "__uuid__": "5bd6433a-8406-4d43-9b21-644e40881706@f9941",
+        "__uuid__": "e44e1489-d811-4476-a2a5-a382c03a3211@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "39d45b4f-d3df-4c73-8419-7627e553d1ac@f9941",
+        "__uuid__": "186baf79-f961-461f-952e-44858b329609@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "9615e6fb-2fe0-4070-be2c-050ccd37340d@f9941",
+        "__uuid__": "58e7d5d5-b1a3-4016-9018-62ab805110f0@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "aeed46a0-6964-449e-8f91-23c009f48da1@f9941",
+        "__uuid__": "50b76dfa-27fc-4faa-9566-f09e6ad2e49e@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "7151ed12-38dc-4efc-9212-3f8ffce6c0b6@f9941",
+        "__uuid__": "b62af270-979c-4338-ae9e-629b19e09c03@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "23613160-69da-49d4-8f52-4ce8538d91fc@f9941",
+        "__uuid__": "af9a8af3-a939-4782-93cb-8ff2cde07568@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "50279659-1e25-44e9-92a9-7275213005de@f9941",
+        "__uuid__": "8fd43ecf-66e9-426d-9ce5-5a083e3a50e2@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "9710a2ee-ec91-48b6-a819-30ddfe20e2ff@f9941",
+        "__uuid__": "dadaf470-3429-4731-a7bd-fe1de4e45e1f@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "383029b5-2379-4b44-b442-3a6ca5b2447e@f9941",
+        "__uuid__": "6f597312-c20c-4e0a-8453-81a228cdc4d6@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "4c4a08ba-4bbf-483f-8dbb-a198ba9f3434@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "401e4e89-adad-461b-aeaa-3fc076326dca@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "5c00e285-8577-40db-9286-7a90a1b84120@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "10fa836a-f702-4b2d-b391-65ce1c62ad0d@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "b1e67846-ed7a-463b-96e4-f3e00931263f@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "28a5544b-8d85-4fff-b77b-058dbfe3c425@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "aaccf61b-0255-4526-b415-357368d9cbfa@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "063cf550-5b20-447d-8024-e37fbec3035a@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "aa5e98bc-e783-45b6-b5ff-849686159452@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "d4cca2a8-5621-4b87-b20a-ab2035433520@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "f4a92df9-9d49-43cb-8d79-3c0edb000cc9@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "daee1340-ae24-479f-a8c3-ef860c902d3e@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "928ebff9-50a4-4e07-8483-895d8b3ae035@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "cac908c9-7438-4754-92a4-1e0c89295988@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "581e4048-2eb9-4864-ae71-4026a67d8f50@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "7b7fc185-e098-4117-882d-16f8e217c433@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "d3121819-8f87-4b92-86c6-fd130478ea87@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "89c47e5e-fbb3-46d3-963c-f5cbff0b17c2@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "38ecc49b-6329-42a6-a04c-65e967802965@f9941",
+        "__uuid__": "e44e1489-d811-4476-a2a5-a382c03a3211@f9941",
         "__expectedType__": "cc.SpriteFrame"
       }
     ]

+ 8 - 38
assets/Cup/2water/Anim/w1_idle_pour.anim

@@ -8,10 +8,10 @@
     },
     "_native": "",
     "sample": 60,
-    "speed": 0.8,
+    "speed": 1,
     "wrapMode": 2,
     "enableTrsBlending": false,
-    "_duration": 0.2,
+    "_duration": 0.18333333333333332,
     "_hash": 500763545,
     "_tracks": [
       {
@@ -62,17 +62,11 @@
     "__type__": "cc.ObjectCurve",
     "_times": [
       0,
-      0.016666666666666666,
       0.03333333333333333,
-      0.05,
       0.06666666666666667,
-      0.08333333333333333,
       0.1,
-      0.11666666666666667,
       0.13333333333333333,
-      0.15,
-      0.16666666666666666,
-      0.18333333333333332
+      0.16666666666666666
     ],
     "_values": [
       {
@@ -80,47 +74,23 @@
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "91570d8b-4327-4f6f-8a66-d97a4a76674a@f9941",
+        "__uuid__": "a22dc251-b643-4756-b752-cdf25b91e943@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "8e8116ae-b56d-4edc-b9ff-bd66f5732707@f9941",
+        "__uuid__": "a74d105b-60bb-4f4c-905d-2078d95e71a8@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "f572f6df-c1df-4f6f-9508-8d3412b23750@f9941",
+        "__uuid__": "63a3f096-0b2e-475e-9916-0752f12adb6f@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "afa5b339-ef56-4afa-a8ea-6e8a0df448bf@f9941",
+        "__uuid__": "4d6dc154-111d-429c-a41d-cca0001e443c@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "40de082a-d0e7-4c07-9a70-5c01c09e4bad@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "ab9cf9aa-fe75-466f-9383-d5495ac43b09@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "9f2b7c35-5d5e-4172-9795-8d72b24b73ee@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "98099d25-9714-4a0e-81de-7b8b6e4905a0@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "06b623fa-9206-49af-a563-4e8bcf174097@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "a0ccebdf-deba-428d-aad3-741d2897a408@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "94054970-f9db-4228-a42f-598d0792f3bd@f9941",
+        "__uuid__": "f2e203d4-533a-44ae-aa8f-8dd8fae2e262@f9941",
         "__expectedType__": "cc.SpriteFrame"
       }
     ]

+ 10 - 60
assets/Cup/2water/Anim/w1_pour_01.anim

@@ -8,10 +8,10 @@
     },
     "_native": "",
     "sample": 60,
-    "speed": 0.4,
+    "speed": 1,
     "wrapMode": 1,
     "enableTrsBlending": false,
-    "_duration": 0.26666666666666666,
+    "_duration": 0.35,
     "_hash": 500763545,
     "_tracks": [
       {
@@ -62,85 +62,35 @@
     "__type__": "cc.ObjectCurve",
     "_times": [
       0,
-      0.016666666666666666,
-      0.03333333333333333,
-      0.05,
       0.06666666666666667,
-      0.08333333333333333,
-      0.1,
-      0.11666666666666667,
       0.13333333333333333,
-      0.15,
-      0.16666666666666666,
-      0.18333333333333332,
       0.2,
-      0.21666666666666667,
-      0.23333333333333334,
-      0.25
+      0.26666666666666666,
+      0.3333333333333333
     ],
     "_values": [
       {
-        "__uuid__": "276cdcda-8cfa-473e-b98e-a05a28261f67@f9941",
+        "__uuid__": "4ff19192-d33b-4a2d-9627-24aeacb6a874@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "a893981e-c269-42d7-80e4-e3cc5a28881d@f9941",
+        "__uuid__": "7c8c3f79-23f1-4944-bb01-2a34cf08409c@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "19b6c1ce-10c4-45d6-9300-627885f0f357@f9941",
+        "__uuid__": "dc2542f9-e669-4518-8711-919d0e25bbd2@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "fca1c196-8574-4d13-9745-67b58d8eed36@f9941",
+        "__uuid__": "1018dd43-ce50-4c0b-b1e3-1ee865bf943b@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "aa17107e-bd41-4822-9b02-bd07955207f0@f9941",
+        "__uuid__": "3855e176-979f-437c-bd0d-0e2ad09c0744@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "44cac722-f31d-49ed-ab87-76c792ce2d69@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "1e6dc59b-f03d-41e7-a83f-9bc904c58c6c@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "11ed36c7-f000-4305-bfea-5e78ee61c706@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "e0d70262-f637-4c40-9191-c23d66b028c2@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "f1bfbfb8-46c6-4d18-9152-13f2dfa749cf@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "363f6369-d219-4359-b51c-572411dca960@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "233dc382-f376-491c-8f87-47de00893190@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "7543826e-7eaf-46c4-b471-ce9f5a1381a9@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "4465610b-3c65-45a8-a690-d391b9ccb79b@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "ddb157b0-6f27-48fe-9f93-719fea3dc532@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "b333400f-a3d4-4e96-ba87-f2d0c2399b0f@f9941",
+        "__uuid__": "a2205fa5-9b7d-44b1-9f2e-9c75d8b18457@f9941",
         "__expectedType__": "cc.SpriteFrame"
       }
     ]

+ 8 - 38
assets/Cup/2water/Anim/w2_idle_pour.anim

@@ -8,10 +8,10 @@
     },
     "_native": "",
     "sample": 60,
-    "speed": 0.8,
+    "speed": 1,
     "wrapMode": 2,
     "enableTrsBlending": false,
-    "_duration": 0.2,
+    "_duration": 0.18333333333333332,
     "_hash": 500763545,
     "_tracks": [
       {
@@ -62,17 +62,11 @@
     "__type__": "cc.ObjectCurve",
     "_times": [
       0,
-      0.016666666666666666,
       0.03333333333333333,
-      0.05,
       0.06666666666666667,
-      0.08333333333333333,
       0.1,
-      0.11666666666666667,
       0.13333333333333333,
-      0.15,
-      0.16666666666666666,
-      0.18333333333333332
+      0.16666666666666666
     ],
     "_values": [
       {
@@ -80,47 +74,23 @@
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "d7d8f1a3-4700-4f41-8f1d-78c0dfd244a8@f9941",
+        "__uuid__": "95f88639-9ff2-4898-bd18-3f9a35711be3@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "97bca3ae-161f-44b4-bddb-c4ccb50f40d8@f9941",
+        "__uuid__": "4f21ecd3-8d0e-4433-a821-89e70b267dd2@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "0eca0ef2-b2f4-41b4-9f86-a5f06d892f3e@f9941",
+        "__uuid__": "c7d3b675-5ec2-44b9-a557-843bf28c0db7@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "d4033908-b4e8-438c-a661-0ded7326d113@f9941",
+        "__uuid__": "c245ed5f-05c1-4ef1-ace5-f01fd3369e41@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "832d5ff8-81d6-4643-b1fe-2d4b499698c2@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "a6a25317-332e-4820-996b-07c9b4c34a7b@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "6c616cd8-6fd0-4b29-9bdf-325610ab4da6@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "26cc7941-6b72-4f58-92df-ceee7d097254@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "99650c16-8d1e-4322-88de-f737fbb9a774@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "1d412f51-bffc-4403-b8bf-96c17e642d24@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "3b41d059-3c37-40a7-8fac-dcca7b09ecbf@f9941",
+        "__uuid__": "4a7c2566-c3ab-4868-9a19-c639a9d9ae0f@f9941",
         "__expectedType__": "cc.SpriteFrame"
       }
     ]

+ 12 - 92
assets/Cup/2water/Anim/w2_pour_01.anim

@@ -8,10 +8,10 @@
     },
     "_native": "",
     "sample": 60,
-    "speed": 0.4,
+    "speed": 1,
     "wrapMode": 1,
     "enableTrsBlending": false,
-    "_duration": 0.4,
+    "_duration": 0.48333333333333334,
     "_hash": 500763545,
     "_tracks": [
       {
@@ -62,125 +62,45 @@
     "__type__": "cc.ObjectCurve",
     "_times": [
       0,
-      0.016666666666666666,
-      0.03333333333333333,
-      0.05,
       0.06666666666666667,
-      0.08333333333333333,
-      0.1,
-      0.11666666666666667,
       0.13333333333333333,
-      0.15,
-      0.16666666666666666,
-      0.18333333333333332,
       0.2,
-      0.21666666666666667,
-      0.23333333333333334,
-      0.25,
       0.26666666666666666,
-      0.2833333333333333,
-      0.3,
-      0.31666666666666665,
       0.3333333333333333,
-      0.35,
-      0.36666666666666664,
-      0.38333333333333336
+      0.4,
+      0.4666666666666667
     ],
     "_values": [
       {
-        "__uuid__": "1ea02156-f038-4197-9fc2-7518df003586@f9941",
+        "__uuid__": "d33b64c1-745b-40b8-bed8-b6623804c443@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "ff570e3f-b70f-47c5-8779-22c3f2101f58@f9941",
+        "__uuid__": "11238e7c-c0a0-4765-9e2b-62a405dd2afe@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "05b4fbdd-1eef-4e72-b05a-7e4055549521@f9941",
+        "__uuid__": "8dd4959c-09e6-41ee-b874-5968b2c44c51@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "fc6a8410-f18e-47dd-8353-c8f7e182e6c8@f9941",
+        "__uuid__": "ef2bdee7-4e7d-4283-9dac-bb1bcf9b27b3@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "3a4ec52e-03c4-495f-a7fd-d376d59f062c@f9941",
+        "__uuid__": "a3133b98-f1b9-4b83-bfa0-e8398b44a631@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "4eca1ce5-91cd-458c-92b2-8b47df80959c@f9941",
+        "__uuid__": "ef1e096f-c4dc-4625-9582-20c21186e72f@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "a3b1edff-b49f-4899-b9e6-9781749f8139@f9941",
+        "__uuid__": "61222ab2-0df8-4383-87c7-07518228db82@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "cbe4f463-d2ec-454e-8292-2622fa667f4a@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "d7c19b1a-be10-4d52-9b86-a700480b7183@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "630084d8-4a93-4467-8ecc-e748b67b23d6@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "daf979de-d31f-4fb9-8a30-f62000334d02@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "a3ed1a2e-41fe-4227-b899-7a698f9ecc1a@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "954a8219-2d88-4667-94cf-c5fd082ab4fc@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "abdee339-d3cf-4f88-b7cc-f414f8b4a0a4@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "b4d41bd0-a166-4094-a065-e4966ef0fce5@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "ef11c38f-a48c-49a4-ac1a-84bb52ca2d74@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "72fcb60e-b5e6-4e0b-9fd0-29649be94fcf@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "2b99e16b-670b-4e71-adec-3e6e76ae067c@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "9b9c322d-e039-4582-9083-231fba4e184f@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "f6a1323f-ef9b-45cb-a97b-2e8777972929@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "be33efbc-8474-43dc-9fa9-2c9e9637d443@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "b88a4771-6834-454d-89a0-38d256e1034b@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "e94f23f7-bd65-427d-bec9-67be95423ef8@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "fe97346c-c5b0-492a-9573-215059c6155d@f9941",
+        "__uuid__": "d33b64c1-745b-40b8-bed8-b6623804c443@f9941",
         "__expectedType__": "cc.SpriteFrame"
       }
     ]

+ 11 - 66
assets/Cup/2water/Anim/w2_pour_02.anim

@@ -8,10 +8,10 @@
     },
     "_native": "",
     "sample": 60,
-    "speed": 0.5,
+    "speed": 1,
     "wrapMode": 1,
     "enableTrsBlending": false,
-    "_duration": 0.3,
+    "_duration": 0.4166666666666667,
     "_hash": 500763545,
     "_tracks": [
       {
@@ -62,95 +62,40 @@
     "__type__": "cc.ObjectCurve",
     "_times": [
       0,
-      0.016666666666666666,
-      0.03333333333333333,
-      0.05,
       0.06666666666666667,
-      0.08333333333333333,
-      0.1,
-      0.11666666666666667,
       0.13333333333333333,
-      0.15,
-      0.16666666666666666,
-      0.18333333333333332,
       0.2,
-      0.21666666666666667,
-      0.23333333333333334,
-      0.25,
       0.26666666666666666,
-      0.2833333333333333
+      0.3333333333333333,
+      0.4
     ],
     "_values": [
       {
-        "__uuid__": "b9217297-6183-4551-aaf6-c3f3f6605b5d@f9941",
+        "__uuid__": "4a7c2566-c3ab-4868-9a19-c639a9d9ae0f@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "f946e4aa-82fe-411f-aff4-4d4d4e5ab71e@f9941",
+        "__uuid__": "4897a13f-2c10-4951-b085-f91c933b2355@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "6f30f83d-6f1d-41f6-8827-d244b1247f87@f9941",
+        "__uuid__": "c5c77f34-1a28-4aaf-8c0f-7c5f416572ee@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "52d81671-c9e7-477d-af9b-caf209e9162f@f9941",
+        "__uuid__": "f099484c-f531-45c0-99be-c7af2540ea2b@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "49f5655a-fc48-412c-b190-e0825be5802f@f9941",
+        "__uuid__": "506ca86e-408d-405f-8791-9f5669c0565e@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "a743f2b4-e89d-4ba4-a2bc-422848333109@f9941",
+        "__uuid__": "c0a55d4c-0db0-438e-8cc8-8981bd46fe8e@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "20662b42-5cac-40ab-a0f0-06bf198986c3@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "27def3f9-fdd9-4873-8061-4f32bc4b1b17@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "9d60feea-f9cb-431e-8727-40f8ae0bc842@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "ef02df08-1097-4198-b773-aaa8f89fa526@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "ec741427-214d-4e45-aef8-0959f7f9bf8c@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "7d8862ef-d0d8-4f98-8305-88e833f3b210@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "47941ec6-0007-47cd-8f0a-70e72acce70c@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "29473c8a-9564-4708-ae2c-3b528a7b22ea@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "6d58e03f-bb97-4ac1-95fb-a64f5d908ee6@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "b5339582-ef89-4857-86cd-a07c445aa82d@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "7fce0dee-c41b-4319-bc0f-b488853d2363@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "cd44a732-e6b0-4dc8-855c-3ac9dbfce46a@f9941",
+        "__uuid__": "ef879f68-f80d-49e8-8d94-61a7ecbd98bf@f9941",
         "__expectedType__": "cc.SpriteFrame"
       }
     ]

+ 6 - 6
assets/Cup/2water/cup/c_00000.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.26",
   "importer": "image",
   "imported": true,
-  "uuid": "a9f36ae5-ff68-4767-af02-cba0be326446",
+  "uuid": "3ccd3794-2ef8-4ab4-9b1b-3d027d5e4351",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "a9f36ae5-ff68-4767-af02-cba0be326446@6c48a",
+      "uuid": "3ccd3794-2ef8-4ab4-9b1b-3d027d5e4351@6c48a",
       "displayName": "c_00000",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "a9f36ae5-ff68-4767-af02-cba0be326446",
+        "imageUuidOrDatabaseUri": "3ccd3794-2ef8-4ab4-9b1b-3d027d5e4351",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "a9f36ae5-ff68-4767-af02-cba0be326446@f9941",
+      "uuid": "3ccd3794-2ef8-4ab4-9b1b-3d027d5e4351@f9941",
       "displayName": "c_00000",
       "id": "f9941",
       "name": "spriteFrame",
@@ -114,7 +114,7 @@
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "a9f36ae5-ff68-4767-af02-cba0be326446@6c48a",
+        "imageUuidOrDatabaseUri": "3ccd3794-2ef8-4ab4-9b1b-3d027d5e4351@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "a9f36ae5-ff68-4767-af02-cba0be326446@f9941"
+    "redirect": "3ccd3794-2ef8-4ab4-9b1b-3d027d5e4351@f9941"
   }
 }

BIN
assets/Cup/2water/cup/c_00001.png


+ 0 - 134
assets/Cup/2water/cup/c_00001.png.meta

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.26",
-  "importer": "image",
-  "imported": true,
-  "uuid": "9cb00efd-504c-4856-8cfc-8ec155347c3f",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "9cb00efd-504c-4856-8cfc-8ec155347c3f@6c48a",
-      "displayName": "c_00001",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "9cb00efd-504c-4856-8cfc-8ec155347c3f",
-        "isUuid": true,
-        "visible": false,
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "nearest",
-        "anisotropy": 0
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f9941": {
-      "importer": "sprite-frame",
-      "uuid": "9cb00efd-504c-4856-8cfc-8ec155347c3f@f9941",
-      "displayName": "c_00001",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 42.5,
-        "offsetY": -82,
-        "trimX": 127,
-        "trimY": 168,
-        "width": 111,
-        "height": 168,
-        "rawWidth": 280,
-        "rawHeight": 340,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -55.5,
-            -84,
-            0,
-            55.5,
-            -84,
-            0,
-            -55.5,
-            84,
-            0,
-            55.5,
-            84,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            127,
-            172,
-            238,
-            172,
-            127,
-            4,
-            238,
-            4
-          ],
-          "nuv": [
-            0.45357142857142857,
-            0.011764705882352941,
-            0.85,
-            0.011764705882352941,
-            0.45357142857142857,
-            0.5058823529411764,
-            0.85,
-            0.5058823529411764
-          ],
-          "minPos": [
-            -55.5,
-            -84,
-            0
-          ],
-          "maxPos": [
-            55.5,
-            84,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "9cb00efd-504c-4856-8cfc-8ec155347c3f@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "9cb00efd-504c-4856-8cfc-8ec155347c3f@f9941"
-  }
-}

+ 6 - 6
assets/Cup/2water/cup/c_00002.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.26",
   "importer": "image",
   "imported": true,
-  "uuid": "e74930ec-0e6d-4a5e-8d2e-db49ef1d15a1",
+  "uuid": "fb43c660-2006-4664-b177-c79fe734eb0a",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "e74930ec-0e6d-4a5e-8d2e-db49ef1d15a1@6c48a",
+      "uuid": "fb43c660-2006-4664-b177-c79fe734eb0a@6c48a",
       "displayName": "c_00002",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "e74930ec-0e6d-4a5e-8d2e-db49ef1d15a1",
+        "imageUuidOrDatabaseUri": "fb43c660-2006-4664-b177-c79fe734eb0a",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "e74930ec-0e6d-4a5e-8d2e-db49ef1d15a1@f9941",
+      "uuid": "fb43c660-2006-4664-b177-c79fe734eb0a@f9941",
       "displayName": "c_00002",
       "id": "f9941",
       "name": "spriteFrame",
@@ -114,7 +114,7 @@
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "e74930ec-0e6d-4a5e-8d2e-db49ef1d15a1@6c48a",
+        "imageUuidOrDatabaseUri": "fb43c660-2006-4664-b177-c79fe734eb0a@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "e74930ec-0e6d-4a5e-8d2e-db49ef1d15a1@f9941"
+    "redirect": "fb43c660-2006-4664-b177-c79fe734eb0a@f9941"
   }
 }

BIN
assets/Cup/2water/cup/c_00003.png


+ 0 - 134
assets/Cup/2water/cup/c_00003.png.meta

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.26",
-  "importer": "image",
-  "imported": true,
-  "uuid": "345f63a8-f433-42c1-b04d-6e99f22c0d31",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "345f63a8-f433-42c1-b04d-6e99f22c0d31@6c48a",
-      "displayName": "c_00003",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "345f63a8-f433-42c1-b04d-6e99f22c0d31",
-        "isUuid": true,
-        "visible": false,
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "nearest",
-        "anisotropy": 0
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f9941": {
-      "importer": "sprite-frame",
-      "uuid": "345f63a8-f433-42c1-b04d-6e99f22c0d31@f9941",
-      "displayName": "c_00003",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 36.5,
-        "offsetY": -78,
-        "trimX": 117,
-        "trimY": 164,
-        "width": 119,
-        "height": 168,
-        "rawWidth": 280,
-        "rawHeight": 340,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -59.5,
-            -84,
-            0,
-            59.5,
-            -84,
-            0,
-            -59.5,
-            84,
-            0,
-            59.5,
-            84,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            117,
-            176,
-            236,
-            176,
-            117,
-            8,
-            236,
-            8
-          ],
-          "nuv": [
-            0.41785714285714287,
-            0.023529411764705882,
-            0.8428571428571429,
-            0.023529411764705882,
-            0.41785714285714287,
-            0.5176470588235295,
-            0.8428571428571429,
-            0.5176470588235295
-          ],
-          "minPos": [
-            -59.5,
-            -84,
-            0
-          ],
-          "maxPos": [
-            59.5,
-            84,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "345f63a8-f433-42c1-b04d-6e99f22c0d31@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "345f63a8-f433-42c1-b04d-6e99f22c0d31@f9941"
-  }
-}

+ 6 - 6
assets/Cup/2water/cup/c_00004.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.26",
   "importer": "image",
   "imported": true,
-  "uuid": "b3b050a7-5417-4d9a-946b-f8c59c31a43a",
+  "uuid": "7260851f-963f-458a-b675-b87b609c1f67",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "b3b050a7-5417-4d9a-946b-f8c59c31a43a@6c48a",
+      "uuid": "7260851f-963f-458a-b675-b87b609c1f67@6c48a",
       "displayName": "c_00004",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "b3b050a7-5417-4d9a-946b-f8c59c31a43a",
+        "imageUuidOrDatabaseUri": "7260851f-963f-458a-b675-b87b609c1f67",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "b3b050a7-5417-4d9a-946b-f8c59c31a43a@f9941",
+      "uuid": "7260851f-963f-458a-b675-b87b609c1f67@f9941",
       "displayName": "c_00004",
       "id": "f9941",
       "name": "spriteFrame",
@@ -114,7 +114,7 @@
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "b3b050a7-5417-4d9a-946b-f8c59c31a43a@6c48a",
+        "imageUuidOrDatabaseUri": "7260851f-963f-458a-b675-b87b609c1f67@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "b3b050a7-5417-4d9a-946b-f8c59c31a43a@f9941"
+    "redirect": "7260851f-963f-458a-b675-b87b609c1f67@f9941"
   }
 }

BIN
assets/Cup/2water/cup/c_00005.png


+ 0 - 134
assets/Cup/2water/cup/c_00005.png.meta

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.26",
-  "importer": "image",
-  "imported": true,
-  "uuid": "2a58823a-be41-4aba-a115-9c84bd667e25",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "2a58823a-be41-4aba-a115-9c84bd667e25@6c48a",
-      "displayName": "c_00005",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "2a58823a-be41-4aba-a115-9c84bd667e25",
-        "isUuid": true,
-        "visible": false,
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "nearest",
-        "anisotropy": 0
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f9941": {
-      "importer": "sprite-frame",
-      "uuid": "2a58823a-be41-4aba-a115-9c84bd667e25@f9941",
-      "displayName": "c_00005",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 30.5,
-        "offsetY": -73.5,
-        "trimX": 107,
-        "trimY": 159,
-        "width": 127,
-        "height": 169,
-        "rawWidth": 280,
-        "rawHeight": 340,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -63.5,
-            -84.5,
-            0,
-            63.5,
-            -84.5,
-            0,
-            -63.5,
-            84.5,
-            0,
-            63.5,
-            84.5,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            107,
-            181,
-            234,
-            181,
-            107,
-            12,
-            234,
-            12
-          ],
-          "nuv": [
-            0.3821428571428571,
-            0.03529411764705882,
-            0.8357142857142857,
-            0.03529411764705882,
-            0.3821428571428571,
-            0.5323529411764706,
-            0.8357142857142857,
-            0.5323529411764706
-          ],
-          "minPos": [
-            -63.5,
-            -84.5,
-            0
-          ],
-          "maxPos": [
-            63.5,
-            84.5,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "2a58823a-be41-4aba-a115-9c84bd667e25@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "2a58823a-be41-4aba-a115-9c84bd667e25@f9941"
-  }
-}

+ 6 - 6
assets/Cup/2water/cup/c_00006.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.26",
   "importer": "image",
   "imported": true,
-  "uuid": "6f8e880a-12dd-4249-aa30-fb9f25e6c64d",
+  "uuid": "06078af2-ebbc-4ac3-a0e5-cc1860e5459c",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "6f8e880a-12dd-4249-aa30-fb9f25e6c64d@6c48a",
+      "uuid": "06078af2-ebbc-4ac3-a0e5-cc1860e5459c@6c48a",
       "displayName": "c_00006",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "6f8e880a-12dd-4249-aa30-fb9f25e6c64d",
+        "imageUuidOrDatabaseUri": "06078af2-ebbc-4ac3-a0e5-cc1860e5459c",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "6f8e880a-12dd-4249-aa30-fb9f25e6c64d@f9941",
+      "uuid": "06078af2-ebbc-4ac3-a0e5-cc1860e5459c@f9941",
       "displayName": "c_00006",
       "id": "f9941",
       "name": "spriteFrame",
@@ -114,7 +114,7 @@
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "6f8e880a-12dd-4249-aa30-fb9f25e6c64d@6c48a",
+        "imageUuidOrDatabaseUri": "06078af2-ebbc-4ac3-a0e5-cc1860e5459c@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "6f8e880a-12dd-4249-aa30-fb9f25e6c64d@f9941"
+    "redirect": "06078af2-ebbc-4ac3-a0e5-cc1860e5459c@f9941"
   }
 }

BIN
assets/Cup/2water/cup/c_00007.png


+ 0 - 134
assets/Cup/2water/cup/c_00007.png.meta

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.26",
-  "importer": "image",
-  "imported": true,
-  "uuid": "ff12ac04-a805-4b3e-81e0-b804dbc1f996",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "ff12ac04-a805-4b3e-81e0-b804dbc1f996@6c48a",
-      "displayName": "c_00007",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "ff12ac04-a805-4b3e-81e0-b804dbc1f996",
-        "isUuid": true,
-        "visible": false,
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "nearest",
-        "anisotropy": 0
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f9941": {
-      "importer": "sprite-frame",
-      "uuid": "ff12ac04-a805-4b3e-81e0-b804dbc1f996@f9941",
-      "displayName": "c_00007",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 24.5,
-        "offsetY": -68.5,
-        "trimX": 98,
-        "trimY": 154,
-        "width": 133,
-        "height": 169,
-        "rawWidth": 280,
-        "rawHeight": 340,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -66.5,
-            -84.5,
-            0,
-            66.5,
-            -84.5,
-            0,
-            -66.5,
-            84.5,
-            0,
-            66.5,
-            84.5,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            98,
-            186,
-            231,
-            186,
-            98,
-            17,
-            231,
-            17
-          ],
-          "nuv": [
-            0.35,
-            0.05,
-            0.825,
-            0.05,
-            0.35,
-            0.5470588235294118,
-            0.825,
-            0.5470588235294118
-          ],
-          "minPos": [
-            -66.5,
-            -84.5,
-            0
-          ],
-          "maxPos": [
-            66.5,
-            84.5,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "ff12ac04-a805-4b3e-81e0-b804dbc1f996@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "ff12ac04-a805-4b3e-81e0-b804dbc1f996@f9941"
-  }
-}

+ 6 - 6
assets/Cup/2water/cup/c_00008.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.26",
   "importer": "image",
   "imported": true,
-  "uuid": "9cd15236-91ad-4dbd-87d6-074c80796316",
+  "uuid": "7e3219e8-3a12-4f63-bd7d-e841ded036b1",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "9cd15236-91ad-4dbd-87d6-074c80796316@6c48a",
+      "uuid": "7e3219e8-3a12-4f63-bd7d-e841ded036b1@6c48a",
       "displayName": "c_00008",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "9cd15236-91ad-4dbd-87d6-074c80796316",
+        "imageUuidOrDatabaseUri": "7e3219e8-3a12-4f63-bd7d-e841ded036b1",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "9cd15236-91ad-4dbd-87d6-074c80796316@f9941",
+      "uuid": "7e3219e8-3a12-4f63-bd7d-e841ded036b1@f9941",
       "displayName": "c_00008",
       "id": "f9941",
       "name": "spriteFrame",
@@ -114,7 +114,7 @@
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "9cd15236-91ad-4dbd-87d6-074c80796316@6c48a",
+        "imageUuidOrDatabaseUri": "7e3219e8-3a12-4f63-bd7d-e841ded036b1@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "9cd15236-91ad-4dbd-87d6-074c80796316@f9941"
+    "redirect": "7e3219e8-3a12-4f63-bd7d-e841ded036b1@f9941"
   }
 }

BIN
assets/Cup/2water/cup/c_00009.png


+ 0 - 134
assets/Cup/2water/cup/c_00009.png.meta

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.26",
-  "importer": "image",
-  "imported": true,
-  "uuid": "652c3f6a-9282-4c28-9b51-fca8abd8573a",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "652c3f6a-9282-4c28-9b51-fca8abd8573a@6c48a",
-      "displayName": "c_00009",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "652c3f6a-9282-4c28-9b51-fca8abd8573a",
-        "isUuid": true,
-        "visible": false,
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "nearest",
-        "anisotropy": 0
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f9941": {
-      "importer": "sprite-frame",
-      "uuid": "652c3f6a-9282-4c28-9b51-fca8abd8573a@f9941",
-      "displayName": "c_00009",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 18.5,
-        "offsetY": -63.5,
-        "trimX": 88,
-        "trimY": 148,
-        "width": 141,
-        "height": 171,
-        "rawWidth": 280,
-        "rawHeight": 340,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -70.5,
-            -85.5,
-            0,
-            70.5,
-            -85.5,
-            0,
-            -70.5,
-            85.5,
-            0,
-            70.5,
-            85.5,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            88,
-            192,
-            229,
-            192,
-            88,
-            21,
-            229,
-            21
-          ],
-          "nuv": [
-            0.3142857142857143,
-            0.061764705882352944,
-            0.8178571428571428,
-            0.061764705882352944,
-            0.3142857142857143,
-            0.5647058823529412,
-            0.8178571428571428,
-            0.5647058823529412
-          ],
-          "minPos": [
-            -70.5,
-            -85.5,
-            0
-          ],
-          "maxPos": [
-            70.5,
-            85.5,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "652c3f6a-9282-4c28-9b51-fca8abd8573a@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "652c3f6a-9282-4c28-9b51-fca8abd8573a@f9941"
-  }
-}

+ 6 - 6
assets/Cup/2water/cup/c_00010.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.26",
   "importer": "image",
   "imported": true,
-  "uuid": "61843eef-ebc9-4b84-8e19-518fb45fa6a6",
+  "uuid": "e44e1489-d811-4476-a2a5-a382c03a3211",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "61843eef-ebc9-4b84-8e19-518fb45fa6a6@6c48a",
+      "uuid": "e44e1489-d811-4476-a2a5-a382c03a3211@6c48a",
       "displayName": "c_00010",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "61843eef-ebc9-4b84-8e19-518fb45fa6a6",
+        "imageUuidOrDatabaseUri": "e44e1489-d811-4476-a2a5-a382c03a3211",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "61843eef-ebc9-4b84-8e19-518fb45fa6a6@f9941",
+      "uuid": "e44e1489-d811-4476-a2a5-a382c03a3211@f9941",
       "displayName": "c_00010",
       "id": "f9941",
       "name": "spriteFrame",
@@ -114,7 +114,7 @@
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "61843eef-ebc9-4b84-8e19-518fb45fa6a6@6c48a",
+        "imageUuidOrDatabaseUri": "e44e1489-d811-4476-a2a5-a382c03a3211@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "61843eef-ebc9-4b84-8e19-518fb45fa6a6@f9941"
+    "redirect": "e44e1489-d811-4476-a2a5-a382c03a3211@f9941"
   }
 }

BIN
assets/Cup/2water/cup/c_00011.png


+ 0 - 134
assets/Cup/2water/cup/c_00011.png.meta

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.26",
-  "importer": "image",
-  "imported": true,
-  "uuid": "058220aa-9cc6-4689-a64a-ffc3a26b2638",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "058220aa-9cc6-4689-a64a-ffc3a26b2638@6c48a",
-      "displayName": "c_00011",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "058220aa-9cc6-4689-a64a-ffc3a26b2638",
-        "isUuid": true,
-        "visible": false,
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "nearest",
-        "anisotropy": 0
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f9941": {
-      "importer": "sprite-frame",
-      "uuid": "058220aa-9cc6-4689-a64a-ffc3a26b2638@f9941",
-      "displayName": "c_00011",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 15,
-        "offsetY": -60.5,
-        "trimX": 82,
-        "trimY": 145,
-        "width": 146,
-        "height": 171,
-        "rawWidth": 280,
-        "rawHeight": 340,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -73,
-            -85.5,
-            0,
-            73,
-            -85.5,
-            0,
-            -73,
-            85.5,
-            0,
-            73,
-            85.5,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            82,
-            195,
-            228,
-            195,
-            82,
-            24,
-            228,
-            24
-          ],
-          "nuv": [
-            0.29285714285714287,
-            0.07058823529411765,
-            0.8142857142857143,
-            0.07058823529411765,
-            0.29285714285714287,
-            0.5735294117647058,
-            0.8142857142857143,
-            0.5735294117647058
-          ],
-          "minPos": [
-            -73,
-            -85.5,
-            0
-          ],
-          "maxPos": [
-            73,
-            85.5,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "058220aa-9cc6-4689-a64a-ffc3a26b2638@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "058220aa-9cc6-4689-a64a-ffc3a26b2638@f9941"
-  }
-}

+ 6 - 6
assets/Cup/2water/cup/c_00016.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.26",
   "importer": "image",
   "imported": true,
-  "uuid": "c46a2e2b-779b-42d5-8dc4-f1f82490003f",
+  "uuid": "6cae4cd1-ffc2-49c7-b931-dc684877b96d",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "c46a2e2b-779b-42d5-8dc4-f1f82490003f@6c48a",
+      "uuid": "6cae4cd1-ffc2-49c7-b931-dc684877b96d@6c48a",
       "displayName": "c_00016",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "c46a2e2b-779b-42d5-8dc4-f1f82490003f",
+        "imageUuidOrDatabaseUri": "6cae4cd1-ffc2-49c7-b931-dc684877b96d",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "c46a2e2b-779b-42d5-8dc4-f1f82490003f@f9941",
+      "uuid": "6cae4cd1-ffc2-49c7-b931-dc684877b96d@f9941",
       "displayName": "c_00016",
       "id": "f9941",
       "name": "spriteFrame",
@@ -114,7 +114,7 @@
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "c46a2e2b-779b-42d5-8dc4-f1f82490003f@6c48a",
+        "imageUuidOrDatabaseUri": "6cae4cd1-ffc2-49c7-b931-dc684877b96d@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "c46a2e2b-779b-42d5-8dc4-f1f82490003f@f9941"
+    "redirect": "6cae4cd1-ffc2-49c7-b931-dc684877b96d@f9941"
   }
 }

BIN
assets/Cup/2water/cup/c_00017.png


+ 0 - 134
assets/Cup/2water/cup/c_00017.png.meta

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.26",
-  "importer": "image",
-  "imported": true,
-  "uuid": "1c9e6cae-5557-44c3-a8ae-ddd13a1df176",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "1c9e6cae-5557-44c3-a8ae-ddd13a1df176@6c48a",
-      "displayName": "c_00017",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "1c9e6cae-5557-44c3-a8ae-ddd13a1df176",
-        "isUuid": true,
-        "visible": false,
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "nearest",
-        "anisotropy": 0
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f9941": {
-      "importer": "sprite-frame",
-      "uuid": "1c9e6cae-5557-44c3-a8ae-ddd13a1df176@f9941",
-      "displayName": "c_00017",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 12.5,
-        "offsetY": -49.5,
-        "trimX": 76,
-        "trimY": 135,
-        "width": 153,
-        "height": 169,
-        "rawWidth": 280,
-        "rawHeight": 340,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -76.5,
-            -84.5,
-            0,
-            76.5,
-            -84.5,
-            0,
-            -76.5,
-            84.5,
-            0,
-            76.5,
-            84.5,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            76,
-            205,
-            229,
-            205,
-            76,
-            36,
-            229,
-            36
-          ],
-          "nuv": [
-            0.2714285714285714,
-            0.10588235294117647,
-            0.8178571428571428,
-            0.10588235294117647,
-            0.2714285714285714,
-            0.6029411764705882,
-            0.8178571428571428,
-            0.6029411764705882
-          ],
-          "minPos": [
-            -76.5,
-            -84.5,
-            0
-          ],
-          "maxPos": [
-            76.5,
-            84.5,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "1c9e6cae-5557-44c3-a8ae-ddd13a1df176@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "1c9e6cae-5557-44c3-a8ae-ddd13a1df176@f9941"
-  }
-}

BIN
assets/Cup/2water/cup/c_00018.png


+ 0 - 134
assets/Cup/2water/cup/c_00018.png.meta

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.26",
-  "importer": "image",
-  "imported": true,
-  "uuid": "c53d6255-a9c0-4ef4-a8d5-9344cf6388d7",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "c53d6255-a9c0-4ef4-a8d5-9344cf6388d7@6c48a",
-      "displayName": "c_00018",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "c53d6255-a9c0-4ef4-a8d5-9344cf6388d7",
-        "isUuid": true,
-        "visible": false,
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "nearest",
-        "anisotropy": 0
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f9941": {
-      "importer": "sprite-frame",
-      "uuid": "c53d6255-a9c0-4ef4-a8d5-9344cf6388d7@f9941",
-      "displayName": "c_00018",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 10.5,
-        "offsetY": -39,
-        "trimX": 70,
-        "trimY": 125,
-        "width": 161,
-        "height": 168,
-        "rawWidth": 280,
-        "rawHeight": 340,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -80.5,
-            -84,
-            0,
-            80.5,
-            -84,
-            0,
-            -80.5,
-            84,
-            0,
-            80.5,
-            84,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            70,
-            215,
-            231,
-            215,
-            70,
-            47,
-            231,
-            47
-          ],
-          "nuv": [
-            0.25,
-            0.13823529411764707,
-            0.825,
-            0.13823529411764707,
-            0.25,
-            0.6323529411764706,
-            0.825,
-            0.6323529411764706
-          ],
-          "minPos": [
-            -80.5,
-            -84,
-            0
-          ],
-          "maxPos": [
-            80.5,
-            84,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "c53d6255-a9c0-4ef4-a8d5-9344cf6388d7@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "c53d6255-a9c0-4ef4-a8d5-9344cf6388d7@f9941"
-  }
-}

BIN
assets/Cup/2water/cup/c_00019.png


+ 0 - 134
assets/Cup/2water/cup/c_00019.png.meta

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.26",
-  "importer": "image",
-  "imported": true,
-  "uuid": "641b9f62-b6c9-49bc-b864-493e1b36fc54",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "641b9f62-b6c9-49bc-b864-493e1b36fc54@6c48a",
-      "displayName": "c_00019",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "641b9f62-b6c9-49bc-b864-493e1b36fc54",
-        "isUuid": true,
-        "visible": false,
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "nearest",
-        "anisotropy": 0
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f9941": {
-      "importer": "sprite-frame",
-      "uuid": "641b9f62-b6c9-49bc-b864-493e1b36fc54@f9941",
-      "displayName": "c_00019",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 9.5,
-        "offsetY": -29.5,
-        "trimX": 67,
-        "trimY": 117,
-        "width": 165,
-        "height": 165,
-        "rawWidth": 280,
-        "rawHeight": 340,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -82.5,
-            -82.5,
-            0,
-            82.5,
-            -82.5,
-            0,
-            -82.5,
-            82.5,
-            0,
-            82.5,
-            82.5,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            67,
-            223,
-            232,
-            223,
-            67,
-            58,
-            232,
-            58
-          ],
-          "nuv": [
-            0.2392857142857143,
-            0.17058823529411765,
-            0.8285714285714286,
-            0.17058823529411765,
-            0.2392857142857143,
-            0.6558823529411765,
-            0.8285714285714286,
-            0.6558823529411765
-          ],
-          "minPos": [
-            -82.5,
-            -82.5,
-            0
-          ],
-          "maxPos": [
-            82.5,
-            82.5,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "641b9f62-b6c9-49bc-b864-493e1b36fc54@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "641b9f62-b6c9-49bc-b864-493e1b36fc54@f9941"
-  }
-}

+ 6 - 6
assets/Cup/2water/cup/c_00020.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.26",
   "importer": "image",
   "imported": true,
-  "uuid": "7086ede4-ab4f-40b3-be37-9047211cd204",
+  "uuid": "48a6beea-bfcf-4813-8464-f5cd81308fd9",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "7086ede4-ab4f-40b3-be37-9047211cd204@6c48a",
+      "uuid": "48a6beea-bfcf-4813-8464-f5cd81308fd9@6c48a",
       "displayName": "c_00020",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "7086ede4-ab4f-40b3-be37-9047211cd204",
+        "imageUuidOrDatabaseUri": "48a6beea-bfcf-4813-8464-f5cd81308fd9",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "7086ede4-ab4f-40b3-be37-9047211cd204@f9941",
+      "uuid": "48a6beea-bfcf-4813-8464-f5cd81308fd9@f9941",
       "displayName": "c_00020",
       "id": "f9941",
       "name": "spriteFrame",
@@ -114,7 +114,7 @@
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "7086ede4-ab4f-40b3-be37-9047211cd204@6c48a",
+        "imageUuidOrDatabaseUri": "48a6beea-bfcf-4813-8464-f5cd81308fd9@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "7086ede4-ab4f-40b3-be37-9047211cd204@f9941"
+    "redirect": "48a6beea-bfcf-4813-8464-f5cd81308fd9@f9941"
   }
 }

BIN
assets/Cup/2water/cup/c_00021.png


+ 0 - 134
assets/Cup/2water/cup/c_00021.png.meta

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.26",
-  "importer": "image",
-  "imported": true,
-  "uuid": "fa5d429d-5987-46b2-a35e-5440f33707f8",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "fa5d429d-5987-46b2-a35e-5440f33707f8@6c48a",
-      "displayName": "c_00021",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "fa5d429d-5987-46b2-a35e-5440f33707f8",
-        "isUuid": true,
-        "visible": false,
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "nearest",
-        "anisotropy": 0
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f9941": {
-      "importer": "sprite-frame",
-      "uuid": "fa5d429d-5987-46b2-a35e-5440f33707f8@f9941",
-      "displayName": "c_00021",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 10,
-        "offsetY": -19,
-        "trimX": 66,
-        "trimY": 109,
-        "width": 168,
-        "height": 160,
-        "rawWidth": 280,
-        "rawHeight": 340,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -84,
-            -80,
-            0,
-            84,
-            -80,
-            0,
-            -84,
-            80,
-            0,
-            84,
-            80,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            66,
-            231,
-            234,
-            231,
-            66,
-            71,
-            234,
-            71
-          ],
-          "nuv": [
-            0.2357142857142857,
-            0.2088235294117647,
-            0.8357142857142857,
-            0.2088235294117647,
-            0.2357142857142857,
-            0.6794117647058824,
-            0.8357142857142857,
-            0.6794117647058824
-          ],
-          "minPos": [
-            -84,
-            -80,
-            0
-          ],
-          "maxPos": [
-            84,
-            80,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "fa5d429d-5987-46b2-a35e-5440f33707f8@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "fa5d429d-5987-46b2-a35e-5440f33707f8@f9941"
-  }
-}

BIN
assets/Cup/2water/cup/c_00022.png


+ 0 - 134
assets/Cup/2water/cup/c_00022.png.meta

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.26",
-  "importer": "image",
-  "imported": true,
-  "uuid": "bd22736b-d0de-4253-9d7c-e6963a3920cf",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "bd22736b-d0de-4253-9d7c-e6963a3920cf@6c48a",
-      "displayName": "c_00022",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "bd22736b-d0de-4253-9d7c-e6963a3920cf",
-        "isUuid": true,
-        "visible": false,
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "nearest",
-        "anisotropy": 0
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f9941": {
-      "importer": "sprite-frame",
-      "uuid": "bd22736b-d0de-4253-9d7c-e6963a3920cf@f9941",
-      "displayName": "c_00022",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 10.5,
-        "offsetY": -17,
-        "trimX": 66,
-        "trimY": 108,
-        "width": 169,
-        "height": 158,
-        "rawWidth": 280,
-        "rawHeight": 340,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -84.5,
-            -79,
-            0,
-            84.5,
-            -79,
-            0,
-            -84.5,
-            79,
-            0,
-            84.5,
-            79,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            66,
-            232,
-            235,
-            232,
-            66,
-            74,
-            235,
-            74
-          ],
-          "nuv": [
-            0.2357142857142857,
-            0.21764705882352942,
-            0.8392857142857143,
-            0.21764705882352942,
-            0.2357142857142857,
-            0.6823529411764706,
-            0.8392857142857143,
-            0.6823529411764706
-          ],
-          "minPos": [
-            -84.5,
-            -79,
-            0
-          ],
-          "maxPos": [
-            84.5,
-            79,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "bd22736b-d0de-4253-9d7c-e6963a3920cf@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "bd22736b-d0de-4253-9d7c-e6963a3920cf@f9941"
-  }
-}

BIN
assets/Cup/2water/cup/c_00023.png


+ 0 - 134
assets/Cup/2water/cup/c_00023.png.meta

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.26",
-  "importer": "image",
-  "imported": true,
-  "uuid": "1a5ce336-f503-4cc4-ae16-d85992cf0e96",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "1a5ce336-f503-4cc4-ae16-d85992cf0e96@6c48a",
-      "displayName": "c_00023",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "1a5ce336-f503-4cc4-ae16-d85992cf0e96",
-        "isUuid": true,
-        "visible": false,
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "nearest",
-        "anisotropy": 0
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f9941": {
-      "importer": "sprite-frame",
-      "uuid": "1a5ce336-f503-4cc4-ae16-d85992cf0e96@f9941",
-      "displayName": "c_00023",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 11,
-        "offsetY": -14.5,
-        "trimX": 67,
-        "trimY": 106,
-        "width": 168,
-        "height": 157,
-        "rawWidth": 280,
-        "rawHeight": 340,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -84,
-            -78.5,
-            0,
-            84,
-            -78.5,
-            0,
-            -84,
-            78.5,
-            0,
-            84,
-            78.5,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            67,
-            234,
-            235,
-            234,
-            67,
-            77,
-            235,
-            77
-          ],
-          "nuv": [
-            0.2392857142857143,
-            0.22647058823529412,
-            0.8392857142857143,
-            0.22647058823529412,
-            0.2392857142857143,
-            0.6882352941176471,
-            0.8392857142857143,
-            0.6882352941176471
-          ],
-          "minPos": [
-            -84,
-            -78.5,
-            0
-          ],
-          "maxPos": [
-            84,
-            78.5,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "1a5ce336-f503-4cc4-ae16-d85992cf0e96@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "1a5ce336-f503-4cc4-ae16-d85992cf0e96@f9941"
-  }
-}

+ 6 - 6
assets/Cup/2water/cup/c_00024.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.26",
   "importer": "image",
   "imported": true,
-  "uuid": "1d1af7c7-7421-4eaf-bd31-1141e6835dd9",
+  "uuid": "c3d9cbce-f531-43e1-abfd-3f82eca05465",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "1d1af7c7-7421-4eaf-bd31-1141e6835dd9@6c48a",
+      "uuid": "c3d9cbce-f531-43e1-abfd-3f82eca05465@6c48a",
       "displayName": "c_00024",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "1d1af7c7-7421-4eaf-bd31-1141e6835dd9",
+        "imageUuidOrDatabaseUri": "c3d9cbce-f531-43e1-abfd-3f82eca05465",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "1d1af7c7-7421-4eaf-bd31-1141e6835dd9@f9941",
+      "uuid": "c3d9cbce-f531-43e1-abfd-3f82eca05465@f9941",
       "displayName": "c_00024",
       "id": "f9941",
       "name": "spriteFrame",
@@ -114,7 +114,7 @@
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "1d1af7c7-7421-4eaf-bd31-1141e6835dd9@6c48a",
+        "imageUuidOrDatabaseUri": "c3d9cbce-f531-43e1-abfd-3f82eca05465@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "1d1af7c7-7421-4eaf-bd31-1141e6835dd9@f9941"
+    "redirect": "c3d9cbce-f531-43e1-abfd-3f82eca05465@f9941"
   }
 }

BIN
assets/Cup/2water/cup/c_00025.png


+ 0 - 134
assets/Cup/2water/cup/c_00025.png.meta

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.26",
-  "importer": "image",
-  "imported": true,
-  "uuid": "a48c4242-0fa9-499c-abfa-e6e2972cbd41",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "a48c4242-0fa9-499c-abfa-e6e2972cbd41@6c48a",
-      "displayName": "c_00025",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "a48c4242-0fa9-499c-abfa-e6e2972cbd41",
-        "isUuid": true,
-        "visible": false,
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "nearest",
-        "anisotropy": 0
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f9941": {
-      "importer": "sprite-frame",
-      "uuid": "a48c4242-0fa9-499c-abfa-e6e2972cbd41@f9941",
-      "displayName": "c_00025",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 12,
-        "offsetY": -10.5,
-        "trimX": 67,
-        "trimY": 103,
-        "width": 170,
-        "height": 155,
-        "rawWidth": 280,
-        "rawHeight": 340,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -85,
-            -77.5,
-            0,
-            85,
-            -77.5,
-            0,
-            -85,
-            77.5,
-            0,
-            85,
-            77.5,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            67,
-            237,
-            237,
-            237,
-            67,
-            82,
-            237,
-            82
-          ],
-          "nuv": [
-            0.2392857142857143,
-            0.2411764705882353,
-            0.8464285714285714,
-            0.2411764705882353,
-            0.2392857142857143,
-            0.6970588235294117,
-            0.8464285714285714,
-            0.6970588235294117
-          ],
-          "minPos": [
-            -85,
-            -77.5,
-            0
-          ],
-          "maxPos": [
-            85,
-            77.5,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "a48c4242-0fa9-499c-abfa-e6e2972cbd41@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "a48c4242-0fa9-499c-abfa-e6e2972cbd41@f9941"
-  }
-}

BIN
assets/Cup/2water/cup/c_00026.png


+ 0 - 134
assets/Cup/2water/cup/c_00026.png.meta

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.26",
-  "importer": "image",
-  "imported": true,
-  "uuid": "b7c1a822-a8bc-459d-966a-17c04a42ea75",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "b7c1a822-a8bc-459d-966a-17c04a42ea75@6c48a",
-      "displayName": "c_00026",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "b7c1a822-a8bc-459d-966a-17c04a42ea75",
-        "isUuid": true,
-        "visible": false,
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "nearest",
-        "anisotropy": 0
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f9941": {
-      "importer": "sprite-frame",
-      "uuid": "b7c1a822-a8bc-459d-966a-17c04a42ea75@f9941",
-      "displayName": "c_00026",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 12.5,
-        "offsetY": -9,
-        "trimX": 68,
-        "trimY": 103,
-        "width": 169,
-        "height": 152,
-        "rawWidth": 280,
-        "rawHeight": 340,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -84.5,
-            -76,
-            0,
-            84.5,
-            -76,
-            0,
-            -84.5,
-            76,
-            0,
-            84.5,
-            76,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            68,
-            237,
-            237,
-            237,
-            68,
-            85,
-            237,
-            85
-          ],
-          "nuv": [
-            0.24285714285714285,
-            0.25,
-            0.8464285714285714,
-            0.25,
-            0.24285714285714285,
-            0.6970588235294117,
-            0.8464285714285714,
-            0.6970588235294117
-          ],
-          "minPos": [
-            -84.5,
-            -76,
-            0
-          ],
-          "maxPos": [
-            84.5,
-            76,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "b7c1a822-a8bc-459d-966a-17c04a42ea75@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "b7c1a822-a8bc-459d-966a-17c04a42ea75@f9941"
-  }
-}

BIN
assets/Cup/2water/cup/c_00027.png


+ 0 - 134
assets/Cup/2water/cup/c_00027.png.meta

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.26",
-  "importer": "image",
-  "imported": true,
-  "uuid": "a01633ca-4041-4b6a-8661-cfe50c78ff4a",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "a01633ca-4041-4b6a-8661-cfe50c78ff4a@6c48a",
-      "displayName": "c_00027",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "a01633ca-4041-4b6a-8661-cfe50c78ff4a",
-        "isUuid": true,
-        "visible": false,
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "nearest",
-        "anisotropy": 0
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f9941": {
-      "importer": "sprite-frame",
-      "uuid": "a01633ca-4041-4b6a-8661-cfe50c78ff4a@f9941",
-      "displayName": "c_00027",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 13,
-        "offsetY": -6.5,
-        "trimX": 68,
-        "trimY": 101,
-        "width": 170,
-        "height": 151,
-        "rawWidth": 280,
-        "rawHeight": 340,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -85,
-            -75.5,
-            0,
-            85,
-            -75.5,
-            0,
-            -85,
-            75.5,
-            0,
-            85,
-            75.5,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            68,
-            239,
-            238,
-            239,
-            68,
-            88,
-            238,
-            88
-          ],
-          "nuv": [
-            0.24285714285714285,
-            0.25882352941176473,
-            0.85,
-            0.25882352941176473,
-            0.24285714285714285,
-            0.7029411764705882,
-            0.85,
-            0.7029411764705882
-          ],
-          "minPos": [
-            -85,
-            -75.5,
-            0
-          ],
-          "maxPos": [
-            85,
-            75.5,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "a01633ca-4041-4b6a-8661-cfe50c78ff4a@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "a01633ca-4041-4b6a-8661-cfe50c78ff4a@f9941"
-  }
-}

+ 6 - 6
assets/Cup/2water/cup/c_00028.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.26",
   "importer": "image",
   "imported": true,
-  "uuid": "0df941a4-7885-4b2f-99df-4a1d79e430d0",
+  "uuid": "54e76d69-6418-4ce5-a5e2-3c605833ab4f",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "0df941a4-7885-4b2f-99df-4a1d79e430d0@6c48a",
+      "uuid": "54e76d69-6418-4ce5-a5e2-3c605833ab4f@6c48a",
       "displayName": "c_00028",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "0df941a4-7885-4b2f-99df-4a1d79e430d0",
+        "imageUuidOrDatabaseUri": "54e76d69-6418-4ce5-a5e2-3c605833ab4f",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "0df941a4-7885-4b2f-99df-4a1d79e430d0@f9941",
+      "uuid": "54e76d69-6418-4ce5-a5e2-3c605833ab4f@f9941",
       "displayName": "c_00028",
       "id": "f9941",
       "name": "spriteFrame",
@@ -114,7 +114,7 @@
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "0df941a4-7885-4b2f-99df-4a1d79e430d0@6c48a",
+        "imageUuidOrDatabaseUri": "54e76d69-6418-4ce5-a5e2-3c605833ab4f@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "0df941a4-7885-4b2f-99df-4a1d79e430d0@f9941"
+    "redirect": "54e76d69-6418-4ce5-a5e2-3c605833ab4f@f9941"
   }
 }

BIN
assets/Cup/2water/cup/c_00029.png


+ 0 - 134
assets/Cup/2water/cup/c_00029.png.meta

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.26",
-  "importer": "image",
-  "imported": true,
-  "uuid": "3872da16-ed2a-47b6-977f-41e5ba91fc93",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "3872da16-ed2a-47b6-977f-41e5ba91fc93@6c48a",
-      "displayName": "c_00029",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "3872da16-ed2a-47b6-977f-41e5ba91fc93",
-        "isUuid": true,
-        "visible": false,
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "nearest",
-        "anisotropy": 0
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f9941": {
-      "importer": "sprite-frame",
-      "uuid": "3872da16-ed2a-47b6-977f-41e5ba91fc93@f9941",
-      "displayName": "c_00029",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 14,
-        "offsetY": -4,
-        "trimX": 69,
-        "trimY": 100,
-        "width": 170,
-        "height": 148,
-        "rawWidth": 280,
-        "rawHeight": 340,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -85,
-            -74,
-            0,
-            85,
-            -74,
-            0,
-            -85,
-            74,
-            0,
-            85,
-            74,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            69,
-            240,
-            239,
-            240,
-            69,
-            92,
-            239,
-            92
-          ],
-          "nuv": [
-            0.24642857142857144,
-            0.27058823529411763,
-            0.8535714285714285,
-            0.27058823529411763,
-            0.24642857142857144,
-            0.7058823529411765,
-            0.8535714285714285,
-            0.7058823529411765
-          ],
-          "minPos": [
-            -85,
-            -74,
-            0
-          ],
-          "maxPos": [
-            85,
-            74,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "3872da16-ed2a-47b6-977f-41e5ba91fc93@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "3872da16-ed2a-47b6-977f-41e5ba91fc93@f9941"
-  }
-}

BIN
assets/Cup/2water/cup/c_00030.png


+ 0 - 134
assets/Cup/2water/cup/c_00030.png.meta

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.26",
-  "importer": "image",
-  "imported": true,
-  "uuid": "a9b35afa-ca7f-47da-bfa3-aea2324f8784",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "a9b35afa-ca7f-47da-bfa3-aea2324f8784@6c48a",
-      "displayName": "c_00030",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "a9b35afa-ca7f-47da-bfa3-aea2324f8784",
-        "isUuid": true,
-        "visible": false,
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "nearest",
-        "anisotropy": 0
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f9941": {
-      "importer": "sprite-frame",
-      "uuid": "a9b35afa-ca7f-47da-bfa3-aea2324f8784@f9941",
-      "displayName": "c_00030",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 14,
-        "offsetY": -4,
-        "trimX": 69,
-        "trimY": 100,
-        "width": 170,
-        "height": 148,
-        "rawWidth": 280,
-        "rawHeight": 340,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -85,
-            -74,
-            0,
-            85,
-            -74,
-            0,
-            -85,
-            74,
-            0,
-            85,
-            74,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            69,
-            240,
-            239,
-            240,
-            69,
-            92,
-            239,
-            92
-          ],
-          "nuv": [
-            0.24642857142857144,
-            0.27058823529411763,
-            0.8535714285714285,
-            0.27058823529411763,
-            0.24642857142857144,
-            0.7058823529411765,
-            0.8535714285714285,
-            0.7058823529411765
-          ],
-          "minPos": [
-            -85,
-            -74,
-            0
-          ],
-          "maxPos": [
-            85,
-            74,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "a9b35afa-ca7f-47da-bfa3-aea2324f8784@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "a9b35afa-ca7f-47da-bfa3-aea2324f8784@f9941"
-  }
-}

BIN
assets/Cup/2water/cup/c_00031.png


+ 0 - 134
assets/Cup/2water/cup/c_00031.png.meta

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.26",
-  "importer": "image",
-  "imported": true,
-  "uuid": "9fc3b22a-b223-4086-9876-dcf94b369142",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "9fc3b22a-b223-4086-9876-dcf94b369142@6c48a",
-      "displayName": "c_00031",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "9fc3b22a-b223-4086-9876-dcf94b369142",
-        "isUuid": true,
-        "visible": false,
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "nearest",
-        "anisotropy": 0
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f9941": {
-      "importer": "sprite-frame",
-      "uuid": "9fc3b22a-b223-4086-9876-dcf94b369142@f9941",
-      "displayName": "c_00031",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 14,
-        "offsetY": -4,
-        "trimX": 69,
-        "trimY": 100,
-        "width": 170,
-        "height": 148,
-        "rawWidth": 280,
-        "rawHeight": 340,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -85,
-            -74,
-            0,
-            85,
-            -74,
-            0,
-            -85,
-            74,
-            0,
-            85,
-            74,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            69,
-            240,
-            239,
-            240,
-            69,
-            92,
-            239,
-            92
-          ],
-          "nuv": [
-            0.24642857142857144,
-            0.27058823529411763,
-            0.8535714285714285,
-            0.27058823529411763,
-            0.24642857142857144,
-            0.7058823529411765,
-            0.8535714285714285,
-            0.7058823529411765
-          ],
-          "minPos": [
-            -85,
-            -74,
-            0
-          ],
-          "maxPos": [
-            85,
-            74,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "9fc3b22a-b223-4086-9876-dcf94b369142@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "9fc3b22a-b223-4086-9876-dcf94b369142@f9941"
-  }
-}

+ 6 - 6
assets/Cup/2water/cup/c_00032.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.26",
   "importer": "image",
   "imported": true,
-  "uuid": "a030693c-4c8c-4d03-adb1-63bc0f25347b",
+  "uuid": "976c17b6-1c95-49c1-8d54-891cd2146822",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "a030693c-4c8c-4d03-adb1-63bc0f25347b@6c48a",
+      "uuid": "976c17b6-1c95-49c1-8d54-891cd2146822@6c48a",
       "displayName": "c_00032",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "a030693c-4c8c-4d03-adb1-63bc0f25347b",
+        "imageUuidOrDatabaseUri": "976c17b6-1c95-49c1-8d54-891cd2146822",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "a030693c-4c8c-4d03-adb1-63bc0f25347b@f9941",
+      "uuid": "976c17b6-1c95-49c1-8d54-891cd2146822@f9941",
       "displayName": "c_00032",
       "id": "f9941",
       "name": "spriteFrame",
@@ -114,7 +114,7 @@
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "a030693c-4c8c-4d03-adb1-63bc0f25347b@6c48a",
+        "imageUuidOrDatabaseUri": "976c17b6-1c95-49c1-8d54-891cd2146822@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "a030693c-4c8c-4d03-adb1-63bc0f25347b@f9941"
+    "redirect": "976c17b6-1c95-49c1-8d54-891cd2146822@f9941"
   }
 }

BIN
assets/Cup/2water/cup/c_00033.png


+ 0 - 134
assets/Cup/2water/cup/c_00033.png.meta

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.26",
-  "importer": "image",
-  "imported": true,
-  "uuid": "cc55287d-2463-42be-a610-28fdeb39444c",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "cc55287d-2463-42be-a610-28fdeb39444c@6c48a",
-      "displayName": "c_00033",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "cc55287d-2463-42be-a610-28fdeb39444c",
-        "isUuid": true,
-        "visible": false,
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "nearest",
-        "anisotropy": 0
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f9941": {
-      "importer": "sprite-frame",
-      "uuid": "cc55287d-2463-42be-a610-28fdeb39444c@f9941",
-      "displayName": "c_00033",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 12.5,
-        "offsetY": -8,
-        "trimX": 68,
-        "trimY": 102,
-        "width": 169,
-        "height": 152,
-        "rawWidth": 280,
-        "rawHeight": 340,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -84.5,
-            -76,
-            0,
-            84.5,
-            -76,
-            0,
-            -84.5,
-            76,
-            0,
-            84.5,
-            76,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            68,
-            238,
-            237,
-            238,
-            68,
-            86,
-            237,
-            86
-          ],
-          "nuv": [
-            0.24285714285714285,
-            0.2529411764705882,
-            0.8464285714285714,
-            0.2529411764705882,
-            0.24285714285714285,
-            0.7,
-            0.8464285714285714,
-            0.7
-          ],
-          "minPos": [
-            -84.5,
-            -76,
-            0
-          ],
-          "maxPos": [
-            84.5,
-            76,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "cc55287d-2463-42be-a610-28fdeb39444c@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "cc55287d-2463-42be-a610-28fdeb39444c@f9941"
-  }
-}

BIN
assets/Cup/2water/cup/c_00034.png


+ 0 - 134
assets/Cup/2water/cup/c_00034.png.meta

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.26",
-  "importer": "image",
-  "imported": true,
-  "uuid": "6915ce1a-2f02-4f3c-ac02-7f07050b11d2",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "6915ce1a-2f02-4f3c-ac02-7f07050b11d2@6c48a",
-      "displayName": "c_00034",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "6915ce1a-2f02-4f3c-ac02-7f07050b11d2",
-        "isUuid": true,
-        "visible": false,
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "nearest",
-        "anisotropy": 0
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f9941": {
-      "importer": "sprite-frame",
-      "uuid": "6915ce1a-2f02-4f3c-ac02-7f07050b11d2@f9941",
-      "displayName": "c_00034",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 11.5,
-        "offsetY": -11.5,
-        "trimX": 67,
-        "trimY": 104,
-        "width": 169,
-        "height": 155,
-        "rawWidth": 280,
-        "rawHeight": 340,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -84.5,
-            -77.5,
-            0,
-            84.5,
-            -77.5,
-            0,
-            -84.5,
-            77.5,
-            0,
-            84.5,
-            77.5,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            67,
-            236,
-            236,
-            236,
-            67,
-            81,
-            236,
-            81
-          ],
-          "nuv": [
-            0.2392857142857143,
-            0.23823529411764705,
-            0.8428571428571429,
-            0.23823529411764705,
-            0.2392857142857143,
-            0.6941176470588235,
-            0.8428571428571429,
-            0.6941176470588235
-          ],
-          "minPos": [
-            -84.5,
-            -77.5,
-            0
-          ],
-          "maxPos": [
-            84.5,
-            77.5,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "6915ce1a-2f02-4f3c-ac02-7f07050b11d2@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "6915ce1a-2f02-4f3c-ac02-7f07050b11d2@f9941"
-  }
-}

BIN
assets/Cup/2water/cup/c_00035.png


+ 0 - 134
assets/Cup/2water/cup/c_00035.png.meta

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.26",
-  "importer": "image",
-  "imported": true,
-  "uuid": "78809fa2-d732-4cd4-a902-404508122383",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "78809fa2-d732-4cd4-a902-404508122383@6c48a",
-      "displayName": "c_00035",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "78809fa2-d732-4cd4-a902-404508122383",
-        "isUuid": true,
-        "visible": false,
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "nearest",
-        "anisotropy": 0
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f9941": {
-      "importer": "sprite-frame",
-      "uuid": "78809fa2-d732-4cd4-a902-404508122383@f9941",
-      "displayName": "c_00035",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 10.5,
-        "offsetY": -14.5,
-        "trimX": 66,
-        "trimY": 106,
-        "width": 169,
-        "height": 157,
-        "rawWidth": 280,
-        "rawHeight": 340,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -84.5,
-            -78.5,
-            0,
-            84.5,
-            -78.5,
-            0,
-            -84.5,
-            78.5,
-            0,
-            84.5,
-            78.5,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            66,
-            234,
-            235,
-            234,
-            66,
-            77,
-            235,
-            77
-          ],
-          "nuv": [
-            0.2357142857142857,
-            0.22647058823529412,
-            0.8392857142857143,
-            0.22647058823529412,
-            0.2357142857142857,
-            0.6882352941176471,
-            0.8392857142857143,
-            0.6882352941176471
-          ],
-          "minPos": [
-            -84.5,
-            -78.5,
-            0
-          ],
-          "maxPos": [
-            84.5,
-            78.5,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "78809fa2-d732-4cd4-a902-404508122383@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "78809fa2-d732-4cd4-a902-404508122383@f9941"
-  }
-}

+ 6 - 6
assets/Cup/2water/cup/c_00036.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.26",
   "importer": "image",
   "imported": true,
-  "uuid": "eb3f56f0-4bc7-4b5d-917b-d7b653333b8e",
+  "uuid": "80474d6a-4c03-42f3-b608-c0e657d377e7",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "eb3f56f0-4bc7-4b5d-917b-d7b653333b8e@6c48a",
+      "uuid": "80474d6a-4c03-42f3-b608-c0e657d377e7@6c48a",
       "displayName": "c_00036",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "eb3f56f0-4bc7-4b5d-917b-d7b653333b8e",
+        "imageUuidOrDatabaseUri": "80474d6a-4c03-42f3-b608-c0e657d377e7",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "eb3f56f0-4bc7-4b5d-917b-d7b653333b8e@f9941",
+      "uuid": "80474d6a-4c03-42f3-b608-c0e657d377e7@f9941",
       "displayName": "c_00036",
       "id": "f9941",
       "name": "spriteFrame",
@@ -114,7 +114,7 @@
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "eb3f56f0-4bc7-4b5d-917b-d7b653333b8e@6c48a",
+        "imageUuidOrDatabaseUri": "80474d6a-4c03-42f3-b608-c0e657d377e7@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "eb3f56f0-4bc7-4b5d-917b-d7b653333b8e@f9941"
+    "redirect": "80474d6a-4c03-42f3-b608-c0e657d377e7@f9941"
   }
 }

BIN
assets/Cup/2water/cup/c_00037.png


+ 0 - 134
assets/Cup/2water/cup/c_00037.png.meta

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.26",
-  "importer": "image",
-  "imported": true,
-  "uuid": "b8684932-2436-4ca9-859b-adacb75d63a7",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "b8684932-2436-4ca9-859b-adacb75d63a7@6c48a",
-      "displayName": "c_00037",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "b8684932-2436-4ca9-859b-adacb75d63a7",
-        "isUuid": true,
-        "visible": false,
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "nearest",
-        "anisotropy": 0
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f9941": {
-      "importer": "sprite-frame",
-      "uuid": "b8684932-2436-4ca9-859b-adacb75d63a7@f9941",
-      "displayName": "c_00037",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 9.5,
-        "offsetY": -24.5,
-        "trimX": 66,
-        "trimY": 113,
-        "width": 167,
-        "height": 163,
-        "rawWidth": 280,
-        "rawHeight": 340,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -83.5,
-            -81.5,
-            0,
-            83.5,
-            -81.5,
-            0,
-            -83.5,
-            81.5,
-            0,
-            83.5,
-            81.5,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            66,
-            227,
-            233,
-            227,
-            66,
-            64,
-            233,
-            64
-          ],
-          "nuv": [
-            0.2357142857142857,
-            0.18823529411764706,
-            0.8321428571428572,
-            0.18823529411764706,
-            0.2357142857142857,
-            0.6676470588235294,
-            0.8321428571428572,
-            0.6676470588235294
-          ],
-          "minPos": [
-            -83.5,
-            -81.5,
-            0
-          ],
-          "maxPos": [
-            83.5,
-            81.5,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "b8684932-2436-4ca9-859b-adacb75d63a7@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "b8684932-2436-4ca9-859b-adacb75d63a7@f9941"
-  }
-}

BIN
assets/Cup/2water/cup/c_00038.png


+ 0 - 134
assets/Cup/2water/cup/c_00038.png.meta

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.26",
-  "importer": "image",
-  "imported": true,
-  "uuid": "92787807-730f-48f0-8b7b-704f171d5a59",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "92787807-730f-48f0-8b7b-704f171d5a59@6c48a",
-      "displayName": "c_00038",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "92787807-730f-48f0-8b7b-704f171d5a59",
-        "isUuid": true,
-        "visible": false,
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "nearest",
-        "anisotropy": 0
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f9941": {
-      "importer": "sprite-frame",
-      "uuid": "92787807-730f-48f0-8b7b-704f171d5a59@f9941",
-      "displayName": "c_00038",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 10.5,
-        "offsetY": -39,
-        "trimX": 70,
-        "trimY": 125,
-        "width": 161,
-        "height": 168,
-        "rawWidth": 280,
-        "rawHeight": 340,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -80.5,
-            -84,
-            0,
-            80.5,
-            -84,
-            0,
-            -80.5,
-            84,
-            0,
-            80.5,
-            84,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            70,
-            215,
-            231,
-            215,
-            70,
-            47,
-            231,
-            47
-          ],
-          "nuv": [
-            0.25,
-            0.13823529411764707,
-            0.825,
-            0.13823529411764707,
-            0.25,
-            0.6323529411764706,
-            0.825,
-            0.6323529411764706
-          ],
-          "minPos": [
-            -80.5,
-            -84,
-            0
-          ],
-          "maxPos": [
-            80.5,
-            84,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "92787807-730f-48f0-8b7b-704f171d5a59@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "92787807-730f-48f0-8b7b-704f171d5a59@f9941"
-  }
-}

+ 6 - 6
assets/Cup/2water/cup/c_00039.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.26",
   "importer": "image",
   "imported": true,
-  "uuid": "abf1864d-199a-428b-88a5-ceffc8af000d",
+  "uuid": "02062c82-e7a3-4875-92d6-1ef91844636d",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "abf1864d-199a-428b-88a5-ceffc8af000d@6c48a",
+      "uuid": "02062c82-e7a3-4875-92d6-1ef91844636d@6c48a",
       "displayName": "c_00039",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "abf1864d-199a-428b-88a5-ceffc8af000d",
+        "imageUuidOrDatabaseUri": "02062c82-e7a3-4875-92d6-1ef91844636d",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "abf1864d-199a-428b-88a5-ceffc8af000d@f9941",
+      "uuid": "02062c82-e7a3-4875-92d6-1ef91844636d@f9941",
       "displayName": "c_00039",
       "id": "f9941",
       "name": "spriteFrame",
@@ -114,7 +114,7 @@
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "abf1864d-199a-428b-88a5-ceffc8af000d@6c48a",
+        "imageUuidOrDatabaseUri": "02062c82-e7a3-4875-92d6-1ef91844636d@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "abf1864d-199a-428b-88a5-ceffc8af000d@f9941"
+    "redirect": "02062c82-e7a3-4875-92d6-1ef91844636d@f9941"
   }
 }

+ 6 - 6
assets/Cup/2water/cup/c_00044.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.26",
   "importer": "image",
   "imported": true,
-  "uuid": "5bd6433a-8406-4d43-9b21-644e40881706",
+  "uuid": "186baf79-f961-461f-952e-44858b329609",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "5bd6433a-8406-4d43-9b21-644e40881706@6c48a",
+      "uuid": "186baf79-f961-461f-952e-44858b329609@6c48a",
       "displayName": "c_00044",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "5bd6433a-8406-4d43-9b21-644e40881706",
+        "imageUuidOrDatabaseUri": "186baf79-f961-461f-952e-44858b329609",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "5bd6433a-8406-4d43-9b21-644e40881706@f9941",
+      "uuid": "186baf79-f961-461f-952e-44858b329609@f9941",
       "displayName": "c_00044",
       "id": "f9941",
       "name": "spriteFrame",
@@ -114,7 +114,7 @@
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "5bd6433a-8406-4d43-9b21-644e40881706@6c48a",
+        "imageUuidOrDatabaseUri": "186baf79-f961-461f-952e-44858b329609@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "5bd6433a-8406-4d43-9b21-644e40881706@f9941"
+    "redirect": "186baf79-f961-461f-952e-44858b329609@f9941"
   }
 }

BIN
assets/Cup/2water/cup/c_00045.png


+ 0 - 134
assets/Cup/2water/cup/c_00045.png.meta

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.26",
-  "importer": "image",
-  "imported": true,
-  "uuid": "39d45b4f-d3df-4c73-8419-7627e553d1ac",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "39d45b4f-d3df-4c73-8419-7627e553d1ac@6c48a",
-      "displayName": "c_00045",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "39d45b4f-d3df-4c73-8419-7627e553d1ac",
-        "isUuid": true,
-        "visible": false,
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "nearest",
-        "anisotropy": 0
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f9941": {
-      "importer": "sprite-frame",
-      "uuid": "39d45b4f-d3df-4c73-8419-7627e553d1ac@f9941",
-      "displayName": "c_00045",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 10.5,
-        "offsetY": -38,
-        "trimX": 70,
-        "trimY": 124,
-        "width": 161,
-        "height": 168,
-        "rawWidth": 280,
-        "rawHeight": 340,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -80.5,
-            -84,
-            0,
-            80.5,
-            -84,
-            0,
-            -80.5,
-            84,
-            0,
-            80.5,
-            84,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            70,
-            216,
-            231,
-            216,
-            70,
-            48,
-            231,
-            48
-          ],
-          "nuv": [
-            0.25,
-            0.1411764705882353,
-            0.825,
-            0.1411764705882353,
-            0.25,
-            0.6352941176470588,
-            0.825,
-            0.6352941176470588
-          ],
-          "minPos": [
-            -80.5,
-            -84,
-            0
-          ],
-          "maxPos": [
-            80.5,
-            84,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "39d45b4f-d3df-4c73-8419-7627e553d1ac@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "39d45b4f-d3df-4c73-8419-7627e553d1ac@f9941"
-  }
-}

BIN
assets/Cup/2water/cup/c_00046.png


+ 0 - 134
assets/Cup/2water/cup/c_00046.png.meta

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.26",
-  "importer": "image",
-  "imported": true,
-  "uuid": "9615e6fb-2fe0-4070-be2c-050ccd37340d",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "9615e6fb-2fe0-4070-be2c-050ccd37340d@6c48a",
-      "displayName": "c_00046",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "9615e6fb-2fe0-4070-be2c-050ccd37340d",
-        "isUuid": true,
-        "visible": false,
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "nearest",
-        "anisotropy": 0
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f9941": {
-      "importer": "sprite-frame",
-      "uuid": "9615e6fb-2fe0-4070-be2c-050ccd37340d@f9941",
-      "displayName": "c_00046",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 10,
-        "offsetY": -25.5,
-        "trimX": 67,
-        "trimY": 114,
-        "width": 166,
-        "height": 163,
-        "rawWidth": 280,
-        "rawHeight": 340,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -83,
-            -81.5,
-            0,
-            83,
-            -81.5,
-            0,
-            -83,
-            81.5,
-            0,
-            83,
-            81.5,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            67,
-            226,
-            233,
-            226,
-            67,
-            63,
-            233,
-            63
-          ],
-          "nuv": [
-            0.2392857142857143,
-            0.18529411764705883,
-            0.8321428571428572,
-            0.18529411764705883,
-            0.2392857142857143,
-            0.6647058823529411,
-            0.8321428571428572,
-            0.6647058823529411
-          ],
-          "minPos": [
-            -83,
-            -81.5,
-            0
-          ],
-          "maxPos": [
-            83,
-            81.5,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "9615e6fb-2fe0-4070-be2c-050ccd37340d@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "9615e6fb-2fe0-4070-be2c-050ccd37340d@f9941"
-  }
-}

BIN
assets/Cup/2water/cup/c_00047.png


+ 0 - 134
assets/Cup/2water/cup/c_00047.png.meta

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.26",
-  "importer": "image",
-  "imported": true,
-  "uuid": "aeed46a0-6964-449e-8f91-23c009f48da1",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "aeed46a0-6964-449e-8f91-23c009f48da1@6c48a",
-      "displayName": "c_00047",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "aeed46a0-6964-449e-8f91-23c009f48da1",
-        "isUuid": true,
-        "visible": false,
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "nearest",
-        "anisotropy": 0
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f9941": {
-      "importer": "sprite-frame",
-      "uuid": "aeed46a0-6964-449e-8f91-23c009f48da1@f9941",
-      "displayName": "c_00047",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 11.5,
-        "offsetY": -13.5,
-        "trimX": 67,
-        "trimY": 105,
-        "width": 169,
-        "height": 157,
-        "rawWidth": 280,
-        "rawHeight": 340,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -84.5,
-            -78.5,
-            0,
-            84.5,
-            -78.5,
-            0,
-            -84.5,
-            78.5,
-            0,
-            84.5,
-            78.5,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            67,
-            235,
-            236,
-            235,
-            67,
-            78,
-            236,
-            78
-          ],
-          "nuv": [
-            0.2392857142857143,
-            0.22941176470588234,
-            0.8428571428571429,
-            0.22941176470588234,
-            0.2392857142857143,
-            0.6911764705882353,
-            0.8428571428571429,
-            0.6911764705882353
-          ],
-          "minPos": [
-            -84.5,
-            -78.5,
-            0
-          ],
-          "maxPos": [
-            84.5,
-            78.5,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "aeed46a0-6964-449e-8f91-23c009f48da1@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "aeed46a0-6964-449e-8f91-23c009f48da1@f9941"
-  }
-}

+ 6 - 6
assets/Cup/2water/cup/c_00048.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.26",
   "importer": "image",
   "imported": true,
-  "uuid": "7151ed12-38dc-4efc-9212-3f8ffce6c0b6",
+  "uuid": "58e7d5d5-b1a3-4016-9018-62ab805110f0",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "7151ed12-38dc-4efc-9212-3f8ffce6c0b6@6c48a",
+      "uuid": "58e7d5d5-b1a3-4016-9018-62ab805110f0@6c48a",
       "displayName": "c_00048",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "7151ed12-38dc-4efc-9212-3f8ffce6c0b6",
+        "imageUuidOrDatabaseUri": "58e7d5d5-b1a3-4016-9018-62ab805110f0",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "7151ed12-38dc-4efc-9212-3f8ffce6c0b6@f9941",
+      "uuid": "58e7d5d5-b1a3-4016-9018-62ab805110f0@f9941",
       "displayName": "c_00048",
       "id": "f9941",
       "name": "spriteFrame",
@@ -114,7 +114,7 @@
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "7151ed12-38dc-4efc-9212-3f8ffce6c0b6@6c48a",
+        "imageUuidOrDatabaseUri": "58e7d5d5-b1a3-4016-9018-62ab805110f0@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "7151ed12-38dc-4efc-9212-3f8ffce6c0b6@f9941"
+    "redirect": "58e7d5d5-b1a3-4016-9018-62ab805110f0@f9941"
   }
 }

BIN
assets/Cup/2water/cup/c_00049.png


+ 0 - 134
assets/Cup/2water/cup/c_00049.png.meta

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.26",
-  "importer": "image",
-  "imported": true,
-  "uuid": "23613160-69da-49d4-8f52-4ce8538d91fc",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "23613160-69da-49d4-8f52-4ce8538d91fc@6c48a",
-      "displayName": "c_00049",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "23613160-69da-49d4-8f52-4ce8538d91fc",
-        "isUuid": true,
-        "visible": false,
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "nearest",
-        "anisotropy": 0
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f9941": {
-      "importer": "sprite-frame",
-      "uuid": "23613160-69da-49d4-8f52-4ce8538d91fc@f9941",
-      "displayName": "c_00049",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 17.5,
-        "offsetY": 5.5,
-        "trimX": 73,
-        "trimY": 96,
-        "width": 169,
-        "height": 137,
-        "rawWidth": 280,
-        "rawHeight": 340,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -84.5,
-            -68.5,
-            0,
-            84.5,
-            -68.5,
-            0,
-            -84.5,
-            68.5,
-            0,
-            84.5,
-            68.5,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            73,
-            244,
-            242,
-            244,
-            73,
-            107,
-            242,
-            107
-          ],
-          "nuv": [
-            0.26071428571428573,
-            0.31470588235294117,
-            0.8642857142857143,
-            0.31470588235294117,
-            0.26071428571428573,
-            0.7176470588235294,
-            0.8642857142857143,
-            0.7176470588235294
-          ],
-          "minPos": [
-            -84.5,
-            -68.5,
-            0
-          ],
-          "maxPos": [
-            84.5,
-            68.5,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "23613160-69da-49d4-8f52-4ce8538d91fc@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "23613160-69da-49d4-8f52-4ce8538d91fc@f9941"
-  }
-}

BIN
assets/Cup/2water/cup/c_00050.png


+ 0 - 134
assets/Cup/2water/cup/c_00050.png.meta

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.26",
-  "importer": "image",
-  "imported": true,
-  "uuid": "50279659-1e25-44e9-92a9-7275213005de",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "50279659-1e25-44e9-92a9-7275213005de@6c48a",
-      "displayName": "c_00050",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "50279659-1e25-44e9-92a9-7275213005de",
-        "isUuid": true,
-        "visible": false,
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "nearest",
-        "anisotropy": 0
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f9941": {
-      "importer": "sprite-frame",
-      "uuid": "50279659-1e25-44e9-92a9-7275213005de@f9941",
-      "displayName": "c_00050",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 21.5,
-        "offsetY": 12,
-        "trimX": 77,
-        "trimY": 94,
-        "width": 169,
-        "height": 128,
-        "rawWidth": 280,
-        "rawHeight": 340,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -84.5,
-            -64,
-            0,
-            84.5,
-            -64,
-            0,
-            -84.5,
-            64,
-            0,
-            84.5,
-            64,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            77,
-            246,
-            246,
-            246,
-            77,
-            118,
-            246,
-            118
-          ],
-          "nuv": [
-            0.275,
-            0.34705882352941175,
-            0.8785714285714286,
-            0.34705882352941175,
-            0.275,
-            0.7235294117647059,
-            0.8785714285714286,
-            0.7235294117647059
-          ],
-          "minPos": [
-            -84.5,
-            -64,
-            0
-          ],
-          "maxPos": [
-            84.5,
-            64,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "50279659-1e25-44e9-92a9-7275213005de@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "50279659-1e25-44e9-92a9-7275213005de@f9941"
-  }
-}

BIN
assets/Cup/2water/cup/c_00051.png


+ 0 - 134
assets/Cup/2water/cup/c_00051.png.meta

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.26",
-  "importer": "image",
-  "imported": true,
-  "uuid": "9710a2ee-ec91-48b6-a819-30ddfe20e2ff",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "9710a2ee-ec91-48b6-a819-30ddfe20e2ff@6c48a",
-      "displayName": "c_00051",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "9710a2ee-ec91-48b6-a819-30ddfe20e2ff",
-        "isUuid": true,
-        "visible": false,
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "nearest",
-        "anisotropy": 0
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f9941": {
-      "importer": "sprite-frame",
-      "uuid": "9710a2ee-ec91-48b6-a819-30ddfe20e2ff@f9941",
-      "displayName": "c_00051",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 24,
-        "offsetY": 15.5,
-        "trimX": 80,
-        "trimY": 93,
-        "width": 168,
-        "height": 123,
-        "rawWidth": 280,
-        "rawHeight": 340,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -84,
-            -61.5,
-            0,
-            84,
-            -61.5,
-            0,
-            -84,
-            61.5,
-            0,
-            84,
-            61.5,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            80,
-            247,
-            248,
-            247,
-            80,
-            124,
-            248,
-            124
-          ],
-          "nuv": [
-            0.2857142857142857,
-            0.36470588235294116,
-            0.8857142857142857,
-            0.36470588235294116,
-            0.2857142857142857,
-            0.7264705882352941,
-            0.8857142857142857,
-            0.7264705882352941
-          ],
-          "minPos": [
-            -84,
-            -61.5,
-            0
-          ],
-          "maxPos": [
-            84,
-            61.5,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "9710a2ee-ec91-48b6-a819-30ddfe20e2ff@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "9710a2ee-ec91-48b6-a819-30ddfe20e2ff@f9941"
-  }
-}

+ 6 - 6
assets/Cup/2water/cup/c_00052.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.26",
   "importer": "image",
   "imported": true,
-  "uuid": "383029b5-2379-4b44-b442-3a6ca5b2447e",
+  "uuid": "50b76dfa-27fc-4faa-9566-f09e6ad2e49e",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "383029b5-2379-4b44-b442-3a6ca5b2447e@6c48a",
+      "uuid": "50b76dfa-27fc-4faa-9566-f09e6ad2e49e@6c48a",
       "displayName": "c_00052",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "383029b5-2379-4b44-b442-3a6ca5b2447e",
+        "imageUuidOrDatabaseUri": "50b76dfa-27fc-4faa-9566-f09e6ad2e49e",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "383029b5-2379-4b44-b442-3a6ca5b2447e@f9941",
+      "uuid": "50b76dfa-27fc-4faa-9566-f09e6ad2e49e@f9941",
       "displayName": "c_00052",
       "id": "f9941",
       "name": "spriteFrame",
@@ -114,7 +114,7 @@
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "383029b5-2379-4b44-b442-3a6ca5b2447e@6c48a",
+        "imageUuidOrDatabaseUri": "50b76dfa-27fc-4faa-9566-f09e6ad2e49e@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "383029b5-2379-4b44-b442-3a6ca5b2447e@f9941"
+    "redirect": "50b76dfa-27fc-4faa-9566-f09e6ad2e49e@f9941"
   }
 }

BIN
assets/Cup/2water/cup/c_00053.png


+ 0 - 134
assets/Cup/2water/cup/c_00053.png.meta

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.26",
-  "importer": "image",
-  "imported": true,
-  "uuid": "4c4a08ba-4bbf-483f-8dbb-a198ba9f3434",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "4c4a08ba-4bbf-483f-8dbb-a198ba9f3434@6c48a",
-      "displayName": "c_00053",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "4c4a08ba-4bbf-483f-8dbb-a198ba9f3434",
-        "isUuid": true,
-        "visible": false,
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "nearest",
-        "anisotropy": 0
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f9941": {
-      "importer": "sprite-frame",
-      "uuid": "4c4a08ba-4bbf-483f-8dbb-a198ba9f3434@f9941",
-      "displayName": "c_00053",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 27,
-        "offsetY": 19.5,
-        "trimX": 83,
-        "trimY": 93,
-        "width": 168,
-        "height": 115,
-        "rawWidth": 280,
-        "rawHeight": 340,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -84,
-            -57.5,
-            0,
-            84,
-            -57.5,
-            0,
-            -84,
-            57.5,
-            0,
-            84,
-            57.5,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            83,
-            247,
-            251,
-            247,
-            83,
-            132,
-            251,
-            132
-          ],
-          "nuv": [
-            0.29642857142857143,
-            0.38823529411764707,
-            0.8964285714285715,
-            0.38823529411764707,
-            0.29642857142857143,
-            0.7264705882352941,
-            0.8964285714285715,
-            0.7264705882352941
-          ],
-          "minPos": [
-            -84,
-            -57.5,
-            0
-          ],
-          "maxPos": [
-            84,
-            57.5,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "4c4a08ba-4bbf-483f-8dbb-a198ba9f3434@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "4c4a08ba-4bbf-483f-8dbb-a198ba9f3434@f9941"
-  }
-}

BIN
assets/Cup/2water/cup/c_00054.png


+ 0 - 134
assets/Cup/2water/cup/c_00054.png.meta

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.26",
-  "importer": "image",
-  "imported": true,
-  "uuid": "401e4e89-adad-461b-aeaa-3fc076326dca",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "401e4e89-adad-461b-aeaa-3fc076326dca@6c48a",
-      "displayName": "c_00054",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "401e4e89-adad-461b-aeaa-3fc076326dca",
-        "isUuid": true,
-        "visible": false,
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "nearest",
-        "anisotropy": 0
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f9941": {
-      "importer": "sprite-frame",
-      "uuid": "401e4e89-adad-461b-aeaa-3fc076326dca@f9941",
-      "displayName": "c_00054",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 28.5,
-        "offsetY": 21,
-        "trimX": 85,
-        "trimY": 93,
-        "width": 167,
-        "height": 112,
-        "rawWidth": 280,
-        "rawHeight": 340,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -83.5,
-            -56,
-            0,
-            83.5,
-            -56,
-            0,
-            -83.5,
-            56,
-            0,
-            83.5,
-            56,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            85,
-            247,
-            252,
-            247,
-            85,
-            135,
-            252,
-            135
-          ],
-          "nuv": [
-            0.30357142857142855,
-            0.39705882352941174,
-            0.9,
-            0.39705882352941174,
-            0.30357142857142855,
-            0.7264705882352941,
-            0.9,
-            0.7264705882352941
-          ],
-          "minPos": [
-            -83.5,
-            -56,
-            0
-          ],
-          "maxPos": [
-            83.5,
-            56,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "401e4e89-adad-461b-aeaa-3fc076326dca@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "401e4e89-adad-461b-aeaa-3fc076326dca@f9941"
-  }
-}

BIN
assets/Cup/2water/cup/c_00055.png


+ 0 - 134
assets/Cup/2water/cup/c_00055.png.meta

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.26",
-  "importer": "image",
-  "imported": true,
-  "uuid": "5c00e285-8577-40db-9286-7a90a1b84120",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "5c00e285-8577-40db-9286-7a90a1b84120@6c48a",
-      "displayName": "c_00055",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "5c00e285-8577-40db-9286-7a90a1b84120",
-        "isUuid": true,
-        "visible": false,
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "nearest",
-        "anisotropy": 0
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f9941": {
-      "importer": "sprite-frame",
-      "uuid": "5c00e285-8577-40db-9286-7a90a1b84120@f9941",
-      "displayName": "c_00055",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 29.5,
-        "offsetY": 22.5,
-        "trimX": 86,
-        "trimY": 93,
-        "width": 167,
-        "height": 109,
-        "rawWidth": 280,
-        "rawHeight": 340,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -83.5,
-            -54.5,
-            0,
-            83.5,
-            -54.5,
-            0,
-            -83.5,
-            54.5,
-            0,
-            83.5,
-            54.5,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            86,
-            247,
-            253,
-            247,
-            86,
-            138,
-            253,
-            138
-          ],
-          "nuv": [
-            0.30714285714285716,
-            0.40588235294117647,
-            0.9035714285714286,
-            0.40588235294117647,
-            0.30714285714285716,
-            0.7264705882352941,
-            0.9035714285714286,
-            0.7264705882352941
-          ],
-          "minPos": [
-            -83.5,
-            -54.5,
-            0
-          ],
-          "maxPos": [
-            83.5,
-            54.5,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "5c00e285-8577-40db-9286-7a90a1b84120@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "5c00e285-8577-40db-9286-7a90a1b84120@f9941"
-  }
-}

+ 6 - 6
assets/Cup/2water/cup/c_00056.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.26",
   "importer": "image",
   "imported": true,
-  "uuid": "10fa836a-f702-4b2d-b391-65ce1c62ad0d",
+  "uuid": "b62af270-979c-4338-ae9e-629b19e09c03",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "10fa836a-f702-4b2d-b391-65ce1c62ad0d@6c48a",
+      "uuid": "b62af270-979c-4338-ae9e-629b19e09c03@6c48a",
       "displayName": "c_00056",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "10fa836a-f702-4b2d-b391-65ce1c62ad0d",
+        "imageUuidOrDatabaseUri": "b62af270-979c-4338-ae9e-629b19e09c03",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "10fa836a-f702-4b2d-b391-65ce1c62ad0d@f9941",
+      "uuid": "b62af270-979c-4338-ae9e-629b19e09c03@f9941",
       "displayName": "c_00056",
       "id": "f9941",
       "name": "spriteFrame",
@@ -114,7 +114,7 @@
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "10fa836a-f702-4b2d-b391-65ce1c62ad0d@6c48a",
+        "imageUuidOrDatabaseUri": "b62af270-979c-4338-ae9e-629b19e09c03@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "10fa836a-f702-4b2d-b391-65ce1c62ad0d@f9941"
+    "redirect": "b62af270-979c-4338-ae9e-629b19e09c03@f9941"
   }
 }

BIN
assets/Cup/2water/cup/c_00057.png


+ 0 - 134
assets/Cup/2water/cup/c_00057.png.meta

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.26",
-  "importer": "image",
-  "imported": true,
-  "uuid": "b1e67846-ed7a-463b-96e4-f3e00931263f",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "b1e67846-ed7a-463b-96e4-f3e00931263f@6c48a",
-      "displayName": "c_00057",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "b1e67846-ed7a-463b-96e4-f3e00931263f",
-        "isUuid": true,
-        "visible": false,
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "nearest",
-        "anisotropy": 0
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f9941": {
-      "importer": "sprite-frame",
-      "uuid": "b1e67846-ed7a-463b-96e4-f3e00931263f@f9941",
-      "displayName": "c_00057",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 32.5,
-        "offsetY": 25.5,
-        "trimX": 89,
-        "trimY": 89,
-        "width": 167,
-        "height": 111,
-        "rawWidth": 280,
-        "rawHeight": 340,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -83.5,
-            -55.5,
-            0,
-            83.5,
-            -55.5,
-            0,
-            -83.5,
-            55.5,
-            0,
-            83.5,
-            55.5,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            89,
-            251,
-            256,
-            251,
-            89,
-            140,
-            256,
-            140
-          ],
-          "nuv": [
-            0.31785714285714284,
-            0.4117647058823529,
-            0.9142857142857143,
-            0.4117647058823529,
-            0.31785714285714284,
-            0.7382352941176471,
-            0.9142857142857143,
-            0.7382352941176471
-          ],
-          "minPos": [
-            -83.5,
-            -55.5,
-            0
-          ],
-          "maxPos": [
-            83.5,
-            55.5,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "b1e67846-ed7a-463b-96e4-f3e00931263f@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "b1e67846-ed7a-463b-96e4-f3e00931263f@f9941"
-  }
-}

BIN
assets/Cup/2water/cup/c_00058.png


+ 0 - 134
assets/Cup/2water/cup/c_00058.png.meta

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.26",
-  "importer": "image",
-  "imported": true,
-  "uuid": "28a5544b-8d85-4fff-b77b-058dbfe3c425",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "28a5544b-8d85-4fff-b77b-058dbfe3c425@6c48a",
-      "displayName": "c_00058",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "28a5544b-8d85-4fff-b77b-058dbfe3c425",
-        "isUuid": true,
-        "visible": false,
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "nearest",
-        "anisotropy": 0
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f9941": {
-      "importer": "sprite-frame",
-      "uuid": "28a5544b-8d85-4fff-b77b-058dbfe3c425@f9941",
-      "displayName": "c_00058",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 34,
-        "offsetY": 27,
-        "trimX": 90,
-        "trimY": 86,
-        "width": 168,
-        "height": 114,
-        "rawWidth": 280,
-        "rawHeight": 340,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -84,
-            -57,
-            0,
-            84,
-            -57,
-            0,
-            -84,
-            57,
-            0,
-            84,
-            57,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            90,
-            254,
-            258,
-            254,
-            90,
-            140,
-            258,
-            140
-          ],
-          "nuv": [
-            0.32142857142857145,
-            0.4117647058823529,
-            0.9214285714285714,
-            0.4117647058823529,
-            0.32142857142857145,
-            0.7470588235294118,
-            0.9214285714285714,
-            0.7470588235294118
-          ],
-          "minPos": [
-            -84,
-            -57,
-            0
-          ],
-          "maxPos": [
-            84,
-            57,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "28a5544b-8d85-4fff-b77b-058dbfe3c425@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "28a5544b-8d85-4fff-b77b-058dbfe3c425@f9941"
-  }
-}

BIN
assets/Cup/2water/cup/c_00059.png


+ 0 - 134
assets/Cup/2water/cup/c_00059.png.meta

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.26",
-  "importer": "image",
-  "imported": true,
-  "uuid": "aaccf61b-0255-4526-b415-357368d9cbfa",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "aaccf61b-0255-4526-b415-357368d9cbfa@6c48a",
-      "displayName": "c_00059",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "aaccf61b-0255-4526-b415-357368d9cbfa",
-        "isUuid": true,
-        "visible": false,
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "nearest",
-        "anisotropy": 0
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f9941": {
-      "importer": "sprite-frame",
-      "uuid": "aaccf61b-0255-4526-b415-357368d9cbfa@f9941",
-      "displayName": "c_00059",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 35,
-        "offsetY": 28,
-        "trimX": 91,
-        "trimY": 84,
-        "width": 168,
-        "height": 116,
-        "rawWidth": 280,
-        "rawHeight": 340,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -84,
-            -58,
-            0,
-            84,
-            -58,
-            0,
-            -84,
-            58,
-            0,
-            84,
-            58,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            91,
-            256,
-            259,
-            256,
-            91,
-            140,
-            259,
-            140
-          ],
-          "nuv": [
-            0.325,
-            0.4117647058823529,
-            0.925,
-            0.4117647058823529,
-            0.325,
-            0.7529411764705882,
-            0.925,
-            0.7529411764705882
-          ],
-          "minPos": [
-            -84,
-            -58,
-            0
-          ],
-          "maxPos": [
-            84,
-            58,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "aaccf61b-0255-4526-b415-357368d9cbfa@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "aaccf61b-0255-4526-b415-357368d9cbfa@f9941"
-  }
-}

+ 6 - 6
assets/Cup/2water/cup/c_00060.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.26",
   "importer": "image",
   "imported": true,
-  "uuid": "063cf550-5b20-447d-8024-e37fbec3035a",
+  "uuid": "af9a8af3-a939-4782-93cb-8ff2cde07568",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "063cf550-5b20-447d-8024-e37fbec3035a@6c48a",
+      "uuid": "af9a8af3-a939-4782-93cb-8ff2cde07568@6c48a",
       "displayName": "c_00060",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "063cf550-5b20-447d-8024-e37fbec3035a",
+        "imageUuidOrDatabaseUri": "af9a8af3-a939-4782-93cb-8ff2cde07568",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "063cf550-5b20-447d-8024-e37fbec3035a@f9941",
+      "uuid": "af9a8af3-a939-4782-93cb-8ff2cde07568@f9941",
       "displayName": "c_00060",
       "id": "f9941",
       "name": "spriteFrame",
@@ -114,7 +114,7 @@
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "063cf550-5b20-447d-8024-e37fbec3035a@6c48a",
+        "imageUuidOrDatabaseUri": "af9a8af3-a939-4782-93cb-8ff2cde07568@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "063cf550-5b20-447d-8024-e37fbec3035a@f9941"
+    "redirect": "af9a8af3-a939-4782-93cb-8ff2cde07568@f9941"
   }
 }

BIN
assets/Cup/2water/cup/c_00061.png


+ 0 - 134
assets/Cup/2water/cup/c_00061.png.meta

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.26",
-  "importer": "image",
-  "imported": true,
-  "uuid": "aa5e98bc-e783-45b6-b5ff-849686159452",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "aa5e98bc-e783-45b6-b5ff-849686159452@6c48a",
-      "displayName": "c_00061",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "aa5e98bc-e783-45b6-b5ff-849686159452",
-        "isUuid": true,
-        "visible": false,
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "nearest",
-        "anisotropy": 0
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f9941": {
-      "importer": "sprite-frame",
-      "uuid": "aa5e98bc-e783-45b6-b5ff-849686159452@f9941",
-      "displayName": "c_00061",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 35.5,
-        "offsetY": 28.5,
-        "trimX": 92,
-        "trimY": 83,
-        "width": 167,
-        "height": 117,
-        "rawWidth": 280,
-        "rawHeight": 340,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -83.5,
-            -58.5,
-            0,
-            83.5,
-            -58.5,
-            0,
-            -83.5,
-            58.5,
-            0,
-            83.5,
-            58.5,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            92,
-            257,
-            259,
-            257,
-            92,
-            140,
-            259,
-            140
-          ],
-          "nuv": [
-            0.32857142857142857,
-            0.4117647058823529,
-            0.925,
-            0.4117647058823529,
-            0.32857142857142857,
-            0.7558823529411764,
-            0.925,
-            0.7558823529411764
-          ],
-          "minPos": [
-            -83.5,
-            -58.5,
-            0
-          ],
-          "maxPos": [
-            83.5,
-            58.5,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "aa5e98bc-e783-45b6-b5ff-849686159452@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "aa5e98bc-e783-45b6-b5ff-849686159452@f9941"
-  }
-}

BIN
assets/Cup/2water/cup/c_00062.png


+ 0 - 134
assets/Cup/2water/cup/c_00062.png.meta

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.26",
-  "importer": "image",
-  "imported": true,
-  "uuid": "d4cca2a8-5621-4b87-b20a-ab2035433520",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "d4cca2a8-5621-4b87-b20a-ab2035433520@6c48a",
-      "displayName": "c_00062",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "d4cca2a8-5621-4b87-b20a-ab2035433520",
-        "isUuid": true,
-        "visible": false,
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "nearest",
-        "anisotropy": 0
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f9941": {
-      "importer": "sprite-frame",
-      "uuid": "d4cca2a8-5621-4b87-b20a-ab2035433520@f9941",
-      "displayName": "c_00062",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 34.5,
-        "offsetY": 27.5,
-        "trimX": 91,
-        "trimY": 85,
-        "width": 167,
-        "height": 115,
-        "rawWidth": 280,
-        "rawHeight": 340,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -83.5,
-            -57.5,
-            0,
-            83.5,
-            -57.5,
-            0,
-            -83.5,
-            57.5,
-            0,
-            83.5,
-            57.5,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            91,
-            255,
-            258,
-            255,
-            91,
-            140,
-            258,
-            140
-          ],
-          "nuv": [
-            0.325,
-            0.4117647058823529,
-            0.9214285714285714,
-            0.4117647058823529,
-            0.325,
-            0.75,
-            0.9214285714285714,
-            0.75
-          ],
-          "minPos": [
-            -83.5,
-            -57.5,
-            0
-          ],
-          "maxPos": [
-            83.5,
-            57.5,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "d4cca2a8-5621-4b87-b20a-ab2035433520@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "d4cca2a8-5621-4b87-b20a-ab2035433520@f9941"
-  }
-}

برخی فایل ها در این مقایسه diff نمایش داده نمی شوند زیرا تعداد فایل ها بسیار زیاد است