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

assets/Script/public/ManageUI.js

@@ -80,11 +80,12 @@ cc.Class({
     ExchangeBtn: cc.Button,
     //钻石足够获得种子
     DiamondSeedsView: cc.Node,
+    LightRotate: cc.Node,
     DiamondSeeds_SureBtn: cc.Button,
 
     inviteNode: cc.Node,
 
-    listUserInfoNode:cc.Node,
+    listUserInfoNode: cc.Node,
 
     //商店面的介绍模板
     mallContent_Name: cc.Label,
@@ -595,15 +596,16 @@ cc.Class({
   },
 
   onListUserInfo_Open() {
-    this.listUserInfoNode.getComponent('userListInfo').onOpen();
+    this.listUserInfoNode.getComponent('userListInfo').onOpen()
   },
 
   //点击钻石兑换
   onButtonEvent_Exchange() {
-    this.onSetTouchStatus(this.DiamondGapView, true)
+    this.DiamondGapView.active = true
+    // this.onSetTouchStatus(this.DiamondGapView, true)
     //判断钻石数量是否大于等于3万个
     if (GlobalD.GameData.GetDiamond() < 30000) {
-      this.ExchangeBtn.interactable = true
+      this.ExchangeBtn.interactable = false
       // GlobalD.GameData.showToast(
       //   cc.find('Canvas/UICamera'),
       //   '钻石数量不够，累积到30000个钻石即可免费兑换一包辣椒种子。',
@@ -616,7 +618,7 @@ cc.Class({
   },
   //点击取消钻石兑换
   onButtonEvent_ExchangeCancel() {
-    this.onSetTouchStatus(this.DiamondGapView, false)
+    this.DiamondGapView.active = false
   },
 
   //点击确认钻石兑换辣椒种子
@@ -624,6 +626,7 @@ cc.Class({
     let diamonAmount = 30000
     //调用兑换接口
     GlobalD.GameData.exchangeSeed(diamonAmount, (value) => {
+      return
       //兑换成功
       if (0 === value.code) {
         var BuildingView = cc
@@ -631,21 +634,24 @@ cc.Class({
           .getComponent('BuildingView')
         BuildingView.onUpdateList()
 
-        this.onSetTouchStatus(this.DiamondGapView, false)
-        this.onSetTouchStatus(this.DiamondSeedsView, true)
+        this.DiamondGapView.active = false
+        this.DiamondSeedsView.active = true
+
+        //光芒旋转
+        var rotate = cc.repeatForever(cc.rotateBy(2, -100, 0))
+        this.LightRotate.runAction(rotate)
       } else {
         //兑换失败
         GlobalD.GameData.showToast(cc.find('Canvas/UICamera'), value.msg, 2)
-        this.onSetTouchStatus(this.DiamondGapView, false)
-        this.onSetTouchStatus(this.DiamondSeedsView, true)
       }
     })
   },
 
   //点击钻石兑换的确认按钮
   onButtonEvent_DiamondSure() {
-    this.onSetTouchStatus(this.DiamondSeedsView, false)
-    this.onSetTouchStatus(this.DiamondGapView, false)
+    this.DiamondSeedsView.active = false
+    //停止光芒旋转
+    this.LightRotate.stopAllActions()
   },
 
   //音效设置界面

assets/UI/NPublic/DiamondExchangeBg1.png.meta

@@ -24,10 +24,10 @@
       "height": 492,
       "rawWidth": 676,
       "rawHeight": 492,
-      "borderTop": 0,
-      "borderBottom": 0,
-      "borderLeft": 0,
-      "borderRight": 0,
+      "borderTop": 175,
+      "borderBottom": 302,
+      "borderLeft": 324,
+      "borderRight": 321,
       "subMetas": {}
     }
   }

assets/UI/Tips/LightRotate.png.meta

@@ -0,0 +1,34 @@
+{
+  "ver": "2.3.3",
+  "uuid": "b9d393fe-cf71-482a-918e-b50c34c77541",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "platformSettings": {},
+  "subMetas": {
+    "LightRotate": {
+      "ver": "1.0.4",
+      "uuid": "de6dbaf1-42fd-4d1e-8191-e27f2a480d51",
+      "rawTextureUuid": "b9d393fe-cf71-482a-918e-b50c34c77541",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 1031,
+      "height": 1037,
+      "rawWidth": 1031,
+      "rawHeight": 1037,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/UI/Tips/StealSuccess_Star.png.meta

@@ -0,0 +1,34 @@
+{
+  "ver": "2.3.3",
+  "uuid": "a1b8ec85-6fb2-47c0-908a-a3c98bdb9673",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "platformSettings": {},
+  "subMetas": {
+    "StealSuccess_Star": {
+      "ver": "1.0.4",
+      "uuid": "13475db3-2b26-4417-a465-d1fad78d63c5",
+      "rawTextureUuid": "a1b8ec85-6fb2-47c0-908a-a3c98bdb9673",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": -0.5,
+      "offsetY": 0,
+      "trimX": 14,
+      "trimY": 15,
+      "width": 284,
+      "height": 267,
+      "rawWidth": 313,
+      "rawHeight": 297,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/UI/Tips/StealTipDog.png.meta

@@ -0,0 +1,34 @@
+{
+  "ver": "2.3.3",
+  "uuid": "82b8aa57-c957-4d32-8b9e-547c2a2454e0",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "platformSettings": {},
+  "subMetas": {
+    "StealTipDog": {
+      "ver": "1.0.4",
+      "uuid": "76696448-4f17-43e7-8cdc-3adee2efc89d",
+      "rawTextureUuid": "82b8aa57-c957-4d32-8b9e-547c2a2454e0",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 626,
+      "height": 794,
+      "rawWidth": 626,
+      "rawHeight": 794,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/UI/Tips/StealTipDogPaw.png.meta

@@ -0,0 +1,34 @@
+{
+  "ver": "2.3.3",
+  "uuid": "ca223e52-3e96-4605-9536-2cc60635f759",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "platformSettings": {},
+  "subMetas": {
+    "StealTipDogPaw": {
+      "ver": "1.0.4",
+      "uuid": "e96a0df1-513d-4db5-9ae7-696597a3f0ac",
+      "rawTextureUuid": "ca223e52-3e96-4605-9536-2cc60635f759",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 212,
+      "height": 182,
+      "rawWidth": 212,
+      "rawHeight": 182,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/UI/Tips/StealTitle_Fail.png.meta

@@ -0,0 +1,34 @@
+{
+  "ver": "2.3.3",
+  "uuid": "a6445200-707d-4a55-bfd0-a514675c6529",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "platformSettings": {},
+  "subMetas": {
+    "StealTitle_Fail": {
+      "ver": "1.0.4",
+      "uuid": "0a0d29ef-3133-4bf0-a07e-2c52d3205959",
+      "rawTextureUuid": "a6445200-707d-4a55-bfd0-a514675c6529",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 689,
+      "height": 182,
+      "rawWidth": 689,
+      "rawHeight": 182,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/UI/Tips/StealTitle_Success.png.meta

@@ -0,0 +1,34 @@
+{
+  "ver": "2.3.3",
+  "uuid": "00fb460a-e2e1-475a-9c62-16a7d147196b",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "platformSettings": {},
+  "subMetas": {
+    "StealTitle_Success": {
+      "ver": "1.0.4",
+      "uuid": "079fe841-fd47-4a06-b54b-24292998834c",
+      "rawTextureUuid": "00fb460a-e2e1-475a-9c62-16a7d147196b",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 454,
+      "height": 134,
+      "rawWidth": 454,
+      "rawHeight": 134,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

settings/project.json

@@ -45,7 +45,7 @@
     "height": 640,
     "width": 960
   },
-  "start-scene": "e0bea6db-64db-4c3b-b02a-531046201733",
+  "start-scene": "591a1367-313f-4af1-9802-88a6dd1f5ef0",
   "use-customize-simulator": true,
   "use-project-simulator-setting": false
 }