Kaynağa Gözat

倒水动画测试

vene 3 ay önce
ebeveyn
işleme
79776ae1fb
100 değiştirilmiş dosya ile 212 ekleme ve 5692 silme
  1. 7 32
      assets/Cup/3water/Anim/c_idle_pour.anim
  2. 10 85
      assets/Cup/3water/Anim/c_pour_01.anim
  3. 8 98
      assets/Cup/3water/Anim/c_pour_02.anim
  4. 12 117
      assets/Cup/3water/Anim/c_pour_03.anim
  5. 7 32
      assets/Cup/3water/Anim/w1_idle_pour.anim
  6. 8 58
      assets/Cup/3water/Anim/w1_pour_01.anim
  7. 7 32
      assets/Cup/3water/Anim/w2_idle_pour.anim
  8. 10 85
      assets/Cup/3water/Anim/w2_pour_01.anim
  9. 6 66
      assets/Cup/3water/Anim/w2_pour_02.anim
  10. 7 32
      assets/Cup/3water/Anim/w3_idle_pour.anim
  11. 10 85
      assets/Cup/3water/Anim/w3_pour_01.anim
  12. 8 98
      assets/Cup/3water/Anim/w3_pour_02.anim
  13. 10 80
      assets/Cup/3water/Anim/w3_pour_03.anim
  14. BIN
      assets/Cup/3water/cup/c_00001.png
  15. 0 134
      assets/Cup/3water/cup/c_00001.png.meta
  16. 6 6
      assets/Cup/3water/cup/c_00002.png.meta
  17. BIN
      assets/Cup/3water/cup/c_00003.png
  18. 0 134
      assets/Cup/3water/cup/c_00003.png.meta
  19. 6 6
      assets/Cup/3water/cup/c_00004.png.meta
  20. BIN
      assets/Cup/3water/cup/c_00005.png
  21. 0 134
      assets/Cup/3water/cup/c_00005.png.meta
  22. 6 6
      assets/Cup/3water/cup/c_00006.png.meta
  23. BIN
      assets/Cup/3water/cup/c_00007.png
  24. 0 134
      assets/Cup/3water/cup/c_00007.png.meta
  25. 6 6
      assets/Cup/3water/cup/c_00008.png.meta
  26. BIN
      assets/Cup/3water/cup/c_00009.png
  27. 0 134
      assets/Cup/3water/cup/c_00009.png.meta
  28. 6 6
      assets/Cup/3water/cup/c_00010.png.meta
  29. 6 6
      assets/Cup/3water/cup/c_00013.png.meta
  30. BIN
      assets/Cup/3water/cup/c_00014.png
  31. 0 134
      assets/Cup/3water/cup/c_00014.png.meta
  32. BIN
      assets/Cup/3water/cup/c_00015.png
  33. 0 134
      assets/Cup/3water/cup/c_00015.png.meta
  34. BIN
      assets/Cup/3water/cup/c_00016.png
  35. 0 134
      assets/Cup/3water/cup/c_00016.png.meta
  36. 6 6
      assets/Cup/3water/cup/c_00017.png.meta
  37. BIN
      assets/Cup/3water/cup/c_00018.png
  38. 0 134
      assets/Cup/3water/cup/c_00018.png.meta
  39. BIN
      assets/Cup/3water/cup/c_00019.png
  40. 0 134
      assets/Cup/3water/cup/c_00019.png.meta
  41. BIN
      assets/Cup/3water/cup/c_00020.png
  42. 0 134
      assets/Cup/3water/cup/c_00020.png.meta
  43. 6 6
      assets/Cup/3water/cup/c_00021.png.meta
  44. BIN
      assets/Cup/3water/cup/c_00022.png
  45. 0 134
      assets/Cup/3water/cup/c_00022.png.meta
  46. BIN
      assets/Cup/3water/cup/c_00023.png
  47. 0 134
      assets/Cup/3water/cup/c_00023.png.meta
  48. BIN
      assets/Cup/3water/cup/c_00024.png
  49. 0 134
      assets/Cup/3water/cup/c_00024.png.meta
  50. 6 6
      assets/Cup/3water/cup/c_00025.png.meta
  51. BIN
      assets/Cup/3water/cup/c_00026.png
  52. 0 134
      assets/Cup/3water/cup/c_00026.png.meta
  53. BIN
      assets/Cup/3water/cup/c_00027.png
  54. 0 134
      assets/Cup/3water/cup/c_00027.png.meta
  55. BIN
      assets/Cup/3water/cup/c_00028.png
  56. 0 134
      assets/Cup/3water/cup/c_00028.png.meta
  57. 6 6
      assets/Cup/3water/cup/c_00029.png.meta
  58. BIN
      assets/Cup/3water/cup/c_00030.png
  59. 0 134
      assets/Cup/3water/cup/c_00030.png.meta
  60. BIN
      assets/Cup/3water/cup/c_00031.png
  61. 0 134
      assets/Cup/3water/cup/c_00031.png.meta
  62. BIN
      assets/Cup/3water/cup/c_00032.png
  63. 0 134
      assets/Cup/3water/cup/c_00032.png.meta
  64. 6 6
      assets/Cup/3water/cup/c_00033.png.meta
  65. 6 6
      assets/Cup/3water/cup/c_00034.png.meta
  66. 6 6
      assets/Cup/3water/cup/c_00040.png.meta
  67. BIN
      assets/Cup/3water/cup/c_00041.png
  68. 0 134
      assets/Cup/3water/cup/c_00041.png.meta
  69. BIN
      assets/Cup/3water/cup/c_00042.png
  70. 0 134
      assets/Cup/3water/cup/c_00042.png.meta
  71. BIN
      assets/Cup/3water/cup/c_00043.png
  72. 0 134
      assets/Cup/3water/cup/c_00043.png.meta
  73. 6 6
      assets/Cup/3water/cup/c_00044.png.meta
  74. BIN
      assets/Cup/3water/cup/c_00045.png
  75. 0 134
      assets/Cup/3water/cup/c_00045.png.meta
  76. BIN
      assets/Cup/3water/cup/c_00046.png
  77. 0 134
      assets/Cup/3water/cup/c_00046.png.meta
  78. BIN
      assets/Cup/3water/cup/c_00047.png
  79. 0 134
      assets/Cup/3water/cup/c_00047.png.meta
  80. 6 6
      assets/Cup/3water/cup/c_00048.png.meta
  81. BIN
      assets/Cup/3water/cup/c_00049.png
  82. 0 134
      assets/Cup/3water/cup/c_00049.png.meta
  83. BIN
      assets/Cup/3water/cup/c_00050.png
  84. 0 134
      assets/Cup/3water/cup/c_00050.png.meta
  85. BIN
      assets/Cup/3water/cup/c_00051.png
  86. 0 134
      assets/Cup/3water/cup/c_00051.png.meta
  87. 6 6
      assets/Cup/3water/cup/c_00052.png.meta
  88. BIN
      assets/Cup/3water/cup/c_00053.png
  89. 0 134
      assets/Cup/3water/cup/c_00053.png.meta
  90. BIN
      assets/Cup/3water/cup/c_00054.png
  91. 0 134
      assets/Cup/3water/cup/c_00054.png.meta
  92. BIN
      assets/Cup/3water/cup/c_00055.png
  93. 0 134
      assets/Cup/3water/cup/c_00055.png.meta
  94. 6 6
      assets/Cup/3water/cup/c_00056.png.meta
  95. BIN
      assets/Cup/3water/cup/c_00057.png
  96. 0 134
      assets/Cup/3water/cup/c_00057.png.meta
  97. BIN
      assets/Cup/3water/cup/c_00058.png
  98. 0 134
      assets/Cup/3water/cup/c_00058.png.meta
  99. BIN
      assets/Cup/3water/cup/c_00059.png
  100. 0 134
      assets/Cup/3water/cup/c_00059.png.meta

+ 7 - 32
assets/Cup/3water/Anim/c_idle_pour.anim

@@ -11,7 +11,7 @@
     "speed": 0.8,
     "wrapMode": 1,
     "enableTrsBlending": false,
-    "_duration": 0.18333333333333332,
+    "_duration": 0.1,
     "_hash": 500763545,
     "_tracks": [
       {
@@ -66,12 +66,7 @@
       0.03333333333333333,
       0.05,
       0.06666666666666667,
-      0.08333333333333333,
-      0.1,
-      0.11666666666666667,
-      0.13333333333333333,
-      0.15,
-      0.16666666666666666
+      0.08333333333333333
     ],
     "_values": [
       {
@@ -79,43 +74,23 @@
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "25a8cde5-5b57-429d-8a97-45c5329cd664@f9941",
+        "__uuid__": "2403a9d9-aebf-4b20-9168-66651e74e5d3@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "d030bfb3-6a7a-4b38-9c32-6550990a37ca@f9941",
+        "__uuid__": "7351a6cd-8534-48a3-9ed5-00da65c2c658@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "9328ae1a-4a13-45c1-a84d-3bd5d2665960@f9941",
+        "__uuid__": "ef6bae7d-558a-43a8-a50b-b9a6648c4e1a@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "2c060afe-a652-4c20-998f-393efbea8fc6@f9941",
+        "__uuid__": "32e7c429-1f87-4c07-9f12-afd79b1b36e5@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "2ec8f3ed-2fc3-42ae-a6fa-99097568a04a@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "9a700cfe-090e-442d-aab4-b8614e4f1460@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "8d99c594-e187-4da8-93c1-fcd4c7513d8b@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "31686344-6e7b-4e35-8e9f-e12d4de7f3c5@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "11a65856-29e8-40ed-88ac-2e418f578491@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "86f983f1-fce4-4038-8257-9d0b79a7baaf@f9941",
+        "__uuid__": "8f8a323c-ee0c-423d-9c1a-ed3fdfbbe4de@f9941",
         "__expectedType__": "cc.SpriteFrame"
       }
     ]

+ 10 - 85
assets/Cup/3water/Anim/c_pour_01.anim

@@ -8,10 +8,10 @@
     },
     "_native": "",
     "sample": 60,
-    "speed": 0.4,
+    "speed": 1,
     "wrapMode": 1,
     "enableTrsBlending": false,
-    "_duration": 0.36666666666666664,
+    "_duration": 0.4166666666666667,
     "_hash": 500763545,
     "_tracks": [
       {
@@ -62,115 +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.3,
-      0.31666666666666665,
       0.3333333333333333,
-      0.35
+      0.4
     ],
     "_values": [
       {
-        "__uuid__": "57e5f446-7668-4409-842e-175b82272f57@f9941",
+        "__uuid__": "831ba12a-cb0b-4c31-8b1c-9a3d0a4c9644@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "15651e12-ef5b-404f-89c7-b95d9b5b066e@f9941",
+        "__uuid__": "acd1b3da-a615-4942-81d0-ead73b62e6ff@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "19343f0b-4351-482e-85bb-4286aea93ac3@f9941",
+        "__uuid__": "f3cf04e4-1055-48f8-90bd-ffb1befb8e9b@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "bb99f085-9d50-4d10-b90b-4fe736d8700a@f9941",
+        "__uuid__": "a3c9571e-56c0-4d4b-b955-183d902d4ed1@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "b1e8a071-141a-431f-bd57-f5029b4f0878@f9941",
+        "__uuid__": "3236c8d0-265e-44db-9c50-4570cf0b1c32@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "f3832f6f-0f28-42cb-a50e-ff6b82e886a4@f9941",
+        "__uuid__": "2dcfce3b-c788-48fe-a6ed-32fc79baf3fb@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "a776ecea-8348-4a56-a38b-9be947a830ef@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "f4f4ef7f-102a-4356-8c79-4106a7873269@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "23b2b6ec-be01-417c-b140-18e2c748e756@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "ffc5948d-32c6-4134-b94e-1bf62367ef6c@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "5cb5ef0d-016e-402e-9a46-604dc3e1c82c@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "05eef497-345d-4726-868f-578962e96c4d@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "ea455747-766b-4972-ab67-f388fb6f8d78@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "0751015f-a589-44ea-9b22-c6642f08f78c@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "3b38724c-9e3b-4c0c-b566-1e264fca0b85@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "6d501961-ee85-4581-9578-5fde2579416f@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "6f1a5dc0-729e-46e8-bf6e-939f9e0e85df@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "ba8be570-80d2-414d-917b-90ba265f0b07@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "570907c6-ceb7-4ea9-8466-d7a83b8ab9ad@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "44cd192e-daff-413e-a78a-4cb45b7594a5@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "4ac5f25a-a191-4722-a615-487fc0aeae19@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "93a758dc-b7fc-468e-accf-15da34b18a73@f9941",
+        "__uuid__": "90def525-1b70-4356-9c1b-f6d0f81af82e@f9941",
         "__expectedType__": "cc.SpriteFrame"
       }
     ]

+ 8 - 98
assets/Cup/3water/Anim/c_pour_02.anim

@@ -8,7 +8,7 @@
     },
     "_native": "",
     "sample": 60,
-    "speed": 0.4,
+    "speed": 1,
     "wrapMode": 1,
     "enableTrsBlending": false,
     "_duration": 0.4166666666666667,
@@ -62,130 +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.3,
-      0.31666666666666665,
       0.3333333333333333,
-      0.35,
-      0.36666666666666664,
-      0.38333333333333336,
       0.4
     ],
     "_values": [
       {
-        "__uuid__": "35a8fed4-a865-4ade-8a65-573b8a279ade@f9941",
+        "__uuid__": "a901d314-a979-47cf-8040-1362dd30c828@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "124750fb-3138-4607-90f4-970b386e4405@f9941",
+        "__uuid__": "a0d12b19-d0be-4787-8210-b55331016626@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "12868f96-514f-41a3-b05f-a328a826013a@f9941",
+        "__uuid__": "6e0a5c15-eac4-47cf-9fe4-02a7962e1526@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "66848dc1-e9be-449b-9fe4-c3a14d7f3621@f9941",
+        "__uuid__": "d155e3a8-9a82-4b5f-8e48-82aa5b3decdf@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "eadbca92-aaf7-4d18-a795-d4581377b135@f9941",
+        "__uuid__": "e66f0c81-8263-4ba4-9f63-11a1d5a1e0f2@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "bfaff3b3-189b-4402-9b28-22087bf10af9@f9941",
+        "__uuid__": "39aa048c-51f7-48cb-b163-599f89ca0d92@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "1345d2bc-0d3d-47d4-9c98-c17ce7724c97@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "6b397a3c-1fd8-4bd3-97ec-eab68c6cc6f1@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "9487454e-1c38-4736-b130-168c61eba0e1@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "c2de91ef-1c98-45c6-ad51-5b3e95c7a920@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "982f9d3b-4c3a-4099-a4ba-0429016198ba@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "0b91c9fe-28a6-4930-947e-6929b7dc7a9f@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "87708acf-1929-43b5-869d-9cffd591bca8@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "6c640633-30e3-44b0-87ac-e7f331a7eef8@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "62241d84-2536-4bf6-bb78-317257f7a5d7@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "928bb91b-e231-4fae-ac5b-6df971b47ef9@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "aeefa4a8-e79f-4e2f-bbe9-3b31a45f7098@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "f1d5cc4f-e03f-45b1-ae83-5659f17a6845@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "1170a31c-d13b-406e-a486-1560382cec08@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "7a73aca1-d5eb-488e-9a38-6836602ff842@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "3143e80f-33a3-4344-8b59-ea0733644790@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "cb37e7f3-0437-4e01-b8d2-b5bf5ff68be6@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "63a3094c-ce38-4de9-9a45-162397ab5d75@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "25e54728-13d6-474c-8538-63352689fc7a@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "094a8729-213b-43ca-9480-ca8287a4891c@f9941",
+        "__uuid__": "499c41f1-59fe-4480-8595-746d2b044dc1@f9941",
         "__expectedType__": "cc.SpriteFrame"
       }
     ]

