update

assets/res/prefabs/NUI/NewcellTask.prefab.meta

@@ -0,0 +1,7 @@
+{
+  "ver": "1.0.1",
+  "uuid": "5082dbff-45a7-4687-8057-8afa4b26c527",
+  "optimizationPolicy": "AUTO",
+  "asyncLoadAssets": false,
+  "subMetas": {}
+}

assets/res/prefabs/NUI/UIMain.prefab

@@ -31797,7 +31797,7 @@
       "__uuid__": "35e430f6-6ab1-46bf-9c1c-c5d59e8b6755"
     },
     "pb_task": {
-      "__uuid__": "2f423480-cd34-4220-8c64-b95765601258"
+      "__uuid__": "2223615f-b73e-4a21-86e7-95395f1f7e22"
     },
     "pb_gun": {
       "__uuid__": "fe5f3a9c-81e5-494d-92f7-82435448571c"

assets/res/prefabs/NUI/UINewTask.prefab.meta

@@ -0,0 +1,7 @@
+{
+  "ver": "1.0.1",
+  "uuid": "2223615f-b73e-4a21-86e7-95395f1f7e22",
+  "optimizationPolicy": "AUTO",
+  "asyncLoadAssets": false,
+  "subMetas": {}
+}

assets/res/prefabs/NUI/UItask.prefab

@@ -3624,7 +3624,7 @@
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
-      "__uuid__": "74237d08-2f37-4bfd-b666-a446453147ec"
+      "__uuid__": "9e935fde-febc-43e7-8bdb-7b106307474c"
     },
     "_type": 0,
     "_sizeMode": 0,
@@ -3859,8 +3859,8 @@
     },
     "_scale": {
       "__type__": "cc.Vec3",
-      "x": 0.7,
+      "x": 1,
-      "y": 0.7,
+      "y": 1,
       "z": 1
     },
     "_rotationX": 0,
@@ -3958,7 +3958,7 @@
     "node": {
       "__id__": 83
     },
-    "_enabled": true,
+    "_enabled": false,
     "duration": 0.1,
     "zoomScale": 0.9,
     "clickEvents": [
@@ -4726,7 +4726,7 @@
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
-      "__uuid__": "74237d08-2f37-4bfd-b666-a446453147ec"
+      "__uuid__": "9e935fde-febc-43e7-8bdb-7b106307474c"
     },
     "_type": 0,
     "_sizeMode": 0,
