Merge remote-tracking branch 'origin/liuyun' into zhuguoqing/dev-v4

assets/res/ui/ui_academy/an_advanced/bg.png.meta

@@ -1,6 +1,6 @@
 {
   "ver": "2.2.0",
-  "uuid": "273bd987-1f92-47dc-b164-f90abbc68807",
+  "uuid": "c7d01989-fcdc-488c-a78d-f6afcb533a0d",
   "type": "sprite",
   "wrapMode": "clamp",
   "filterMode": "bilinear",
@@ -8,8 +8,8 @@
   "subMetas": {
     "bg": {
       "ver": "1.0.4",
-      "uuid": "b736425f-16df-424e-8402-5315e0e0690f",
+      "uuid": "ee20e780-a8ad-4643-918a-96681f99500a",
-      "rawTextureUuid": "273bd987-1f92-47dc-b164-f90abbc68807",
+      "rawTextureUuid": "c7d01989-fcdc-488c-a78d-f6afcb533a0d",
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,

assets/res/ui/ui_academy/an_advanced/bg2.png.meta

@@ -1,6 +1,6 @@
 {
   "ver": "2.2.0",
-  "uuid": "9f59cdf2-4d13-41a4-9f89-19b5b57db435",
+  "uuid": "e2349a22-6d53-4fff-8958-9a34e01aa2db",
   "type": "sprite",
   "wrapMode": "clamp",
   "filterMode": "bilinear",
@@ -8,8 +8,8 @@
   "subMetas": {
     "bg2": {
       "ver": "1.0.4",
-      "uuid": "6236a785-b2df-4d5e-8173-2aa248bf49fc",
+      "uuid": "79330afe-edcc-4e98-84b5-8971ea6b0efb",
-      "rawTextureUuid": "9f59cdf2-4d13-41a4-9f89-19b5b57db435",
+      "rawTextureUuid": "e2349a22-6d53-4fff-8958-9a34e01aa2db",
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,

assets/res/ui/ui_academy/an_advanced/jiantoulizi.png.meta

@@ -1,6 +1,6 @@
 {
   "ver": "2.2.0",
-  "uuid": "557d27de-d481-4bec-b6de-3ac83010df99",
+  "uuid": "b4d3a18c-8778-41aa-873f-56f729d2fc92",
   "type": "sprite",
   "wrapMode": "clamp",
   "filterMode": "bilinear",
@@ -8,8 +8,8 @@
   "subMetas": {
     "jiantoulizi": {
       "ver": "1.0.4",
-      "uuid": "c33ea6e4-447a-4994-a8aa-250ab50e8838",
+      "uuid": "75eb4801-ccb1-4f3d-b173-01fd2148d0b2",
-      "rawTextureUuid": "557d27de-d481-4bec-b6de-3ac83010df99",
+      "rawTextureUuid": "b4d3a18c-8778-41aa-873f-56f729d2fc92",
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,

assets/res/ui/ui_academy/an_advanced/jiantouyou .png.meta

@@ -1,6 +1,6 @@
 {
   "ver": "2.2.0",
-  "uuid": "d53891d4-e6d2-4c04-b41c-2a049db042a5",
+  "uuid": "74d85678-ffd3-45f9-ada0-01a835088445",
   "type": "sprite",
   "wrapMode": "clamp",
   "filterMode": "bilinear",
@@ -8,8 +8,8 @@
   "subMetas": {
     "jiantouyou ": {
       "ver": "1.0.4",
-      "uuid": "dc05fe8f-1ddf-44b1-ac75-d86ddf7681f3",
+      "uuid": "63ea7ed6-467d-486e-b583-2b5acaba4d68",
-      "rawTextureUuid": "d53891d4-e6d2-4c04-b41c-2a049db042a5",
+      "rawTextureUuid": "74d85678-ffd3-45f9-ada0-01a835088445",
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,

assets/res/ui/ui_academy/an_advanced/levelup.png.meta

@@ -1,6 +1,6 @@
 {
   "ver": "2.2.0",
-  "uuid": "2d38b763-62f4-4350-b7d3-cecd520e0d98",
+  "uuid": "66da4476-98a4-4294-a44c-3ba5bddf8c30",
   "type": "sprite",
   "wrapMode": "clamp",
   "filterMode": "bilinear",
@@ -8,8 +8,8 @@
   "subMetas": {
     "levelup": {
       "ver": "1.0.4",
-      "uuid": "015b1137-69cb-4b52-bd72-b340203c1cac",
+      "uuid": "4ac67c35-fb08-4408-9d3e-3c98cb127cc0",
-      "rawTextureUuid": "2d38b763-62f4-4350-b7d3-cecd520e0d98",
+      "rawTextureUuid": "66da4476-98a4-4294-a44c-3ba5bddf8c30",
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,

assets/res/ui/ui_academy/an_advanced/quan.png.meta

@@ -1,6 +1,6 @@
 {
   "ver": "2.2.0",
-  "uuid": "c30de75d-997a-4f25-bda7-f239bacb5e1e",
+  "uuid": "ebc63153-163b-44db-9ce8-2100a51384f4",
   "type": "sprite",
   "wrapMode": "clamp",
   "filterMode": "bilinear",
@@ -8,8 +8,8 @@
   "subMetas": {
     "quan": {
       "ver": "1.0.4",
-      "uuid": "26e9269b-127d-43c4-857c-f734a82807a8",
+      "uuid": "9f1a770a-7c10-499b-a8b6-1ea958f7e815",
-      "rawTextureUuid": "c30de75d-997a-4f25-bda7-f239bacb5e1e",
+      "rawTextureUuid": "ebc63153-163b-44db-9ce8-2100a51384f4",
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,

assets/res/ui/ui_academy/an_advanced/quan1.png.meta

@@ -1,6 +1,6 @@
 {
   "ver": "2.2.0",
-  "uuid": "dcf89e66-b1a3-486d-b78e-115a117e20f0",
+  "uuid": "6bb334bd-7a8d-4901-b76f-217e73148b98",
   "type": "sprite",
   "wrapMode": "clamp",
   "filterMode": "bilinear",
@@ -8,8 +8,8 @@
   "subMetas": {
     "quan1": {
       "ver": "1.0.4",
-      "uuid": "cab94685-1b89-4496-9f6e-473747875db8",
+      "uuid": "ce33d588-06e7-4e7b-9459-4797d44b4bc9",
-      "rawTextureUuid": "dcf89e66-b1a3-486d-b78e-115a117e20f0",
+      "rawTextureUuid": "6bb334bd-7a8d-4901-b76f-217e73148b98",
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,

assets/res/ui/ui_academy/an_advanced/quan2.png.meta

@@ -1,6 +1,6 @@
 {
   "ver": "2.2.0",
-  "uuid": "bd6ac2b1-807b-4cf0-bbd5-b8bc4d7d2f2c",
+  "uuid": "0af4ec84-5218-49ef-ba18-9674b18cba30",
   "type": "sprite",
   "wrapMode": "clamp",
   "filterMode": "bilinear",
@@ -8,8 +8,8 @@
   "subMetas": {
     "quan2": {
       "ver": "1.0.4",
-      "uuid": "239f23ba-69d4-4ba3-9f07-1f0c80b1688c",
+      "uuid": "83c6ae2a-938e-4d34-99b0-f9a643ec3e66",
-      "rawTextureUuid": "bd6ac2b1-807b-4cf0-bbd5-b8bc4d7d2f2c",
+      "rawTextureUuid": "0af4ec84-5218-49ef-ba18-9674b18cba30",
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,

assets/res/ui/ui_academy/an_advanced/xiantiao.png.meta

@@ -1,6 +1,6 @@
 {
   "ver": "2.2.0",
-  "uuid": "a81a6897-d673-454a-86c7-4cf5e026bfc2",
+  "uuid": "b1184921-cbaf-4f6c-bc8a-334dbbbf0de6",
   "type": "sprite",
   "wrapMode": "clamp",
   "filterMode": "bilinear",
@@ -8,8 +8,8 @@
   "subMetas": {
     "xiantiao": {
       "ver": "1.0.4",
-      "uuid": "e1bd6129-2b41-4d32-821c-cbfe44e6933d",
+      "uuid": "521087c8-0e84-4676-83a6-b1377785c8eb",
-      "rawTextureUuid": "a81a6897-d673-454a-86c7-4cf5e026bfc2",
+      "rawTextureUuid": "b1184921-cbaf-4f6c-bc8a-334dbbbf0de6",
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,

assets/res/ui/ui_academy/an_advanced/xiantiao2.png.meta

@@ -1,6 +1,6 @@
 {
   "ver": "2.2.0",
-  "uuid": "cc3bc40a-9355-4afa-9db4-307860d8d26f",
+  "uuid": "75f25dc5-9a60-4a90-8e50-7c08cb72bbae",
   "type": "sprite",
   "wrapMode": "clamp",
   "filterMode": "bilinear",
@@ -8,8 +8,8 @@
   "subMetas": {
     "xiantiao2": {
       "ver": "1.0.4",
-      "uuid": "753c0294-c40f-4ea5-8b41-b6b8bc2bd1d1",
+      "uuid": "78881714-48cb-4b20-bd9f-25927e8f516f",
-      "rawTextureUuid": "cc3bc40a-9355-4afa-9db4-307860d8d26f",
+      "rawTextureUuid": "75f25dc5-9a60-4a90-8e50-7c08cb72bbae",
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,

assets/res/ui/ui_academy/an_advanced/xiantiao3.png.meta

@@ -1,6 +1,6 @@
 {
   "ver": "2.2.0",
-  "uuid": "2e364734-ab02-462e-bb8c-25ad12b4af2d",
+  "uuid": "e1918cd5-e17d-4ee9-8876-13e7178f128c",
   "type": "sprite",
   "wrapMode": "clamp",
   "filterMode": "bilinear",
@@ -8,8 +8,8 @@
   "subMetas": {
     "xiantiao3": {
       "ver": "1.0.4",
-      "uuid": "dd3b86b0-6777-4060-b902-f7682af6d155",
+      "uuid": "699a4ba7-dade-4f9f-b240-f79c443cbc72",
-      "rawTextureUuid": "2e364734-ab02-462e-bb8c-25ad12b4af2d",
+      "rawTextureUuid": "e1918cd5-e17d-4ee9-8876-13e7178f128c",
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,

assets/res/ui/ui_academy/an_advanced/xiaojiantou.png.meta

@@ -1,6 +1,6 @@
 {
   "ver": "2.2.0",
-  "uuid": "ab284835-71dd-41c4-9f23-8a512536f766",
+  "uuid": "f34f28cd-b4e6-44b7-80a9-8bb767924789",
   "type": "sprite",
   "wrapMode": "clamp",
   "filterMode": "bilinear",
@@ -8,8 +8,8 @@
   "subMetas": {
     "xiaojiantou": {
       "ver": "1.0.4",
-      "uuid": "4cddf1b0-817c-4a42-b104-5aa75f96e2b2",
+      "uuid": "82e96ff7-9042-4205-af13-acb57cbbd0f7",
-      "rawTextureUuid": "ab284835-71dd-41c4-9f23-8a512536f766",
+      "rawTextureUuid": "f34f28cd-b4e6-44b7-80a9-8bb767924789",
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,