修改首页钻石兑换辣椒种子UI

assets/Script/public/ManageUI.js

@@ -92,7 +92,7 @@ cc.Class({
   },
   onLoad() {
     cc.game.setFrameRate(30)
-    cc.director.preloadScene('Login', function () { }.bind(this))
+    cc.director.preloadScene('Login', function () {}.bind(this))
     if (this.EditorialBuildings) {
       this._thisEditBuildingsParent = this.EditorialBuildings.parent
       this._Cancellation = this.EditorialBuildings.getChildByName(
@@ -209,8 +209,8 @@ cc.Class({
           .getChildByName('PriceBG')
           .getChildByName('label')
           .getComponent(cc.Label).string = this.FormatMoney(
-            AConfig.BuildingUnlockMoneyArray[i]
-          )
+          AConfig.BuildingUnlockMoneyArray[i]
+        )
     }
 
     // *********** todo *************
@@ -234,7 +234,7 @@ cc.Class({
       if (0 === value.code) {
         //没有兑换过和没有租赁过
         if (!value.data.isExchange && !value.data.isLeased) {
-          this.DiamondGapViewShow();
+          this.DiamondGapViewShow()
         }
       }
     })
@@ -545,7 +545,7 @@ cc.Class({
     //商城界面
     if (this.StoreView.active) this.onSetTouchStatus(this.StoreView, false)
   },
-  
+
   //底部菜单栏
   onBottomMenuView(isActive) {
     if (this.BottomView) {
@@ -577,7 +577,7 @@ cc.Class({
     this.BuildingInfoView.active = false
   },
   //进入编辑模式，
-  onEnterEditing() { },
+  onEnterEditing() {},
   onSetTouchStatus(target, isActive) {
     target.active = isActive
     if (this.UITouch) {
@@ -592,30 +592,46 @@ cc.Class({
     this.inviteNode.getComponent('inviteInfo').onOpenInviteInfo()
   },
 
-
   //点击钻石兑换
   onButtonEvent_Exchange() {
+    this.onSetTouchStatus(this.DiamondGapView, true)
     //判断钻石数量是否大于等于3万个
     if (GlobalD.GameData.GetDiamond() < 30000) {
-      GlobalD.GameData.showToast(
-        cc.find('Canvas/UICamera'),
-        '钻石数量不够，累积到30000个钻石即可免费兑换一包辣椒种子。',
-        2
-      )
+      this.ExchangeBtn.interactable = true
+      // GlobalD.GameData.showToast(
+      //   cc.find('Canvas/UICamera'),
+      //   '钻石数量不够，累积到30000个钻石即可免费兑换一包辣椒种子。',
+      //   2
+      // )
       return
+    } else {
+      this.ExchangeBtn.interactable = true
     }
-    let diamonAmount = 30000;
+  },
+  //点击取消钻石兑换
+  onButtonEvent_ExchangeCancel() {
+    this.onSetTouchStatus(this.DiamondGapView, false)
+  },
+
+  //点击确认钻石兑换辣椒种子
+  onButtonEvent_ExchangeChili() {
+    let diamonAmount = 30000
     //调用兑换接口
     GlobalD.GameData.exchangeSeed(diamonAmount, (res, value) => {
       //兑换成功
       if (0 === value.code) {
-        var BuildingView = cc.find("Canvas/UICamera/BuildingContainer/BuildingView").getComponent("BuildingView");
-        BuildingView.onUpdateList();
+        var BuildingView = cc
+          .find('Canvas/UICamera/BuildingContainer/BuildingView')
+          .getComponent('BuildingView')
+        BuildingView.onUpdateList()
 
-        this.onSetTouchStatus(this.DiamondSeedsView, true);
+        this.onSetTouchStatus(this.DiamondGapView, false)
+        this.onSetTouchStatus(this.DiamondSeedsView, true)
       } else {
         //兑换失败
         GlobalD.GameData.showToast(cc.find('Canvas/UICamera'), value.msg, 2)
+        this.onSetTouchStatus(this.DiamondGapView, false)
+        this.onSetTouchStatus(this.DiamondSeedsView, true)
       }
     })
   },
@@ -960,7 +976,7 @@ cc.Class({
         20,
         -470,
         task.taskCursorName[4],
-        function (nodePrefabs) { }.bind(this)
+        function (nodePrefabs) {}.bind(this)
       )
     }
   },

assets/UI/DApp/mayorButton.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/NBuilding/Store/ExchangeSeedsIcon_off.png.meta

@@ -0,0 +1,34 @@
+{
+  "ver": "2.3.3",
+  "uuid": "97e4aeeb-c7b5-4dd1-a823-9f17ef1f1a68",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "platformSettings": {},
+  "subMetas": {
+    "ExchangeSeedsIcon_off": {
+      "ver": "1.0.4",
+      "uuid": "5b194c63-6f67-42a0-a979-f7bf8aa1c390",
+      "rawTextureUuid": "97e4aeeb-c7b5-4dd1-a823-9f17ef1f1a68",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 198,
+      "height": 79,
+      "rawWidth": 198,
+      "rawHeight": 79,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/UI/NBuilding/Store/ExchangeSeedsIcon_on.png.meta

@@ -0,0 +1,34 @@
+{
+  "ver": "2.3.3",
+  "uuid": "159f2404-fd46-45c9-9361-ad35020a613b",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "platformSettings": {},
+  "subMetas": {
+    "ExchangeSeedsIcon_on": {
+      "ver": "1.0.4",
+      "uuid": "9a75b1d6-5277-4c14-b6ce-a3d5b1f21d49",
+      "rawTextureUuid": "159f2404-fd46-45c9-9361-ad35020a613b",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 198,
+      "height": 79,
+      "rawWidth": 198,
+      "rawHeight": 79,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/UI/NBuilding/Store/HotPepperSeeds.png.meta

@@ -0,0 +1,34 @@
+{
+  "ver": "2.3.3",
+  "uuid": "376fe06e-4170-437f-9dd5-4bb790029e35",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "platformSettings": {},
+  "subMetas": {
+    "HotPepperSeeds": {
+      "ver": "1.0.4",
+      "uuid": "7556af6c-6003-4eb8-bbed-5dc5b50776a2",
+      "rawTextureUuid": "376fe06e-4170-437f-9dd5-4bb790029e35",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 128,
+      "height": 160,
+      "rawWidth": 128,
+      "rawHeight": 160,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/UI/NOther/Diamond/ChiliDiamondIcon.png.meta

@@ -0,0 +1,34 @@
+{
+  "ver": "2.3.3",
+  "uuid": "67381665-ae9b-4b1d-b717-d1f3c9156ca3",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "platformSettings": {},
+  "subMetas": {
+    "ChiliDiamondIcon": {
+      "ver": "1.0.4",
+      "uuid": "683dbf3f-555a-44de-a628-003d270c237c",
+      "rawTextureUuid": "67381665-ae9b-4b1d-b717-d1f3c9156ca3",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 81,
+      "height": 75,
+      "rawWidth": 81,
+      "rawHeight": 75,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

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

@@ -0,0 +1,34 @@
+{
+  "ver": "2.3.3",
+  "uuid": "04bdd602-4390-42e3-a483-8938af0a24a0",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "platformSettings": {},
+  "subMetas": {
+    "Vines": {
+      "ver": "1.0.4",
+      "uuid": "1bb7c141-f962-4254-84f0-85e1b1b7c541",
+      "rawTextureUuid": "04bdd602-4390-42e3-a483-8938af0a24a0",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 73,
+      "height": 139,
+      "rawWidth": 73,
+      "rawHeight": 139,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/UI/NPublic/DiamondExchangeBg1.png.meta

@@ -0,0 +1,34 @@
+{
+  "ver": "2.3.3",
+  "uuid": "c448e80a-fd2c-4b44-b64e-e9c9c03387cd",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "platformSettings": {},
+  "subMetas": {
+    "DiamondExchangeBg1": {
+      "ver": "1.0.4",
+      "uuid": "2063e561-a0c7-4106-8df3-01df7554777e",
+      "rawTextureUuid": "c448e80a-fd2c-4b44-b64e-e9c9c03387cd",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0.5,
+      "offsetY": 0,
+      "trimX": 1,
+      "trimY": 0,
+      "width": 675,
+      "height": 492,
+      "rawWidth": 676,
+      "rawHeight": 492,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/UI/NPublic/DiamondExchangeBg2.png.meta

@@ -0,0 +1,34 @@
+{
+  "ver": "2.3.3",
+  "uuid": "936ffca2-6eea-4174-860f-fb08cf5fc79d",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "platformSettings": {},
+  "subMetas": {
+    "DiamondExchangeBg2": {
+      "ver": "1.0.4",
+      "uuid": "ac6bed28-f031-46a9-a3a2-5b7b7a6f922c",
+      "rawTextureUuid": "936ffca2-6eea-4174-860f-fb08cf5fc79d",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 558,
+      "height": 339,
+      "rawWidth": 558,
+      "rawHeight": 339,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/UI/NPublic/LvyLeaf1.png.meta

@@ -0,0 +1,34 @@
+{
+  "ver": "2.3.3",
+  "uuid": "282d63eb-d3b2-43ea-94ee-ce28f7c1df71",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "platformSettings": {},
+  "subMetas": {
+    "LvyLeaf1": {
+      "ver": "1.0.4",
+      "uuid": "181d1afd-5208-4cd0-9d5a-af4944797898",
+      "rawTextureUuid": "282d63eb-d3b2-43ea-94ee-ce28f7c1df71",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 1,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 750,
+      "height": 460,
+      "rawWidth": 750,
+      "rawHeight": 462,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/UI/NPublic/LvyLeaf2.png.meta

@@ -0,0 +1,34 @@
+{
+  "ver": "2.3.3",
+  "uuid": "e2d73155-47c1-4a9c-b7d3-5fdaf5ba3d5d",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "platformSettings": {},
+  "subMetas": {
+    "LvyLeaf2": {
+      "ver": "1.0.4",
+      "uuid": "6deffc1d-e67a-4a3f-ae0b-bb59c1d24f18",
+      "rawTextureUuid": "e2d73155-47c1-4a9c-b7d3-5fdaf5ba3d5d",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 926,
+      "height": 428,
+      "rawWidth": 926,
+      "rawHeight": 428,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/UI/NPublic/LvyLeaf3.png.meta

@@ -0,0 +1,34 @@
+{
+  "ver": "2.3.3",
+  "uuid": "10bec002-a4a7-4a40-91f1-26f0b13311d6",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "platformSettings": {},
+  "subMetas": {
+    "LvyLeaf3": {
+      "ver": "1.0.4",
+      "uuid": "ce0566eb-b4b1-49ca-b784-5050d0468fc4",
+      "rawTextureUuid": "10bec002-a4a7-4a40-91f1-26f0b13311d6",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": -1,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 288,
+      "height": 215,
+      "rawWidth": 290,
+      "rawHeight": 215,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/UI/NPublic/LvyLeaf4.png.meta

@@ -0,0 +1,34 @@
+{
+  "ver": "2.3.3",
+  "uuid": "35991c76-8f70-4748-8799-3e5da019fc65",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "platformSettings": {},
+  "subMetas": {
+    "LvyLeaf4": {
+      "ver": "1.0.4",
+      "uuid": "f8b7bd20-60f5-4654-9a14-2cea401435d4",
+      "rawTextureUuid": "35991c76-8f70-4748-8799-3e5da019fc65",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 309,
+      "height": 190,
+      "rawWidth": 309,
+      "rawHeight": 190,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/UI/NPublic/LvyLeaf5.png.meta

@@ -0,0 +1,34 @@
+{
+  "ver": "2.3.3",
+  "uuid": "6d749a24-25eb-4b3d-ae3c-099fd7585b3b",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "platformSettings": {},
+  "subMetas": {
+    "LvyLeaf5": {
+      "ver": "1.0.4",
+      "uuid": "04320f8c-ceab-4e96-8746-e56ab58377db",
+      "rawTextureUuid": "6d749a24-25eb-4b3d-ae3c-099fd7585b3b",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 269,
+      "height": 211,
+      "rawWidth": 269,
+      "rawHeight": 211,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/UI/NPublic/LvyLeaf6.png.meta

@@ -0,0 +1,34 @@
+{
+  "ver": "2.3.3",
+  "uuid": "b25cf965-207b-4698-a121-42c2f6d76f69",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "platformSettings": {},
+  "subMetas": {
+    "LvyLeaf6": {
+      "ver": "1.0.4",
+      "uuid": "def862db-b773-4b78-9b00-97c0ab6613cf",
+      "rawTextureUuid": "b25cf965-207b-4698-a121-42c2f6d76f69",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 252,
+      "height": 260,
+      "rawWidth": 252,
+      "rawHeight": 260,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/UI/NPublic/exchange_close_btn.png.meta

@@ -0,0 +1,34 @@
+{
+  "ver": "2.3.3",
+  "uuid": "b77236b3-c411-4556-81b6-58495bfe34fc",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "platformSettings": {},
+  "subMetas": {
+    "exchange_close_btn": {
+      "ver": "1.0.4",
+      "uuid": "d5b30f50-5a88-4911-9987-cb2b6bc4f520",
+      "rawTextureUuid": "b77236b3-c411-4556-81b6-58495bfe34fc",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": -0.5,
+      "offsetY": 0.5,
+      "trimX": 2,
+      "trimY": 2,
+      "width": 151,
+      "height": 152,
+      "rawWidth": 156,
+      "rawHeight": 157,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/UI/Tips/SureBtn_New.png.meta

@@ -0,0 +1,34 @@
+{
+  "ver": "2.3.3",
+  "uuid": "6ce53278-8ff4-48a0-ace9-3bb9836a5b4a",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "platformSettings": {},
+  "subMetas": {
+    "SureBtn_New": {
+      "ver": "1.0.4",
+      "uuid": "057894bc-b3cf-4a27-993a-097ccbe08c60",
+      "rawTextureUuid": "6ce53278-8ff4-48a0-ace9-3bb9836a5b4a",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 254,
+      "height": 102,
+      "rawWidth": 254,
+      "rawHeight": 102,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}