+ 12 - 117
assets/Cup/3water/Anim/c_pour_03.anim

@@ -8,10 +8,10 @@
     },
     "_native": "",
     "sample": 60,
-    "speed": 0.5,
+    "speed": 1,
     "wrapMode": 1,
     "enableTrsBlending": false,
-    "_duration": 0.5,
+    "_duration": 0.55,
     "_hash": 500763545,
     "_tracks": [
       {
@@ -62,155 +62,50 @@
     "__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.48333333333333334
+      0.5333333333333333
     ],
     "_values": [
       {
-        "__uuid__": "bc31c782-e7aa-41b9-8f0b-173f8acb0436@f9941",
+        "__uuid__": "e2a811de-2d06-4874-84fd-b68c93728cba@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "c51699ad-0f2d-459b-944b-b870a73fd2f7@f9941",
+        "__uuid__": "c4e7e23a-ef8d-4754-b537-48c29e55a8c5@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "dd5bab3d-6f00-4cf7-bdbe-a88b04ea7bc0@f9941",
+        "__uuid__": "3017543b-c69b-47ca-a24b-d785155d677e@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "4e68a9f2-3667-47b3-8f86-0c93d573b9eb@f9941",
+        "__uuid__": "5e4e9dfe-82de-4019-be13-3ee07e1a943b@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "8c88c61a-6967-4e69-8e9d-8bb2023ae9b6@f9941",
+        "__uuid__": "9a277040-4f8e-4692-bcd9-747e552c3482@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "e16dedcf-f8fe-4147-a6c9-794664ebcfc9@f9941",
+        "__uuid__": "3d0ef03d-174a-4aac-a3e9-8a31f74527e7@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "4b8c7d23-5a26-4a4f-aecb-bd0ce0eda6fc@f9941",
+        "__uuid__": "9be8a7e2-ada9-4cee-8ef4-a7f45620dbf9@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "3018e7bd-1273-4cb6-8cac-2f9a058f49ea@f9941",
+        "__uuid__": "77b4acef-862d-4eb6-b5e3-3ea2bb82b7c5@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "575ec8fd-9dc4-4533-b005-183b18750036@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "cad6a855-cde9-4b3e-a2a5-b6496dc92b47@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "8eb8b2c6-00e5-4b27-a16a-3fcaae0aa572@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "6a8a4c96-996c-494f-a66f-76fcbdddf190@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "8c40ec92-5e09-41d6-887f-3dd888422833@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "7f3f2f05-932f-4281-bfd4-503506ed4415@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "5cd98744-1fe5-4980-b9a7-54a6177bf6f4@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "0ae1afa6-8522-4701-a78b-578679e4b821@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "d5187845-dc74-4009-b0db-fac9ae1703c3@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "9985e306-7031-4ca8-8a28-5d03855e8526@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "4cc30b5a-d5d8-4f81-8a28-1afafc82572e@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "2cf4c435-6350-409b-8beb-68cd7733a516@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "ae463352-2e91-4718-aefc-0eb8bc3d83b0@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "af98ea1f-9d25-4fa9-b4c1-adec468e8529@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "6a73e6af-d867-4587-ac91-d89104f4d82f@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "8757a586-f730-41e3-8bed-5ddf34abcb54@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "310a971c-e7d9-4daf-9de9-a499b0ec89fe@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "6f090ed9-8dd5-4ee5-bf43-58e03d501401@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "265a2259-1e36-481f-a0d2-d9960c7cdf14@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "48eac487-52e5-43b3-ac4a-75adb6c2d427@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "09b7ca03-fe60-4985-b1a1-60fd62545dd7@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "203406e2-bf64-470a-849e-6d343a239562@f9941",
+        "__uuid__": "ccf989e3-576e-42f2-b253-f76701589bbf@f9941",
         "__expectedType__": "cc.SpriteFrame"
       }
     ]

+ 7 - 32
assets/Cup/3water/Anim/w1_idle_pour.anim

@@ -11,7 +11,7 @@
     "speed": 0.8,
     "wrapMode": 1,
     "enableTrsBlending": false,
-    "_duration": 0.18333333333333332,
+    "_duration": 0.1,
     "_hash": 500763545,
     "_tracks": [
       {
@@ -66,12 +66,7 @@
       0.03333333333333333,
       0.05,
       0.06666666666666667,
-      0.08333333333333333,
-      0.1,
-      0.11666666666666667,
-      0.13333333333333333,
-      0.15,
-      0.16666666666666666
+      0.08333333333333333
     ],
     "_values": [
       {
@@ -79,43 +74,23 @@
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "c0f48f83-2468-45aa-8597-5aa3b14f5522@f9941",
+        "__uuid__": "abe2bae9-d3a2-4ce5-9177-bdacbb2f33c5@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "b8e351b3-a44f-41a0-9882-56459598ebae@f9941",
+        "__uuid__": "1b2ce571-1895-45e8-853f-5ad93b201fe1@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "ed755ff8-6b7e-4b9d-8662-1558bf11824f@f9941",
+        "__uuid__": "01882161-888f-46a6-8992-d125f5b5a0c6@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "c8f0d56e-72ea-450f-94ef-ba2dee1406ad@f9941",
+        "__uuid__": "8597f06e-ccac-49c5-89d7-91d764a79c75@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "06f68186-fb45-4b20-8b1c-b04dd03413f3@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "82240f15-8673-4550-8959-6cd3888aaa5d@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "b6ee1d9f-2b25-473c-84bb-5b8ef7f78240@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "9402bb06-4e93-4315-9695-a05fa414858f@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "ce2c70be-a8f6-4bed-ba03-8d7fee9d9ad1@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "d32b1dfd-e1e3-4af6-94ce-a0c51a04e2cd@f9941",
+        "__uuid__": "41280546-a783-4722-b17e-d70d5a39f872@f9941",
         "__expectedType__": "cc.SpriteFrame"
       }
     ]

+ 8 - 58
assets/Cup/3water/Anim/w1_pour_01.anim

@@ -8,10 +8,10 @@
     },
     "_native": "",
     "sample": 60,
-    "speed": 0.4,
+    "speed": 1,
     "wrapMode": 1,
     "enableTrsBlending": false,
-    "_duration": 0.25,
+    "_duration": 0.2833333333333333,
     "_hash": 500763545,
     "_tracks": [
       {
@@ -62,80 +62,30 @@
     "__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.26666666666666666
     ],
     "_values": [
       {
-        "__uuid__": "ae127909-fb82-4eac-8cbe-99e67ffe23d1@f9941",
+        "__uuid__": "086fb608-58b8-4f02-be9f-f6cac156dc5f@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "18ccfcf4-6ab0-4359-abaf-28e0ca8f17bf@f9941",
+        "__uuid__": "b449924b-4f52-42ae-879d-1c2846645b93@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "ddbaa38c-9380-4fd0-8cec-c6ce830ee0ea@f9941",
+        "__uuid__": "23eaf34f-c645-455a-9261-718be38f366d@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "032c20ef-5f16-462f-b455-80bbef5172b9@f9941",
+        "__uuid__": "00c4d3a6-bf5e-4d11-823f-6349d80fcc81@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "4315d34d-9546-4f80-bfe5-bc7050174274@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "010bcd87-0686-4730-85df-211b4f21c3ec@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "9e15574d-8397-45a2-a373-279ca045e157@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "efe52bc5-828f-4d6b-96cf-0020463e1ad5@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "fac3eb56-d99e-4640-94fd-06920763dfa1@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "6355a713-58bd-44af-8827-9811f1e384bc@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "8789acf9-9faf-4f77-990a-feeeba6caec7@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "e77a1e00-5cff-4a90-aa7c-e9ea7ebbec29@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "4bf9d6ef-5248-475e-942d-b57ecb2ca10c@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "ba8a34b4-1725-40bf-b0eb-fa66ecacaa6c@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "b67e39ab-4697-4ce0-bdd8-7b4de1586551@f9941",
+        "__uuid__": "5c2e7aaa-2951-4ea0-a27c-6af5a3ce6e24@f9941",
         "__expectedType__": "cc.SpriteFrame"
       }
     ]

+ 7 - 32
assets/Cup/3water/Anim/w2_idle_pour.anim

@@ -11,7 +11,7 @@
     "speed": 0.8,
     "wrapMode": 1,
     "enableTrsBlending": false,
-    "_duration": 0.18333333333333332,
+    "_duration": 0.1,
     "_hash": 500763545,
     "_tracks": [
       {
@@ -66,12 +66,7 @@
       0.03333333333333333,
       0.05,
       0.06666666666666667,
-      0.08333333333333333,
-      0.1,
-      0.11666666666666667,
-      0.13333333333333333,
-      0.15,
-      0.16666666666666666
+      0.08333333333333333
     ],
     "_values": [
       {
@@ -79,43 +74,23 @@
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "06842274-b0cd-44f1-b232-782d7579f296@f9941",
+        "__uuid__": "87e372c8-f017-4622-a0b4-5ee3786a2e1c@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "4771d36f-d3d0-471c-8492-7982894b64a3@f9941",
+        "__uuid__": "200345c4-1326-4229-9b15-8016f8d51787@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "55d01378-6612-45cd-8453-8683b19a33ca@f9941",
+        "__uuid__": "0eca8507-a5c6-4743-89d6-a464c19ea23d@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "09d6d5e4-0f57-4716-9370-fc84c899fcb8@f9941",
+        "__uuid__": "5a1ad8a5-37f4-4a4a-8215-7d214585d580@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "91492061-3df9-435c-85af-b2759df64f7e@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "4740e04c-b443-4eb9-9378-2d4c9a762195@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "8f7e405a-cd2f-4708-b5a6-833e5feb02aa@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "82e184c8-a15e-4dc3-a62e-731036b3815a@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "518880e7-8baf-4bbe-8f93-87bf9b5bf7e6@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "817e4fc3-a046-4dea-9755-a9d3ee5b2e8d@f9941",
+        "__uuid__": "6320bcf6-0553-4f32-888d-21d65c80a79a@f9941",
         "__expectedType__": "cc.SpriteFrame"
       }
     ]

+ 10 - 85
assets/Cup/3water/Anim/w2_pour_01.anim

@@ -8,10 +8,10 @@
     },
     "_native": "",
     "sample": 60,
-    "speed": 0.4,
+    "speed": 1,
     "wrapMode": 1,
     "enableTrsBlending": false,
-    "_duration": 0.36666666666666664,
+    "_duration": 0.4166666666666667,
     "_hash": 500763545,
     "_tracks": [
       {
@@ -62,115 +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.3,
-      0.31666666666666665,
       0.3333333333333333,
-      0.35
+      0.4
     ],
     "_values": [
       {
-        "__uuid__": "bd220831-2b0f-4b04-90de-f95c07f160eb@f9941",
+        "__uuid__": "f4744a5f-345d-4660-b12d-0d3db4cf45ab@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "b2a6aba6-0c28-4297-a58a-c75b26e1c233@f9941",
+        "__uuid__": "9da3fc58-6a0e-47e8-9212-774f19bc612a@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "ed5ea9e0-b77e-4021-b09f-a73a90d1f850@f9941",
+        "__uuid__": "fb5699be-bea0-4273-8d93-ba68467853c7@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "73d6dc8e-cc6b-495d-9491-32d7efca93f8@f9941",
+        "__uuid__": "79550aa7-2cf7-41a6-868f-b5cd8526f614@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "0d8c677e-3a5a-4b37-83a3-d40e15b14d39@f9941",
+        "__uuid__": "31da06c5-6c28-4c0c-8258-1c3a3401eef1@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "81324434-799e-483d-a702-9805f22ff7ee@f9941",
+        "__uuid__": "07be2d8c-ffa1-42d2-bd62-85ef80826211@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "640ed830-7c03-4730-bddb-c381f4f81d6e@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "4c3100a7-048c-49c4-b71d-a14c46c55139@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "cd51abbf-ad01-4448-b94d-195eb5344481@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "7bc72719-1893-4abd-8086-ae393e1c477b@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "d9c1e024-0af1-4fed-b4a3-ba19ef2bb585@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "e815e6b2-1a5f-46d2-956d-629fe8f3b15d@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "61088d10-06d6-4568-82cd-3f35b1dda633@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "7617074c-d824-4993-95b0-488c59fa2b9c@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "ffaaa0ca-5a61-4b48-a891-ce3dfa9998c2@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "6b0002dc-0ed1-4fda-a099-cfd125c69d06@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "e7ef7ed7-ae2b-4a84-adda-a14b4cebf2dc@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "a3b2ba33-04dc-4b66-974e-75e996dfece6@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "5fc3c8a9-e75c-4856-add9-74df3da038c0@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "b7d1aabd-50bf-4ead-89b7-5980c4976003@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "20015f2e-9963-41b0-95b5-08fea49dc757@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "f70634e5-caf0-423f-a7e4-f55ed9f5a5bc@f9941",
+        "__uuid__": "4511031d-47f4-409c-902e-7347820d2e30@f9941",
         "__expectedType__": "cc.SpriteFrame"
       }
     ]

+ 6 - 66
assets/Cup/3water/Anim/w2_pour_02.anim

@@ -8,7 +8,7 @@
     },
     "_native": "",
     "sample": 60,
-    "speed": 0.4,
+    "speed": 1,
     "wrapMode": 1,
     "enableTrsBlending": false,
     "_duration": 0.2833333333333333,
@@ -62,90 +62,30 @@
     "__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
     ],
     "_values": [
       {
-        "__uuid__": "03ca9b26-969b-4537-a6cd-23ce7c24c5a4@f9941",
+        "__uuid__": "41ba936c-3617-4d5a-9106-4254c348c15a@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "e4b55758-aa5a-4bcc-97b2-960951cfa223@f9941",
+        "__uuid__": "bd06c333-3271-4e72-92d9-5992a11c44fa@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "99a97d05-5193-4def-9b3d-7dbaa5a5ea05@f9941",
+        "__uuid__": "3af309a2-082d-4f1a-8ea0-2844ded553f5@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "a43226de-44de-4087-8943-a6c082528dae@f9941",
+        "__uuid__": "3db43eaf-3193-486b-a003-4ae22d0acc0b@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "914e4523-89f8-44d3-b32b-89cb82942753@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "eb338f8c-fecc-472a-bd3e-a3bfeee29b20@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "8635a498-5677-4f1d-b801-f46a347e9f73@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "21f0f9a6-5d7f-43b5-893c-6de771e27290@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "301c535c-51ed-4212-8929-e505d62fd8df@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "18e0c0d3-6958-431d-90e5-93016c8e936a@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "fda60aa4-bfbf-443a-b490-629d1e08b370@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "bbbf395b-d431-4a2b-8dd9-5bbee3960297@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "b5a43c2f-1262-440d-a832-32f62fea6fa7@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "cde3aa17-0e47-4227-a9b8-dae8208601e3@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "0839fc7d-bc56-4296-a7bf-829f3a67ebd5@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "c5b38b84-cf66-4528-81bf-0708156ee3cb@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "cfbf530e-3a97-4fa1-a607-b251b8b31330@f9941",
+        "__uuid__": "bd210a1c-d02e-4cc0-8f97-4a4edbf4c44f@f9941",
         "__expectedType__": "cc.SpriteFrame"
       }
     ]

+ 7 - 32
assets/Cup/3water/Anim/w3_idle_pour.anim

@@ -11,7 +11,7 @@
     "speed": 0.8,
     "wrapMode": 1,
     "enableTrsBlending": false,
-    "_duration": 0.18333333333333332,
+    "_duration": 0.1,
     "_hash": 500763545,
     "_tracks": [
       {
@@ -66,12 +66,7 @@
       0.03333333333333333,
       0.05,
       0.06666666666666667,
-      0.08333333333333333,
-      0.1,
-      0.11666666666666667,
-      0.13333333333333333,
-      0.15,
-      0.16666666666666666
+      0.08333333333333333
     ],
     "_values": [
       {
@@ -79,43 +74,23 @@
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "f87f0e57-bad0-48ad-a17e-91c44864bf5b@f9941",
+        "__uuid__": "b450adc7-2ae7-44c5-8158-16c3e84c54d1@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "cf0780ca-02c6-42b5-8b4e-b0da095e4193@f9941",
+        "__uuid__": "79359c43-f2b8-4b4a-ad10-afaa52d11fe8@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "6e7766a6-a51c-4a31-8de7-7055a8b61309@f9941",
+        "__uuid__": "80cc33ac-f2c8-43a9-8a3a-ec5d916e975b@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "5ee9d5c3-de28-4c23-8e5a-f2339d04621f@f9941",
+        "__uuid__": "9f9b8848-f280-42d2-b1fe-5ec17fd8314c@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "0210f980-7bac-499e-8b41-dae17b413856@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "ef3312d1-b11d-4653-ba3b-f28317a63c6c@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "995ba892-f2e6-41a6-a201-bb3af17c5e4c@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "b90f07cb-11dc-4196-b310-fcb5883c62fc@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "4992248a-1d6d-4260-b007-461942041a81@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "75217721-a00c-4dda-ad9c-5c550d1d9a62@f9941",
+        "__uuid__": "f17c8d9f-78ed-47cf-9d4b-26f5b770ca6a@f9941",
         "__expectedType__": "cc.SpriteFrame"
       }
     ]

+ 10 - 85
assets/Cup/3water/Anim/w3_pour_01.anim

@@ -8,10 +8,10 @@
     },
     "_native": "",
     "sample": 60,
-    "speed": 0.4,
+    "speed": 1,
     "wrapMode": 1,
     "enableTrsBlending": false,
-    "_duration": 0.36666666666666664,
+    "_duration": 0.4166666666666667,
     "_hash": 500763545,
     "_tracks": [
       {
@@ -62,115 +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.3,
-      0.31666666666666665,
       0.3333333333333333,
-      0.35
+      0.4
     ],
     "_values": [
       {
-        "__uuid__": "c6ef7c71-4865-4b00-9118-06d6f40aded6@f9941",
+        "__uuid__": "22347c63-c6ef-4607-9a60-4db09fc1bd95@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "f44b3f07-8d2e-499a-b9d6-0d8bca304a14@f9941",
+        "__uuid__": "180e5e4c-6eb5-4ec0-9527-12ca7c412617@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "151ae459-d2d5-46d9-9da0-5fd42e9027d7@f9941",
+        "__uuid__": "6c3a6a63-d354-4c7b-83a6-b44d3fde0545@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "677be362-0ac0-4266-833b-e0160a97d921@f9941",
+        "__uuid__": "f1e4c607-8f46-4a84-9a8e-061b02ca40f7@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "45e74497-5c40-4129-b9cb-3654e5feb450@f9941",
+        "__uuid__": "1bade2f3-532f-4fac-bbf8-5d0de060037e@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "71225634-1236-4414-bb61-a9a94ab784a2@f9941",
+        "__uuid__": "47f9ba33-4db9-44e9-b394-3bed6ae1a764@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "32ca0d19-ef8b-4ebe-9c92-e2d8905e6219@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "a59d3066-0e74-4b4e-974e-65c4edde616d@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "54aeb201-1b53-4aa2-9343-34d029973a3a@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "ac0ac550-47d5-4e36-ace8-136a1711a235@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "1e20f1e8-3a7f-4f50-9373-93adb7b7d818@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "7c4bbef1-93f2-4724-ae00-1dc193fb5bc7@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "8f137e20-9e2e-4dd6-976f-8b0e9ba2748c@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "12937a57-e8fa-49fb-8129-eb4a23939038@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "b70bede2-db8b-4786-9b7b-b414e170496b@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "cd5a813b-266b-437e-bf7b-015d29e5d23e@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "f17f0e8d-31c2-4c9c-8942-101bf3e361c2@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "b2befea2-07e0-4ebd-a70b-9bbb6bcdca0c@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "ce6927d3-c9c4-4251-b132-dd3c5f488d82@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "3b82c895-99e5-4725-8509-065c13b5f855@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "e2231d67-1537-418a-ade8-0e01176af39b@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "748c3618-9ecd-4f6c-b510-c7c09894edf7@f9941",
+        "__uuid__": "f9280f74-4f1b-4272-9708-854827a9d6ff@f9941",
         "__expectedType__": "cc.SpriteFrame"
       }
     ]

+ 8 - 98
assets/Cup/3water/Anim/w3_pour_02.anim

@@ -8,7 +8,7 @@
     },
     "_native": "",
     "sample": 60,
-    "speed": 0.4,
+    "speed": 1,
     "wrapMode": 1,
     "enableTrsBlending": false,
     "_duration": 0.4166666666666667,
@@ -62,130 +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.3,
-      0.31666666666666665,
       0.3333333333333333,
-      0.35,
-      0.36666666666666664,
-      0.38333333333333336,
       0.4
     ],
     "_values": [
       {
-        "__uuid__": "3a5fbd24-d8b2-4089-bd1e-1c8ffd1bdfd9@f9941",
+        "__uuid__": "82298e7b-8d9e-4c40-bfcc-4dbbd0f8e3d5@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "46595607-3069-426b-a76b-1adfac06caf3@f9941",
+        "__uuid__": "6eb851e1-3613-4586-89f5-a5d53f91b824@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "39b60c83-6eef-4513-992c-39e0467ed4f6@f9941",
+        "__uuid__": "c9deff79-11f9-4af2-b091-e28371f18102@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "ac66f6bd-f937-4c5c-a16d-dc2079ab3c82@f9941",
+        "__uuid__": "847b5151-3cda-4505-bc42-4bf8eb01f8fc@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "1d528f1a-4312-4c64-a5f4-2e803dd50fd1@f9941",
+        "__uuid__": "eb7d0a13-1ad5-4ed4-ae85-cf4e85a84820@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "9bea7417-763f-40b8-9af0-8ba67d71593b@f9941",
+        "__uuid__": "2adcfb77-4d4f-4e1e-9302-adcf6f5b2a1d@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "8f1ed705-8ae9-4a76-85b8-3403518e0343@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "284fe1ef-1814-410b-8492-266ff49f415c@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "bc7e9cd7-51f4-4975-a754-ee56de72ffec@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "04eec891-2f9d-4bf3-968c-699a6bd9e9dd@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "035eaf2c-6225-4e75-8576-d98598f38e1d@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "29cb06bd-1a42-4b1e-9ba6-7c02b60acdff@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "bcc260fb-c288-4dc3-a494-34827eff8cd2@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "c8be1bfe-807e-47bc-a1b8-fa682a916509@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "40e48ea2-722d-406e-9247-278ba6ac5463@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "babe655a-79d7-487d-8da0-192ac1cd9ac1@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "d4e6d495-2fc2-48a5-b6f6-491bfd09cb95@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "f3827cac-252f-4bfa-8c62-91c87b2be438@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "2b0e32f9-1ca9-4f4b-9ffa-e08dada922b9@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "b3c47997-83ca-40b4-8c7f-6480cfad99e1@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "a52eb228-3699-41ce-89c0-09261f76b1a1@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "499b1eca-c798-4ce2-8759-4b45ff49615e@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "8bfb0879-f512-4151-a444-35f571a0e103@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "5f5fb9d7-3817-470a-b503-4108fc216cff@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "74d41ac2-1194-4b3a-bc59-73ebd4755b29@f9941",
+        "__uuid__": "fda96e87-746c-47ad-a4a6-355f6708b81d@f9941",
         "__expectedType__": "cc.SpriteFrame"
       }
     ]

