diff --git a/shared/resource/jsons/dic_zyz_taskType.json b/shared/resource/jsons/dic_zyz_taskType.json
index 70738c6cc..0a6ca1db8 100644
--- a/shared/resource/jsons/dic_zyz_taskType.json
+++ b/shared/resource/jsons/dic_zyz_taskType.json
@@ -6,13 +6,7 @@
         "param": "day&",
         "string": "天数",
         "content": "每日就用这个填1",
-        "condition": "day",
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0
+        "condition": "day"
     },
     {
         "id": 2,
@@ -21,13 +15,7 @@
         "param": "day&",
         "string": "天数",
         "content": 0,
-        "condition": "day",
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0
+        "condition": "day"
     },
     {
         "id": 3,
@@ -36,13 +24,7 @@
         "param": "lv&",
         "string": "主公等级&",
         "content": 0,
-        "condition": "lv",
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0
+        "condition": "lv"
     },
     {
         "id": 4,
@@ -51,13 +33,7 @@
         "param": "count&",
         "string": "招募次数&",
         "content": 0,
-        "condition": "count",
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0
+        "condition": "count"
     },
     {
         "id": 5,
@@ -66,13 +42,7 @@
         "param": "herocount&",
         "string": "武将数量&",
         "content": 0,
-        "condition": "herocount",
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0
+        "condition": "herocount"
     },
     {
         "id": 6,
@@ -81,13 +51,7 @@
         "param": "herocount&count&",
         "string": "武将数量&升星次数&",
         "content": 0,
-        "condition": "herocount",
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0
+        "condition": "herocount"
     },
     {
         "id": 7,
@@ -96,13 +60,7 @@
         "param": "herocount&quality&",
         "string": "武将数量&品质&",
         "content": 0,
-        "condition": "herocount",
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0
+        "condition": "herocount"
     },
     {
         "id": 8,
@@ -111,13 +69,7 @@
         "param": "herocount&quality&star&",
         "string": "武将数量&品质&星级&",
         "content": "只算普通星级、只算这一种品质",
-        "condition": "herocount",
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0
+        "condition": "herocount"
     },
     {
         "id": 9,
@@ -126,13 +78,7 @@
         "param": "herocount&lv&",
         "string": "武将数量&武将等级&",
         "content": 0,
-        "condition": "herocount",
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0
+        "condition": "herocount"
     },
     {
         "id": 10,
@@ -141,13 +87,7 @@
         "param": "herocount&count&",
         "string": "武将数量&训练次数",
         "content": 0,
-        "condition": "herocount",
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0
+        "condition": "herocount"
     },
     {
         "id": 11,
@@ -156,13 +96,7 @@
         "param": "herocount&",
         "string": "武将数量&",
         "content": 0,
-        "condition": "herocount",
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0
+        "condition": "herocount"
     },
     {
         "id": 12,
@@ -171,13 +105,7 @@
         "param": "herocount&",
         "string": "武将觉醒次数&",
         "content": "从6星升到觉醒1星那一次",
-        "condition": "herocount",
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0
+        "condition": "herocount"
     },
     {
         "id": 13,
@@ -186,13 +114,7 @@
         "param": "count&",
         "string": "训练次数",
         "content": 0,
-        "condition": "count",
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0
+        "condition": "count"
     },
     {
         "id": 14,
@@ -201,13 +123,7 @@
         "param": "herocount&count&",
         "string": "武将数量&进阶次数&",
         "content": 0,
-        "condition": "herocount",
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0
+        "condition": "herocount"
     },
     {
         "id": 15,
@@ -216,13 +132,7 @@
         "param": "herocount&favourlv&",
         "string": "武将数量&好感度等级&",
         "content": 0,
-        "condition": "herocount",
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0
+        "condition": "herocount"
     },
     {
         "id": 16,
@@ -231,13 +141,7 @@
         "param": "count&star&",
         "string": "激活次数&星级&",
         "content": 0,
-        "condition": "count",
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0
+        "condition": "count"
     },
     {
         "id": 17,
@@ -246,13 +150,7 @@
         "param": "count&",
         "string": "解锁的数量&",
         "content": 0,
-        "condition": "count",
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0
+        "condition": "count"
     },
     {
         "id": 18,
@@ -261,13 +159,7 @@
         "param": "herocount&",
         "string": "放置武将数量&",
         "content": 0,
-        "condition": "herocount",
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0
+        "condition": "herocount"
     },
     {
         "id": 19,
@@ -276,13 +168,7 @@
         "param": "title&",
         "string": "升到的爵位&",
         "content": 0,
-        "condition": "title",
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0
+        "condition": "title"
     },
     {
         "id": 20,
@@ -291,13 +177,7 @@
         "param": "count&",
         "string": "强化次数&",
         "content": 0,
-        "condition": "count",
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0
+        "condition": "count"
     },
     {
         "id": 21,
@@ -306,13 +186,7 @@
         "param": "herocount&",
         "string": "武将数量&",
         "content": 0,
-        "condition": "herocount",
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0
+        "condition": "herocount"
     },
     {
         "id": 22,
@@ -321,13 +195,7 @@
         "param": "equipcount&",
         "string": "装备的装备数量&",
         "content": "所有武将",
-        "condition": "equipcount",
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0
+        "condition": "equipcount"
     },
     {
         "id": 23,
@@ -336,13 +204,7 @@
         "param": "herocount&equipcount&",
         "string": "武将数量&装备数量",
         "content": 0,
-        "condition": "herocount",
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0
+        "condition": "herocount"
     },
     {
         "id": 24,
@@ -351,13 +213,7 @@
         "param": "equipcount&quality&",
         "string": "装备数量&装备品质&",
         "content": 0,
-        "condition": "equipcount",
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0
+        "condition": "equipcount"
     },
     {
         "id": 25,
@@ -366,13 +222,7 @@
         "param": "equipcount&lv&",
         "string": "装备数量&强化等级&",
         "content": 0,
-        "condition": "equipcount",
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0
+        "condition": "equipcount"
     },
     {
         "id": 26,
@@ -381,13 +231,7 @@
         "param": "equipcount&",
         "string": "装备数量&",
         "content": "必须同时镶嵌中，脱下再嵌不算",
-        "condition": "equipcount",
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0
+        "condition": "equipcount"
     },
     {
         "id": 27,
@@ -396,13 +240,7 @@
         "param": "equipcount&",
         "string": "套装数量&",
         "content": "根据物品表里是否有suitId判断",
-        "condition": "equipcount",
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0
+        "condition": "equipcount"
     },
     {
         "id": 28,
@@ -411,13 +249,7 @@
         "param": "count&",
         "string": "套装数量&",
         "content": "不需要装备上",
-        "condition": "count",
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0
+        "condition": "count"
     },
     {
         "id": 29,
@@ -426,13 +258,7 @@
         "param": "day&",
         "string": "天数",
         "content": 0,
-        "condition": "day",
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0
+        "condition": "day"
     },
     {
         "id": 30,
@@ -441,13 +267,7 @@
         "param": "count&",
         "string": "精炼次数&",
         "content": 0,
-        "condition": "count",
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0
+        "condition": "count"
     },
     {
         "id": 31,
@@ -456,13 +276,7 @@
         "param": "count&",
         "string": "洗炼数量",
         "content": 0,
-        "condition": "count",
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0
+        "condition": "count"
     },
     {
         "id": 32,
@@ -471,13 +285,7 @@
         "param": "count&stage&",
         "string": "镶嵌次数&宝石阶数&",
         "content": "必须同时镶嵌中，脱下再嵌不算",
-        "condition": "count",
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0
+        "condition": "count"
     },
     {
         "id": 33,
@@ -486,13 +294,7 @@
         "param": "count&",
         "string": "宝石数&",
         "content": 0,
-        "condition": "count",
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0
+        "condition": "count"
     },
     {
         "id": 34,
@@ -501,13 +303,7 @@
         "param": "count&",
         "string": "好友数量&",
         "content": 0,
-        "condition": "count",
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0
+        "condition": "count"
     },
     {
         "id": 35,
@@ -516,13 +312,7 @@
         "param": "count&",
         "string": "赠送次数&",
         "content": 0,
-        "condition": "count",
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0
+        "condition": "count"
     },
     {
         "id": 36,
@@ -531,13 +321,7 @@
         "param": "chattype&count&",
         "string": "聊天频道type&发言次数&",
         "content": 0,
-        "condition": "count",
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0
+        "condition": "count"
     },
     {
         "id": 37,
@@ -546,13 +330,7 @@
         "param": "cost&",
         "string": "消耗体力数&",
         "content": 0,
-        "condition": "cost",
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0
+        "condition": "cost"
     },
     {
         "id": 38,
@@ -561,13 +339,7 @@
         "param": "hid&count&warcount&warid&…",
         "string": "武将id&挑战次数&填几个warid&关卡id&…",
         "content": 0,
-        "condition": "count",
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0
+        "condition": "count"
     },
     {
         "id": 39,
@@ -576,13 +348,7 @@
         "param": "warcount&warid&…",
         "string": "关卡id",
         "content": 0,
-        "condition": "warcount",
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0
+        "condition": "warcount"
     },
     {
         "id": 40,
@@ -591,13 +357,7 @@
         "param": "count&",
         "string": "扫荡次数&",
         "content": "不包括手打",
-        "condition": "count",
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0
+        "condition": "count"
     },
     {
         "id": 41,
@@ -606,13 +366,7 @@
         "param": "eventType&count&",
         "string": "奇遇类型&次数&",
         "content": "eventType=0，表示任意奇遇类型",
-        "condition": "count",
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0
+        "condition": "count"
     },
     {
         "id": 42,
@@ -621,13 +375,7 @@
         "param": "star&count&warcount&warid&…",
         "string": "星级&通关次数&填几个warid&关卡id&…",
         "content": "不包括扫荡，不强求三星star填0",
-        "condition": "count",
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0
+        "condition": "count"
     },
     {
         "id": 43,
@@ -636,13 +384,7 @@
         "param": "dailytype&count&",
         "string": "每日类型&挑战次数&",
         "content": 0,
-        "condition": "count",
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0
+        "condition": "count"
     },
     {
         "id": 44,
@@ -651,13 +393,7 @@
         "param": "count&",
         "string": "秘境挑战次数&",
         "content": 0,
-        "condition": "count",
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0
+        "condition": "count"
     },
     {
         "id": 45,
@@ -666,13 +402,7 @@
         "param": "warcount&warid&…",
         "string": "填几个warid&关卡id&…",
         "content": 0,
-        "condition": "warcount",
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0
+        "condition": "warcount"
     },
     {
         "id": 46,
@@ -681,13 +411,7 @@
         "param": "lv&",
         "string": "镇念塔层数",
         "content": 0,
-        "condition": "lv",
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0
+        "condition": "lv"
     },
     {
         "id": 47,
@@ -696,13 +420,7 @@
         "param": "count&",
         "string": "通关次数&",
         "content": 0,
-        "condition": "count",
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0
+        "condition": "count"
     },
     {
         "id": 48,
@@ -711,13 +429,7 @@
         "param": "count&",
         "string": "挑战次数&",
         "content": 0,
-        "condition": "count",
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0
+        "condition": "count"
     },
     {
         "id": 49,
@@ -726,13 +438,7 @@
         "param": "count&",
         "string": "远征次数&",
         "content": 0,
-        "condition": "count",
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0
+        "condition": "count"
     },
     {
         "id": 50,
@@ -741,13 +447,7 @@
         "param": "count&point&",
         "string": "领取次数&宝箱的积分&",
         "content": "积分27分",
-        "condition": "count",
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0
+        "condition": "count"
     },
     {
         "id": 51,
@@ -756,13 +456,7 @@
         "param": "count&",
         "string": "创建队伍次数&",
         "content": "创建了队伍，匹配到人了，并进去挑战了才算一次",
-        "condition": "count",
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0
+        "condition": "count"
     },
     {
         "id": 52,
@@ -771,13 +465,7 @@
         "param": "quality&count&",
         "string": "合成藏宝图品质&合成次数&",
         "content": 0,
-        "condition": "count",
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0
+        "condition": "count"
     },
     {
         "id": 53,
@@ -786,13 +474,7 @@
         "param": "count&",
         "string": "协助寻宝次数&",
         "content": "一定是加别人的",
-        "condition": "count",
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0
+        "condition": "count"
     },
     {
         "id": 54,
@@ -801,13 +483,7 @@
         "param": "count&",
         "string": "寻宝次数&",
         "content": "都算",
-        "condition": "count",
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0
+        "condition": "count"
     },
     {
         "id": 55,
@@ -816,13 +492,7 @@
         "param": "quality&count&",
         "string": "寻宝品质&次数&",
         "content": "创建了队伍，匹配到人了，并进去挑战了才算一次",
-        "condition": "count",
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0
+        "condition": "count"
     },
     {
         "id": 56,
@@ -831,13 +501,7 @@
         "param": "count&goodcount&goodid&…",
         "string": "掉落碎片数量&填的gid的条数&物品id&…",
         "content": 0,
-        "condition": "count",
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0
+        "condition": "count"
     },
     {
         "id": 57,
@@ -846,13 +510,7 @@
         "param": "count&",
         "string": "pvp次数&",
         "content": 0,
-        "condition": "count",
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0
+        "condition": "count"
     },
     {
         "id": 58,
@@ -861,13 +519,7 @@
         "param": "count&",
         "string": "pvp胜利次数&",
         "content": 0,
-        "condition": "count",
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0
+        "condition": "count"
     },
     {
         "id": 59,
@@ -876,13 +528,7 @@
         "param": "count&",
         "string": "领取次数&",
         "content": 0,
-        "condition": "count",
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0
+        "condition": "count"
     },
     {
         "id": 60,
@@ -891,13 +537,7 @@
         "param": "count&",
         "string": "连胜次数&",
         "content": 0,
-        "condition": "count",
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0
+        "condition": "count"
     },
     {
         "id": 61,
@@ -906,13 +546,7 @@
         "param": "herocount&score&",
         "string": "武将数量&积分&",
         "content": 0,
-        "condition": "herocount",
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0
+        "condition": "herocount"
     },
     {
         "id": 62,
@@ -921,13 +555,7 @@
         "param": "rank&",
         "string": "排名&",
         "content": 0,
-        "condition": "rank",
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0
+        "condition": "rank"
     },
     {
         "id": 63,
@@ -936,13 +564,7 @@
         "param": "job&",
         "string": "军团的官职&",
         "content": 0,
-        "condition": "job",
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0
+        "condition": "job"
     },
     {
         "id": 64,
@@ -951,13 +573,7 @@
         "param": "count&",
         "string": "捐献次数&",
         "content": 0,
-        "condition": "count",
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0
+        "condition": "count"
     },
     {
         "id": 65,
@@ -966,13 +582,7 @@
         "param": "count&",
         "string": "领取活跃宝箱次数&",
         "content": 0,
-        "condition": "count",
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0
+        "condition": "count"
     },
     {
         "id": 66,
@@ -981,13 +591,7 @@
         "param": "quality&count&",
         "string": "碎片品质&炼制出次数&",
         "content": "quality=0，表示任意品质",
-        "condition": "count",
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0
+        "condition": "count"
     },
     {
         "id": 67,
@@ -996,13 +600,7 @@
         "param": "count&",
         "string": "加速次数&",
         "content": 0,
-        "condition": "count",
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0
+        "condition": "count"
     },
     {
         "id": 68,
@@ -1011,13 +609,7 @@
         "param": "count&",
         "string": "压制次数&",
         "content": 0,
-        "condition": "count",
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0
+        "condition": "count"
     },
     {
         "id": 69,
@@ -1026,13 +618,7 @@
         "param": "count&",
         "string": "挑战次数&",
         "content": 0,
-        "condition": "count",
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0
+        "condition": "count"
     },
     {
         "id": 70,
@@ -1041,13 +627,7 @@
         "param": "count&",
         "string": "挑战次数&",
         "content": 0,
-        "condition": "count",
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0
+        "condition": "count"
     },
     {
         "id": 71,
@@ -1056,13 +636,7 @@
         "param": "aid&count&",
         "string": "军团活动id&活动次数&",
         "content": "aid-1.蛮夷 2.诸侯 3.粮草，aid=0就是任意军团活动类型",
-        "condition": "count",
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0
+        "condition": "count"
     },
     {
         "id": 72,
@@ -1071,58 +645,34 @@
         "param": "count&",
         "string": "加入军团次数&",
         "content": 0,
-        "condition": "count",
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0
+        "condition": "count"
     },
     {
         "id": 73,
         "name": "精英任务",
         "info": "精英通关第x关",
-        "param": "count&warid&",
+        "param": "warcount&warid&",
         "string": "关卡id",
         "content": 0,
-        "condition": "count",
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0
+        "condition": "warcount"
     },
     {
         "id": 74,
         "name": "武将",
-        "info": "x名x品质武将升至X品质",
+        "info": "x名初始x品质武将升至X品质",
         "param": "herocount&quality&quality&",
         "string": "武将数量&武将初始品质&武将升级后品质",
         "content": 0,
-        "condition": "herocount",
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0
+        "condition": "herocount"
     },
     {
         "id": 75,
         "name": "武将",
-        "info": "x名x品质武将觉醒",
+        "info": "x名初始x品质武将觉醒",
         "param": "herocount&quality&",
         "string": "武将数量&武将初始品质",
         "content": 0,
-        "condition": "herocount",
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0
+        "condition": "herocount"
     },
     {
         "id": 76,
@@ -1131,13 +681,7 @@
         "param": "herocount&star&",
         "string": "武将数量&星级",
         "content": 0,
-        "condition": "herocount",
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0
+        "condition": "herocount"
     },
     {
         "id": 77,
@@ -1146,13 +690,7 @@
         "param": "count&lv&",
         "string": "装备件数&精炼等级",
         "content": 0,
-        "condition": "count",
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0
+        "condition": "count"
     },
     {
         "id": 78,
@@ -1161,73 +699,43 @@
         "param": "count&stage&",
         "string": "发生次数&宝石阶数&",
         "content": 0,
-        "condition": "count",
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0
+        "condition": "count"
     },
     {
         "id": 79,
-        "name": "练兵场",
+        "name": "军团",
         "info": "练兵场通关x关x次",
         "param": "count&wardId&",
         "string": "发生次数&关卡Id&",
         "content": 0,
-        "condition": "count",
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0
+        "condition": "count"
     },
     {
         "id": 80,
-        "name": "名将谱激活",
+        "name": "全局",
         "info": "名将谱x阵营全部激活",
         "param": "count&camp&",
         "string": "数量&阵营类型&",
         "content": 0,
-        "condition": "count",
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0
+        "condition": "count"
     },
     {
         "id": 81,
-        "name": "抽卡",
+        "name": "招募",
         "info": "抽到*次品质*武将",
         "param": "count&quality&",
         "string": "数量&武将品质&",
         "content": 0,
-        "condition": "count",
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0
+        "condition": "count"
     },
     {
         "id": 82,
-        "name": "神像进阶",
+        "name": "全局",
         "info": "神像进阶",
         "param": "count&",
         "string": "次数&",
         "content": 0,
-        "condition": "count",
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0
+        "condition": "count"
     },
     {
         "id": 83,
@@ -1236,27 +744,15 @@
         "param": "count&quality&",
         "string": "次数&装备品质&",
         "content": 0,
-        "condition": "count",
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0
+        "condition": "count"
     },
     {
         "id": 84,
         "name": "武将",
         "info": "x名武将觉醒",
         "param": "herocount&",
-        "string": "武将数量&",
+        "string": "武将数量",
         "content": 0,
-        "condition": "herocount",
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0
+        "condition": "herocount"
     }
 ]
\ No newline at end of file