1

assets/Prefabs/UI/seed/HolyFarmlandFruit.prefab

@@ -890,8 +890,18 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
+<<<<<<< HEAD
+<<<<<<< HEAD
       "width": 90,
       "height": 40
+=======
+      "width": 192,
+      "height": 67
+>>>>>>> cba7e039f9979c7af0832b36f193289324b80096
+=======
+      "width": 170,
+      "height": 40
+>>>>>>> parent of cba7e03... 1、修改仓库界面
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -964,7 +974,7 @@
     },
     "_position": {
       "__type__": "cc.Vec3",
-      "x": 0,
+      "x": -40,
       "y": 0,
       "z": 0
     },
@@ -1236,7 +1246,7 @@
         "__id__": 35
       }
     ],
-    "_active": false,
+    "_active": true,
     "_level": 3,
     "_components": [
       {
@@ -1536,8 +1546,18 @@
     "_enabled": true,
     "_layoutSize": {
       "__type__": "cc.Size",
+<<<<<<< HEAD
+<<<<<<< HEAD
       "width": 90,
       "height": 40
+=======
+      "width": 192,
+      "height": 67
+>>>>>>> cba7e039f9979c7af0832b36f193289324b80096
+=======
+      "width": 170,
+      "height": 40
+>>>>>>> parent of cba7e03... 1、修改仓库界面
     },
     "_resize": 1,
     "_N$layoutType": 1,

assets/Script/UI/StoreView.js

@@ -256,6 +256,25 @@ cc.Class({
             this.seedBottomLabel.active = false;
         }
     },
+<<<<<<< HEAD
+<<<<<<< HEAD
+    OpentSNBExchangeToCNT() {
+        GlobalD.GameData.showToast(cc.find("Canvas/UICamera"), "转换CNT通道关闭！", 1);
+        return;
+        //限制相关人员交易
+        if (1 === GlobalD.UserInfo.limitTran) {
+            GlobalD.GameData.showToast(cc.find("Canvas/UICamera"), "转换CNT通道关闭，请联系相关管理人员！", 1);
+            return;
+        }
+        //更新数据
+        this.snbAmountLabel.string = GlobalD.GameData.SNB;
+        this.ExchangePopView.active = true;
+=======
+    EquipmentBtn: {
+      default: null,
+      type: cc.Node,
+>>>>>>> cba7e039f9979c7af0832b36f193289324b80096
+=======
     switch: function () {
         var children = this.container.children;
         var length = children.length;
@@ -265,10 +284,9 @@ cc.Class({
             var dst = src === length - 1 ? 0 : src + 1;
             node.setSiblingIndex(dst);
         }
+>>>>>>> parent of cba7e03... 1、修改仓库界面
     },
     OpentSNBExchangeToCNT() {
-        GlobalD.GameData.showToast(cc.find("Canvas/UICamera"), "转换CNT通道关闭！", 1);
-        return;
         //限制相关人员交易
         if (1 === GlobalD.UserInfo.limitTran) {
             GlobalD.GameData.showToast(cc.find("Canvas/UICamera"), "转换CNT通道关闭，请联系相关管理人员！", 1);