+ 10 - 80
assets/Cup/3water/Anim/w3_pour_03.anim

@@ -8,10 +8,10 @@
     },
     "_native": "",
     "sample": 60,
-    "speed": 0.5,
+    "speed": 1,
     "wrapMode": 1,
     "enableTrsBlending": false,
-    "_duration": 0.3333333333333333,
+    "_duration": 0.36666666666666664,
     "_hash": 500763545,
     "_tracks": [
       {
@@ -62,105 +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.2833333333333333,
-      0.3,
-      0.31666666666666665
+      0.3333333333333333,
+      0.35
     ],
     "_values": [
       {
-        "__uuid__": "1eb09805-8d49-456e-bc8e-e08536a425b5@f9941",
+        "__uuid__": "a614e088-1f63-44f2-ae39-3c8b76b29af0@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "5c9ed3b3-349a-4cba-ac1d-515f32084e13@f9941",
+        "__uuid__": "b3ec578e-871d-49a0-a507-ccdf4b548841@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "83f78cf0-bfe5-4771-bc8a-879e4042a3f5@f9941",
+        "__uuid__": "75d8fedb-71bc-4c03-bc40-f97230c0c9e7@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "6b7f2339-0597-4487-8ad0-6f01c8ab2019@f9941",
+        "__uuid__": "ca78d9da-fa9a-4261-9725-7286e2b72f8d@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "5c65959f-9ae4-4f38-9fdd-d47205d7d834@f9941",
+        "__uuid__": "9ebcc276-3dae-44dc-ac41-cbfa350da6fe@f9941",
         "__expectedType__": "cc.SpriteFrame"
       },
       {
-        "__uuid__": "78a2a907-3390-41da-baea-1cdf679159a5@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "f88af3d4-7d72-4e5c-b6e2-2b4294b5a77c@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "d9afd957-78be-40bc-9aba-9e51b1a33edf@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "c28fefd6-382a-4bbc-b41d-bf19ed0f8c31@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "3f508de1-5874-4733-a099-653639ff8cca@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "fed1cd12-98c2-4658-b7a8-a53369a64378@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "3d9647b1-a0f5-4a52-af40-e96705c6440c@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "cf71f28e-c0f8-4b96-a5d6-fd24bf9865b8@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "3f360a6e-40e5-47af-ade6-096e28032bf0@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "e0874237-db1c-482a-b547-c976b35d9203@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "9cd7e3e0-b64f-481f-978c-47896c519532@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "79cffede-d2da-4db1-b8f0-a6d986a0afd7@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "8d63a81c-86e7-4312-8f0f-d04bc967960b@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "e3fc4f9c-9b25-48c5-b9bb-55e02bf89714@f9941",
-        "__expectedType__": "cc.SpriteFrame"
-      },
-      {
-        "__uuid__": "b4196749-1f9c-4995-a98d-0ffc0cffdd95@f9941",
+        "__uuid__": "e5b57b0a-80ff-49f1-a455-c558ffc7f78b@f9941",
         "__expectedType__": "cc.SpriteFrame"
       }
     ]

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


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

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.26",
-  "importer": "image",
-  "imported": true,
-  "uuid": "25a8cde5-5b57-429d-8a97-45c5329cd664",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "25a8cde5-5b57-429d-8a97-45c5329cd664@6c48a",
-      "displayName": "c_00001",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "25a8cde5-5b57-429d-8a97-45c5329cd664",
-        "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": "25a8cde5-5b57-429d-8a97-45c5329cd664@f9941",
-      "displayName": "c_00001",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 43.5,
-        "offsetY": -64.5,
-        "trimX": 127,
-        "trimY": 133,
-        "width": 113,
-        "height": 203,
-        "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": [
-            -56.5,
-            -101.5,
-            0,
-            56.5,
-            -101.5,
-            0,
-            -56.5,
-            101.5,
-            0,
-            56.5,
-            101.5,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            127,
-            207,
-            240,
-            207,
-            127,
-            4,
-            240,
-            4
-          ],
-          "nuv": [
-            0.45357142857142857,
-            0.011764705882352941,
-            0.8571428571428571,
-            0.011764705882352941,
-            0.45357142857142857,
-            0.6088235294117647,
-            0.8571428571428571,
-            0.6088235294117647
-          ],
-          "minPos": [
-            -56.5,
-            -101.5,
-            0
-          ],
-          "maxPos": [
-            56.5,
-            101.5,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "25a8cde5-5b57-429d-8a97-45c5329cd664@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "25a8cde5-5b57-429d-8a97-45c5329cd664@f9941"
-  }
-}

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

@@ -2,7 +2,7 @@
   "ver": "1.0.26",
   "importer": "image",
   "imported": true,
-  "uuid": "d030bfb3-6a7a-4b38-9c32-6550990a37ca",
+  "uuid": "2403a9d9-aebf-4b20-9168-66651e74e5d3",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "d030bfb3-6a7a-4b38-9c32-6550990a37ca@6c48a",
+      "uuid": "2403a9d9-aebf-4b20-9168-66651e74e5d3@6c48a",
       "displayName": "c_00002",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "d030bfb3-6a7a-4b38-9c32-6550990a37ca",
