From a941f317bc1eb1014a67cea4fea9f223b618453f Mon Sep 17 00:00:00 2001
From: "guoqing.zhu" <1521292690@qq.com>
Date: Tue, 7 Jun 2022 13:14:57 +0800
Subject: [PATCH] update

---
 assets/res/prefabs/NUI/UIMain.prefab   | 482 ++++++++++++++++++++++++-
 assets/scripts/UI/guns/guns_single.ts  |   4 +-
 assets/scripts/UI/hero/herochoseone.js |   4 +-
 assets/scripts/UI/task/singleWanted.js |  11 +-
 4 files changed, 495 insertions(+), 6 deletions(-)

diff --git a/assets/res/prefabs/NUI/UIMain.prefab b/assets/res/prefabs/NUI/UIMain.prefab
index 388aaea2..b49b2727 100644
--- a/assets/res/prefabs/NUI/UIMain.prefab
+++ b/assets/res/prefabs/NUI/UIMain.prefab
@@ -231,6 +231,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -428,6 +431,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -465,6 +471,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -758,6 +767,8 @@
     "endRadiusVar": 0,
     "rotatePerS": 0,
     "rotatePerSVar": 0,
+    "startX": 0,
+    "startY": 0,
     "_N$preview": true,
     "_id": ""
   },
@@ -930,6 +941,8 @@
     "endRadiusVar": 0,
     "rotatePerS": 0,
     "rotatePerSVar": 0,
+    "startX": 0,
+    "startY": 0,
     "_N$preview": true,
     "_id": ""
   },
@@ -1168,6 +1181,8 @@
     "endRadiusVar": 0,
     "rotatePerS": 0,
     "rotatePerSVar": 0,
+    "startX": 0,
+    "startY": 0,
     "_N$preview": true,
     "_id": ""
   },
@@ -1278,6 +1293,8 @@
     "endRadiusVar": 0,
     "rotatePerS": 0,
     "rotatePerSVar": 0,
+    "startX": 0,
+    "startY": 0,
     "_N$preview": true,
     "_id": ""
   },
@@ -1516,6 +1533,8 @@
     "endRadiusVar": 0,
     "rotatePerS": 0,
     "rotatePerSVar": 0,
+    "startX": 0,
+    "startY": 0,
     "_N$preview": true,
     "_id": ""
   },
@@ -1626,6 +1645,8 @@
     "endRadiusVar": 0,
     "rotatePerS": 0,
     "rotatePerSVar": 0,
+    "startX": 0,
+    "startY": 0,
     "_N$preview": true,
     "_id": ""
   },
@@ -1864,6 +1885,8 @@
     "endRadiusVar": 0,
     "rotatePerS": 0,
     "rotatePerSVar": 0,
+    "startX": 0,
+    "startY": 0,
     "_N$preview": true,
     "_id": ""
   },
@@ -1974,6 +1997,8 @@
     "endRadiusVar": 0,
     "rotatePerS": 0,
     "rotatePerSVar": 0,
+    "startX": 0,
+    "startY": 0,
     "_N$preview": true,
     "_id": ""
   },
@@ -2212,6 +2237,8 @@
     "endRadiusVar": 0,
     "rotatePerS": 0,
     "rotatePerSVar": 0,
+    "startX": 0,
+    "startY": 0,
     "_N$preview": true,
     "_id": ""
   },
@@ -2322,6 +2349,8 @@
     "endRadiusVar": 0,
     "rotatePerS": 0,
     "rotatePerSVar": 0,
+    "startX": 0,
+    "startY": 0,
     "_N$preview": true,
     "_id": ""
   },
@@ -2560,6 +2589,8 @@
     "endRadiusVar": 0,
     "rotatePerS": 0,
     "rotatePerSVar": 0,
+    "startX": 0,
+    "startY": 0,
     "_N$preview": true,
     "_id": ""
   },
@@ -2670,6 +2701,8 @@
     "endRadiusVar": 0,
     "rotatePerS": 0,
     "rotatePerSVar": 0,
+    "startX": 0,
+    "startY": 0,
     "_N$preview": true,
     "_id": ""
   },
@@ -2842,6 +2875,8 @@
     "endRadiusVar": 0,
     "rotatePerS": 0,
     "rotatePerSVar": 0,
+    "startX": 0,
+    "startY": 0,
     "_N$preview": true,
     "_id": ""
   },
@@ -3014,6 +3049,8 @@
     "endRadiusVar": 0,
     "rotatePerS": 0,
     "rotatePerSVar": 0,
