Merge branch 'master' of http://zhi-edu.com:3000/lan/zedu_client

gameRes/gameChineseSeme/19994/ani4-3.png.meta → gameRes/gameChineseSeme/19994/ani4.png.meta

@@ -12,7 +12,7 @@
   "height": 150,
   "platformSettings": {},
   "subMetas": {
-    "ani4-3": {
+    "ani4": {
       "ver": "1.0.6",
       "uuid": "2c8eaac2-e62e-4443-bd1c-902f87acbb23",
       "importer": "sprite-frame",

gameRes/gameChineseSeme/19996/ani2-2.png.meta → gameRes/gameChineseSeme/19996/ani2.png.meta

@@ -12,7 +12,7 @@
   "height": 116,
   "platformSettings": {},
   "subMetas": {
-    "ani2-2": {
+    "ani2": {
       "ver": "1.0.6",
       "uuid": "8cd51fb6-1ad9-4dcb-b3d4-6d26e503c49c",
       "importer": "sprite-frame",

gameRes/gameChineseSeme/19996/ani4-2.png.meta → gameRes/gameChineseSeme/19996/ani4.png.meta

@@ -12,7 +12,7 @@
   "height": 122,
   "platformSettings": {},
   "subMetas": {
-    "ani4-2": {
+    "ani4": {
       "ver": "1.0.6",
       "uuid": "1cd218a2-311e-478e-8fd5-33561f20bb1f",
       "importer": "sprite-frame",

gameRes/gameChineseSeme/20117/ani4-2.png.meta → gameRes/gameChineseSeme/20117/ani4.png.meta

@@ -12,7 +12,7 @@
   "height": 146,
   "platformSettings": {},
   "subMetas": {
-    "ani4-2": {
+    "ani4": {
       "ver": "1.0.6",
       "uuid": "91e798a1-8dba-4bf4-8597-148ed2c04da9",
       "importer": "sprite-frame",

gameRes/gameChineseSeme/20254/ani4-2.png.meta → gameRes/gameChineseSeme/20254/ani4.png.meta

@@ -12,7 +12,7 @@
   "height": 142,
   "platformSettings": {},
   "subMetas": {
-    "ani4-2": {
+    "ani4": {
       "ver": "1.0.6",
       "uuid": "906254d9-5701-4923-92c2-7e4260aac5e5",
       "importer": "sprite-frame",

gameRes/gameChineseSeme/20803/ani4-1.png.meta → gameRes/gameChineseSeme/20803/ani4.png.meta

@@ -12,7 +12,7 @@
   "height": 150,
   "platformSettings": {},
   "subMetas": {
-    "ani4-1": {
+    "ani4": {
       "ver": "1.0.6",
       "uuid": "11447c19-763f-4534-91af-05bf774b7ea3",
       "importer": "sprite-frame",

gameRes/gameChineseSeme/20992/ani4-2.png.meta → gameRes/gameChineseSeme/20992/ani4.png.meta

@@ -12,7 +12,7 @@
   "height": 150,
   "platformSettings": {},
   "subMetas": {
-    "ani4-2": {
+    "ani4": {
       "ver": "1.0.6",
       "uuid": "7d1ac5ae-5834-49f2-94c6-d9e570c0087c",
       "importer": "sprite-frame",

gameRes/gameChineseSeme/21147/ani4-2.png.meta → gameRes/gameChineseSeme/21147/ani4.png.meta

@@ -12,7 +12,7 @@
   "height": 155,
   "platformSettings": {},
   "subMetas": {
-    "ani4-2": {
+    "ani4": {
       "ver": "1.0.6",
       "uuid": "47700067-7f19-423d-9075-7f4c32aa8607",
       "importer": "sprite-frame",

gameRes/gameChineseSeme/21253/ani4-3.png.meta → gameRes/gameChineseSeme/21253/ani4.png.meta

@@ -12,7 +12,7 @@
   "height": 150,
   "platformSettings": {},
   "subMetas": {
-    "ani4-3": {
+    "ani4": {
       "ver": "1.0.6",
       "uuid": "84eebfe7-58c4-4876-8dc6-8a168fab7196",
       "importer": "sprite-frame",

gameRes/gameChineseSeme/21315/ani4-1.png.meta → gameRes/gameChineseSeme/21315/ani4.png.meta

@@ -12,7 +12,7 @@
   "height": 155,
   "platformSettings": {},
   "subMetas": {
-    "ani4-1": {
+    "ani4": {
       "ver": "1.0.6",
       "uuid": "11bab946-bb4d-4d88-90a6-12d5fc285c78",
       "importer": "sprite-frame",

gameRes/gameChineseSeme/21360/ani4-3.png.meta → gameRes/gameChineseSeme/21360/ani4.png.meta

@@ -12,7 +12,7 @@
   "height": 136,
   "platformSettings": {},
   "subMetas": {
-    "ani4-3": {
+    "ani4": {
       "ver": "1.0.6",
       "uuid": "02f8ae67-2f49-4162-8537-1849882f4e12",
       "importer": "sprite-frame",

gameRes/gameChineseSeme/21457/guide/ani1.png.meta

@@ -9,7 +9,7 @@
   "genMipmaps": false,
   "packable": true,
   "width": 395,
-  "height": 362,
+  "height": 361,
   "platformSettings": {},
   "subMetas": {
     "ani1": {
@@ -25,9 +25,9 @@
       "trimX": 0,
       "trimY": 0,
       "width": 395,
-      "height": 362,
+      "height": 361,
       "rawWidth": 395,
-      "rawHeight": 362,
+      "rawHeight": 361,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

gameRes/gameChineseSeme/22352/guide/1.png.meta

@@ -8,8 +8,8 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 68,
-  "height": 119,
+  "width": 69,
+  "height": 118,
   "platformSettings": {},
   "subMetas": {
     "1": {
@@ -20,14 +20,14 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 0.5,
+      "offsetX": 0,
       "offsetY": 0,
-      "trimX": 1,
+      "trimX": 0,
       "trimY": 0,
-      "width": 67,
-      "height": 119,
-      "rawWidth": 68,
-      "rawHeight": 119,
+      "width": 69,
+      "height": 118,
+      "rawWidth": 69,
+      "rawHeight": 118,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

gameRes/gameChineseSeme/22352/guide/3.png.meta

@@ -8,8 +8,8 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 289,
-  "height": 293,
+  "width": 299,
+  "height": 299,
   "platformSettings": {},
   "subMetas": {
     "3": {
@@ -20,14 +20,14 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 0,
+      "offsetX": 0.5,
       "offsetY": 0,
-      "trimX": 0,
+      "trimX": 1,
       "trimY": 0,
-      "width": 289,
-      "height": 293,
-      "rawWidth": 289,
-      "rawHeight": 293,
+      "width": 298,
+      "height": 299,
+      "rawWidth": 299,
+      "rawHeight": 299,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

gameRes/gameChineseSeme/22352/guide/guide_22352.json

@@ -44,8 +44,8 @@
         "isGraphics": false
       },
       {
-        "x": -0.678,
-        "y": 0.434,
+        "x": 0.473,
+        "y": -0.374,
         "nodeName": "33",
         "opacity": 0,
         "tex": "33",
@@ -89,8 +89,8 @@
         "isGraphics": false
       },
       {
-        "x": -0.946,
-        "y": 4.981,
+        "x": -2.813,
+        "y": -2.312,
         "nodeName": "3",
         "opacity": 0,
         "tex": "3",
@@ -121,8 +121,8 @@
         "isGraphics": false
       },
       {
-        "x": 62.05,
-        "y": 83.961,
+        "x": 61.933,
+        "y": 84.303,
         "nodeName": "22",
         "opacity": 0,
         "tex": "22",
@@ -166,8 +166,8 @@
         "isGraphics": false
       },
       {
-        "x": 60.611,
-        "y": 77.456,
+        "x": 59.032,
+        "y": 70.24,
         "nodeName": "2",
         "opacity": 0,
         "tex": "2",
@@ -198,8 +198,8 @@
         "isGraphics": false
       },
       {
-        "x": 59.16,
-        "y": 78.838,
+        "x": 59.607,
+        "y": 69.943,
         "nodeName": "02",
         "opacity": 0,
         "tex": "02",
@@ -219,8 +219,8 @@
         "isGraphics": false
       },
       {
-        "x": -73.636,
-        "y": 86.606,
+        "x": -72.996,
+        "y": 84.889,
         "nodeName": "11",
         "opacity": 0,
         "tex": "11",
@@ -251,8 +251,8 @@
         "isGraphics": false
       },
       {
-        "x": -71.635,
-        "y": 79.653,
+        "x": -72.967,
+        "y": 69.336,
         "nodeName": "1",
         "opacity": 0,
         "tex": "1",
@@ -283,8 +283,8 @@
         "isGraphics": false
       },
       {
-        "x": -72.669,
-        "y": 80.401,
+        "x": -72.841,
+        "y": 69.164,
         "nodeName": "01",
         "opacity": 0,
         "tex": "01",
@@ -304,8 +304,8 @@
         "isGraphics": false
       },
       {
-        "x": -1.246,
-        "y": 8.558,
+        "x": -3.6,
+        "y": -1.619,
         "nodeName": "03",
         "opacity": 0,
         "tex": "03",

gameRes/gameChineseSeme/22359/audio1.mp3.meta

@@ -0,0 +1,8 @@
+{
+  "ver": "2.0.3",
+  "uuid": "9e036b81-a825-44aa-88c5-618e455f22c3",
+  "importer": "audio-clip",
+  "downloadMode": 0,
+  "duration": 0.5225,
+  "subMetas": {}
+}

gameRes/gameChineseSeme/22359/audio2.mp3.meta

@@ -0,0 +1,8 @@
+{
+  "ver": "2.0.3",
+  "uuid": "3f4ec935-33f9-4b47-bf79-13fbfb5da3b1",
+  "importer": "audio-clip",
+  "downloadMode": 0,
+  "duration": 1.728,
+  "subMetas": {}
+}

gameRes/gameChineseSeme/22359/audio3.mp3.meta

@@ -0,0 +1,8 @@
+{
+  "ver": "2.0.3",
+  "uuid": "d09db327-ecaa-47c6-9c8c-e724062ddea8",
+  "importer": "audio-clip",
+  "downloadMode": 0,
+  "duration": 2.976,
+  "subMetas": {}
+}

gameRes/gameChineseSeme/22359/audio4.mp3.meta

@@ -0,0 +1,8 @@
+{
+  "ver": "2.0.3",
+  "uuid": "8f15624b-9c32-4f2e-9b91-e5c4133aaeaa",
+  "importer": "audio-clip",
+  "downloadMode": 0,
+  "duration": 2.136,
+  "subMetas": {}
+}

gameRes/gameChineseSeme/22909/ani4-3.png.meta → gameRes/gameChineseSeme/22909/ani4.png.meta

@@ -12,7 +12,7 @@
   "height": 150,
   "platformSettings": {},
   "subMetas": {
-    "ani4-3": {
+    "ani4": {
       "ver": "1.0.6",
       "uuid": "ed6a4ce6-7acf-4d2b-b44a-b841dc8bd9c4",
       "importer": "sprite-frame",

gameRes/gameChineseSeme/23569/ani4-1.png.meta → gameRes/gameChineseSeme/23569/ani4.png.meta

@@ -12,7 +12,7 @@
   "height": 150,
   "platformSettings": {},
   "subMetas": {
-    "ani4-1": {
+    "ani4": {
       "ver": "1.0.6",
       "uuid": "cbb96404-cd68-409f-895f-b6cae6eca86e",
       "importer": "sprite-frame",

gameRes/gameChineseSeme/23610/ani4-2.png.meta → gameRes/gameChineseSeme/23610/ani4.png.meta

@@ -12,7 +12,7 @@
   "height": 130,
   "platformSettings": {},
   "subMetas": {
-    "ani4-2": {
+    "ani4": {
       "ver": "1.0.6",
       "uuid": "9069dc46-04ee-408c-8841-7a26bd4e7e91",
       "importer": "sprite-frame",

gameRes/gameChineseSeme/24049/ani4-2.png.meta → gameRes/gameChineseSeme/24049/ani4.png.meta

@@ -12,7 +12,7 @@
   "height": 158,
   "platformSettings": {},
   "subMetas": {
-    "ani4-2": {
+    "ani4": {
       "ver": "1.0.6",
       "uuid": "91225082-40cc-4dab-8ec3-b9147988ebf0",
       "importer": "sprite-frame",

gameRes/gameChineseSeme/24052/ani4-3.png.meta → gameRes/gameChineseSeme/24052/ani4.png.meta

@@ -12,7 +12,7 @@
   "height": 150,
   "platformSettings": {},
   "subMetas": {
-    "ani4-3": {
+    "ani4": {
       "ver": "1.0.6",
       "uuid": "1a147bfb-00d6-4b61-b3f9-0ef076c496b5",
       "importer": "sprite-frame",

gameRes/gameChineseSeme/24062/ani4-2.png.meta → gameRes/gameChineseSeme/24062/ani4.png.meta

@@ -12,7 +12,7 @@
   "height": 145,
   "platformSettings": {},
   "subMetas": {
-    "ani4-2": {
+    "ani4": {
       "ver": "1.0.6",
       "uuid": "1bdf42d5-8f06-495d-8f2a-7c00de7b578e",
       "importer": "sprite-frame",

gameRes/gameChineseSeme/24178/ani4-2.png.meta → gameRes/gameChineseSeme/24178/ani4.png.meta

@@ -12,7 +12,7 @@
   "height": 130,
   "platformSettings": {},
   "subMetas": {
-    "ani4-2": {
+    "ani4": {
       "ver": "1.0.6",
       "uuid": "9c649bb1-4edd-47f8-9daa-2c3baf6bb702",
       "importer": "sprite-frame",

gameRes/gameChineseSeme/24179/ani2-1.png.meta → gameRes/gameChineseSeme/24179/ani2.png.meta

@@ -12,7 +12,7 @@
   "height": 113,
   "platformSettings": {},
   "subMetas": {
-    "ani2-1": {
+    "ani2": {
       "ver": "1.0.6",
       "uuid": "b17ea01a-a178-4fac-92dc-4c16f17a1a06",
       "importer": "sprite-frame",

gameRes/gameChineseSeme/24179/ani4-1.png.meta → gameRes/gameChineseSeme/24179/ani4.png.meta

@@ -12,7 +12,7 @@
   "height": 146,
   "platformSettings": {},
   "subMetas": {
-    "ani4-1": {
+    "ani4": {
       "ver": "1.0.6",
       "uuid": "bec98cee-fb33-41aa-9d3f-e433bb55736f",
       "importer": "sprite-frame",

gameRes/gameChineseSeme/24339/ani4-3.png.meta → gameRes/gameChineseSeme/24339/ani4.png.meta

@@ -12,7 +12,7 @@
   "height": 155,
   "platformSettings": {},
   "subMetas": {
-    "ani4-3": {
+    "ani4": {
       "ver": "1.0.6",
       "uuid": "4ed2e8a8-0517-481c-8277-80b4fa428519",
       "importer": "sprite-frame",

gameRes/gameChineseSeme/24351/ani4-1.png.meta → gameRes/gameChineseSeme/24351/ani4.png.meta

@@ -12,7 +12,7 @@
   "height": 150,
   "platformSettings": {},
   "subMetas": {
-    "ani4-1": {
+    "ani4": {
       "ver": "1.0.6",
       "uuid": "22adb4e2-69ab-43a6-aaa4-66d4099487b2",
       "importer": "sprite-frame",

gameRes/gameChineseSeme/24418/ani4-3.png.meta → gameRes/gameChineseSeme/24418/ani4.png.meta

@@ -12,7 +12,7 @@
   "height": 150,
   "platformSettings": {},
   "subMetas": {
-    "ani4-3": {
+    "ani4": {
       "ver": "1.0.6",
       "uuid": "66d59162-56de-4ea1-8dba-0132ae1996a5",
       "importer": "sprite-frame",

gameRes/gameChineseSeme/25171/ani4-1.png.meta → gameRes/gameChineseSeme/25171/ani4.png.meta

@@ -12,7 +12,7 @@
   "height": 145,
   "platformSettings": {},
   "subMetas": {
-    "ani4-1": {
+    "ani4": {
       "ver": "1.0.6",
       "uuid": "4c999df1-7ba8-42f5-aa1b-aa575b8ef763",
       "importer": "sprite-frame",

gameRes/gameChineseSeme/26041/ani4-2.png.meta → gameRes/gameChineseSeme/26041/ani4.png.meta

@@ -12,7 +12,7 @@
   "height": 148,
   "platformSettings": {},
   "subMetas": {
-    "ani4-2": {
+    "ani4": {
       "ver": "1.0.6",
       "uuid": "6a892929-ba01-40ab-9004-f8b95076c960",
       "importer": "sprite-frame",

gameRes/gameChineseSeme/27604/ani4-2.png.meta → gameRes/gameChineseSeme/27604/ani4.png.meta

@@ -12,7 +12,7 @@
   "height": 80,
   "platformSettings": {},
   "subMetas": {
-    "ani4-2": {
+    "ani4": {
       "ver": "1.0.6",
       "uuid": "a1b7b06c-92a2-447d-a816-49cd29115047",
       "importer": "sprite-frame",

gameRes/gameChineseSeme/27882/guide/11.png.meta

@@ -8,8 +8,8 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 89,
-  "height": 305,
+  "width": 92,
+  "height": 299,
   "platformSettings": {},
   "subMetas": {
     "11": {
@@ -24,10 +24,10 @@
       "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 89,
-      "height": 305,
-      "rawWidth": 89,
-      "rawHeight": 305,
+      "width": 92,
+      "height": 299,
+      "rawWidth": 92,
+      "rawHeight": 299,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

gameRes/gameChineseSeme/27882/guide/2.png.meta

@@ -8,7 +8,7 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 157,
+  "width": 158,
   "height": 291,
   "platformSettings": {},
   "subMetas": {
@@ -24,9 +24,9 @@
       "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 157,
+      "width": 158,
       "height": 291,
-      "rawWidth": 157,
+      "rawWidth": 158,
       "rawHeight": 291,
       "borderTop": 0,
       "borderBottom": 0,

gameRes/gameChineseSeme/27882/guide/ani1.png.meta

@@ -8,8 +8,8 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 354,
-  "height": 376,
+  "width": 356,
+  "height": 375,
   "platformSettings": {},
   "subMetas": {
     "ani1": {
@@ -24,10 +24,10 @@
       "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 354,
-      "height": 376,
-      "rawWidth": 354,
-      "rawHeight": 376,
+      "width": 356,
+      "height": 375,
+      "rawWidth": 356,
+      "rawHeight": 375,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

gameRes/gameChineseSeme/27882/guide/ani3.png.meta

@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "d6912798-f41b-4dcf-999b-c5fe4a1fa90f",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 277,
+  "height": 290,
+  "platformSettings": {},
+  "subMetas": {
+    "ani3": {
+      "ver": "1.0.6",
+      "uuid": "66571dcd-8b41-4f12-8204-70432cd29cc1",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "d6912798-f41b-4dcf-999b-c5fe4a1fa90f",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 277,
+      "height": 290,
+      "rawWidth": 277,
+      "rawHeight": 290,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

gameRes/gameChineseSeme/27882/guide/audio.mp3.meta

@@ -3,6 +3,6 @@
   "uuid": "28dcdc51-06c4-4782-9a35-657b8f93f6b3",
   "importer": "audio-clip",
   "downloadMode": 0,
-  "duration": 18.54,
+  "duration": 18.036,
   "subMetas": {}
 }

gameRes/gameChineseSeme/27882/guide/guide_27882.json

@@ -45,7 +45,7 @@
       },
       {
         "x": -131.367,
-        "y": 4.591,
+        "y": 1.234,
         "nodeName": "11",
         "opacity": 0,
         "tex": "11",

gameRes/gameChineseSeme/29239/ani4-1.png.meta → gameRes/gameChineseSeme/29239/ani4.png.meta

@@ -12,7 +12,7 @@
   "height": 150,
   "platformSettings": {},
   "subMetas": {
-    "ani4-1": {
+    "ani4": {
       "ver": "1.0.6",
       "uuid": "79aa1fdb-42f6-446c-83e0-28e9f4ecc583",
       "importer": "sprite-frame",

gameRes/gameChineseSeme/29240/ani4-3.png.meta → gameRes/gameChineseSeme/29240/ani4.png.meta

@@ -12,7 +12,7 @@
   "height": 131,
   "platformSettings": {},
   "subMetas": {
-    "ani4-3": {
+    "ani4": {
       "ver": "1.0.6",
       "uuid": "47b9faae-1477-4aaa-bcf7-f59e7a4e8144",
       "importer": "sprite-frame",

gameRes/gameChineseSeme/29273/ani4-3.png.meta → gameRes/gameChineseSeme/29273/ani4.png.meta

@@ -12,7 +12,7 @@
   "height": 154,
   "platformSettings": {},
   "subMetas": {
-    "ani4-3": {
+    "ani4": {
       "ver": "1.0.6",
       "uuid": "cc22943c-cc95-47cf-a034-dcdae6ea2480",
       "importer": "sprite-frame",

gameRes/gameChineseSeme/29275/ani4-2.png.meta → gameRes/gameChineseSeme/29275/ani4.png.meta

@@ -12,7 +12,7 @@
   "height": 152,
   "platformSettings": {},
   "subMetas": {
-    "ani4-2": {
+    "ani4": {
       "ver": "1.0.6",
       "uuid": "42345812-e4f8-4a70-9bd7-f6332e1f9d7a",
       "importer": "sprite-frame",