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

gameRes/gameChineseSeme/20307/ani3.png.meta

@@ -1,6 +1,6 @@
 {
   "ver": "2.3.7",
-  "uuid": "a5c04832-2d40-411a-ac89-1290de5bd6b9",
+  "uuid": "0a80dc69-c961-4a0b-bce4-fe720a514b4f",
   "importer": "texture",
   "type": "sprite",
   "wrapMode": "clamp",
@@ -14,9 +14,9 @@
   "subMetas": {
     "ani3": {
       "ver": "1.0.6",
-      "uuid": "655334e1-7a14-47ca-9d6e-0572d278953c",
+      "uuid": "274515a0-d5cf-478f-8e6b-5993310fd97f",
       "importer": "sprite-frame",
-      "rawTextureUuid": "a5c04832-2d40-411a-ac89-1290de5bd6b9",
+      "rawTextureUuid": "0a80dc69-c961-4a0b-bce4-fe720a514b4f",
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,

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

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