+    "startX": 0,
+    "startY": 0,
     "_N$preview": true,
     "_id": ""
   },
@@ -3186,6 +3223,8 @@
     "endRadiusVar": 0,
     "rotatePerS": 0,
     "rotatePerSVar": 0,
+    "startX": 0,
+    "startY": 0,
     "_N$preview": true,
     "_id": ""
   },
@@ -3358,6 +3397,8 @@
     "endRadiusVar": 0,
     "rotatePerS": 0,
     "rotatePerSVar": 0,
+    "startX": 0,
+    "startY": 0,
     "_N$preview": true,
     "_id": ""
   },
@@ -3530,6 +3571,8 @@
     "endRadiusVar": 0,
     "rotatePerS": 0,
     "rotatePerSVar": 0,
+    "startX": 0,
+    "startY": 0,
     "_N$preview": true,
     "_id": ""
   },
@@ -3876,6 +3919,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -3913,6 +3959,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -4119,6 +4168,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -4289,6 +4341,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -4388,6 +4443,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -4615,6 +4673,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -4716,6 +4777,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -4986,6 +5050,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -5025,6 +5092,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -5220,6 +5290,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -5478,6 +5551,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -5799,6 +5875,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -5838,6 +5917,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -6098,6 +6180,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -6137,6 +6222,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -6519,6 +6607,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -6817,6 +6908,9 @@
     "_isTrimmedMode": false,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -6918,6 +7012,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -7198,6 +7295,9 @@
     "_isTrimmedMode": false,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -7299,6 +7399,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -7579,6 +7682,9 @@
     "_isTrimmedMode": false,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -7680,6 +7786,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -7954,6 +8063,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -8128,6 +8240,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -8302,6 +8417,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -8763,6 +8881,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -9000,6 +9121,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -9099,6 +9223,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -9198,6 +9325,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -9657,6 +9787,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -9756,6 +9889,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -9795,6 +9931,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -10121,6 +10260,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -10220,6 +10362,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -10259,6 +10404,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -10682,6 +10830,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -10783,6 +10934,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -10922,6 +11076,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -11253,6 +11410,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -11354,6 +11514,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -11493,6 +11656,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -11898,6 +12064,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -11937,6 +12106,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -12317,6 +12489,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -12483,6 +12658,9 @@
     "_isTrimmedMode": false,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -12752,6 +12930,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -12791,6 +12972,9 @@
     "_isTrimmedMode": false,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -12903,6 +13087,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -13004,6 +13191,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -13448,6 +13638,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -13698,6 +13891,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -13799,6 +13995,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -13900,6 +14099,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -14001,6 +14203,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -14102,6 +14307,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -14288,6 +14496,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -14389,6 +14600,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -14490,6 +14704,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -14591,6 +14808,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -14692,6 +14912,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -14975,6 +15198,9 @@
     "_isTrimmedMode": false,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -15076,6 +15302,9 @@
     "_isTrimmedMode": false,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -15175,6 +15404,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -15557,6 +15789,9 @@
     "_isTrimmedMode": false,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -15658,6 +15893,9 @@
     "_isTrimmedMode": false,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -15757,6 +15995,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -16132,6 +16373,9 @@
     "_isTrimmedMode": false,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -16233,6 +16477,9 @@
     "_isTrimmedMode": false,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -16332,6 +16579,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -16433,6 +16683,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -16634,6 +16887,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -16903,6 +17159,9 @@
     "_isTrimmedMode": false,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -17004,6 +17263,9 @@
     "_isTrimmedMode": false,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -17103,6 +17365,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -17475,6 +17740,9 @@
     "_isTrimmedMode": false,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -17576,6 +17844,9 @@
     "_isTrimmedMode": false,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -17675,6 +17946,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -18072,6 +18346,9 @@
     "_isTrimmedMode": false,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -18173,6 +18450,9 @@
     "_isTrimmedMode": false,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -18272,6 +18552,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -18669,6 +18952,9 @@
     "_isTrimmedMode": false,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -18770,6 +19056,9 @@
     "_isTrimmedMode": false,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -18869,6 +19158,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -18970,6 +19262,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -19267,6 +19562,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -19451,6 +19749,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -19635,6 +19936,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -19819,6 +20123,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -20181,6 +20488,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -20469,6 +20779,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -20711,6 +21024,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -20986,6 +21302,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -21207,6 +21526,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -21485,6 +21807,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -21586,6 +21911,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -21687,6 +22015,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -21788,6 +22119,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -21889,6 +22223,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -21990,6 +22327,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -22040,6 +22380,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -22340,6 +22683,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -22504,6 +22850,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -22605,6 +22954,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -23237,6 +23589,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -23548,6 +23903,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -23649,6 +24007,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -23759,6 +24120,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -23809,6 +24173,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -24117,6 +24484,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -24428,6 +24798,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -24529,6 +24902,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -24639,6 +25015,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -24689,6 +25068,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -24997,6 +25379,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -25311,6 +25696,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -25412,6 +25800,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -25513,6 +25904,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -25623,6 +26017,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -25673,6 +26070,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -25981,6 +26381,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -26298,6 +26701,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -26399,6 +26805,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -26500,6 +26909,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -26601,6 +27013,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -26711,6 +27126,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -26761,6 +27179,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -27078,6 +27499,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -27420,6 +27844,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -27557,6 +27984,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -27873,6 +28303,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -28189,6 +28622,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -28505,6 +28941,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -28850,6 +29289,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -28988,6 +29430,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -29087,6 +29532,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -29260,6 +29708,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -29843,6 +30294,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -30907,6 +31361,23 @@
       "a": 255
     },
     "_width": 0.5,