+        "imageUuidOrDatabaseUri": "2403a9d9-aebf-4b20-9168-66651e74e5d3",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "d030bfb3-6a7a-4b38-9c32-6550990a37ca@f9941",
+      "uuid": "2403a9d9-aebf-4b20-9168-66651e74e5d3@f9941",
       "displayName": "c_00002",
       "id": "f9941",
       "name": "spriteFrame",
@@ -114,7 +114,7 @@
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "d030bfb3-6a7a-4b38-9c32-6550990a37ca@6c48a",
+        "imageUuidOrDatabaseUri": "2403a9d9-aebf-4b20-9168-66651e74e5d3@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "d030bfb3-6a7a-4b38-9c32-6550990a37ca@f9941"
+    "redirect": "2403a9d9-aebf-4b20-9168-66651e74e5d3@f9941"
   }
 }

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


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

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.26",
-  "importer": "image",
-  "imported": true,
-  "uuid": "9328ae1a-4a13-45c1-a84d-3bd5d2665960",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "9328ae1a-4a13-45c1-a84d-3bd5d2665960@6c48a",
-      "displayName": "c_00003",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "9328ae1a-4a13-45c1-a84d-3bd5d2665960",
-        "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": "9328ae1a-4a13-45c1-a84d-3bd5d2665960@f9941",
-      "displayName": "c_00003",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 38.5,
-        "offsetY": -60.5,
-        "trimX": 117,
-        "trimY": 129,
-        "width": 123,
-        "height": 203,
-        "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": [
-            -61.5,
-            -101.5,
-            0,
-            61.5,
-            -101.5,
-            0,
-            -61.5,
-            101.5,
-            0,
-            61.5,
-            101.5,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            117,
-            211,
-            240,
-            211,
-            117,
-            8,
-            240,
-            8
-          ],
-          "nuv": [
-            0.41785714285714287,
-            0.023529411764705882,
-            0.8571428571428571,
-            0.023529411764705882,
-            0.41785714285714287,
-            0.6205882352941177,
-            0.8571428571428571,
-            0.6205882352941177
-          ],
-          "minPos": [
-            -61.5,
-            -101.5,
-            0
-          ],
-          "maxPos": [
-            61.5,
-            101.5,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "9328ae1a-4a13-45c1-a84d-3bd5d2665960@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "9328ae1a-4a13-45c1-a84d-3bd5d2665960@f9941"
-  }
-}

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

@@ -2,7 +2,7 @@
   "ver": "1.0.26",
   "importer": "image",
   "imported": true,
-  "uuid": "2c060afe-a652-4c20-998f-393efbea8fc6",
+  "uuid": "7351a6cd-8534-48a3-9ed5-00da65c2c658",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "2c060afe-a652-4c20-998f-393efbea8fc6@6c48a",
+      "uuid": "7351a6cd-8534-48a3-9ed5-00da65c2c658@6c48a",
       "displayName": "c_00004",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "2c060afe-a652-4c20-998f-393efbea8fc6",
+        "imageUuidOrDatabaseUri": "7351a6cd-8534-48a3-9ed5-00da65c2c658",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "2c060afe-a652-4c20-998f-393efbea8fc6@f9941",
+      "uuid": "7351a6cd-8534-48a3-9ed5-00da65c2c658@f9941",
       "displayName": "c_00004",
       "id": "f9941",
       "name": "spriteFrame",
@@ -114,7 +114,7 @@
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "2c060afe-a652-4c20-998f-393efbea8fc6@6c48a",
+        "imageUuidOrDatabaseUri": "7351a6cd-8534-48a3-9ed5-00da65c2c658@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "2c060afe-a652-4c20-998f-393efbea8fc6@f9941"
+    "redirect": "7351a6cd-8534-48a3-9ed5-00da65c2c658@f9941"
   }
 }

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


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

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.26",
-  "importer": "image",
-  "imported": true,
-  "uuid": "2ec8f3ed-2fc3-42ae-a6fa-99097568a04a",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "2ec8f3ed-2fc3-42ae-a6fa-99097568a04a@6c48a",
-      "displayName": "c_00005",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "2ec8f3ed-2fc3-42ae-a6fa-99097568a04a",
-        "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": "2ec8f3ed-2fc3-42ae-a6fa-99097568a04a@f9941",
-      "displayName": "c_00005",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 33.5,
-        "offsetY": -56.5,
-        "trimX": 107,
-        "trimY": 125,
-        "width": 133,
-        "height": 203,
-        "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,
-            -101.5,
-            0,
-            66.5,
-            -101.5,
-            0,
-            -66.5,
-            101.5,
-            0,
-            66.5,
-            101.5,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            107,
-            215,
-            240,
-            215,
-            107,
-            12,
-            240,
-            12
-          ],
-          "nuv": [
-            0.3821428571428571,
-            0.03529411764705882,
-            0.8571428571428571,
-            0.03529411764705882,
-            0.3821428571428571,
-            0.6323529411764706,
-            0.8571428571428571,
-            0.6323529411764706
-          ],
-          "minPos": [
-            -66.5,
-            -101.5,
-            0
-          ],
-          "maxPos": [
-            66.5,
-            101.5,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "2ec8f3ed-2fc3-42ae-a6fa-99097568a04a@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "2ec8f3ed-2fc3-42ae-a6fa-99097568a04a@f9941"
-  }
-}

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

@@ -2,7 +2,7 @@
   "ver": "1.0.26",
   "importer": "image",
   "imported": true,
-  "uuid": "9a700cfe-090e-442d-aab4-b8614e4f1460",
+  "uuid": "ef6bae7d-558a-43a8-a50b-b9a6648c4e1a",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "9a700cfe-090e-442d-aab4-b8614e4f1460@6c48a",
+      "uuid": "ef6bae7d-558a-43a8-a50b-b9a6648c4e1a@6c48a",
       "displayName": "c_00006",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "9a700cfe-090e-442d-aab4-b8614e4f1460",
+        "imageUuidOrDatabaseUri": "ef6bae7d-558a-43a8-a50b-b9a6648c4e1a",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "9a700cfe-090e-442d-aab4-b8614e4f1460@f9941",
+      "uuid": "ef6bae7d-558a-43a8-a50b-b9a6648c4e1a@f9941",
       "displayName": "c_00006",
       "id": "f9941",
       "name": "spriteFrame",
@@ -114,7 +114,7 @@
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "9a700cfe-090e-442d-aab4-b8614e4f1460@6c48a",
+        "imageUuidOrDatabaseUri": "ef6bae7d-558a-43a8-a50b-b9a6648c4e1a@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "9a700cfe-090e-442d-aab4-b8614e4f1460@f9941"
+    "redirect": "ef6bae7d-558a-43a8-a50b-b9a6648c4e1a@f9941"
   }
 }

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


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

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.26",
-  "importer": "image",
-  "imported": true,
-  "uuid": "8d99c594-e187-4da8-93c1-fcd4c7513d8b",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "8d99c594-e187-4da8-93c1-fcd4c7513d8b@6c48a",
-      "displayName": "c_00007",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "8d99c594-e187-4da8-93c1-fcd4c7513d8b",
-        "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": "8d99c594-e187-4da8-93c1-fcd4c7513d8b@f9941",
-      "displayName": "c_00007",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 27.5,
-        "offsetY": -52,
-        "trimX": 95,
-        "trimY": 120,
-        "width": 145,
-        "height": 204,
-        "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": [
-            -72.5,
-            -102,
-            0,
-            72.5,
-            -102,
-            0,
-            -72.5,
-            102,
-            0,
-            72.5,
-            102,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            95,
-            220,
-            240,
-            220,
-            95,
-            16,
-            240,
-            16
-          ],
-          "nuv": [
-            0.3392857142857143,
-            0.047058823529411764,
-            0.8571428571428571,
-            0.047058823529411764,
-            0.3392857142857143,
-            0.6470588235294118,
-            0.8571428571428571,
-            0.6470588235294118
-          ],
-          "minPos": [
-            -72.5,
-            -102,
-            0
-          ],
-          "maxPos": [
-            72.5,
-            102,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "8d99c594-e187-4da8-93c1-fcd4c7513d8b@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "8d99c594-e187-4da8-93c1-fcd4c7513d8b@f9941"
-  }
-}

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

@@ -2,7 +2,7 @@
   "ver": "1.0.26",
   "importer": "image",
   "imported": true,
-  "uuid": "31686344-6e7b-4e35-8e9f-e12d4de7f3c5",
+  "uuid": "32e7c429-1f87-4c07-9f12-afd79b1b36e5",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "31686344-6e7b-4e35-8e9f-e12d4de7f3c5@6c48a",
+      "uuid": "32e7c429-1f87-4c07-9f12-afd79b1b36e5@6c48a",
       "displayName": "c_00008",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "31686344-6e7b-4e35-8e9f-e12d4de7f3c5",
+        "imageUuidOrDatabaseUri": "32e7c429-1f87-4c07-9f12-afd79b1b36e5",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "31686344-6e7b-4e35-8e9f-e12d4de7f3c5@f9941",
+      "uuid": "32e7c429-1f87-4c07-9f12-afd79b1b36e5@f9941",
       "displayName": "c_00008",
       "id": "f9941",
       "name": "spriteFrame",
@@ -114,7 +114,7 @@
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "31686344-6e7b-4e35-8e9f-e12d4de7f3c5@6c48a",
+        "imageUuidOrDatabaseUri": "32e7c429-1f87-4c07-9f12-afd79b1b36e5@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "31686344-6e7b-4e35-8e9f-e12d4de7f3c5@f9941"
+    "redirect": "32e7c429-1f87-4c07-9f12-afd79b1b36e5@f9941"
   }
 }

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


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

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.26",
-  "importer": "image",
-  "imported": true,
-  "uuid": "11a65856-29e8-40ed-88ac-2e418f578491",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "11a65856-29e8-40ed-88ac-2e418f578491@6c48a",
-      "displayName": "c_00009",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "11a65856-29e8-40ed-88ac-2e418f578491",
-        "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": "11a65856-29e8-40ed-88ac-2e418f578491@f9941",
-      "displayName": "c_00009",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 24.5,
-        "offsetY": -46.5,
-        "trimX": 89,
-        "trimY": 115,
-        "width": 151,
-        "height": 203,
-        "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": [
-            -75.5,
-            -101.5,
-            0,
-            75.5,
-            -101.5,
-            0,
-            -75.5,
-            101.5,
-            0,
-            75.5,
-            101.5,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            89,
-            225,
-            240,
-            225,
-            89,
-            22,
-            240,
-            22
-          ],
-          "nuv": [
-            0.31785714285714284,
-            0.06470588235294118,
-            0.8571428571428571,
-            0.06470588235294118,
-            0.31785714285714284,
-            0.6617647058823529,
-            0.8571428571428571,
-            0.6617647058823529
-          ],
-          "minPos": [
-            -75.5,
-            -101.5,
-            0
-          ],
-          "maxPos": [
-            75.5,
-            101.5,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "11a65856-29e8-40ed-88ac-2e418f578491@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "11a65856-29e8-40ed-88ac-2e418f578491@f9941"
-  }
-}

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

@@ -2,7 +2,7 @@
   "ver": "1.0.26",
   "importer": "image",
   "imported": true,
-  "uuid": "86f983f1-fce4-4038-8257-9d0b79a7baaf",
+  "uuid": "8f8a323c-ee0c-423d-9c1a-ed3fdfbbe4de",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "86f983f1-fce4-4038-8257-9d0b79a7baaf@6c48a",
+      "uuid": "8f8a323c-ee0c-423d-9c1a-ed3fdfbbe4de@6c48a",
       "displayName": "c_00010",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "86f983f1-fce4-4038-8257-9d0b79a7baaf",
+        "imageUuidOrDatabaseUri": "8f8a323c-ee0c-423d-9c1a-ed3fdfbbe4de",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "86f983f1-fce4-4038-8257-9d0b79a7baaf@f9941",
+      "uuid": "8f8a323c-ee0c-423d-9c1a-ed3fdfbbe4de@f9941",
       "displayName": "c_00010",
       "id": "f9941",
       "name": "spriteFrame",
@@ -114,7 +114,7 @@
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "86f983f1-fce4-4038-8257-9d0b79a7baaf@6c48a",
+        "imageUuidOrDatabaseUri": "8f8a323c-ee0c-423d-9c1a-ed3fdfbbe4de@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "86f983f1-fce4-4038-8257-9d0b79a7baaf@f9941"
+    "redirect": "8f8a323c-ee0c-423d-9c1a-ed3fdfbbe4de@f9941"
   }
 }

+ 6 - 6
assets/Cup/3water/cup/c_00013.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.26",
   "importer": "image",
   "imported": true,
-  "uuid": "57e5f446-7668-4409-842e-175b82272f57",
+  "uuid": "831ba12a-cb0b-4c31-8b1c-9a3d0a4c9644",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "57e5f446-7668-4409-842e-175b82272f57@6c48a",
+      "uuid": "831ba12a-cb0b-4c31-8b1c-9a3d0a4c9644@6c48a",
       "displayName": "c_00013",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "57e5f446-7668-4409-842e-175b82272f57",
+        "imageUuidOrDatabaseUri": "831ba12a-cb0b-4c31-8b1c-9a3d0a4c9644",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "57e5f446-7668-4409-842e-175b82272f57@f9941",
+      "uuid": "831ba12a-cb0b-4c31-8b1c-9a3d0a4c9644@f9941",
       "displayName": "c_00013",
       "id": "f9941",
       "name": "spriteFrame",
@@ -114,7 +114,7 @@
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "57e5f446-7668-4409-842e-175b82272f57@6c48a",
+        "imageUuidOrDatabaseUri": "831ba12a-cb0b-4c31-8b1c-9a3d0a4c9644@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "57e5f446-7668-4409-842e-175b82272f57@f9941"
+    "redirect": "831ba12a-cb0b-4c31-8b1c-9a3d0a4c9644@f9941"
   }
 }

BIN
assets/Cup/3water/cup/c_00014.png


+ 0 - 134
assets/Cup/3water/cup/c_00014.png.meta

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.26",
-  "importer": "image",
-  "imported": true,
-  "uuid": "15651e12-ef5b-404f-89c7-b95d9b5b066e",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "15651e12-ef5b-404f-89c7-b95d9b5b066e@6c48a",
-      "displayName": "c_00014",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "15651e12-ef5b-404f-89c7-b95d9b5b066e",
-        "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": "15651e12-ef5b-404f-89c7-b95d9b5b066e@f9941",
-      "displayName": "c_00014",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 18,
-        "offsetY": -36,
-        "trimX": 76,
-        "trimY": 105,
-        "width": 164,
-        "height": 202,
-        "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,
-            -101,
-            0,
-            82,
-            -101,
-            0,
-            -82,
-            101,
-            0,
-            82,
-            101,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            76,
-            235,
-            240,
-            235,
-            76,
-            33,
-            240,
-            33
-          ],
-          "nuv": [
-            0.2714285714285714,
-            0.09705882352941177,
-            0.8571428571428571,
-            0.09705882352941177,
-            0.2714285714285714,
-            0.6911764705882353,
-            0.8571428571428571,
-            0.6911764705882353
-          ],
-          "minPos": [
-            -82,
-            -101,
-            0
-          ],
-          "maxPos": [
-            82,
-            101,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "15651e12-ef5b-404f-89c7-b95d9b5b066e@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "15651e12-ef5b-404f-89c7-b95d9b5b066e@f9941"
-  }
-}

