修改部分邀请码显示bug，钻石跳动bug

assets/Script/UI/Collect.js

@@ -139,7 +139,7 @@ cc.Class({
         var tempCount = this.count;
         this.count = 0;
         this.diamond.opacity = 255;
-        let DiamondIcon = cc.find('Canvas').getChildByName('UICamera').getChildByName('BelowTheMask').getChildByName('TopLabel').getChildByName('Diamond').getChildByName('DiamondIcon');
+        let DiamondIcon = cc.find('Canvas').getChildByName('UICamera').getChildByName('BelowTheMask').getChildByName('TopLabel').getChildByName('game-parent').getChildByName('Diamond').getChildByName('DiamondIcon');
         let Pos = DiamondIcon.parent.parent.parent.parent.convertToNodeSpaceAR(touchPos);
         this.diamond.parent = DiamondIcon.parent.parent.parent.parent;
         this.diamond.setPosition(Pos);

assets/Script/adpp/ManageDapp.js

@@ -42,22 +42,18 @@ cc.Class({
 
         villageTitle: {
             default: '任职村长',
-            type: cc.String,
             serializable: true,
         },
         villageContent: {
             default: '村长可获得村民50%的CNT消费.',
-            type: cc.String,
             serializable: true,
         },
         mayorTitle: {
             default: '任职镇长',
-            type: cc.String,
             serializable: true,
         },
         mayorContent: {
             default: '镇长获得村民10%的CNT，成\n为镇长之后，村长的收益不会消\n失.',
-            type: cc.String,
             serializable: true,
         },
         villageAndMayorNode: {

assets/Script/adpp/inviteInfo.js

@@ -45,6 +45,12 @@ cc.Class({
             type: cc.Node,
             serializable: true
         },
+        //输入节点
+        inputContainer:{
+            default:null,
+            type:cc.Node,
+            serializable:true
+        }
     },
 
     // LIFE-CYCLE CALLBACKS:
@@ -63,7 +69,9 @@ cc.Class({
         this.node.active = true;
         this.myInviteValue.string = GlobalD.Dapp.UserInfo.invite_code;
         if (GlobalD.Dapp.UserInfo.parent) {
-            this.parentInviteValue.string = GlobalD.Dapp.UserInfo.parent;
+            this.parentInviteValue.string = GlobalD.Dapp.UserInfo.parent.invite_code;
+            //如果存在父节点，隐藏输入框
+            this.inputContainer.active = false;
         }
 
         // {
@@ -74,14 +82,14 @@ cc.Class({
         //     "team_cnt_amount": 0 // 伞下团队租赁土地消费CNT数量（含直推数量）
         // }
         // 获取镇长/村长团队信息（村长或镇长身份才需要）
-        if (0 === GlobalD.Dapp.UserInfo.agent_level) {
-            console.log("村民不需要获取团队信息");
-            return;
-        }
+        // if (0 === GlobalD.Dapp.UserInfo.agent_level) {
+        //     console.log("村民不需要获取团队信息");
+        //     return;
+        // }
         GlobalD.dapp.teamData().then((data) => {
+            console.log("teamData：" + JSON.stringify(data));
             if (data.err === null) {
                 // 返回成功，见下面消息体
-                console.log("==========>" + JSON.stringify(data));
                 this.neighborValue.string = data.res.children_count;
                 this.neighborConsumValue.string = data.res.children_cnt_amount;
                 this.neighborDirectValue.string = data.res.children_village_chief_count;
@@ -110,17 +118,23 @@ cc.Class({
             return;
         }
         let _self = this;
-        GlobalD.dapp.bindParent(this.inputInviteValue).then((data) => {
+        GlobalD.dapp.bindParent(_self.inputInviteValue).then((data) => {
             if (data.err === null) {
                 // 返回成功，见下面消息体
                 console.log(data.res)
-                gameToast.getInstance().show(_self.ToastParent, data.res, 3, () => {
+                //绑定成功时候，隐藏输入框，设置父节点
+                GlobalD.Dapp.UserInfo.parent = data.res;
+                _self.parentInviteValue.string = GlobalD.Dapp.UserInfo.parent.invite_code;
+                //如果存在父节点，隐藏输入框
+                _self.inputContainer.active = false;
+
+                gameToast.getInstance().show(_self.ToastParent, "绑定成功！", 3, () => {
                     console.log("finish toast!");
                 }, _self);
             } else {
                 //TODO 服务错误
                 console.log(data.err)
-                gameToast.getInstance().show(_self.ToastParent, data.err, 3, () => {
+                gameToast.getInstance().show(_self.ToastParent, "绑定失败！", 3, () => {
                     console.log("finish toast!");
                 }, _self);
             }

assets/UI/DApp/avatar/farmer.png.meta

@@ -11,7 +11,7 @@
   "subMetas": {
     "farmer": {
       "ver": "1.0.4",
-      "uuid": "3f6e0c99-e2f0-4858-9623-5ec08b6c5fd5",
+      "uuid": "0523575f-e3c6-46ac-a727-80330227cb46",
       "rawTextureUuid": "6a02d298-f221-42db-b698-26283d29f354",
       "trimType": "auto",
       "trimThreshold": 1,

assets/UI/DApp/avatar/village.png.meta

@@ -11,7 +11,7 @@
   "subMetas": {
     "village": {
       "ver": "1.0.4",
-      "uuid": "d233ad9b-7057-429e-aee7-9c4a17dc5972",
+      "uuid": "bf6ac2d7-1875-4233-b4e1-632dd702d6c3",
       "rawTextureUuid": "673ec0d6-45d9-47a7-8594-8e52ca824415",
       "trimType": "auto",
       "trimThreshold": 1,

assets/resources/prefab/login.prefab

@@ -186,7 +186,7 @@
       "__id__": 1
     },
     "_children": [],
-    "_active": true,
+    "_active": false,
     "_level": 2,
     "_components": [
       {
@@ -252,8 +252,8 @@
       }
     ],
     "_useOriginalSize": false,
-    "_string": "抵制不良游戏 拒绝到饭游戏 注意自我保护 谨防受骗上当",
-    "_N$string": "抵制不良游戏 拒绝到饭游戏 注意自我保护 谨防受骗上当",
+    "_string": "抵制不良游戏 拒绝盗版游戏 注意自我保护 谨防受骗上当",
+    "_N$string": "抵制不良游戏 拒绝盗版游戏 注意自我保护 谨防受骗上当",
     "_fontSize": 15,
     "_lineHeight": 20,
     "_enableWrapText": true,
@@ -287,7 +287,7 @@
       "__id__": 1
     },
     "_children": [],
-    "_active": true,
+    "_active": false,
     "_level": 2,
     "_components": [
       {

settings/project.json

@@ -37,7 +37,7 @@
     "height": 640,
     "width": 960
   },
-  "start-scene": "e0bea6db-64db-4c3b-b02a-531046201733",
+  "start-scene": "1ba1d133-0a26-4f5f-9d5b-3982bb2dd083",
   "use-customize-simulator": true,
   "use-project-simulator-setting": false
 }