@@ -4945,7 +4945,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 120,
+      "width": 161.6,
       "height": 40
     },
     "_anchorPoint": {
@@ -5060,7 +5060,7 @@
     "node": {
       "__id__": 115
     },
-    "_enabled": true,
+    "_enabled": false,
     "duration": 0.1,
     "zoomScale": 0.9,
     "clickEvents": [
@@ -5828,7 +5828,7 @@
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
-      "__uuid__": "74237d08-2f37-4bfd-b666-a446453147ec"
+      "__uuid__": "9e935fde-febc-43e7-8bdb-7b106307474c"
     },
     "_type": 0,
     "_sizeMode": 0,
@@ -6047,7 +6047,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 120,
+      "width": 161.6,
       "height": 40
     },
     "_anchorPoint": {
@@ -6162,7 +6162,7 @@
     "node": {
       "__id__": 147
     },
-    "_enabled": true,
+    "_enabled": false,
     "duration": 0.1,
     "zoomScale": 0.9,
     "clickEvents": [
@@ -6930,7 +6930,7 @@
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
-      "__uuid__": "74237d08-2f37-4bfd-b666-a446453147ec"
+      "__uuid__": "9e935fde-febc-43e7-8bdb-7b106307474c"
     },
     "_type": 0,
     "_sizeMode": 0,
@@ -7149,7 +7149,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 120,
+      "width": 161.6,
       "height": 40
     },
     "_anchorPoint": {
@@ -7264,7 +7264,7 @@
     "node": {
       "__id__": 179
     },
-    "_enabled": true,
+    "_enabled": false,
     "duration": 0.1,
     "zoomScale": 0.9,
     "clickEvents": [
@@ -8251,7 +8251,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 120,
+      "width": 161.6,
       "height": 40
     },
     "_anchorPoint": {
@@ -8366,7 +8366,7 @@
     "node": {
       "__id__": 211
     },
-    "_enabled": true,
+    "_enabled": false,
     "duration": 0.1,
     "zoomScale": 0.9,
     "clickEvents": [
@@ -11141,7 +11141,7 @@
         "__id__": 345
       }
     ],
-    "_active": true,
+    "_active": false,
     "_level": 2,
     "_components": [
       {
@@ -13397,6 +13397,9 @@
     "nd_content": {
       "__id__": 246
     },
+    "canGetSprite": {
+      "__uuid__": "9e935fde-febc-43e7-8bdb-7b106307474c"
+    },
     "_id": ""
   },
   {
@@ -13406,7 +13409,7 @@
     "node": {
       "__id__": 1
     },
-    "_enabled": true,
+    "_enabled": false,
     "_id": ""
   },
   {

assets/scripts/UI/season/cellTaskSeason.js

@@ -35,10 +35,6 @@ cc.Class({
 
     },
 
-    // LIFE-CYCLE CALLBACKS:
-
-    // onLoad () {},
-
     init: function(index, data, reload, group) {
         if (index >= data.array.length) { 
             this.node.active = false
@@ -74,24 +70,14 @@ cc.Class({
 
 
     onclickgo() {
-        if (this.jump == 2) {
         cc.uiMain.callbattlechosehero({
             teamuuid: null,
         })
-        } else if (this.jump == 3) {
-            cc.uiMain.callteammatch()
-        }
     },
 
     onclickget() {
         NetManage.commitMission(this.mid, () => {
-            NetManage.missionList(2, (data) => {
+            NetManage.missionList(1)
-                this.target.refreshtask(data)
-            })
-            NetManage.seasonCard((res) => {
-                cc.Notifier.emit("onSeasonCardInfo", res)
-            })
         })
     },
-    // update (dt) {},
 });

assets/scripts/UI/task/UITask.js

@@ -12,10 +12,6 @@ cc.Class({
       default: null,
       type: cc.Node,
     },
-    spine_hero: {
-      default: null,
-      type: sp.Skeleton,
-    },
     pr_progress: {
       default: null,
       type: cc.ProgressBar,
@@ -55,7 +51,7 @@ cc.Class({
   // LIFE-CYCLE CALLBACKS:
 
   onLoad() {
-    // cc.Notifier.on('missionList', this, this.initdata.bind(this));
+    cc.Notifier.on('missionList', this, this.initdata.bind(this));
     // wanted mission
 
     cc.Notifier.on("ReFreshMission", this, () => {
@@ -71,12 +67,14 @@ cc.Class({
   },
   
   initdata(v) {
+
     // daily mission
     this.lb_huoyue.string = v.current_active_value;
     this.pr_progress.progress = v.current_active_value / v.max_active_value;
     for (var i = 0; i < v.mission_list1.length; i++) {
       var nd_hasget = this.nd_uprewards[i].getChildByName("getReward");
       var nd_canget = this.nd_uprewards[i].getChildByName("Available");
+      var icon =  this.nd_uprewards[i].getChildByName("icon")
       nd_hasget.active = false;
       nd_canget.active = false;
       this.nd_uprewards[i].getChildByName("num").getComponent(cc.Label).string =
@@ -84,6 +82,7 @@ cc.Class({
       var state = v.mission_list1[i].state;
       if (state == 0) {
         nd_canget.active = true;
+       icon.getComponent(cc.Sprite).SpriteFrame = this.canGetSprite;
       } else if (state == 1) {
         nd_hasget.active = true;
       }
@@ -116,13 +115,6 @@ cc.Class({
         target: this,
       });
 
-    // console.log(this.nd_content.childernCount);
-
-    // cc.loader.loadRes("spine/heropic/pic_hero" + cc.playerData.getshowhero(), sp.SkeletonData, function(err, sp) {
-    //     this.spine_hero.skeletonData = sp;
-    //     this.spine_hero._updateSkeletonData();
-    //     this.spine_hero.setAnimation(0, "animation", true);
-    // }.bind(this));
   },
 
   onclose() {

assets/scripts/UI/task/cellTask.js

@@ -77,25 +77,29 @@ cc.Class({
         } else if (state == 2) {
             this.nd_doing.active = true
         }
-        var items = cc.playerData.getDrop(cfg.reward)
+        // var items = cc.playerData.getDrop(cfg.reward)
-        this.lb_huoyue.string = items[0].num
+        // this.lb_huoyue.string = items[0].num
-        this.lb_count.string = items[1].num
+        // this.lb_count.string = items[1].num
 
 
-        Utils.setitem(this, items[1].id, this.sp_icon, this.sp_pz)
+        // Utils.setitem(this, items[1].id, this.sp_icon, this.sp_pz)
-        this.jump = cfg.jump_value
+        // this.jump = cfg.jump_value
     }
     },
 
 
     onclickgo() {
-        if (this.jump == 2) {
+        // console.log("open game")
         cc.uiMain.callbattlechosehero({
             teamuuid: null,
         })
-        } else if (this.jump == 3) {
+        // if (this.jump == 2) {
-            cc.uiMain.callteammatch()
+        //     cc.uiMain.callbattlechosehero({
-        }
+        //         teamuuid: null,
+        //     })
+        // } else if (this.jump == 3) {
+        //     cc.uiMain.callteammatch()
+        // }
     },
 
     onclickget() {