BIN
assets/Cup/3water/cup/c_00015.png


+ 0 - 134
assets/Cup/3water/cup/c_00015.png.meta

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.26",
-  "importer": "image",
-  "imported": true,
-  "uuid": "19343f0b-4351-482e-85bb-4286aea93ac3",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "19343f0b-4351-482e-85bb-4286aea93ac3@6c48a",
-      "displayName": "c_00015",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "19343f0b-4351-482e-85bb-4286aea93ac3",
-        "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": "19343f0b-4351-482e-85bb-4286aea93ac3@f9941",
-      "displayName": "c_00015",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 14,
-        "offsetY": -28,
-        "trimX": 67,
-        "trimY": 98,
-        "width": 174,
-        "height": 200,
-        "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": [
-            -87,
-            -100,
-            0,
-            87,
-            -100,
-            0,
-            -87,
-            100,
-            0,
-            87,
-            100,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            67,
-            242,
-            241,
-            242,
-            67,
-            42,
-            241,
-            42
-          ],
-          "nuv": [
-            0.2392857142857143,
-            0.12352941176470589,
-            0.8607142857142858,
-            0.12352941176470589,
-            0.2392857142857143,
-            0.711764705882353,
-            0.8607142857142858,
-            0.711764705882353
-          ],
-          "minPos": [
-            -87,
-            -100,
-            0
-          ],
-          "maxPos": [
-            87,
-            100,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "19343f0b-4351-482e-85bb-4286aea93ac3@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "19343f0b-4351-482e-85bb-4286aea93ac3@f9941"
-  }
-}

BIN
assets/Cup/3water/cup/c_00016.png


+ 0 - 134
assets/Cup/3water/cup/c_00016.png.meta

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.26",
-  "importer": "image",
-  "imported": true,
-  "uuid": "bb99f085-9d50-4d10-b90b-4fe736d8700a",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "bb99f085-9d50-4d10-b90b-4fe736d8700a@6c48a",
-      "displayName": "c_00016",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "bb99f085-9d50-4d10-b90b-4fe736d8700a",
-        "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": "bb99f085-9d50-4d10-b90b-4fe736d8700a@f9941",
-      "displayName": "c_00016",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 11,
-        "offsetY": -20.5,
-        "trimX": 61,
-        "trimY": 92,
-        "width": 180,
-        "height": 197,
-        "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": [
-            -90,
-            -98.5,
-            0,
-            90,
-            -98.5,
-            0,
-            -90,
-            98.5,
-            0,
-            90,
-            98.5,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            61,
-            248,
-            241,
-            248,
-            61,
-            51,
-            241,
-            51
-          ],
-          "nuv": [
-            0.21785714285714286,
-            0.15,
-            0.8607142857142858,
-            0.15,
-            0.21785714285714286,
-            0.7294117647058823,
-            0.8607142857142858,
-            0.7294117647058823
-          ],
-          "minPos": [
-            -90,
-            -98.5,
-            0
-          ],
-          "maxPos": [
-            90,
-            98.5,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "bb99f085-9d50-4d10-b90b-4fe736d8700a@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "bb99f085-9d50-4d10-b90b-4fe736d8700a@f9941"
-  }
-}

+ 6 - 6
assets/Cup/3water/cup/c_00017.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.26",
   "importer": "image",
   "imported": true,
-  "uuid": "b1e8a071-141a-431f-bd57-f5029b4f0878",
+  "uuid": "acd1b3da-a615-4942-81d0-ead73b62e6ff",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "b1e8a071-141a-431f-bd57-f5029b4f0878@6c48a",
+      "uuid": "acd1b3da-a615-4942-81d0-ead73b62e6ff@6c48a",
       "displayName": "c_00017",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "b1e8a071-141a-431f-bd57-f5029b4f0878",
+        "imageUuidOrDatabaseUri": "acd1b3da-a615-4942-81d0-ead73b62e6ff",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "b1e8a071-141a-431f-bd57-f5029b4f0878@f9941",
+      "uuid": "acd1b3da-a615-4942-81d0-ead73b62e6ff@f9941",
       "displayName": "c_00017",
       "id": "f9941",
       "name": "spriteFrame",
@@ -114,7 +114,7 @@
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "b1e8a071-141a-431f-bd57-f5029b4f0878@6c48a",
+        "imageUuidOrDatabaseUri": "acd1b3da-a615-4942-81d0-ead73b62e6ff@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "b1e8a071-141a-431f-bd57-f5029b4f0878@f9941"
+    "redirect": "acd1b3da-a615-4942-81d0-ead73b62e6ff@f9941"
   }
 }

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


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

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.26",
-  "importer": "image",
-  "imported": true,
-  "uuid": "f3832f6f-0f28-42cb-a50e-ff6b82e886a4",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "f3832f6f-0f28-42cb-a50e-ff6b82e886a4@6c48a",
-      "displayName": "c_00018",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "f3832f6f-0f28-42cb-a50e-ff6b82e886a4",
-        "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": "f3832f6f-0f28-42cb-a50e-ff6b82e886a4@f9941",
-      "displayName": "c_00018",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 8.5,
-        "offsetY": -10,
-        "trimX": 54,
-        "trimY": 84,
-        "width": 189,
-        "height": 192,
-        "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": [
-            -94.5,
-            -96,
-            0,
-            94.5,
-            -96,
-            0,
-            -94.5,
-            96,
-            0,
-            94.5,
-            96,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            54,
-            256,
-            243,
-            256,
-            54,
-            64,
-            243,
-            64
-          ],
-          "nuv": [
-            0.19285714285714287,
-            0.18823529411764706,
-            0.8678571428571429,
-            0.18823529411764706,
-            0.19285714285714287,
-            0.7529411764705882,
-            0.8678571428571429,
-            0.7529411764705882
-          ],
-          "minPos": [
-            -94.5,
-            -96,
-            0
-          ],
-          "maxPos": [
-            94.5,
-            96,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "f3832f6f-0f28-42cb-a50e-ff6b82e886a4@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "f3832f6f-0f28-42cb-a50e-ff6b82e886a4@f9941"
-  }
-}

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


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

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.26",
-  "importer": "image",
-  "imported": true,
-  "uuid": "a776ecea-8348-4a56-a38b-9be947a830ef",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "a776ecea-8348-4a56-a38b-9be947a830ef@6c48a",
-      "displayName": "c_00019",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "a776ecea-8348-4a56-a38b-9be947a830ef",
-        "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": "a776ecea-8348-4a56-a38b-9be947a830ef@f9941",
-      "displayName": "c_00019",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 7,
-        "offsetY": -6.5,
-        "trimX": 52,
-        "trimY": 81,
-        "width": 190,
-        "height": 191,
-        "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": [
-            -95,
-            -95.5,
-            0,
-            95,
-            -95.5,
-            0,
-            -95,
-            95.5,
-            0,
-            95,
-            95.5,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            52,
-            259,
-            242,
-            259,
-            52,
-            68,
-            242,
-            68
-          ],
-          "nuv": [
-            0.18571428571428572,
-            0.2,
-            0.8642857142857143,
-            0.2,
-            0.18571428571428572,
-            0.7617647058823529,
-            0.8642857142857143,
-            0.7617647058823529
-          ],
-          "minPos": [
-            -95,
-            -95.5,
-            0
-          ],
-          "maxPos": [
-            95,
-            95.5,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "a776ecea-8348-4a56-a38b-9be947a830ef@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "a776ecea-8348-4a56-a38b-9be947a830ef@f9941"
-  }
-}

BIN
assets/Cup/3water/cup/c_00020.png


+ 0 - 134
assets/Cup/3water/cup/c_00020.png.meta

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.26",
-  "importer": "image",
-  "imported": true,
-  "uuid": "f4f4ef7f-102a-4356-8c79-4106a7873269",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "f4f4ef7f-102a-4356-8c79-4106a7873269@6c48a",
-      "displayName": "c_00020",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "f4f4ef7f-102a-4356-8c79-4106a7873269",
-        "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": "f4f4ef7f-102a-4356-8c79-4106a7873269@f9941",
-      "displayName": "c_00020",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 7,
-        "offsetY": -4,
-        "trimX": 51,
-        "trimY": 79,
-        "width": 192,
-        "height": 190,
-        "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": [
-            -96,
-            -95,
-            0,
-            96,
-            -95,
-            0,
-            -96,
-            95,
-            0,
-            96,
-            95,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            51,
-            261,
-            243,
-            261,
-            51,
-            71,
-            243,
-            71
-          ],
-          "nuv": [
-            0.18214285714285713,
-            0.2088235294117647,
-            0.8678571428571429,
-            0.2088235294117647,
-            0.18214285714285713,
-            0.7676470588235295,
-            0.8678571428571429,
-            0.7676470588235295
-          ],
-          "minPos": [
-            -96,
-            -95,
-            0
-          ],
-          "maxPos": [
-            96,
-            95,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "f4f4ef7f-102a-4356-8c79-4106a7873269@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "f4f4ef7f-102a-4356-8c79-4106a7873269@f9941"
-  }
-}

+ 6 - 6
assets/Cup/3water/cup/c_00021.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.26",
   "importer": "image",
   "imported": true,
-  "uuid": "23b2b6ec-be01-417c-b140-18e2c748e756",
+  "uuid": "f3cf04e4-1055-48f8-90bd-ffb1befb8e9b",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "23b2b6ec-be01-417c-b140-18e2c748e756@6c48a",
+      "uuid": "f3cf04e4-1055-48f8-90bd-ffb1befb8e9b@6c48a",
       "displayName": "c_00021",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "23b2b6ec-be01-417c-b140-18e2c748e756",
+        "imageUuidOrDatabaseUri": "f3cf04e4-1055-48f8-90bd-ffb1befb8e9b",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "23b2b6ec-be01-417c-b140-18e2c748e756@f9941",
+      "uuid": "f3cf04e4-1055-48f8-90bd-ffb1befb8e9b@f9941",
       "displayName": "c_00021",
       "id": "f9941",
       "name": "spriteFrame",
@@ -114,7 +114,7 @@
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "23b2b6ec-be01-417c-b140-18e2c748e756@6c48a",
+        "imageUuidOrDatabaseUri": "f3cf04e4-1055-48f8-90bd-ffb1befb8e9b@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "23b2b6ec-be01-417c-b140-18e2c748e756@f9941"
+    "redirect": "f3cf04e4-1055-48f8-90bd-ffb1befb8e9b@f9941"
   }
 }

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


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

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.26",
-  "importer": "image",
-  "imported": true,
-  "uuid": "ffc5948d-32c6-4134-b94e-1bf62367ef6c",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "ffc5948d-32c6-4134-b94e-1bf62367ef6c@6c48a",
-      "displayName": "c_00022",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "ffc5948d-32c6-4134-b94e-1bf62367ef6c",
-        "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": "ffc5948d-32c6-4134-b94e-1bf62367ef6c@f9941",
-      "displayName": "c_00022",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 6,
-        "offsetY": 1,
-        "trimX": 49,
-        "trimY": 76,
-        "width": 194,
-        "height": 186,
-        "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": [
-            -97,
-            -93,
-            0,
-            97,
-            -93,
-            0,
-            -97,
-            93,
-            0,
-            97,
-            93,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            49,
-            264,
-            243,
-            264,
-            49,
-            78,
-            243,
-            78
-          ],
-          "nuv": [
-            0.175,
-            0.22941176470588234,
-            0.8678571428571429,
-            0.22941176470588234,
-            0.175,
-            0.7764705882352941,
-            0.8678571428571429,
-            0.7764705882352941
-          ],
-          "minPos": [
-            -97,
-            -93,
-            0
-          ],
-          "maxPos": [
-            97,
-            93,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "ffc5948d-32c6-4134-b94e-1bf62367ef6c@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "ffc5948d-32c6-4134-b94e-1bf62367ef6c@f9941"
-  }
-}

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


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

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.26",
-  "importer": "image",
-  "imported": true,
-  "uuid": "5cb5ef0d-016e-402e-9a46-604dc3e1c82c",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "5cb5ef0d-016e-402e-9a46-604dc3e1c82c@6c48a",
-      "displayName": "c_00023",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "5cb5ef0d-016e-402e-9a46-604dc3e1c82c",
-        "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": "5cb5ef0d-016e-402e-9a46-604dc3e1c82c@f9941",
-      "displayName": "c_00023",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 6,
-        "offsetY": 3.5,
-        "trimX": 48,
-        "trimY": 74,
-        "width": 196,
-        "height": 185,
-        "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": [
-            -98,
-            -92.5,
-            0,
-            98,
-            -92.5,
-            0,
-            -98,
-            92.5,
-            0,
-            98,
-            92.5,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            48,
-            266,
-            244,
-            266,
-            48,
-            81,
-            244,
-            81
-          ],
-          "nuv": [
-            0.17142857142857143,
-            0.23823529411764705,
-            0.8714285714285714,
-            0.23823529411764705,
-            0.17142857142857143,
-            0.7823529411764706,
-            0.8714285714285714,
-            0.7823529411764706
-          ],
-          "minPos": [
-            -98,
-            -92.5,
-            0
-          ],
-          "maxPos": [
-            98,
-            92.5,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "5cb5ef0d-016e-402e-9a46-604dc3e1c82c@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "5cb5ef0d-016e-402e-9a46-604dc3e1c82c@f9941"
-  }
-}

BIN
assets/Cup/3water/cup/c_00024.png


+ 0 - 134
assets/Cup/3water/cup/c_00024.png.meta

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.26",
-  "importer": "image",
-  "imported": true,
-  "uuid": "05eef497-345d-4726-868f-578962e96c4d",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "05eef497-345d-4726-868f-578962e96c4d@6c48a",
-      "displayName": "c_00024",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "05eef497-345d-4726-868f-578962e96c4d",
-        "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": "05eef497-345d-4726-868f-578962e96c4d@f9941",
-      "displayName": "c_00024",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 6,
-        "offsetY": 5.5,
-        "trimX": 48,
-        "trimY": 73,
-        "width": 196,
-        "height": 183,
-        "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": [
-            -98,
-            -91.5,
-            0,
-            98,
-            -91.5,
-            0,
-            -98,
-            91.5,
-            0,
-            98,
-            91.5,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            48,
-            267,
-            244,
-            267,
-            48,
-            84,
-            244,
-            84
-          ],
-          "nuv": [
-            0.17142857142857143,
-            0.24705882352941178,
-            0.8714285714285714,
-            0.24705882352941178,
-            0.17142857142857143,
-            0.7852941176470588,
-            0.8714285714285714,
-            0.7852941176470588
-          ],
-          "minPos": [
-            -98,
-            -91.5,
-            0
-          ],
-          "maxPos": [
-            98,
-            91.5,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "05eef497-345d-4726-868f-578962e96c4d@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "05eef497-345d-4726-868f-578962e96c4d@f9941"
-  }
-}

