Merge branch 'TheHolyFarmer' of http://81.70.224.233:10080/yichael/FragrantTown into TheHolyFarmer

assets/UI/NListInfo/BindingText.png.meta

@@ -0,0 +1,34 @@
+{
+  "ver": "2.3.3",
+  "uuid": "e29dd503-3921-408c-a414-1f5c76cb8f43",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "platformSettings": {},
+  "subMetas": {
+    "BindingText": {
+      "ver": "1.0.4",
+      "uuid": "82cc8ff9-8c28-4c09-89c6-6e61d2b9763e",
+      "rawTextureUuid": "e29dd503-3921-408c-a414-1f5c76cb8f43",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 195,
+      "height": 93,
+      "rawWidth": 195,
+      "rawHeight": 93,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/UI/NListInfo/InviteCode.png.meta

@@ -0,0 +1,34 @@
+{
+  "ver": "2.3.3",
+  "uuid": "41f391be-2081-46f9-a6b0-bba7e3855e0e",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "platformSettings": {},
+  "subMetas": {
+    "InviteCode": {
+      "ver": "1.0.4",
+      "uuid": "f85c0165-946d-4707-8c8f-7f173f589e64",
+      "rawTextureUuid": "41f391be-2081-46f9-a6b0-bba7e3855e0e",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 228,
+      "height": 81,
+      "rawWidth": 228,
+      "rawHeight": 81,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/UI/NListInfo/InviteCodeBg.png.meta

@@ -0,0 +1,34 @@
+{
+  "ver": "2.3.3",
+  "uuid": "b1b5473e-5bf3-4c21-afb3-9a2b06a2a4f7",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "platformSettings": {},
+  "subMetas": {
+    "InviteCodeBg": {
+      "ver": "1.0.4",
+      "uuid": "c031bcf5-4cf2-46fc-8105-a04e62344992",
+      "rawTextureUuid": "b1b5473e-5bf3-4c21-afb3-9a2b06a2a4f7",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 534,
+      "height": 94,
+      "rawWidth": 534,
+      "rawHeight": 94,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/UI/NListInfo/ListGrayBox.png.meta

@@ -0,0 +1,34 @@
+{
+  "ver": "2.3.3",
+  "uuid": "55e6c6c3-972c-489d-9fef-88704163abab",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "platformSettings": {},
+  "subMetas": {
+    "ListGrayBox": {
+      "ver": "1.0.4",
+      "uuid": "17783164-6ea0-4324-8275-81f690438286",
+      "rawTextureUuid": "55e6c6c3-972c-489d-9fef-88704163abab",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 910,
+      "height": 495,
+      "rawWidth": 910,
+      "rawHeight": 495,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/UI/NListInfo/ListNail.png.meta

@@ -0,0 +1,34 @@
+{
+  "ver": "2.3.3",
+  "uuid": "68fdae52-8baa-4885-bf7d-0e3944d18e50",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "platformSettings": {},
+  "subMetas": {
+    "ListNail": {
+      "ver": "1.0.4",
+      "uuid": "3bf38d21-90b8-46ae-a029-3bfc92fb3534",
+      "rawTextureUuid": "68fdae52-8baa-4885-bf7d-0e3944d18e50",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 115,
+      "height": 130,
+      "rawWidth": 115,
+      "rawHeight": 130,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/UI/NSetting/settting_0.png.meta

@@ -20,10 +20,10 @@
       "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 118,
-      "height": 66,
-      "rawWidth": 118,
-      "rawHeight": 66,
+      "width": 389,
+      "height": 188,
+      "rawWidth": 389,
+      "rawHeight": 188,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

assets/UI/NSetting/settting_1.png.meta

@@ -20,10 +20,10 @@
       "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 99,
-      "height": 48,
-      "rawWidth": 99,
-      "rawHeight": 48,
+      "width": 240,
+      "height": 120,
+      "rawWidth": 240,
+      "rawHeight": 120,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

assets/UI/NSetting/settting_1icon.png.meta

@@ -0,0 +1,34 @@
+{
+  "ver": "2.3.3",
+  "uuid": "3dcebc22-5bad-4cd4-abe5-223cfc9ef0aa",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "platformSettings": {},
+  "subMetas": {
+    "settting_1icon": {
+      "ver": "1.0.4",
+      "uuid": "885d963c-736a-46bd-97ad-29b3cfb3477e",
+      "rawTextureUuid": "3dcebc22-5bad-4cd4-abe5-223cfc9ef0aa",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 84,
+      "height": 84,
+      "rawWidth": 84,
+      "rawHeight": 84,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/UI/NSetting/settting_2.png.meta

@@ -20,10 +20,10 @@
       "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 99,
-      "height": 48,
-      "rawWidth": 99,
-      "rawHeight": 48,
+      "width": 240,
+      "height": 120,
+      "rawWidth": 240,
+      "rawHeight": 120,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

assets/UI/NSetting/settting_2Icon.png.meta

@@ -0,0 +1,34 @@
+{
+  "ver": "2.3.3",
+  "uuid": "ed08df78-118e-40c5-8351-5a4ad89706d3",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "platformSettings": {},
+  "subMetas": {
+    "settting_2Icon": {
+      "ver": "1.0.4",
+      "uuid": "14ea668e-cdf3-46eb-a52c-d6f0b98f4fb5",
+      "rawTextureUuid": "ed08df78-118e-40c5-8351-5a4ad89706d3",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 81,
+      "height": 84,
+      "rawWidth": 81,
+      "rawHeight": 84,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/UI/NSetting/settting_3.png.meta

@@ -16,14 +16,14 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": -0.5,
+      "offsetX": 0,
       "offsetY": 0,
-      "trimX": 8,
+      "trimX": 0,
       "trimY": 0,
-      "width": 251,
-      "height": 128,
-      "rawWidth": 268,
-      "rawHeight": 128,
+      "width": 252,
+      "height": 108,
+      "rawWidth": 252,
+      "rawHeight": 108,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

assets/UI/NSetting/settting_4.png.meta

@@ -16,14 +16,14 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": -0.5,
+      "offsetX": 0,
       "offsetY": 0,
-      "trimX": 8,
+      "trimX": 0,
       "trimY": 0,
-      "width": 251,
-      "height": 128,
-      "rawWidth": 268,
-      "rawHeight": 128,
+      "width": 252,
+      "height": 108,
+      "rawWidth": 252,
+      "rawHeight": 108,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

assets/UI/NSetting/settting_5.png.meta

@@ -16,14 +16,14 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": -0.5,
-      "offsetY": 0,
+      "offsetX": 0,
+      "offsetY": -0.5,
       "trimX": 0,
-      "trimY": 0,
-      "width": 267,
-      "height": 128,
-      "rawWidth": 268,
-      "rawHeight": 128,
+      "trimY": 1,
+      "width": 252,
+      "height": 107,
+      "rawWidth": 252,
+      "rawHeight": 108,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

assets/UI/NSetting/settting_6.png.meta

@@ -16,14 +16,14 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": -0.5,
-      "offsetY": 0,
+      "offsetX": 0,
+      "offsetY": -0.5,
       "trimX": 0,
-      "trimY": 0,
-      "width": 267,
-      "height": 128,
-      "rawWidth": 268,
-      "rawHeight": 128,
+      "trimY": 1,
+      "width": 252,
+      "height": 107,
+      "rawWidth": 252,
+      "rawHeight": 108,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

assets/UI/Tips/CopyBtn.png.meta

@@ -0,0 +1,34 @@
+{
+  "ver": "2.3.3",
+  "uuid": "a2abaeb5-ee6c-461d-ac50-f80497bace9b",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "platformSettings": {},
+  "subMetas": {
+    "CopyBtn": {
+      "ver": "1.0.4",
+      "uuid": "bcdae905-666f-4365-8ecd-f51dcfa4f801",
+      "rawTextureUuid": "a2abaeb5-ee6c-461d-ac50-f80497bace9b",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 177,
+      "height": 96,
+      "rawWidth": 177,
+      "rawHeight": 96,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}