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

assets/UI/DApp/farmeText.png.meta

@@ -18,12 +18,12 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 2,
-      "trimY": 2,
-      "width": 57,
-      "height": 30,
-      "rawWidth": 61,
-      "rawHeight": 34,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 172,
+      "height": 52,
+      "rawWidth": 172,
+      "rawHeight": 52,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

assets/UI/DApp/mayorText.png.meta

@@ -16,14 +16,14 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0,
+      "offsetX": -0.5,
+      "offsetY": -1.5,
       "trimX": 2,
-      "trimY": 2,
-      "width": 57,
-      "height": 30,
-      "rawWidth": 61,
-      "rawHeight": 34,
+      "trimY": 4,
+      "width": 258,
+      "height": 78,
+      "rawWidth": 263,
+      "rawHeight": 83,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

assets/UI/DApp/villageButton.png.meta

@@ -16,14 +16,14 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0,
+      "offsetX": -0.5,
+      "offsetY": -0.5,
       "trimX": 0,
-      "trimY": 0,
-      "width": 124,
-      "height": 47,
-      "rawWidth": 124,
-      "rawHeight": 47,
+      "trimY": 2,
+      "width": 249,
+      "height": 118,
+      "rawWidth": 250,
+      "rawHeight": 121,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

assets/UI/DApp/villageText.png.meta

@@ -16,14 +16,14 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0,
+      "offsetX": -0.5,
+      "offsetY": -1.5,
       "trimX": 2,
-      "trimY": 2,
-      "width": 57,
-      "height": 30,
-      "rawWidth": 61,
-      "rawHeight": 34,
+      "trimY": 4,
+      "width": 258,
+      "height": 78,
+      "rawWidth": 263,
+      "rawHeight": 83,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

assets/UI/NBuilding/Store/equipment_button.jpg.meta