+ 6 - 6
assets/Cup/3water/cup/c_00025.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.26",
   "importer": "image",
   "imported": true,
-  "uuid": "ea455747-766b-4972-ab67-f388fb6f8d78",
+  "uuid": "a3c9571e-56c0-4d4b-b955-183d902d4ed1",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "ea455747-766b-4972-ab67-f388fb6f8d78@6c48a",
+      "uuid": "a3c9571e-56c0-4d4b-b955-183d902d4ed1@6c48a",
       "displayName": "c_00025",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "ea455747-766b-4972-ab67-f388fb6f8d78",
+        "imageUuidOrDatabaseUri": "a3c9571e-56c0-4d4b-b955-183d902d4ed1",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "ea455747-766b-4972-ab67-f388fb6f8d78@f9941",
+      "uuid": "a3c9571e-56c0-4d4b-b955-183d902d4ed1@f9941",
       "displayName": "c_00025",
       "id": "f9941",
       "name": "spriteFrame",
@@ -114,7 +114,7 @@
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "ea455747-766b-4972-ab67-f388fb6f8d78@6c48a",
+        "imageUuidOrDatabaseUri": "a3c9571e-56c0-4d4b-b955-183d902d4ed1@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "ea455747-766b-4972-ab67-f388fb6f8d78@f9941"
+    "redirect": "a3c9571e-56c0-4d4b-b955-183d902d4ed1@f9941"
   }
 }

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


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

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.26",
-  "importer": "image",
-  "imported": true,
-  "uuid": "0751015f-a589-44ea-9b22-c6642f08f78c",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "0751015f-a589-44ea-9b22-c6642f08f78c@6c48a",
-      "displayName": "c_00026",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "0751015f-a589-44ea-9b22-c6642f08f78c",
-        "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": "0751015f-a589-44ea-9b22-c6642f08f78c@f9941",
-      "displayName": "c_00026",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 6,
-        "offsetY": 10.5,
-        "trimX": 47,
-        "trimY": 70,
-        "width": 198,
-        "height": 179,
-        "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": [
-            -99,
-            -89.5,
-            0,
-            99,
-            -89.5,
-            0,
-            -99,
-            89.5,
-            0,
-            99,
-            89.5,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            47,
-            270,
-            245,
-            270,
-            47,
-            91,
-            245,
-            91
-          ],
-          "nuv": [
-            0.16785714285714284,
-            0.2676470588235294,
-            0.875,
-            0.2676470588235294,
-            0.16785714285714284,
-            0.7941176470588235,
-            0.875,
-            0.7941176470588235
-          ],
-          "minPos": [
-            -99,
-            -89.5,
-            0
-          ],
-          "maxPos": [
-            99,
-            89.5,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "0751015f-a589-44ea-9b22-c6642f08f78c@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "0751015f-a589-44ea-9b22-c6642f08f78c@f9941"
-  }
-}

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


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

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.26",
-  "importer": "image",
-  "imported": true,
-  "uuid": "3b38724c-9e3b-4c0c-b566-1e264fca0b85",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "3b38724c-9e3b-4c0c-b566-1e264fca0b85@6c48a",
-      "displayName": "c_00027",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "3b38724c-9e3b-4c0c-b566-1e264fca0b85",
-        "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": "3b38724c-9e3b-4c0c-b566-1e264fca0b85@f9941",
-      "displayName": "c_00027",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 6,
-        "offsetY": 9.5,
-        "trimX": 47,
-        "trimY": 71,
-        "width": 198,
-        "height": 179,
-        "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": [
-            -99,
-            -89.5,
-            0,
-            99,
-            -89.5,
-            0,
-            -99,
-            89.5,
-            0,
-            99,
-            89.5,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            47,
-            269,
-            245,
-            269,
-            47,
-            90,
-            245,
-            90
-          ],
-          "nuv": [
-            0.16785714285714284,
-            0.2647058823529412,
-            0.875,
-            0.2647058823529412,
-            0.16785714285714284,
-            0.7911764705882353,
-            0.875,
-            0.7911764705882353
-          ],
-          "minPos": [
-            -99,
-            -89.5,
-            0
-          ],
-          "maxPos": [
-            99,
-            89.5,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "3b38724c-9e3b-4c0c-b566-1e264fca0b85@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "3b38724c-9e3b-4c0c-b566-1e264fca0b85@f9941"
-  }
-}

BIN
assets/Cup/3water/cup/c_00028.png


+ 0 - 134
assets/Cup/3water/cup/c_00028.png.meta

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.26",
-  "importer": "image",
-  "imported": true,
-  "uuid": "6d501961-ee85-4581-9578-5fde2579416f",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "6d501961-ee85-4581-9578-5fde2579416f@6c48a",
-      "displayName": "c_00028",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "6d501961-ee85-4581-9578-5fde2579416f",
-        "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": "6d501961-ee85-4581-9578-5fde2579416f@f9941",
-      "displayName": "c_00028",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 5.5,
-        "offsetY": 5.5,
-        "trimX": 47,
-        "trimY": 73,
-        "width": 197,
-        "height": 183,
-        "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": [
-            -98.5,
-            -91.5,
-            0,
-            98.5,
-            -91.5,
-            0,
-            -98.5,
-            91.5,
-            0,
-            98.5,
-            91.5,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            47,
-            267,
-            244,
-            267,
-            47,
-            84,
-            244,
-            84
-          ],
-          "nuv": [
-            0.16785714285714284,
-            0.24705882352941178,
-            0.8714285714285714,
-            0.24705882352941178,
-            0.16785714285714284,
-            0.7852941176470588,
-            0.8714285714285714,
-            0.7852941176470588
-          ],
-          "minPos": [
-            -98.5,
-            -91.5,
-            0
-          ],
-          "maxPos": [
-            98.5,
-            91.5,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "6d501961-ee85-4581-9578-5fde2579416f@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "6d501961-ee85-4581-9578-5fde2579416f@f9941"
-  }
-}

+ 6 - 6
assets/Cup/3water/cup/c_00029.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.26",
   "importer": "image",
   "imported": true,
-  "uuid": "6f1a5dc0-729e-46e8-bf6e-939f9e0e85df",
+  "uuid": "3236c8d0-265e-44db-9c50-4570cf0b1c32",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "6f1a5dc0-729e-46e8-bf6e-939f9e0e85df@6c48a",
+      "uuid": "3236c8d0-265e-44db-9c50-4570cf0b1c32@6c48a",
       "displayName": "c_00029",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "6f1a5dc0-729e-46e8-bf6e-939f9e0e85df",
+        "imageUuidOrDatabaseUri": "3236c8d0-265e-44db-9c50-4570cf0b1c32",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "6f1a5dc0-729e-46e8-bf6e-939f9e0e85df@f9941",
+      "uuid": "3236c8d0-265e-44db-9c50-4570cf0b1c32@f9941",
       "displayName": "c_00029",
       "id": "f9941",
       "name": "spriteFrame",
@@ -114,7 +114,7 @@
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "6f1a5dc0-729e-46e8-bf6e-939f9e0e85df@6c48a",
+        "imageUuidOrDatabaseUri": "3236c8d0-265e-44db-9c50-4570cf0b1c32@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "6f1a5dc0-729e-46e8-bf6e-939f9e0e85df@f9941"
+    "redirect": "3236c8d0-265e-44db-9c50-4570cf0b1c32@f9941"
   }
 }

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


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

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.26",
-  "importer": "image",
-  "imported": true,
-  "uuid": "ba8be570-80d2-414d-917b-90ba265f0b07",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "ba8be570-80d2-414d-917b-90ba265f0b07@6c48a",
-      "displayName": "c_00030",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "ba8be570-80d2-414d-917b-90ba265f0b07",
-        "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": "ba8be570-80d2-414d-917b-90ba265f0b07@f9941",
-      "displayName": "c_00030",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 6.5,
-        "offsetY": -2.5,
-        "trimX": 50,
-        "trimY": 78,
-        "width": 193,
-        "height": 189,
-        "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": [
-            -96.5,
-            -94.5,
-            0,
-            96.5,
-            -94.5,
-            0,
-            -96.5,
-            94.5,
-            0,
-            96.5,
-            94.5,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            50,
-            262,
-            243,
-            262,
-            50,
-            73,
-            243,
-            73
-          ],
-          "nuv": [
-            0.17857142857142858,
-            0.21470588235294116,
-            0.8678571428571429,
-            0.21470588235294116,
-            0.17857142857142858,
-            0.7705882352941177,
-            0.8678571428571429,
-            0.7705882352941177
-          ],
-          "minPos": [
-            -96.5,
-            -94.5,
-            0
-          ],
-          "maxPos": [
-            96.5,
-            94.5,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "ba8be570-80d2-414d-917b-90ba265f0b07@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "ba8be570-80d2-414d-917b-90ba265f0b07@f9941"
-  }
-}

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


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

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.26",
-  "importer": "image",
-  "imported": true,
-  "uuid": "570907c6-ceb7-4ea9-8466-d7a83b8ab9ad",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "570907c6-ceb7-4ea9-8466-d7a83b8ab9ad@6c48a",
-      "displayName": "c_00031",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "570907c6-ceb7-4ea9-8466-d7a83b8ab9ad",
-        "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": "570907c6-ceb7-4ea9-8466-d7a83b8ab9ad@f9941",
-      "displayName": "c_00031",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 7.5,
-        "offsetY": -6.5,
-        "trimX": 52,
-        "trimY": 81,
-        "width": 191,
-        "height": 191,
-        "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": [
-            -95.5,
-            -95.5,
-            0,
-            95.5,
-            -95.5,
-            0,
-            -95.5,
-            95.5,
-            0,
-            95.5,
-            95.5,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            52,
-            259,
-            243,
-            259,
-            52,
-            68,
-            243,
-            68
-          ],
-          "nuv": [
-            0.18571428571428572,
-            0.2,
-            0.8678571428571429,
-            0.2,
-            0.18571428571428572,
-            0.7617647058823529,
-            0.8678571428571429,
-            0.7617647058823529
-          ],
-          "minPos": [
-            -95.5,
-            -95.5,
-            0
-          ],
-          "maxPos": [
-            95.5,
-            95.5,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "570907c6-ceb7-4ea9-8466-d7a83b8ab9ad@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "570907c6-ceb7-4ea9-8466-d7a83b8ab9ad@f9941"
-  }
-}

BIN
assets/Cup/3water/cup/c_00032.png


+ 0 - 134
assets/Cup/3water/cup/c_00032.png.meta

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.26",
-  "importer": "image",
-  "imported": true,
-  "uuid": "44cd192e-daff-413e-a78a-4cb45b7594a5",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "44cd192e-daff-413e-a78a-4cb45b7594a5@6c48a",
-      "displayName": "c_00032",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "44cd192e-daff-413e-a78a-4cb45b7594a5",
-        "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": "44cd192e-daff-413e-a78a-4cb45b7594a5@f9941",
-      "displayName": "c_00032",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 8.5,
-        "offsetY": -13,
-        "trimX": 55,
-        "trimY": 86,
-        "width": 187,
-        "height": 194,
-        "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": [
-            -93.5,
-            -97,
-            0,
-            93.5,
-            -97,
-            0,
-            -93.5,
-            97,
-            0,
-            93.5,
-            97,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            55,
-            254,
-            242,
-            254,
-            55,
-            60,
-            242,
-            60
-          ],
-          "nuv": [
-            0.19642857142857142,
-            0.17647058823529413,
-            0.8642857142857143,
-            0.17647058823529413,
-            0.19642857142857142,
-            0.7470588235294118,
-            0.8642857142857143,
-            0.7470588235294118
-          ],
-          "minPos": [
-            -93.5,
-            -97,
-            0
-          ],
-          "maxPos": [
-            93.5,
-            97,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "44cd192e-daff-413e-a78a-4cb45b7594a5@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "44cd192e-daff-413e-a78a-4cb45b7594a5@f9941"
-  }
-}

+ 6 - 6
assets/Cup/3water/cup/c_00033.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.26",
   "importer": "image",
   "imported": true,
-  "uuid": "4ac5f25a-a191-4722-a615-487fc0aeae19",
+  "uuid": "2dcfce3b-c788-48fe-a6ed-32fc79baf3fb",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "4ac5f25a-a191-4722-a615-487fc0aeae19@6c48a",
+      "uuid": "2dcfce3b-c788-48fe-a6ed-32fc79baf3fb@6c48a",
       "displayName": "c_00033",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "4ac5f25a-a191-4722-a615-487fc0aeae19",
+        "imageUuidOrDatabaseUri": "2dcfce3b-c788-48fe-a6ed-32fc79baf3fb",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "4ac5f25a-a191-4722-a615-487fc0aeae19@f9941",
+      "uuid": "2dcfce3b-c788-48fe-a6ed-32fc79baf3fb@f9941",
       "displayName": "c_00033",
       "id": "f9941",
       "name": "spriteFrame",
@@ -114,7 +114,7 @@
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "4ac5f25a-a191-4722-a615-487fc0aeae19@6c48a",
+        "imageUuidOrDatabaseUri": "2dcfce3b-c788-48fe-a6ed-32fc79baf3fb@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "4ac5f25a-a191-4722-a615-487fc0aeae19@f9941"
+    "redirect": "2dcfce3b-c788-48fe-a6ed-32fc79baf3fb@f9941"
   }
 }

+ 6 - 6
assets/Cup/3water/cup/c_00034.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.26",
   "importer": "image",
   "imported": true,
-  "uuid": "93a758dc-b7fc-468e-accf-15da34b18a73",
+  "uuid": "90def525-1b70-4356-9c1b-f6d0f81af82e",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "93a758dc-b7fc-468e-accf-15da34b18a73@6c48a",
+      "uuid": "90def525-1b70-4356-9c1b-f6d0f81af82e@6c48a",
       "displayName": "c_00034",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "93a758dc-b7fc-468e-accf-15da34b18a73",
+        "imageUuidOrDatabaseUri": "90def525-1b70-4356-9c1b-f6d0f81af82e",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "93a758dc-b7fc-468e-accf-15da34b18a73@f9941",
+      "uuid": "90def525-1b70-4356-9c1b-f6d0f81af82e@f9941",
       "displayName": "c_00034",
       "id": "f9941",
       "name": "spriteFrame",