+    "_color2": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_width2": 0,
+    "_isUnderline": false,
+    "_UnderlineColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_UnderlineWidth": 0,
     "_id": ""
   },
   {
@@ -31093,6 +31564,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -31275,7 +31749,7 @@
         "__id__": 872
       }
     ],
-    "_active": true,
+    "_active": false,
     "_level": 2,
     "_components": [],
     "_prefab": {
@@ -31413,6 +31887,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
@@ -31517,6 +31994,9 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
+    "_tilecount": 1,
+    "_tileoffx": 0,
+    "_tileoffy": 0,
     "_id": ""
   },
   {
diff --git a/assets/scripts/UI/guns/guns_single.ts b/assets/scripts/UI/guns/guns_single.ts
index 80f53a0e..0415e8d3 100644
--- a/assets/scripts/UI/guns/guns_single.ts
+++ b/assets/scripts/UI/guns/guns_single.ts
@@ -37,8 +37,8 @@ export class guns_single extends cc.Component {
 
 		if (data.lock_type == 3) {
 			this.showWanted();
-			this.wantedNode.getComponentInChildren(cc.Label).string =
-				this.formatSeconds(lefttime);
+			// this.wantedNode.getComponentInChildren(cc.Label).string =
+			// 	this.formatSeconds(lefttime);
 			this.schedule(function () {
 				this.wantedNode.getComponentInChildren(cc.Label).string =
 					this.formatSeconds(lefttime);
diff --git a/assets/scripts/UI/hero/herochoseone.js b/assets/scripts/UI/hero/herochoseone.js
index d0a3a480..1e6cb78e 100644
--- a/assets/scripts/UI/hero/herochoseone.js
+++ b/assets/scripts/UI/hero/herochoseone.js
@@ -66,8 +66,8 @@ cc.Class({
 
 		if (v.lock_type == 3) {
 			this.showWanted();
-			this.wantedNode.getComponentInChildren(cc.Label).string =
-				this.formatSeconds(lefttime);
+			// this.wantedNode.getComponentInChildren(cc.Label).string =
+			// 	this.formatSeconds(lefttime);
 			this.schedule(function () {
 				this.wantedNode.getComponentInChildren(cc.Label).string =
 					this.formatSeconds(lefttime);
diff --git a/assets/scripts/UI/task/singleWanted.js b/assets/scripts/UI/task/singleWanted.js
index 4d200ff7..ed6c9046 100644
--- a/assets/scripts/UI/task/singleWanted.js
+++ b/assets/scripts/UI/task/singleWanted.js
@@ -71,6 +71,7 @@ cc.Class({
 		if (this.missionState == 0) {
 			NetManage.commitMission(this.missionId, () => {
 				cc.uiHelper.showTips('Get Reward Success!');
+				cc.Notifier.emit('ReFreshMission');
 			});
 		}
 		if (this.missionState == 1) {
@@ -151,13 +152,21 @@ cc.Class({
 
 		this.boostCost = data.boost;
 
+		console.log(JSON.stringify(originData));
+
 		this.wantedData = data;
 		this.missionId = originData.mission_id;
+		this.missionState = originData.state;
 		if (originData.state == 0) {
+			//can revice
 			this.receiveNode.active = true;
-			this.missionState = 0;
+		}
+		if (originData.state == 1) {
+			// has get
+			this.getNode.active = true;
 		}
 		if (originData.state == 2) {
+			// doing
 			if (originData.objects.length == 0) {
 				this.getNode.active = true;
 				this.missionState = 1;