@@ -0,0 +1,34 @@
+{
+  "ver": "2.3.3",
+  "uuid": "95c3e7af-45f2-46f5-9c43-0b2b4f568a96",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "platformSettings": {},
+  "subMetas": {
+    "equipment_button": {
+      "ver": "1.0.4",
+      "uuid": "9cc0d357-f119-4760-86ea-8655b57ab8e1",
+      "rawTextureUuid": "95c3e7af-45f2-46f5-9c43-0b2b4f568a96",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 194,
+      "height": 156,
+      "rawWidth": 194,
+      "rawHeight": 156,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/UI/NBuilding/Store/equipment_nbutton.jpg.meta

@@ -0,0 +1,34 @@
+{
+  "ver": "2.3.3",
+  "uuid": "3f900b84-4e73-4e55-9734-3a6ea3fbe3cd",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "platformSettings": {},
+  "subMetas": {
+    "equipment_nbutton": {
+      "ver": "1.0.4",
+      "uuid": "c591679a-6660-4793-8b2c-3bbfdd2973cc",
+      "rawTextureUuid": "3f900b84-4e73-4e55-9734-3a6ea3fbe3cd",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 200,
+      "height": 84,
+      "rawWidth": 200,
+      "rawHeight": 84,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/UI/NOther/EveryDaySign/CNTIcon.png.meta

@@ -16,14 +16,14 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": -0.5,
-      "offsetY": 1.5,
-      "trimX": 1,
-      "trimY": 1,
-      "width": 78,
-      "height": 76,
-      "rawWidth": 81,
-      "rawHeight": 81,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 69,
+      "height": 68,
+      "rawWidth": 69,
+      "rawHeight": 68,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

assets/UI/NOther/MainMenu/MainMenuBG.png.meta → assets/UI/NOther/EveryDaySign/EnergyIcon.png.meta

@@ -1,6 +1,6 @@
 {
   "ver": "2.3.3",
-  "uuid": "a20673c3-b59b-4b5a-9aed-05ef9e08b306",
+  "uuid": "e0460870-db1f-4ab6-aa2c-5d17ad9f42bf",
   "type": "sprite",
   "wrapMode": "clamp",
   "filterMode": "bilinear",
@@ -9,10 +9,10 @@
   "packable": true,
   "platformSettings": {},
   "subMetas": {
-    "MainMenuBG": {
+    "EnergyIcon": {
       "ver": "1.0.4",
-      "uuid": "c2c53433-c1be-4ecc-bc97-e955352fa475",
-      "rawTextureUuid": "a20673c3-b59b-4b5a-9aed-05ef9e08b306",
+      "uuid": "1e9889c5-e827-4a33-b6a8-df83be68cfc1",
+      "rawTextureUuid": "e0460870-db1f-4ab6-aa2c-5d17ad9f42bf",
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
@@ -20,10 +20,10 @@
       "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 644,
-      "height": 108,
-      "rawWidth": 644,
-      "rawHeight": 108,
+      "width": 76,
+      "height": 113,
+      "rawWidth": 76,
+      "rawHeight": 113,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

assets/UI/NOther/EveryDaySign/LuckyIcon.png.meta

@@ -0,0 +1,34 @@
+{
+  "ver": "2.3.3",
+  "uuid": "2c7f47ab-e0ec-42f1-bc66-03541213ce4c",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "platformSettings": {},
+  "subMetas": {
+    "LuckyIcon": {
+      "ver": "1.0.4",
+      "uuid": "ce5ae914-22cd-43e5-a54e-fd93e756a816",
+      "rawTextureUuid": "2c7f47ab-e0ec-42f1-bc66-03541213ce4c",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 77,
+      "height": 75,
+      "rawWidth": 77,
+      "rawHeight": 75,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/UI/NOther/EveryDaySign/SNBIcon.png.meta

@@ -17,13 +17,13 @@
       "trimThreshold": 1,
       "rotated": false,
       "offsetX": 0,
-      "offsetY": -0.5,
-      "trimX": 1,
-      "trimY": 4,
-      "width": 79,
-      "height": 74,
-      "rawWidth": 81,
-      "rawHeight": 81,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 71,
+      "height": 69,
+      "rawWidth": 71,
+      "rawHeight": 69,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

assets/UI/NOther/EveryDaySign/diamondicon2.png.meta

@@ -20,10 +20,10 @@
       "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 54,
-      "height": 48,
-      "rawWidth": 54,
-      "rawHeight": 48,
+      "width": 96,
+      "height": 94,
+      "rawWidth": 96,
+      "rawHeight": 94,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

assets/UI/NOther/EveryDaySign/icon_coin2.png.meta

@@ -18,12 +18,12 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 3,
-      "trimY": 3,
-      "width": 50,
-      "height": 50,
-      "rawWidth": 56,
-      "rawHeight": 56,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 86,
+      "height": 92,
+      "rawWidth": 86,
+      "rawHeight": 92,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

assets/UI/NOther/MainMenu/BingInvite.png.meta

@@ -16,14 +16,14 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 0,
-      "offsetY": 1,
+      "offsetX": -0.5,
+      "offsetY": 0.5,
       "trimX": 0,
       "trimY": 0,
-      "width": 100,
-      "height": 112,
-      "rawWidth": 100,
-      "rawHeight": 114,
+      "width": 199,
+      "height": 199,
+      "rawWidth": 200,
+      "rawHeight": 200,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

assets/UI/NOther/MainMenu/ExchangeSeeds.png.meta

@@ -0,0 +1,34 @@
+{
+  "ver": "2.3.3",
+  "uuid": "b27c0959-7248-405b-abc8-bf0d5180880a",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "platformSettings": {},
+  "subMetas": {
+    "ExchangeSeeds": {
+      "ver": "1.0.4",
+      "uuid": "b2fcf164-8b50-4cf6-88e5-f2a379eaecbd",
+      "rawTextureUuid": "b27c0959-7248-405b-abc8-bf0d5180880a",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 168,
+      "height": 178,
+      "rawWidth": 168,
+      "rawHeight": 178,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/UI/NOther/MainMenu/Management.png.meta

@@ -20,10 +20,10 @@
       "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 123,
-      "height": 141,
-      "rawWidth": 123,
-      "rawHeight": 141,
+      "width": 162,
+      "height": 177,
+      "rawWidth": 162,
+      "rawHeight": 177,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

assets/UI/NOther/MainMenu/Repository.png.meta

@@ -17,13 +17,13 @@
       "trimThreshold": 1,
       "rotated": false,
       "offsetX": 0,
-      "offsetY": 1,
+      "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 126,
-      "height": 133,
-      "rawWidth": 126,
-      "rawHeight": 135,
+      "width": 162,
+      "height": 174,
+      "rawWidth": 162,
+      "rawHeight": 174,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

assets/UI/NOther/MainMenu/Stealing.png.meta

@@ -0,0 +1,34 @@
+{
+  "ver": "2.3.3",
+  "uuid": "50421a9d-7202-4037-b2eb-a85d4c6220eb",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "platformSettings": {},
+  "subMetas": {
+    "Stealing": {
+      "ver": "1.0.4",
+      "uuid": "005d64e0-b129-4a08-980c-b4d3bceff594",
+      "rawTextureUuid": "50421a9d-7202-4037-b2eb-a85d4c6220eb",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 210,
+      "height": 190,
+      "rawWidth": 210,
+      "rawHeight": 190,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/UI/NOther/MainMenu/Store.png.meta

@@ -17,13 +17,13 @@
       "trimThreshold": 1,
       "rotated": false,
       "offsetX": 0,
-      "offsetY": 1,
+      "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 131,
-      "height": 127,
-      "rawWidth": 131,
-      "rawHeight": 129,
+      "width": 162,
+      "height": 182,
+      "rawWidth": 162,
+      "rawHeight": 182,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

assets/UI/NOther/MainMenu/TopLabelBg.png.meta

@@ -0,0 +1,34 @@
+{
+  "ver": "2.3.3",
+  "uuid": "212f14e8-5da0-4f39-96db-e02d232ef517",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "platformSettings": {},
+  "subMetas": {
+    "TopLabelBg": {
+      "ver": "1.0.4",
+      "uuid": "5f9b8ead-0fc3-4ee7-8a24-d15501fad608",
+      "rawTextureUuid": "212f14e8-5da0-4f39-96db-e02d232ef517",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 407,
+      "height": 175,
+      "rawWidth": 407,
+      "rawHeight": 175,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/UI/NOther/MainMenu/avatarBg.png.meta

@@ -0,0 +1,34 @@
+{
+  "ver": "2.3.3",
+  "uuid": "d0104744-a54e-410a-bf17-f8fa9c5633a1",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "platformSettings": {},
+  "subMetas": {
+    "avatarBg": {
+      "ver": "1.0.4",
+      "uuid": "d8042082-05ff-4a63-b4ce-81b584a05c53",
+      "rawTextureUuid": "d0104744-a54e-410a-bf17-f8fa9c5633a1",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 177,
+      "height": 187,
+      "rawWidth": 177,
+      "rawHeight": 187,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/UI/NOther/MainMenu/btn_set.png.meta

@@ -16,14 +16,14 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0,
+      "offsetX": -0.5,
+      "offsetY": 0.5,
       "trimX": 0,
       "trimY": 0,
-      "width": 77,
-      "height": 86,
-      "rawWidth": 77,
-      "rawHeight": 86,
+      "width": 199,
+      "height": 199,
+      "rawWidth": 200,
+      "rawHeight": 200,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

assets/UI/NOther/MainMenu/labelBg2.png.meta

@@ -17,13 +17,13 @@
       "trimThreshold": 1,
       "rotated": false,
       "offsetX": 0,
-      "offsetY": -0.5,
-      "trimX": 4,
-      "trimY": 5,
-      "width": 245,
-      "height": 38,
-      "rawWidth": 253,
-      "rawHeight": 47,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 244,
+      "height": 61,
+      "rawWidth": 244,
+      "rawHeight": 61,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

assets/UI/NOther/MainMenu/labelBg3.png.meta

@@ -0,0 +1,34 @@
+{
+  "ver": "2.3.3",
+  "uuid": "6c9151c8-0018-448c-bdae-7aaae3c349b0",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "platformSettings": {},
+  "subMetas": {
+    "labelBg3": {
+      "ver": "1.0.4",
+      "uuid": "3e0444ce-170a-4fce-a569-cb072a9676f6",
+      "rawTextureUuid": "6c9151c8-0018-448c-bdae-7aaae3c349b0",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 292,
+      "height": 65,
+      "rawWidth": 292,
+      "rawHeight": 65,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

settings/project.json

@@ -45,8 +45,7 @@
     "height": 640,
     "width": 960
   },
-  "start-scene": "e0bea6db-64db-4c3b-b02a-531046201733",
+  "start-scene": "current",
   "use-customize-simulator": true,
-  "use-project-simulator-setting": false,
-  "start-scene": "current"
+  "use-project-simulator-setting": false
 }