@@ -114,7 +114,7 @@
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "93a758dc-b7fc-468e-accf-15da34b18a73@6c48a",
+        "imageUuidOrDatabaseUri": "90def525-1b70-4356-9c1b-f6d0f81af82e@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "93a758dc-b7fc-468e-accf-15da34b18a73@f9941"
+    "redirect": "90def525-1b70-4356-9c1b-f6d0f81af82e@f9941"
   }
 }

+ 6 - 6
assets/Cup/3water/cup/c_00040.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.26",
   "importer": "image",
   "imported": true,
-  "uuid": "35a8fed4-a865-4ade-8a65-573b8a279ade",
+  "uuid": "a901d314-a979-47cf-8040-1362dd30c828",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "35a8fed4-a865-4ade-8a65-573b8a279ade@6c48a",
+      "uuid": "a901d314-a979-47cf-8040-1362dd30c828@6c48a",
       "displayName": "c_00040",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "35a8fed4-a865-4ade-8a65-573b8a279ade",
+        "imageUuidOrDatabaseUri": "a901d314-a979-47cf-8040-1362dd30c828",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "35a8fed4-a865-4ade-8a65-573b8a279ade@f9941",
+      "uuid": "a901d314-a979-47cf-8040-1362dd30c828@f9941",
       "displayName": "c_00040",
       "id": "f9941",
       "name": "spriteFrame",
@@ -114,7 +114,7 @@
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "35a8fed4-a865-4ade-8a65-573b8a279ade@6c48a",
+        "imageUuidOrDatabaseUri": "a901d314-a979-47cf-8040-1362dd30c828@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "35a8fed4-a865-4ade-8a65-573b8a279ade@f9941"
+    "redirect": "a901d314-a979-47cf-8040-1362dd30c828@f9941"
   }
 }

BIN
assets/Cup/3water/cup/c_00041.png


+ 0 - 134
assets/Cup/3water/cup/c_00041.png.meta

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.26",
-  "importer": "image",
-  "imported": true,
-  "uuid": "124750fb-3138-4607-90f4-970b386e4405",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "124750fb-3138-4607-90f4-970b386e4405@6c48a",
-      "displayName": "c_00041",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "124750fb-3138-4607-90f4-970b386e4405",
-        "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": "124750fb-3138-4607-90f4-970b386e4405@f9941",
-      "displayName": "c_00041",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 15,
-        "offsetY": -29.5,
-        "trimX": 69,
-        "trimY": 99,
-        "width": 172,
-        "height": 201,
-        "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": [
-            -86,
-            -100.5,
-            0,
-            86,
-            -100.5,
-            0,
-            -86,
-            100.5,
-            0,
-            86,
-            100.5,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            69,
-            241,
-            241,
-            241,
-            69,
-            40,
-            241,
-            40
-          ],
-          "nuv": [
-            0.24642857142857144,
-            0.11764705882352941,
-            0.8607142857142858,
-            0.11764705882352941,
-            0.24642857142857144,
-            0.7088235294117647,
-            0.8607142857142858,
-            0.7088235294117647
-          ],
-          "minPos": [
-            -86,
-            -100.5,
-            0
-          ],
-          "maxPos": [
-            86,
-            100.5,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "124750fb-3138-4607-90f4-970b386e4405@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "124750fb-3138-4607-90f4-970b386e4405@f9941"
-  }
-}

BIN
assets/Cup/3water/cup/c_00042.png


+ 0 - 134
assets/Cup/3water/cup/c_00042.png.meta

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.26",
-  "importer": "image",
-  "imported": true,
-  "uuid": "12868f96-514f-41a3-b05f-a328a826013a",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "12868f96-514f-41a3-b05f-a328a826013a@6c48a",
-      "displayName": "c_00042",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "12868f96-514f-41a3-b05f-a328a826013a",
-        "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": "12868f96-514f-41a3-b05f-a328a826013a@f9941",
-      "displayName": "c_00042",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 11,
-        "offsetY": -20,
-        "trimX": 61,
-        "trimY": 91,
-        "width": 180,
-        "height": 198,
-        "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": [
-            -90,
-            -99,
-            0,
-            90,
-            -99,
-            0,
-            -90,
-            99,
-            0,
-            90,
-            99,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            61,
-            249,
-            241,
-            249,
-            61,
-            51,
-            241,
-            51
-          ],
-          "nuv": [
-            0.21785714285714286,
-            0.15,
-            0.8607142857142858,
-            0.15,
-            0.21785714285714286,
-            0.7323529411764705,
-            0.8607142857142858,
-            0.7323529411764705
-          ],
-          "minPos": [
-            -90,
-            -99,
-            0
-          ],
-          "maxPos": [
-            90,
-            99,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "12868f96-514f-41a3-b05f-a328a826013a@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "12868f96-514f-41a3-b05f-a328a826013a@f9941"
-  }
-}

BIN
assets/Cup/3water/cup/c_00043.png


+ 0 - 134
assets/Cup/3water/cup/c_00043.png.meta

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.26",
-  "importer": "image",
-  "imported": true,
-  "uuid": "66848dc1-e9be-449b-9fe4-c3a14d7f3621",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "66848dc1-e9be-449b-9fe4-c3a14d7f3621@6c48a",
-      "displayName": "c_00043",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "66848dc1-e9be-449b-9fe4-c3a14d7f3621",
-        "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": "66848dc1-e9be-449b-9fe4-c3a14d7f3621@f9941",
-      "displayName": "c_00043",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 8,
-        "offsetY": -10.5,
-        "trimX": 54,
-        "trimY": 84,
-        "width": 188,
-        "height": 193,
-        "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": [
-            -94,
-            -96.5,
-            0,
-            94,
-            -96.5,
-            0,
-            -94,
-            96.5,
-            0,
-            94,
-            96.5,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            54,
-            256,
-            242,
-            256,
-            54,
-            63,
-            242,
-            63
-          ],
-          "nuv": [
-            0.19285714285714287,
-            0.18529411764705883,
-            0.8642857142857143,
-            0.18529411764705883,
-            0.19285714285714287,
-            0.7529411764705882,
-            0.8642857142857143,
-            0.7529411764705882
-          ],
-          "minPos": [
-            -94,
-            -96.5,
-            0
-          ],
-          "maxPos": [
-            94,
-            96.5,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "66848dc1-e9be-449b-9fe4-c3a14d7f3621@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "66848dc1-e9be-449b-9fe4-c3a14d7f3621@f9941"
-  }
-}

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

@@ -2,7 +2,7 @@
   "ver": "1.0.26",
   "importer": "image",
   "imported": true,
-  "uuid": "eadbca92-aaf7-4d18-a795-d4581377b135",
+  "uuid": "a0d12b19-d0be-4787-8210-b55331016626",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "eadbca92-aaf7-4d18-a795-d4581377b135@6c48a",
+      "uuid": "a0d12b19-d0be-4787-8210-b55331016626@6c48a",
       "displayName": "c_00044",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "eadbca92-aaf7-4d18-a795-d4581377b135",
+        "imageUuidOrDatabaseUri": "a0d12b19-d0be-4787-8210-b55331016626",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "eadbca92-aaf7-4d18-a795-d4581377b135@f9941",
+      "uuid": "a0d12b19-d0be-4787-8210-b55331016626@f9941",
       "displayName": "c_00044",
       "id": "f9941",
       "name": "spriteFrame",
@@ -114,7 +114,7 @@
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "eadbca92-aaf7-4d18-a795-d4581377b135@6c48a",
+        "imageUuidOrDatabaseUri": "a0d12b19-d0be-4787-8210-b55331016626@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "eadbca92-aaf7-4d18-a795-d4581377b135@f9941"
+    "redirect": "a0d12b19-d0be-4787-8210-b55331016626@f9941"
   }
 }

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


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

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.26",
-  "importer": "image",
-  "imported": true,
-  "uuid": "bfaff3b3-189b-4402-9b28-22087bf10af9",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "bfaff3b3-189b-4402-9b28-22087bf10af9@6c48a",
-      "displayName": "c_00045",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "bfaff3b3-189b-4402-9b28-22087bf10af9",
-        "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": "bfaff3b3-189b-4402-9b28-22087bf10af9@f9941",
-      "displayName": "c_00045",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 5.5,
-        "offsetY": 7,
-        "trimX": 47,
-        "trimY": 72,
-        "width": 197,
-        "height": 182,
-        "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": [
-            -98.5,
-            -91,
-            0,
-            98.5,
-            -91,
-            0,
-            -98.5,
-            91,
-            0,
-            98.5,
-            91,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            47,
-            268,
-            244,
-            268,
-            47,
-            86,
-            244,
-            86
-          ],
-          "nuv": [
-            0.16785714285714284,
-            0.2529411764705882,
-            0.8714285714285714,
-            0.2529411764705882,
-            0.16785714285714284,
-            0.788235294117647,
-            0.8714285714285714,
-            0.788235294117647
-          ],
-          "minPos": [
-            -98.5,
-            -91,
-            0
-          ],
-          "maxPos": [
-            98.5,
-            91,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "bfaff3b3-189b-4402-9b28-22087bf10af9@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "bfaff3b3-189b-4402-9b28-22087bf10af9@f9941"
-  }
-}

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


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

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.26",
-  "importer": "image",
-  "imported": true,
-  "uuid": "1345d2bc-0d3d-47d4-9c98-c17ce7724c97",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "1345d2bc-0d3d-47d4-9c98-c17ce7724c97@6c48a",
-      "displayName": "c_00046",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "1345d2bc-0d3d-47d4-9c98-c17ce7724c97",
-        "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": "1345d2bc-0d3d-47d4-9c98-c17ce7724c97@f9941",
-      "displayName": "c_00046",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 6,
-        "offsetY": 14.5,
-        "trimX": 46,
-        "trimY": 68,
-        "width": 200,
-        "height": 175,
-        "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": [
-            -100,
-            -87.5,
-            0,
-            100,
-            -87.5,
-            0,
-            -100,
-            87.5,
-            0,
-            100,
-            87.5,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            46,
-            272,
-            246,
-            272,
-            46,
-            97,
-            246,
-            97
-          ],
-          "nuv": [
-            0.16428571428571428,
-            0.2852941176470588,
-            0.8785714285714286,
-            0.2852941176470588,
-            0.16428571428571428,
-            0.8,
-            0.8785714285714286,
-            0.8
-          ],
-          "minPos": [
-            -100,
-            -87.5,
-            0
-          ],
-          "maxPos": [
-            100,
-            87.5,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "1345d2bc-0d3d-47d4-9c98-c17ce7724c97@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "1345d2bc-0d3d-47d4-9c98-c17ce7724c97@f9941"
-  }
-}

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


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

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.26",
-  "importer": "image",
-  "imported": true,
-  "uuid": "6b397a3c-1fd8-4bd3-97ec-eab68c6cc6f1",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "6b397a3c-1fd8-4bd3-97ec-eab68c6cc6f1@6c48a",
-      "displayName": "c_00047",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "6b397a3c-1fd8-4bd3-97ec-eab68c6cc6f1",
-        "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": "6b397a3c-1fd8-4bd3-97ec-eab68c6cc6f1@f9941",
-      "displayName": "c_00047",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 6.5,
-        "offsetY": 20,
-        "trimX": 46,
-        "trimY": 65,
-        "width": 201,
-        "height": 170,
-        "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": [
-            -100.5,
-            -85,
-            0,
-            100.5,
-            -85,
-            0,
-            -100.5,
-            85,
-            0,
-            100.5,
-            85,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            46,
-            275,
-            247,
-            275,
-            46,
-            105,
-            247,
-            105
-          ],
-          "nuv": [
-            0.16428571428571428,
-            0.3088235294117647,
-            0.8821428571428571,
-            0.3088235294117647,
-            0.16428571428571428,
-            0.8088235294117647,
-            0.8821428571428571,
-            0.8088235294117647
-          ],
-          "minPos": [
-            -100.5,
-            -85,
-            0
-          ],
-          "maxPos": [
-            100.5,
-            85,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "6b397a3c-1fd8-4bd3-97ec-eab68c6cc6f1@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "6b397a3c-1fd8-4bd3-97ec-eab68c6cc6f1@f9941"
-  }
-}

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

@@ -2,7 +2,7 @@
   "ver": "1.0.26",
   "importer": "image",
   "imported": true,
-  "uuid": "9487454e-1c38-4736-b130-168c61eba0e1",
+  "uuid": "6e0a5c15-eac4-47cf-9fe4-02a7962e1526",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "9487454e-1c38-4736-b130-168c61eba0e1@6c48a",
+      "uuid": "6e0a5c15-eac4-47cf-9fe4-02a7962e1526@6c48a",
       "displayName": "c_00048",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "9487454e-1c38-4736-b130-168c61eba0e1",
+        "imageUuidOrDatabaseUri": "6e0a5c15-eac4-47cf-9fe4-02a7962e1526",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "9487454e-1c38-4736-b130-168c61eba0e1@f9941",
+      "uuid": "6e0a5c15-eac4-47cf-9fe4-02a7962e1526@f9941",
       "displayName": "c_00048",
       "id": "f9941",
       "name": "spriteFrame",
