From 62270ac4490b09e5f4f80b86bf35dec81792ac41 Mon Sep 17 00:00:00 2001
From: "guoqing.zhu" <1521292690@qq.com>
Date: Tue, 7 Jun 2022 16:34:49 +0800
Subject: [PATCH] update

---
 assets/LoginScene.fire             |   4 +-
 assets/scripts/UI/task/cellTask.js | 205 +++++++++++++++--------------
 2 files changed, 107 insertions(+), 102 deletions(-)

diff --git a/assets/LoginScene.fire b/assets/LoginScene.fire
index cf221ab6..961b1c7f 100644
--- a/assets/LoginScene.fire
+++ b/assets/LoginScene.fire
@@ -47,8 +47,8 @@
     },
     "_scale": {
       "__type__": "cc.Vec3",
-      "x": 1.026988988699419,
-      "y": 1.026988988699419,
+      "x": 0.5279307895527016,
+      "y": 0.5279307895527016,
       "z": 1
     },
     "_quat": {
diff --git a/assets/scripts/UI/task/cellTask.js b/assets/scripts/UI/task/cellTask.js
index b38f4875..6e9ab4ae 100644
--- a/assets/scripts/UI/task/cellTask.js
+++ b/assets/scripts/UI/task/cellTask.js
@@ -1,111 +1,116 @@
-let viewCell = require("viewCell")
-var gameConfig = require("gameConfig")
-var NetManage = require("NetManage")
-var Utils = require("Utils")
+let viewCell = require('viewCell');
+var gameConfig = require('gameConfig');
+var NetManage = require('NetManage');
+var Utils = require('Utils');
 cc.Class({
-    extends: viewCell,
+	extends: viewCell,
 
-    properties: {
-        sp_icon: {
-            default: null,
-            type: cc.Sprite,
-        },
-        sp_pz: {
-            default: null,
-            type: cc.Sprite,
-        },
-        lb_des: {
-            default: null,
-            type: cc.Label,
-        },
-        lb_huoyue: {
-            default: null,
-            type: cc.Label,
-        },
-        lb_count: {
-            default: null,
-            type: cc.Label,
-        },
-        lb_jd: {
-            default: null,
-            type: cc.Label,
-        },
+	properties: {
+		sp_icon: {
+			default: null,
+			type: cc.Sprite,
+		},
+		sp_pz: {
+			default: null,
+			type: cc.Sprite,
+		},
+		lb_des: {
+			default: null,
+			type: cc.Label,
+		},
+		lb_huoyue: {
+			default: null,
+			type: cc.Label,
+		},
+		lb_count: {
+			default: null,
+			type: cc.Label,
+		},
+		lb_jd: {
+			default: null,
+			type: cc.Label,
+		},
 
+		nd_doing: {
+			default: null,
+			type: cc.Node,
+		},
+		nd_finish: {
+			default: null,
+			type: cc.Node,
+		},
+		nd_lingqu: {
+			default: null,
+			type: cc.Node,
+		},
+	},
 
-        nd_doing: {
-            default: null,
-            type: cc.Node,
-        },
-        nd_finish: {
-            default: null,
-            type: cc.Node,
-        },
-        nd_lingqu: {
-            default: null,
-            type: cc.Node,
-        },
+	// LIFE-CYCLE CALLBACKS:
 
-    },
+	// onLoad () {},
 
-    // LIFE-CYCLE CALLBACKS:
+	init: function (index, data, reload, group) {
+		if (index >= data.array.length) {
+			this.node.active = false;
+			return;
+		}
+		this.target = data.target;
+		var sdata = data.array[index];
+		this.initdata(sdata);
+	},
+	initdata(v) {
+		var state = v.state;
+		this.mid = v.mission_id;
+		this.lb_jd.string = v.current + '/' + v.target;
+		var cfg = gameConfig.task[this.mid];
+		if (cfg) {
+			this.lb_des.string = cfg.des;
+			this.nd_lingqu.active =
+				this.nd_finish.active =
+				this.nd_doing.active =
+					false;
+			if (state == 0) {
+				this.nd_lingqu.active = true;
+				this.lb_jd.string = ' ';
+			} else if (state == 1) {
+				this.nd_finish.active = true;
+				this.lb_jd.string = ' ';
+			} else if (state == 2) {
+				this.nd_doing.active = true;
+			}
+			// var items = cc.playerData.getDrop(cfg.reward)
+			// this.lb_huoyue.string = items[0].num
+			// this.lb_count.string = items[1].num
 
-    // onLoad () {},
+			// Utils.setitem(this, items[1].id, this.sp_icon, this.sp_pz)
+			// this.jump = cfg.jump_value
+		}
+	},
 
-    init: function(index, data, reload, group) {
-        if (index >= data.array.length) { 
-            this.node.active = false
-            return;
-        }
-        this.target = data.target
-        var sdata = data.array[index]
-        this.initdata(sdata)
-    }, 
-    initdata(v) {
-        var state = v.state
-        this.mid = v.mission_id
-        this.lb_jd.string = v.current + "/" + v.target
-        var cfg = gameConfig.task[this.mid]
-        if(cfg){
-        this.lb_des.string = cfg.des
-        this.nd_lingqu.active = this.nd_finish.active = this.nd_doing.active = false
-        if (state == 0) {
-            this.nd_lingqu.active = true
-            this.lb_jd.string = " "
-        } else if (state == 1) {
-            this.nd_finish.active = true
-            this.lb_jd.string = " "
-        } else if (state == 2) {
-            this.nd_doing.active = true
-        }
-        // var items = cc.playerData.getDrop(cfg.reward)
-        // this.lb_huoyue.string = items[0].num
-        // this.lb_count.string = items[1].num
+	onclickgo() {
+		// console.log("open game")
 
+		if (!window.hasWallet) {
+			uimanger.showUI(GuestLoginTip.prefabPath);
+			return;
+		}
 
-        // Utils.setitem(this, items[1].id, this.sp_icon, this.sp_pz)
-        // this.jump = cfg.jump_value
-    }
-    },
+		cc.uiMain.callbattlechosehero({
+			teamuuid: null,
+		});
+		// if (this.jump == 2) {
+		//     cc.uiMain.callbattlechosehero({
+		//         teamuuid: null,
+		//     })
+		// } else if (this.jump == 3) {
+		//     cc.uiMain.callteammatch()
+		// }
+	},
 
-
-    onclickgo() {
-        // console.log("open game")
-        cc.uiMain.callbattlechosehero({
-            teamuuid: null,
-        })
-        // if (this.jump == 2) {
-        //     cc.uiMain.callbattlechosehero({
-        //         teamuuid: null,
-        //     })
-        // } else if (this.jump == 3) {
-        //     cc.uiMain.callteammatch()
-        // }
-    },
-
-    onclickget() {
-        NetManage.commitMission(this.mid, () => {
-            NetManage.missionList(1)
-        })
-    },
-    // update (dt) {},
-});
\ No newline at end of file
+	onclickget() {
+		NetManage.commitMission(this.mid, () => {
+			NetManage.missionList(1);
+		});
+	},
+	// update (dt) {},
+});