From dfaa9da2ea0ed9900ca71cdf203b603fed5b2543 Mon Sep 17 00:00:00 2001
From: chenxingzhi <1721823980@qq.com>
Date: Tue, 24 Aug 2021 17:41:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E6=88=90=E5=B0=B1?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resource/jsons/dic_zyz_achievement.json   | 620 ++++++------------
 1 file changed, 208 insertions(+), 412 deletions(-)

diff --git a/shared/resource/jsons/dic_zyz_achievement.json b/shared/resource/jsons/dic_zyz_achievement.json
index f08d1eb45..94f93ebc5 100644
--- a/shared/resource/jsons/dic_zyz_achievement.json
+++ b/shared/resource/jsons/dic_zyz_achievement.json
@@ -13,7 +13,7 @@
         "achieveTaskName": "有情有义",
         "taskInfo": "累计登陆7天",
         "condition": 7,
-        "taskReward": "22001*10",
+        "taskReward": "22001&10",
         "point": 10
     },
     {
@@ -30,7 +30,7 @@
         "achieveTaskName": "情深义重",
         "taskInfo": "累计登陆30天",
         "condition": 30,
-        "taskReward": "22001*15",
+        "taskReward": "22001&15",
         "point": 20
     },
     {
@@ -47,7 +47,7 @@
         "achieveTaskName": "情比金坚",
         "taskInfo": "累计登陆360天",
         "condition": 360,
-        "taskReward": "22001*20",
+        "taskReward": "22001&20",
         "point": 30
     },
     {
@@ -64,7 +64,7 @@
         "achieveTaskName": "一见如故",
         "taskInfo": "连续登陆7天",
         "condition": 7,
-        "taskReward": "22001*10",
+        "taskReward": "22001&10",
         "point": 5
     },
     {
@@ -81,7 +81,7 @@
         "achieveTaskName": "相见恨晚",
         "taskInfo": "连续登陆30天",
         "condition": 30,
-        "taskReward": "22001*15",
+        "taskReward": "22001&15",
         "point": 10
     },
     {
@@ -97,8 +97,8 @@
         "achieveType": 3,
         "achieveTaskName": "初出茅庐",
         "taskInfo": "主公达到20级",
-        "condition": 0,
-        "taskReward": "33001*10000",
+        "condition": 20,
+        "taskReward": "33001&10000",
         "point": 0
     },
     {
@@ -114,8 +114,8 @@
         "achieveType": 3,
         "achieveTaskName": "小有名气",
         "taskInfo": "主公达到40级",
-        "condition": 0,
-        "taskReward": "33001*20000",
+        "condition": 40,
+        "taskReward": "33001&20000",
         "point": 0
     },
     {
@@ -131,8 +131,8 @@
         "achieveType": 3,
         "achieveTaskName": "声名远扬",
         "taskInfo": "主公达到60级",
-        "condition": 0,
-        "taskReward": "33001*30000",
+        "condition": 60,
+        "taskReward": "33001&30000",
         "point": 0
     },
     {
@@ -148,8 +148,8 @@
         "achieveType": 3,
         "achieveTaskName": "名传四方",
         "taskInfo": "主公达到80级",
-        "condition": 0,
-        "taskReward": "33001*40000",
+        "condition": 80,
+        "taskReward": "33001&40000",
         "point": 0
     },
     {
@@ -165,8 +165,8 @@
         "achieveType": 3,
         "achieveTaskName": "游戏正式开始",
         "taskInfo": "主公达到100级",
-        "condition": 0,
-        "taskReward": "33001*50000",
+        "condition": 100,
+        "taskReward": "33001&50000",
         "point": 0
     },
     {
@@ -182,8 +182,8 @@
         "achieveType": 4,
         "achieveTaskName": "招兵买马",
         "taskInfo": "招募100次",
-        "condition": 0,
-        "taskReward": "自选紫将碎片*10",
+        "condition": 100,
+        "taskReward": "71002&10",
         "point": 0
     },
     {
@@ -199,8 +199,8 @@
         "achieveType": 4,
         "achieveTaskName": "八方来才",
         "taskInfo": "招募500次",
-        "condition": 0,
-        "taskReward": "自选橙将碎片*40",
+        "condition": 500,
+        "taskReward": "71002&40",
         "point": 0
     },
     {
@@ -216,8 +216,8 @@
         "achieveType": 4,
         "achieveTaskName": "还没抽到心仪武将吗？",
         "taskInfo": "招募1000次",
-        "condition": 0,
-        "taskReward": "自选橙将碎片*80",
+        "condition": 1000,
+        "taskReward": "71002&80",
         "point": 0
     },
     {
@@ -233,8 +233,8 @@
         "achieveType": 5,
         "achieveTaskName": "小有团伙",
         "taskInfo": "拥有10名武将",
-        "condition": 0,
-        "taskReward": "11001*1000",
+        "condition": 10,
+        "taskReward": "11001&1000",
         "point": 0
     },
     {
@@ -250,8 +250,8 @@
         "achieveType": 5,
         "achieveTaskName": "割据一方",
         "taskInfo": "拥有20名武将",
-        "condition": 0,
-        "taskReward": "11001*2000",
+        "condition": 20,
+        "taskReward": "11001&2000",
         "point": 0
     },
     {
@@ -267,8 +267,8 @@
         "achieveType": 5,
         "achieveTaskName": "贤才聚至",
         "taskInfo": "拥有30名武将",
-        "condition": 0,
-        "taskReward": "11001*5000",
+        "condition": 30,
+        "taskReward": "11001&5000",
         "point": 0
     },
     {
@@ -284,8 +284,8 @@
         "achieveType": 5,
         "achieveTaskName": "尽入彀中矣",
         "taskInfo": "拥有50名武将",
-        "condition": 0,
-        "taskReward": "11001*10000",
+        "condition": 50,
+        "taskReward": "11001&10000",
         "point": 0
     },
     {
@@ -301,8 +301,8 @@
         "achieveType": 6,
         "achieveTaskName": "让他升·壹",
         "taskInfo": "1名武将升星2次",
-        "condition": 0,
-        "taskReward": "33001*5000",
+        "condition": 2,
+        "taskReward": "33001&5000",
         "point": 0
     },
     {
@@ -318,8 +318,8 @@
         "achieveType": 6,
         "achieveTaskName": "让他升·贰",
         "taskInfo": "5名武将升星2次",
-        "condition": 0,
-        "taskReward": "33001*10000",
+        "condition": 5,
+        "taskReward": "33001&10000",
         "point": 0
     },
     {
@@ -335,8 +335,8 @@
         "achieveType": 6,
         "achieveTaskName": "让他升·叁",
         "taskInfo": "10名武将升星2次",
-        "condition": 0,
-        "taskReward": "33001*20000",
+        "condition": 10,
+        "taskReward": "33001&20000",
         "point": 0
     },
     {
@@ -352,8 +352,8 @@
         "achieveType": 7,
         "achieveTaskName": "良好开端·壹",
         "taskInfo": "拥有1名初始神话品质武将",
-        "condition": 0,
-        "taskReward": "33001*10000",
+        "condition": 1,
+        "taskReward": "33001&10000",
         "point": 0
     },
     {
@@ -369,8 +369,8 @@
         "achieveType": 7,
         "achieveTaskName": "良好开端·贰",
         "taskInfo": "拥有5名初始神话品质武将",
-        "condition": 0,
-        "taskReward": "33001*20000",
+        "condition": 5,
+        "taskReward": "33001&20000",
         "point": 0
     },
     {
@@ -386,8 +386,8 @@
         "achieveType": 7,
         "achieveTaskName": "良好开端·叁",
         "taskInfo": "拥有10名初始神话品质武将",
-        "condition": 0,
-        "taskReward": "33001*30000",
+        "condition": 10,
+        "taskReward": "33001&30000",
         "point": 0
     },
     {
@@ -403,8 +403,8 @@
         "achieveType": 8,
         "achieveTaskName": "将之巅峰·壹",
         "taskInfo": "1名神话品质武将升至6星",
-        "condition": 0,
-        "taskReward": "蓝色好感度道具*5",
+        "condition": 1,
+        "taskReward": "11011&5",
         "point": 0
     },
     {
@@ -420,8 +420,8 @@
         "achieveType": 8,
         "achieveTaskName": "将之巅峰·贰",
         "taskInfo": "5名神话品质武将升至6星",
-        "condition": 0,
-        "taskReward": "蓝色好感度道具*10",
+        "condition": 5,
+        "taskReward": "11011&10",
         "point": 0
     },
     {
@@ -437,8 +437,8 @@
         "achieveType": 8,
         "achieveTaskName": "将之巅峰·叁",
         "taskInfo": "10名神话品质武将升至6星",
-        "condition": 0,
-        "taskReward": "紫色好感度道具*10",
+        "condition": 10,
+        "taskReward": "11012&10",
         "point": 0
     },
     {
@@ -452,10 +452,10 @@
         "taskParam": "1&20&",
         "group": 0,
         "achieveType": 9,
-        "achieveTaskName": 0,
+        "achieveTaskName": "将星闪耀·壹",
         "taskInfo": "1名武将升至20级",
-        "condition": 0,
-        "taskReward": "11001*1000",
+        "condition": 20,
+        "taskReward": "11001&1000",
         "point": 0
     },
     {
@@ -469,10 +469,10 @@
         "taskParam": "1&40&",
         "group": 0,
         "achieveType": 9,
-        "achieveTaskName": 0,
+        "achieveTaskName": "将星闪耀·贰",
         "taskInfo": "1名武将升至40级",
-        "condition": 0,
-        "taskReward": "11001*5000",
+        "condition": 40,
+        "taskReward": "11001&5000",
         "point": 0
     },
     {
@@ -486,10 +486,10 @@
         "taskParam": "1&60&",
         "group": 0,
         "achieveType": 9,
-        "achieveTaskName": 0,
+        "achieveTaskName": "将星闪耀·叁",
         "taskInfo": "1名武将升至60级",
-        "condition": 0,
-        "taskReward": "11001*10000",
+        "condition": 60,
+        "taskReward": "11001&10000",
         "point": 0
     },
     {
@@ -503,10 +503,10 @@
         "taskParam": "1&80&",
         "group": 0,
         "achieveType": 9,
-        "achieveTaskName": 0,
+        "achieveTaskName": "将星闪耀·肆",
         "taskInfo": "1名武将升至80级",
-        "condition": 0,
-        "taskReward": "11001*15000",
+        "condition": 80,
+        "taskReward": "11001&15000",
         "point": 0
     },
     {
@@ -520,10 +520,10 @@
         "taskParam": "1&100&",
         "group": 0,
         "achieveType": 9,
-        "achieveTaskName": 0,
+        "achieveTaskName": "将星闪耀·伍",
         "taskInfo": "1名武将升至100级",
-        "condition": 0,
-        "taskReward": "11001*20000",
+        "condition": 100,
+        "taskReward": "11001&20000",
         "point": 0
     },
     {
@@ -537,10 +537,10 @@
         "taskParam": "5&20&",
         "group": 0,
         "achieveType": 10,
-        "achieveTaskName": 0,
+        "achieveTaskName": "群杰并辉·壹",
         "taskInfo": "5名武将升至20级",
-        "condition": 0,
-        "taskReward": "33002*100",
+        "condition": 20,
+        "taskReward": "33002&100",
         "point": 0
     },
     {
@@ -554,10 +554,10 @@
         "taskParam": "5&40&",
         "group": 0,
         "achieveType": 10,
-        "achieveTaskName": 0,
+        "achieveTaskName": "群杰并辉·贰",
         "taskInfo": "5名武将升至40级",
-        "condition": 0,
-        "taskReward": "33002*150",
+        "condition": 40,
+        "taskReward": "33002&150",
         "point": 0
     },
     {
@@ -571,10 +571,10 @@
         "taskParam": "5&60&",
         "group": 0,
         "achieveType": 10,
-        "achieveTaskName": 0,
+        "achieveTaskName": "群杰并辉·叁",
         "taskInfo": "5名武将升至60级",
-        "condition": 0,
-        "taskReward": "33002*200",
+        "condition": 60,
+        "taskReward": "33002&200",
         "point": 0
     },
     {
@@ -588,10 +588,10 @@
         "taskParam": "5&80&",
         "group": 0,
         "achieveType": 10,
-        "achieveTaskName": 0,
+        "achieveTaskName": "群杰并辉·肆",
         "taskInfo": "5名武将升至80级",
-        "condition": 0,
-        "taskReward": "33002*250",
+        "condition": 80,
+        "taskReward": "33002&250",
         "point": 0
     },
     {
@@ -605,10 +605,10 @@
         "taskParam": "5&100&",
         "group": 0,
         "achieveType": 10,
-        "achieveTaskName": 0,
+        "achieveTaskName": "群杰并辉·伍",
         "taskInfo": "5名武将升至100级",
-        "condition": 0,
-        "taskReward": "33002*300",
+        "condition": 100,
+        "taskReward": "33002&300",
         "point": 0
     },
     {
@@ -622,10 +622,10 @@
         "taskParam": "10&20&",
         "group": 0,
         "achieveType": 11,
-        "achieveTaskName": 0,
+        "achieveTaskName": "煌煌其将·壹",
         "taskInfo": "10名武将升至20级",
-        "condition": 0,
-        "taskReward": "33002*200",
+        "condition": 20,
+        "taskReward": "33002&200",
         "point": 0
     },
     {
@@ -639,10 +639,10 @@
         "taskParam": "10&40&",
         "group": 0,
         "achieveType": 11,
-        "achieveTaskName": 0,
+        "achieveTaskName": "煌煌其将·贰",
         "taskInfo": "10名武将升至40级",
-        "condition": 0,
-        "taskReward": "33002*250",
+        "condition": 40,
+        "taskReward": "33002&250",
         "point": 0
     },
     {
@@ -656,10 +656,10 @@
         "taskParam": "10&60&",
         "group": 0,
         "achieveType": 11,
-        "achieveTaskName": 0,
+        "achieveTaskName": "煌煌其将·叁",
         "taskInfo": "10名武将升至60级",
-        "condition": 0,
-        "taskReward": "33002*300",
+        "condition": 60,
+        "taskReward": "33002&300",
         "point": 0
     },
     {
@@ -673,10 +673,10 @@
         "taskParam": "10&80&",
         "group": 0,
         "achieveType": 11,
-        "achieveTaskName": 0,
+        "achieveTaskName": "煌煌其将·肆",
         "taskInfo": "10名武将升至80级",
-        "condition": 0,
-        "taskReward": "33002*350",
+        "condition": 80,
+        "taskReward": "33002&350",
         "point": 0
     },
     {
@@ -690,10 +690,10 @@
         "taskParam": "10&100&",
         "group": 0,
         "achieveType": 11,
-        "achieveTaskName": 0,
+        "achieveTaskName": "煌煌其将·伍",
         "taskInfo": "10名武将升至100级",
-        "condition": 0,
-        "taskReward": "33002*400",
+        "condition": 100,
+        "taskReward": "33002&400",
         "point": 0
     },
     {
@@ -707,10 +707,10 @@
         "taskParam": "1&",
         "group": 0,
         "achieveType": 12,
-        "achieveTaskName": 0,
+        "achieveTaskName": "更进一步·壹",
         "taskInfo": "1名武将进行升品",
-        "condition": 0,
-        "taskReward": "33001*1000",
+        "condition": 1,
+        "taskReward": "33001&1000",
         "point": 0
     },
     {
@@ -724,10 +724,10 @@
         "taskParam": "5&",
         "group": 0,
         "achieveType": 12,
-        "achieveTaskName": 0,
+        "achieveTaskName": "更进一步·贰",
         "taskInfo": "5名武将进行升品",
-        "condition": 0,
-        "taskReward": "33001*2000",
+        "condition": 5,
+        "taskReward": "33001&2000",
         "point": 0
     },
     {
@@ -741,10 +741,10 @@
         "taskParam": "10&",
         "group": 0,
         "achieveType": 12,
-        "achieveTaskName": 0,
+        "achieveTaskName": "更进一步·叁",
         "taskInfo": "10名武将进行升品",
-        "condition": 0,
-        "taskReward": "33001*5000",
+        "condition": 10,
+        "taskReward": "33001&5000",
         "point": 0
     },
     {
@@ -760,8 +760,8 @@
         "achieveType": 13,
         "achieveTaskName": "苏醒吧……力量·壹",
         "taskInfo": "武将觉醒1次",
-        "condition": 0,
-        "taskReward": "自选橙将碎片*10",
+        "condition": 1,
+        "taskReward": "71002&10",
         "point": 0
     },
     {
@@ -777,8 +777,8 @@
         "achieveType": 13,
         "achieveTaskName": "苏醒吧……力量·贰",
         "taskInfo": "武将觉醒3次",
-        "condition": 0,
-        "taskReward": "自选橙将碎片*40",
+        "condition": 3,
+        "taskReward": "71002&40",
         "point": 0
     },
     {
@@ -794,8 +794,8 @@
         "achieveType": 13,
         "achieveTaskName": "苏醒吧……力量·叁",
         "taskInfo": "武将觉醒6次",
-        "condition": 0,
-        "taskReward": "自选橙将碎片*80",
+        "condition": 6,
+        "taskReward": "71002&80",
         "point": 0
     },
     {
@@ -811,8 +811,8 @@
         "achieveType": 13,
         "achieveTaskName": "苏醒吧……力量·肆",
         "taskInfo": "武将觉醒12次",
-        "condition": 0,
-        "taskReward": "觉醒石*1",
+        "condition": 12,
+        "taskReward": "17001&1",
         "point": 0
     },
     {
@@ -828,8 +828,8 @@
         "achieveType": 14,
         "achieveTaskName": "流汗不流血·壹",
         "taskInfo": "训练1次",
-        "condition": 0,
-        "taskReward": "17042*1",
+        "condition": 1,
+        "taskReward": "17042&1",
         "point": 0
     },
     {
@@ -845,8 +845,8 @@
         "achieveType": 14,
         "achieveTaskName": "流汗不流血·贰",
         "taskInfo": "训练10次",
-        "condition": 0,
-        "taskReward": "17042*2",
+        "condition": 10,
+        "taskReward": "17042&2",
         "point": 0
     },
     {
@@ -862,8 +862,8 @@
         "achieveType": 14,
         "achieveTaskName": "流汗不流血·叁",
         "taskInfo": "训练30次",
-        "condition": 0,
-        "taskReward": "17042*3",
+        "condition": 30,
+        "taskReward": "17042&3",
         "point": 0
     },
     {
@@ -879,8 +879,8 @@
         "achieveType": 15,
         "achieveTaskName": "转职成功·壹",
         "taskInfo": "1名武将兵种进阶10次",
-        "condition": 0,
-        "taskReward": "17042*1",
+        "condition": 10,
+        "taskReward": "17042&1",
         "point": 0
     },
     {
@@ -896,8 +896,8 @@
         "achieveType": 16,
         "achieveTaskName": "转职成功·贰",
         "taskInfo": "5名武将兵种进阶1次",
-        "condition": 0,
-        "taskReward": "17042*2",
+        "condition": 1,
+        "taskReward": "17042&2",
         "point": 0
     },
     {
@@ -913,8 +913,8 @@
         "achieveType": 17,
         "achieveTaskName": "形同陌路",
         "taskInfo": "对1名武将的好感度升至1级",
-        "condition": 0,
-        "taskReward": "11014*1",
+        "condition": 1,
+        "taskReward": "11014&1",
         "point": 0
     },
     {
@@ -930,8 +930,8 @@
         "achieveType": 17,
         "achieveTaskName": "点头之交",
         "taskInfo": "对1名武将的好感度升至3级",
-        "condition": 0,
-        "taskReward": "11014*2",
+        "condition": 3,
+        "taskReward": "11014&2",
         "point": 0
     },
     {
@@ -947,8 +947,8 @@
         "achieveType": 17,
         "achieveTaskName": "亲密无间",
         "taskInfo": "对1名武将的好感度升至6级",
-        "condition": 0,
-        "taskReward": "11014*5",
+        "condition": 6,
+        "taskReward": "11014&5",
         "point": 0
     },
     {
@@ -964,8 +964,8 @@
         "achieveType": 17,
         "achieveTaskName": "生死之交",
         "taskInfo": "对1名武将的好感度升至12级",
-        "condition": 0,
-        "taskReward": "11014*10",
+        "condition": 12,
+        "taskReward": "11014&10",
         "point": 0
     },
     {
@@ -981,8 +981,8 @@
         "achieveType": 18,
         "achieveTaskName": "一个好汉三个帮",
         "taskInfo": "对3名武将的好感度升至6级",
-        "condition": 0,
-        "taskReward": "11014*5",
+        "condition": 6,
+        "taskReward": "11014&5",
         "point": 0
     },
     {
@@ -998,8 +998,8 @@
         "achieveType": 18,
         "achieveTaskName": "你们结义吧",
         "taskInfo": "对3名武将的好感度升至12级",
-        "condition": 0,
-        "taskReward": "11014*10",
+        "condition": 12,
+        "taskReward": "11014&10",
         "point": 0
     },
     {
@@ -1016,7 +1016,7 @@
         "achieveTaskName": "广招生源·壹",
         "taskInfo": "百家学宫解锁30个安置位",
         "condition": 0,
-        "taskReward": "22001*5",
+        "taskReward": "22001&5",
         "point": 0
     },
     {
@@ -1033,7 +1033,7 @@
         "achieveTaskName": "广招生源·贰",
         "taskInfo": "百家学宫解锁40个安置位",
         "condition": 0,
-        "taskReward": "22001*10",
+        "taskReward": "22001&10",
         "point": 0
     },
     {
@@ -1050,7 +1050,7 @@
         "achieveTaskName": "白衣出生",
         "taskInfo": "爵位升至2级",
         "condition": 0,
-        "taskReward": "33002*200",
+        "taskReward": "33002&200",
         "point": 0
     },
     {
@@ -1067,7 +1067,7 @@
         "achieveTaskName": "起于微末",
         "taskInfo": "爵位升至4级",
         "condition": 0,
-        "taskReward": "33002*300",
+        "taskReward": "33002&300",
         "point": 0
     },
     {
@@ -1084,7 +1084,7 @@
         "achieveTaskName": "尺板斗食",
         "taskInfo": "爵位升至6级",
         "condition": 0,
-        "taskReward": "33002*400",
+        "taskReward": "33002&400",
         "point": 0
     },
     {
@@ -1101,7 +1101,7 @@
         "achieveTaskName": "青云直上",
         "taskInfo": "爵位升至10级",
         "condition": 0,
-        "taskReward": "33002*500",
+        "taskReward": "33002&500",
         "point": 0
     },
     {
@@ -1118,7 +1118,7 @@
         "achieveTaskName": "封侯之位",
         "taskInfo": "爵位升至20级",
         "condition": 0,
-        "taskReward": "33002*1000",
+        "taskReward": "33002&1000",
         "point": 0
     },
     {
@@ -1132,10 +1132,10 @@
         "taskParam": "10&",
         "group": 0,
         "achieveType": 21,
-        "achieveTaskName": 0,
+        "achieveTaskName": "快快长大·壹",
         "taskInfo": "神兽培养10次",
         "condition": 0,
-        "taskReward": "玉石*20",
+        "taskReward": "17052&20",
         "point": 0
     },
     {
@@ -1149,10 +1149,10 @@
         "taskParam": "100&",
         "group": 0,
         "achieveType": 21,
-        "achieveTaskName": 0,
+        "achieveTaskName": "快快长大·贰",
         "taskInfo": "神兽培养100次",
         "condition": 0,
-        "taskReward": "玉石*50",
+        "taskReward": "17052&50",
         "point": 0
     },
     {
@@ -1169,7 +1169,7 @@
         "achieveTaskName": "喜加十",
         "taskInfo": "名将谱激活10名武将",
         "condition": 0,
-        "taskReward": "33001*5000",
+        "taskReward": "33001&5000",
         "point": 0
     },
     {
@@ -1186,7 +1186,7 @@
         "achieveTaskName": "喜加廿",
         "taskInfo": "名将谱激活20名武将",
         "condition": 0,
-        "taskReward": "33001*10000",
+        "taskReward": "33001&10000",
         "point": 0
     },
     {
@@ -1203,7 +1203,7 @@
         "achieveTaskName": "喜加卅",
         "taskInfo": "名将谱激活40名武将",
         "condition": 0,
-        "taskReward": "33001*20000",
+        "taskReward": "33001&20000",
         "point": 0
     },
     {
@@ -1220,7 +1220,7 @@
         "achieveTaskName": "全副武装·壹",
         "taskInfo": "装备6件装备",
         "condition": 0,
-        "taskReward": "17051*1000",
+        "taskReward": "17051&1000",
         "point": 0
     },
     {
@@ -1237,7 +1237,7 @@
         "achieveTaskName": "全副武装·贰",
         "taskInfo": "2名武将各装备6件装备",
         "condition": 0,
-        "taskReward": "17051*1000",
+        "taskReward": "17051&1000",
         "point": 0
     },
     {
@@ -1254,7 +1254,7 @@
         "achieveTaskName": "全副武装·叁",
         "taskInfo": "装备1件红色品质装备",
         "condition": 0,
-        "taskReward": "17051*2000",
+        "taskReward": "17051&2000",
         "point": 0
     },
     {
@@ -1271,7 +1271,7 @@
         "achieveTaskName": "全副武装·肆",
         "taskInfo": "装备1件金色品质装备",
         "condition": 0,
-        "taskReward": "17051*5000",
+        "taskReward": "17051&5000",
         "point": 0
     },
     {
@@ -1288,7 +1288,7 @@
         "achieveTaskName": "叮叮当当·壹",
         "taskInfo": "1件装备强化至10级",
         "condition": 0,
-        "taskReward": "33001*5000",
+        "taskReward": "33001&5000",
         "point": 0
     },
     {
@@ -1305,7 +1305,7 @@
         "achieveTaskName": "叮叮当当·贰",
         "taskInfo": "6件装备强化至10级",
         "condition": 0,
-        "taskReward": "33001*10000",
+        "taskReward": "33001&10000",
         "point": 0
     },
     {
@@ -1322,7 +1322,7 @@
         "achieveTaskName": "叮叮当当·叁",
         "taskInfo": "6件装备强化至40级",
         "condition": 0,
-        "taskReward": "33001*20000",
+        "taskReward": "33001&20000",
         "point": 0
     },
     {
@@ -1339,7 +1339,7 @@
         "achieveTaskName": "叮叮当当·肆",
         "taskInfo": "6件装备强化至80级",
         "condition": 0,
-        "taskReward": "33001*30000",
+        "taskReward": "33001&30000",
         "point": 0
     },
     {
@@ -1356,7 +1356,7 @@
         "achieveTaskName": "叮叮当当·伍",
         "taskInfo": "6件装备强化至100级",
         "condition": 0,
-        "taskReward": "33001*50000",
+        "taskReward": "33001&50000",
         "point": 0
     },
     {
@@ -1373,7 +1373,7 @@
         "achieveTaskName": "颜值就是战力·壹",
         "taskInfo": "1件装备镶嵌宝石",
         "condition": 0,
-        "taskReward": "一级宝石*10",
+        "taskReward": "60001&10",
         "point": 0
     },
     {
@@ -1390,7 +1390,7 @@
         "achieveTaskName": "颜值就是战力·贰",
         "taskInfo": "6件装备镶嵌宝石",
         "condition": 0,
-        "taskReward": "三级宝石*1",
+        "taskReward": "60003&1",
         "point": 0
     },
     {
@@ -1407,7 +1407,7 @@
         "achieveTaskName": "圣衣在手",
         "taskInfo": "合成1件套装套装",
         "condition": 0,
-        "taskReward": "17051*5000",
+        "taskReward": "17051&5000",
         "point": 0
     },
     {
@@ -1424,7 +1424,7 @@
         "achieveTaskName": "炼他炼他·壹",
         "taskInfo": "成功精炼1次",
         "condition": 0,
-        "taskReward": "17054&*10",
+        "taskReward": "17054&10",
         "point": 0
     },
     {
@@ -1441,7 +1441,7 @@
         "achieveTaskName": "炼他炼他·贰",
         "taskInfo": "成功精炼10次",
         "condition": 0,
-        "taskReward": "17054&*100",
+        "taskReward": "17054&100",
         "point": 0
     },
     {
@@ -1458,7 +1458,7 @@
         "achieveTaskName": "洗刷刷·壹",
         "taskInfo": "洗炼1次",
         "condition": 0,
-        "taskReward": "洗练石*1",
+        "taskReward": "17044&1",
         "point": 0
     },
     {
@@ -1475,7 +1475,7 @@
         "achieveTaskName": "洗刷刷·贰",
         "taskInfo": "洗炼10次",
         "condition": 0,
-        "taskReward": "乾坤锁*1",
+        "taskReward": "17045&1",
         "point": 0
     },
     {
@@ -1492,7 +1492,7 @@
         "achieveTaskName": "颜值就是战力·叁",
         "taskInfo": "镶嵌1个1阶宝石",
         "condition": 0,
-        "taskReward": "一级宝石*10",
+        "taskReward": "60001&10",
         "point": 0
     },
     {
@@ -1509,7 +1509,7 @@
         "achieveTaskName": "颜值就是战力·肆",
         "taskInfo": "镶嵌1个9阶宝石",
         "condition": 0,
-        "taskReward": "六级宝石*1",
+        "taskReward": "60006&1",
         "point": 0
     },
     {
@@ -1526,7 +1526,7 @@
         "achieveTaskName": "颜值就是战力·伍",
         "taskInfo": "镶嵌4个1阶宝石",
         "condition": 0,
-        "taskReward": "三级宝石*1",
+        "taskReward": "60003&1",
         "point": 0
     },
     {
@@ -1543,7 +1543,7 @@
         "achieveTaskName": "人生若只如初见",
         "taskInfo": "拥有1名好友",
         "condition": 0,
-        "taskReward": "11014*1",
+        "taskReward": "11014&1",
         "point": 0
     },
     {
@@ -1557,10 +1557,10 @@
         "taskParam": "10&",
         "group": 0,
         "achieveType": 31,
-        "achieveTaskName": 0,
+        "achieveTaskName": "高朋满座不知愁",
         "taskInfo": "拥有10名好友",
         "condition": 0,
-        "taskReward": "11014*1",
+        "taskReward": "11014&1",
         "point": 0
     },
     {
@@ -1577,7 +1577,7 @@
         "achieveTaskName": "第一次的亲密接触",
         "taskInfo": "赠送1次友情点",
         "condition": 0,
-        "taskReward": "11014*1",
+        "taskReward": "11014&1",
         "point": 0
     },
     {
@@ -1594,7 +1594,7 @@
         "achieveTaskName": "第十次的微笑相对",
         "taskInfo": "赠送10次友情点",
         "condition": 0,
-        "taskReward": "11014*1",
+        "taskReward": "11014&1",
         "point": 0
     },
     {
@@ -1611,7 +1611,7 @@
         "achieveTaskName": "第一百次的回眸",
         "taskInfo": "赠送100次友情点",
         "condition": 0,
-        "taskReward": "11014*1",
+        "taskReward": "11014&1",
         "point": 0
     },
     {
@@ -1628,7 +1628,7 @@
         "achieveTaskName": "喂喂喂,听见吗·壹",
         "taskInfo": "聊天频道发言1次",
         "condition": 0,
-        "taskReward": "33002*100",
+        "taskReward": "33002&100",
         "point": 0
     },
     {
@@ -1645,7 +1645,7 @@
         "achieveTaskName": "喂喂喂,听见吗·贰",
         "taskInfo": "聊天频道发言10次",
         "condition": 0,
-        "taskReward": "33002*200",
+        "taskReward": "33002&200",
         "point": 0
     },
     {
@@ -1662,7 +1662,7 @@
         "achieveTaskName": "汗滴禾下土·壹",
         "taskInfo": "消耗100点体力",
         "condition": 0,
-        "taskReward": "33001*5000",
+        "taskReward": "33001&5000",
         "point": 0
     },
     {
@@ -1679,7 +1679,7 @@
         "achieveTaskName": "汗滴禾下土·贰",
         "taskInfo": "消耗1000点体力",
         "condition": 0,
-        "taskReward": "烧肉*1",
+        "taskReward": "72001&1",
         "point": 0
     },
     {
@@ -1696,7 +1696,7 @@
         "achieveTaskName": "汗滴禾下土·叁",
         "taskInfo": "消耗10000点体力",
         "condition": 0,
-        "taskReward": "烧肉*3",
+        "taskReward": "72001&3",
         "point": 0
     },
     {
@@ -1713,7 +1713,7 @@
         "achieveTaskName": "黄巾贼！哪里跑！",
         "taskInfo": "主线通关第3关",
         "condition": 0,
-        "taskReward": "33001*5000",
+        "taskReward": "33001&5000",
         "point": 0
     },
     {
@@ -1730,7 +1730,7 @@
         "achieveTaskName": "犁庭扫穴·壹",
         "taskInfo": "主线扫荡10次",
         "condition": 0,
-        "taskReward": "33001*5000",
+        "taskReward": "33001&5000",
         "point": 0
     },
     {
@@ -1747,7 +1747,7 @@
         "achieveTaskName": "犁庭扫穴·贰",
         "taskInfo": "主线扫荡100次",
         "condition": 0,
-        "taskReward": "33001*10000",
+        "taskReward": "33001&10000",
         "point": 0
     },
     {
@@ -1764,7 +1764,7 @@
         "achieveTaskName": "奇闻异事·壹",
         "taskInfo": "奇遇1次",
         "condition": 0,
-        "taskReward": "33002*20",
+        "taskReward": "33002&20",
         "point": 0
     },
     {
@@ -1781,7 +1781,7 @@
         "achieveTaskName": "奇闻异事·贰",
         "taskInfo": "奇遇8次",
         "condition": 0,
-        "taskReward": "33002*50",
+        "taskReward": "33002&50",
         "point": 0
     },
     {
@@ -1798,7 +1798,7 @@
         "achieveTaskName": "业精于勤·壹",
         "taskInfo": "每日3星通关1次",
         "condition": 0,
-        "taskReward": "三级宝石*1",
+        "taskReward": "60003&1",
         "point": 0
     },
     {
@@ -1815,7 +1815,7 @@
         "achieveTaskName": "业精于勤·贰",
         "taskInfo": "每日3星通关3次",
         "condition": 0,
-        "taskReward": "三级宝石*2",
+        "taskReward": "60003&2",
         "point": 0
     },
     {
@@ -1832,7 +1832,7 @@
         "achieveTaskName": "重在参与·壹",
         "taskInfo": "参与秘境1次",
         "condition": 0,
-        "taskReward": "40007&*50",
+        "taskReward": "40007&50",
         "point": 0
     },
     {
@@ -1849,7 +1849,7 @@
         "achieveTaskName": "重在参与·贰",
         "taskInfo": "参与秘境10次",
         "condition": 0,
-        "taskReward": "40007&*100",
+        "taskReward": "40007&100",
         "point": 0
     },
     {
@@ -1866,7 +1866,7 @@
         "achieveTaskName": "狼皮大衣针不戳",
         "taskInfo": "秘境通关第1关1难度",
         "condition": 0,
-        "taskReward": "40007&*150",
+        "taskReward": "40007&150",
         "point": 0
     },
     {
@@ -1883,7 +1883,7 @@
         "achieveTaskName": "让我见曹操！",
         "taskInfo": "秘境通关第3关2难度",
         "condition": 0,
-        "taskReward": "40007&*200",
+        "taskReward": "40007&200",
         "point": 0
     },
     {
@@ -1900,7 +1900,7 @@
         "achieveTaskName": "九层之台起于垒土",
         "taskInfo": "通关镇念塔10层",
         "condition": 0,
-        "taskReward": "17054&*10",
+        "taskReward": "17054&10",
         "point": 0
     },
     {
@@ -1917,7 +1917,7 @@
         "achieveTaskName": "是男人就上一百层",
         "taskInfo": "通关镇念塔100层",
         "condition": 0,
-        "taskReward": "17054&*100",
+        "taskReward": "17054&100",
         "point": 0
     },
     {
@@ -1934,7 +1934,7 @@
         "achieveTaskName": "是男人就上五百层",
         "taskInfo": "通关镇念塔500层",
         "condition": 0,
-        "taskReward": "17054&*200",
+        "taskReward": "17054&200",
         "point": 0
     },
     {
@@ -1951,7 +1951,7 @@
         "achieveTaskName": "是男人就继续爬吧",
         "taskInfo": "通关镇念塔1000层",
         "condition": 0,
-        "taskReward": "17054&*300",
+        "taskReward": "17054&300",
         "point": 0
     },
     {
@@ -1968,7 +1968,7 @@
         "achieveTaskName": "黄巾余孽受死！",
         "taskInfo": "挑战遗迹2次",
         "condition": 0,
-        "taskReward": "33002*100",
+        "taskReward": "33002&100",
         "point": 0
     },
     {
@@ -1985,7 +1985,7 @@
         "achieveTaskName": "灭乌桓，复大汉",
         "taskInfo": "开启远征2次",
         "condition": 0,
-        "taskReward": "40001&*100",
+        "taskReward": "40001&100",
         "point": 0
     },
     {
@@ -2002,7 +2002,7 @@
         "achieveTaskName": "开启宝箱·壹",
         "taskInfo": "领取1次远征2宝箱",
         "condition": 0,
-        "taskReward": "40001&*150",
+        "taskReward": "40001&150",
         "point": 0
     },
     {
@@ -2019,7 +2019,7 @@
         "achieveTaskName": "开启宝箱·贰",
         "taskInfo": "领取2次远征2宝箱",
         "condition": 0,
-        "taskReward": "40001&*200",
+        "taskReward": "40001&200",
         "point": 0
     },
     {
@@ -2036,7 +2036,7 @@
         "achieveTaskName": "来人，开团",
         "taskInfo": "寻宝招募队友2次",
         "condition": 0,
-        "taskReward": "40002&*50",
+        "taskReward": "40002&50",
         "point": 0
     },
     {
@@ -2053,7 +2053,7 @@
         "achieveTaskName": "藏宝图上说……",
         "taskInfo": "合成红品质的藏宝图2次",
         "condition": 0,
-        "taskReward": "40002&*100",
+        "taskReward": "40002&100",
         "point": 0
     },
     {
@@ -2070,7 +2070,7 @@
         "achieveTaskName": "你帮我，我帮你",
         "taskInfo": "协助寻宝2次",
         "condition": 0,
-        "taskReward": "40002&*150",
+        "taskReward": "40002&150",
         "point": 0
     },
     {
@@ -2087,7 +2087,7 @@
         "achieveTaskName": "宝贝在哪",
         "taskInfo": "组队寻宝2次",
         "condition": 0,
-        "taskReward": "40002&*200",
+        "taskReward": "40002&200",
         "point": 0
     },
     {
@@ -2104,7 +2104,7 @@
         "achieveTaskName": "找到宝贝了",
         "taskInfo": "寻宝红品质2次",
         "condition": 0,
-        "taskReward": "40002&*250",
+        "taskReward": "40002&250",
         "point": 0
     },
     {
@@ -2121,7 +2121,7 @@
         "achieveTaskName": "新挑战者入场",
         "taskInfo": "PVP挑战2次",
         "condition": 0,
-        "taskReward": "40004&*50",
+        "taskReward": "40004&50",
         "point": 0
     },
     {
@@ -2138,7 +2138,7 @@
         "achieveTaskName": "荣耀之路开启",
         "taskInfo": "PVP胜利2次",
         "condition": 0,
-        "taskReward": "40004&*100",
+        "taskReward": "40004&100",
         "point": 0
     },
     {
@@ -2155,7 +2155,7 @@
         "achieveTaskName": "人人为我",
         "taskInfo": "军团捐献1次",
         "condition": 0,
-        "taskReward": "40005&*1000",
+        "taskReward": "40005&1000",
         "point": 0
     },
     {
@@ -2172,7 +2172,7 @@
         "achieveTaskName": "我为人人",
         "taskInfo": "军团捐献10次",
         "condition": 0,
-        "taskReward": "40005&*1500",
+        "taskReward": "40005&1500",
         "point": 0
     },
     {
@@ -2189,7 +2189,7 @@
         "achieveTaskName": "开启宝箱",
         "taskInfo": "领取2次军团活跃宝箱",
         "condition": 0,
-        "taskReward": "40005&*2000",
+        "taskReward": "40005&2000",
         "point": 0
     },
     {
@@ -2206,7 +2206,7 @@
         "achieveTaskName": "请点击帮我助力",
         "taskInfo": "助力炼器堂研发加速1次",
         "condition": 0,
-        "taskReward": "40005&*2500",
+        "taskReward": "40005&2500",
         "point": 0
     },
     {
@@ -2223,7 +2223,7 @@
         "achieveTaskName": "Boss？就这？",
         "taskInfo": "练兵场军团成功挑战2次BOSS",
         "condition": 0,
-        "taskReward": "40005&*3000",
+        "taskReward": "40005&3000",
         "point": 0
     },
     {
@@ -2240,7 +2240,7 @@
         "achieveTaskName": "大吉大利",
         "taskInfo": "挑战练兵场2次",
         "condition": 0,
-        "taskReward": "40005&*3500",
+        "taskReward": "40005&3500",
         "point": 0
     },
     {
@@ -2257,211 +2257,7 @@
         "achieveTaskName": "我们是……一团人了",
         "taskInfo": "加入军团",
         "condition": 0,
-        "taskReward": "40005&*4000",
+        "taskReward": "40005&4000",
         "point": 0
-    },
-    {
-        "id": 11,
-        "achieveTaskId": 11,
-        "tab": 2,
-        "tabName": "剧情",
-        "subTab": 1,
-        "subTabName": "主线",
-        "taskType": 39,
-        "taskParam": "1&104",
-        "group": 1,
-        "achieveType": 3,
-        "achieveTaskName": "初出茅庐·壹",
-        "taskInfo": "通关主线第1关",
-        "condition": 1,
-        "taskReward": "11002&10|31001&5000",
-        "point": 10
-    },
-    {
-        "id": 12,
-        "achieveTaskId": 12,
-        "tab": 2,
-        "tabName": "剧情",
-        "subTab": 1,
-        "subTabName": "主线",
-        "taskType": 39,
-        "taskParam": "1&106",
-        "group": 2,
-        "achieveType": 3,
-        "achieveTaskName": "初出茅庐·贰",
-        "taskInfo": "通关主线第3关",
-        "condition": 1,
-        "taskReward": "11002&10|31001&5000",
-        "point": 10
-    },
-    {
-        "id": 13,
-        "achieveTaskId": 13,
-        "tab": 2,
-        "tabName": "剧情",
-        "subTab": 1,
-        "subTabName": "主线",
-        "taskType": 39,
-        "taskParam": "1&107",
-        "group": 3,
-        "achieveType": 3,
-        "achieveTaskName": "初出茅庐·叁",
-        "taskInfo": "通关主线第4关",
-        "condition": 1,
-        "taskReward": "11002&10|31001&5000",
-        "point": 10
-    },
-    {
-        "id": 14,
-        "achieveTaskId": 14,
-        "tab": 2,
-        "tabName": "剧情",
-        "subTab": 2,
-        "subTabName": "奇遇",
-        "taskType": 41,
-        "taskParam": "0&10&",
-        "group": 1,
-        "achieveType": 4,
-        "achieveTaskName": "奇闻轶事·壹",
-        "taskInfo": "奇遇10次",
-        "condition": 10,
-        "taskReward": "11002&10|31001&5000",
-        "point": 10
-    },
-    {
-        "id": 15,
-        "achieveTaskId": 15,
-        "tab": 2,
-        "tabName": "剧情",
-        "subTab": 2,
-        "subTabName": "奇遇",
-        "taskType": 41,
-        "taskParam": "0&20&",
-        "group": 1,
-        "achieveType": 4,
-        "achieveTaskName": "奇闻轶事·贰",
-        "taskInfo": "奇遇20次",
-        "condition": 20,
-        "taskReward": "11002&10|31001&5000",
-        "point": 10
-    },
-    {
-        "id": 16,
-        "achieveTaskId": 16,
-        "tab": 2,
-        "tabName": "剧情",
-        "subTab": 2,
-        "subTabName": "奇遇",
-        "taskType": 41,
-        "taskParam": "0&30&",
-        "group": 1,
-        "achieveType": 4,
-        "achieveTaskName": "奇闻轶事·叁",
-        "taskInfo": "奇遇30次",
-        "condition": 30,
-        "taskReward": "11002&10|31001&5000",
-        "point": 10
-    },
-    {
-        "id": 17,
-        "achieveTaskId": 17,
-        "tab": 3,
-        "tabName": "修炼",
-        "subTab": 1,
-        "subTabName": "秘境",
-        "taskType": 44,
-        "taskParam": "10&",
-        "group": 1,
-        "achieveType": 5,
-        "achieveTaskName": "风谲云诡·壹",
-        "taskInfo": "秘境挑战10次",
-        "condition": 10,
-        "taskReward": "11002&10|31001&5000",
-        "point": 10
-    },
-    {
-        "id": 18,
-        "achieveTaskId": 18,
-        "tab": 3,
-        "tabName": "修炼",
-        "subTab": 1,
-        "subTabName": "秘境",
-        "taskType": 44,
-        "taskParam": "20&",
-        "group": 1,
-        "achieveType": 5,
-        "achieveTaskName": "风谲云诡·贰",
-        "taskInfo": "秘境挑战20次",
-        "condition": 20,
-        "taskReward": "11002&10|31001&5000",
-        "point": 10
-    },
-    {
-        "id": 19,
-        "achieveTaskId": 19,
-        "tab": 3,
-        "tabName": "修炼",
-        "subTab": 1,
-        "subTabName": "秘境",
-        "taskType": 44,
-        "taskParam": "30&",
-        "group": 1,
-        "achieveType": 5,
-        "achieveTaskName": "风谲云诡·叁",
-        "taskInfo": "秘境挑战30次",
-        "condition": 30,
-        "taskReward": "11002&10|31001&5000",
-        "point": 10
-    },
-    {
-        "id": 20,
-        "achieveTaskId": 20,
-        "tab": 3,
-        "tabName": "修炼",
-        "subTab": 2,
-        "subTabName": "镇念塔",
-        "taskType": 47,
-        "taskParam": "10&",
-        "group": 1,
-        "achieveType": 6,
-        "achieveTaskName": "我命由我·壹",
-        "taskInfo": "镇念塔挑战10次",
-        "condition": 10,
-        "taskReward": "11002&10|31001&5000",
-        "point": 10
-    },
-    {
-        "id": 21,
-        "achieveTaskId": 21,
-        "tab": 3,
-        "tabName": "修炼",
-        "subTab": 2,
-        "subTabName": "镇念塔",
-        "taskType": 47,
-        "taskParam": "20&",
-        "group": 1,
-        "achieveType": 6,
-        "achieveTaskName": "我命由我·贰",
-        "taskInfo": "镇念塔挑战20次",
-        "condition": 20,
-        "taskReward": "11002&10|31001&5000",
-        "point": 10
-    },
-    {
-        "id": 22,
-        "achieveTaskId": 22,
-        "tab": 3,
-        "tabName": "修炼",
-        "subTab": 2,
-        "subTabName": "镇念塔",
-        "taskType": 47,
-        "taskParam": "30&",
-        "group": 1,
-        "achieveType": 6,
-        "achieveTaskName": "我命由我·叁",
-        "taskInfo": "镇念塔挑战30次",
-        "condition": 30,
-        "taskReward": "11002&10|31001&5000",
-        "point": 10
     }
 ]
\ No newline at end of file