@@ -114,7 +114,7 @@
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "9487454e-1c38-4736-b130-168c61eba0e1@6c48a",
+        "imageUuidOrDatabaseUri": "6e0a5c15-eac4-47cf-9fe4-02a7962e1526@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "9487454e-1c38-4736-b130-168c61eba0e1@f9941"
+    "redirect": "6e0a5c15-eac4-47cf-9fe4-02a7962e1526@f9941"
   }
 }

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


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

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.26",
-  "importer": "image",
-  "imported": true,
-  "uuid": "c2de91ef-1c98-45c6-ad51-5b3e95c7a920",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "c2de91ef-1c98-45c6-ad51-5b3e95c7a920@6c48a",
-      "displayName": "c_00049",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "c2de91ef-1c98-45c6-ad51-5b3e95c7a920",
-        "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": "c2de91ef-1c98-45c6-ad51-5b3e95c7a920@f9941",
-      "displayName": "c_00049",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 7,
-        "offsetY": 27,
-        "trimX": 46,
-        "trimY": 62,
-        "width": 202,
-        "height": 162,
-        "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": [
-            -101,
-            -81,
-            0,
-            101,
-            -81,
-            0,
-            -101,
-            81,
-            0,
-            101,
-            81,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            46,
-            278,
-            248,
-            278,
-            46,
-            116,
-            248,
-            116
-          ],
-          "nuv": [
-            0.16428571428571428,
-            0.3411764705882353,
-            0.8857142857142857,
-            0.3411764705882353,
-            0.16428571428571428,
-            0.8176470588235294,
-            0.8857142857142857,
-            0.8176470588235294
-          ],
-          "minPos": [
-            -101,
-            -81,
-            0
-          ],
-          "maxPos": [
-            101,
-            81,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "c2de91ef-1c98-45c6-ad51-5b3e95c7a920@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "c2de91ef-1c98-45c6-ad51-5b3e95c7a920@f9941"
-  }
-}

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


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

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.26",
-  "importer": "image",
-  "imported": true,
-  "uuid": "982f9d3b-4c3a-4099-a4ba-0429016198ba",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "982f9d3b-4c3a-4099-a4ba-0429016198ba@6c48a",
-      "displayName": "c_00050",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "982f9d3b-4c3a-4099-a4ba-0429016198ba",
-        "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": "982f9d3b-4c3a-4099-a4ba-0429016198ba@f9941",
-      "displayName": "c_00050",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 7.5,
-        "offsetY": 29.5,
-        "trimX": 46,
-        "trimY": 61,
-        "width": 203,
-        "height": 159,
-        "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": [
-            -101.5,
-            -79.5,
-            0,
-            101.5,
-            -79.5,
-            0,
-            -101.5,
-            79.5,
-            0,
-            101.5,
-            79.5,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            46,
-            279,
-            249,
-            279,
-            46,
-            120,
-            249,
-            120
-          ],
-          "nuv": [
-            0.16428571428571428,
-            0.35294117647058826,
-            0.8892857142857142,
-            0.35294117647058826,
-            0.16428571428571428,
-            0.8205882352941176,
-            0.8892857142857142,
-            0.8205882352941176
-          ],
-          "minPos": [
-            -101.5,
-            -79.5,
-            0
-          ],
-          "maxPos": [
-            101.5,
-            79.5,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "982f9d3b-4c3a-4099-a4ba-0429016198ba@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "982f9d3b-4c3a-4099-a4ba-0429016198ba@f9941"
-  }
-}

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


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

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.26",
-  "importer": "image",
-  "imported": true,
-  "uuid": "0b91c9fe-28a6-4930-947e-6929b7dc7a9f",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "0b91c9fe-28a6-4930-947e-6929b7dc7a9f@6c48a",
-      "displayName": "c_00051",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "0b91c9fe-28a6-4930-947e-6929b7dc7a9f",
-        "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": "0b91c9fe-28a6-4930-947e-6929b7dc7a9f@f9941",
-      "displayName": "c_00051",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 8,
-        "offsetY": 32,
-        "trimX": 47,
-        "trimY": 60,
-        "width": 202,
-        "height": 156,
-        "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": [
-            -101,
-            -78,
-            0,
-            101,
-            -78,
-            0,
-            -101,
-            78,
-            0,
-            101,
-            78,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            47,
-            280,
-            249,
-            280,
-            47,
-            124,
-            249,
-            124
-          ],
-          "nuv": [
-            0.16785714285714284,
-            0.36470588235294116,
-            0.8892857142857142,
-            0.36470588235294116,
-            0.16785714285714284,
-            0.8235294117647058,
-            0.8892857142857142,
-            0.8235294117647058
-          ],
-          "minPos": [
-            -101,
-            -78,
-            0
-          ],
-          "maxPos": [
-            101,
-            78,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "0b91c9fe-28a6-4930-947e-6929b7dc7a9f@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "0b91c9fe-28a6-4930-947e-6929b7dc7a9f@f9941"
-  }
-}

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

@@ -2,7 +2,7 @@
   "ver": "1.0.26",
   "importer": "image",
   "imported": true,
-  "uuid": "87708acf-1929-43b5-869d-9cffd591bca8",
+  "uuid": "d155e3a8-9a82-4b5f-8e48-82aa5b3decdf",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "87708acf-1929-43b5-869d-9cffd591bca8@6c48a",
+      "uuid": "d155e3a8-9a82-4b5f-8e48-82aa5b3decdf@6c48a",
       "displayName": "c_00052",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "87708acf-1929-43b5-869d-9cffd591bca8",
+        "imageUuidOrDatabaseUri": "d155e3a8-9a82-4b5f-8e48-82aa5b3decdf",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "87708acf-1929-43b5-869d-9cffd591bca8@f9941",
+      "uuid": "d155e3a8-9a82-4b5f-8e48-82aa5b3decdf@f9941",
       "displayName": "c_00052",
       "id": "f9941",
       "name": "spriteFrame",
@@ -114,7 +114,7 @@
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "87708acf-1929-43b5-869d-9cffd591bca8@6c48a",
+        "imageUuidOrDatabaseUri": "d155e3a8-9a82-4b5f-8e48-82aa5b3decdf@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "87708acf-1929-43b5-869d-9cffd591bca8@f9941"
+    "redirect": "d155e3a8-9a82-4b5f-8e48-82aa5b3decdf@f9941"
   }
 }

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


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

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.26",
-  "importer": "image",
-  "imported": true,
-  "uuid": "6c640633-30e3-44b0-87ac-e7f331a7eef8",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "6c640633-30e3-44b0-87ac-e7f331a7eef8@6c48a",
-      "displayName": "c_00053",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "6c640633-30e3-44b0-87ac-e7f331a7eef8",
-        "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": "6c640633-30e3-44b0-87ac-e7f331a7eef8@f9941",
-      "displayName": "c_00053",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 9.5,
-        "offsetY": 38,
-        "trimX": 48,
-        "trimY": 57,
-        "width": 203,
-        "height": 150,
-        "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": [
-            -101.5,
-            -75,
-            0,
-            101.5,
-            -75,
-            0,
-            -101.5,
-            75,
-            0,
-            101.5,
-            75,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            48,
-            283,
-            251,
-            283,
-            48,
-            133,
-            251,
-            133
-          ],
-          "nuv": [
-            0.17142857142857143,
-            0.3911764705882353,
-            0.8964285714285715,
-            0.3911764705882353,
-            0.17142857142857143,
-            0.8323529411764706,
-            0.8964285714285715,
-            0.8323529411764706
-          ],
-          "minPos": [
-            -101.5,
-            -75,
-            0
-          ],
-          "maxPos": [
-            101.5,
-            75,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "6c640633-30e3-44b0-87ac-e7f331a7eef8@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "6c640633-30e3-44b0-87ac-e7f331a7eef8@f9941"
-  }
-}

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


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

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.26",
-  "importer": "image",
-  "imported": true,
-  "uuid": "62241d84-2536-4bf6-bb78-317257f7a5d7",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "62241d84-2536-4bf6-bb78-317257f7a5d7@6c48a",
-      "displayName": "c_00054",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "62241d84-2536-4bf6-bb78-317257f7a5d7",
-        "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": "62241d84-2536-4bf6-bb78-317257f7a5d7@f9941",
-      "displayName": "c_00054",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 10.5,
-        "offsetY": 40,
-        "trimX": 49,
-        "trimY": 57,
-        "width": 203,
-        "height": 146,
-        "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": [
-            -101.5,
-            -73,
-            0,
-            101.5,
-            -73,
-            0,
-            -101.5,
-            73,
-            0,
-            101.5,
-            73,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            49,
-            283,
-            252,
-            283,
-            49,
-            137,
-            252,
-            137
-          ],
-          "nuv": [
-            0.175,
-            0.40294117647058825,
-            0.9,
-            0.40294117647058825,
-            0.175,
-            0.8323529411764706,
-            0.9,
-            0.8323529411764706
-          ],
-          "minPos": [
-            -101.5,
-            -73,
-            0
-          ],
-          "maxPos": [
-            101.5,
-            73,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "62241d84-2536-4bf6-bb78-317257f7a5d7@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "62241d84-2536-4bf6-bb78-317257f7a5d7@f9941"
-  }
-}

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


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

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.26",
-  "importer": "image",
-  "imported": true,
-  "uuid": "928bb91b-e231-4fae-ac5b-6df971b47ef9",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "928bb91b-e231-4fae-ac5b-6df971b47ef9@6c48a",
-      "displayName": "c_00055",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "928bb91b-e231-4fae-ac5b-6df971b47ef9",
-        "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": "928bb91b-e231-4fae-ac5b-6df971b47ef9@f9941",
-      "displayName": "c_00055",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 10.5,
-        "offsetY": 42,
-        "trimX": 49,
-        "trimY": 56,
-        "width": 203,
-        "height": 144,
-        "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": [
-            -101.5,
-            -72,
-            0,
-            101.5,
-            -72,
-            0,
-            -101.5,
-            72,
-            0,
-            101.5,
-            72,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            49,
-            284,
-            252,
-            284,
-            49,
-            140,
-            252,
-            140
-          ],
-          "nuv": [
-            0.175,
-            0.4117647058823529,
-            0.9,
-            0.4117647058823529,
-            0.175,
-            0.8352941176470589,
-            0.9,
-            0.8352941176470589
-          ],
-          "minPos": [
-            -101.5,
-            -72,
-            0
-          ],
-          "maxPos": [
-            101.5,
-            72,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "928bb91b-e231-4fae-ac5b-6df971b47ef9@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "928bb91b-e231-4fae-ac5b-6df971b47ef9@f9941"
-  }
-}

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

@@ -2,7 +2,7 @@
   "ver": "1.0.26",
   "importer": "image",
   "imported": true,
-  "uuid": "aeefa4a8-e79f-4e2f-bbe9-3b31a45f7098",
+  "uuid": "e66f0c81-8263-4ba4-9f63-11a1d5a1e0f2",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "aeefa4a8-e79f-4e2f-bbe9-3b31a45f7098@6c48a",
+      "uuid": "e66f0c81-8263-4ba4-9f63-11a1d5a1e0f2@6c48a",
       "displayName": "c_00056",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "aeefa4a8-e79f-4e2f-bbe9-3b31a45f7098",
+        "imageUuidOrDatabaseUri": "e66f0c81-8263-4ba4-9f63-11a1d5a1e0f2",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "aeefa4a8-e79f-4e2f-bbe9-3b31a45f7098@f9941",
+      "uuid": "e66f0c81-8263-4ba4-9f63-11a1d5a1e0f2@f9941",
       "displayName": "c_00056",
       "id": "f9941",
       "name": "spriteFrame",
@@ -114,7 +114,7 @@
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "aeefa4a8-e79f-4e2f-bbe9-3b31a45f7098@6c48a",
+        "imageUuidOrDatabaseUri": "e66f0c81-8263-4ba4-9f63-11a1d5a1e0f2@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "aeefa4a8-e79f-4e2f-bbe9-3b31a45f7098@f9941"
+    "redirect": "e66f0c81-8263-4ba4-9f63-11a1d5a1e0f2@f9941"
   }
 }

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


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

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.26",
-  "importer": "image",
-  "imported": true,
-  "uuid": "f1d5cc4f-e03f-45b1-ae83-5659f17a6845",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "f1d5cc4f-e03f-45b1-ae83-5659f17a6845@6c48a",
-      "displayName": "c_00057",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "f1d5cc4f-e03f-45b1-ae83-5659f17a6845",
-        "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": "f1d5cc4f-e03f-45b1-ae83-5659f17a6845@f9941",
-      "displayName": "c_00057",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 9.5,
-        "offsetY": 37,
-        "trimX": 48,
-        "trimY": 58,
-        "width": 203,
-        "height": 150,
-        "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": [
-            -101.5,
-            -75,
-            0,
-            101.5,
-            -75,
-            0,
-            -101.5,
-            75,
-            0,
-            101.5,
-            75,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            48,
-            282,
-            251,
-            282,
-            48,
-            132,
-            251,
-            132
-          ],
-          "nuv": [
-            0.17142857142857143,
-            0.38823529411764707,
-            0.8964285714285715,
-            0.38823529411764707,
-            0.17142857142857143,
-            0.8294117647058824,
-            0.8964285714285715,
-            0.8294117647058824
-          ],
-          "minPos": [
-            -101.5,
-            -75,
-            0
-          ],
-          "maxPos": [
-            101.5,
-            75,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "f1d5cc4f-e03f-45b1-ae83-5659f17a6845@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "f1d5cc4f-e03f-45b1-ae83-5659f17a6845@f9941"
-  }
-}

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


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

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.26",
-  "importer": "image",
-  "imported": true,
-  "uuid": "1170a31c-d13b-406e-a486-1560382cec08",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "1170a31c-d13b-406e-a486-1560382cec08@6c48a",
-      "displayName": "c_00058",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "1170a31c-d13b-406e-a486-1560382cec08",
-        "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": "1170a31c-d13b-406e-a486-1560382cec08@f9941",
-      "displayName": "c_00058",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 8,
-        "offsetY": 32.5,
-        "trimX": 47,
-        "trimY": 60,
-        "width": 202,
-        "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": [
-            -101,
-            -77.5,
-            0,
-            101,
-            -77.5,
-            0,
-            -101,
-            77.5,
-            0,
-            101,
-            77.5,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            47,
-            280,
-            249,
-            280,
-            47,
-            125,
-            249,
-            125
-          ],
-          "nuv": [
-            0.16785714285714284,
-            0.36764705882352944,
-            0.8892857142857142,
-            0.36764705882352944,
-            0.16785714285714284,
-            0.8235294117647058,
-            0.8892857142857142,
-            0.8235294117647058
-          ],
-          "minPos": [
-            -101,
-            -77.5,
-            0
-          ],
-          "maxPos": [
-            101,
-            77.5,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "1170a31c-d13b-406e-a486-1560382cec08@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "1170a31c-d13b-406e-a486-1560382cec08@f9941"
-  }
-}

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


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

@@ -1,134 +0,0 @@
-{
-  "ver": "1.0.26",
-  "importer": "image",
-  "imported": true,
-  "uuid": "7a73aca1-d5eb-488e-9a38-6836602ff842",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "7a73aca1-d5eb-488e-9a38-6836602ff842@6c48a",
-      "displayName": "c_00059",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "7a73aca1-d5eb-488e-9a38-6836602ff842",
-        "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": "7a73aca1-d5eb-488e-9a38-6836602ff842@f9941",
-      "displayName": "c_00059",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 7,
-        "offsetY": 28,
-        "trimX": 46,
-        "trimY": 61,
-        "width": 202,
-        "height": 162,
-        "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": [
-            -101,
-            -81,
-            0,
-            101,
-            -81,
-            0,
-            -101,
-            81,
-            0,
-            101,
-            81,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            46,
-            279,
-            248,
-            279,
-            46,
-            117,
-            248,
-            117
-          ],
-          "nuv": [
-            0.16428571428571428,
-            0.34411764705882353,
-            0.8857142857142857,
-            0.34411764705882353,
-            0.16428571428571428,
-            0.8205882352941176,
-            0.8857142857142857,
-            0.8205882352941176
-          ],
-          "minPos": [
-            -101,
-            -81,
-            0
-          ],
-          "maxPos": [
-            101,
-            81,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "7a73aca1-d5eb-488e-9a38-6836602ff842@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "7a73aca1-d5eb-488e-9a38-6836602ff842@f9941"
-  }
-}

Bu fark içinde çok fazla dosya değişikliği olduğu için bazı dosyalar gösterilmiyor