diff --git a/game-server/app/servers/battle/handler/ladderHandler.ts b/game-server/app/servers/battle/handler/ladderHandler.ts
index 1446a0ef6..90fdaa1f6 100644
--- a/game-server/app/servers/battle/handler/ladderHandler.ts
+++ b/game-server/app/servers/battle/handler/ladderHandler.ts
@@ -18,6 +18,7 @@ import { ServerlistModel } from '../../../db/Serverlist';
 import { saveLadderDefCeByData } from '../../../services/redisService';
 import { pushLadderTopChangeMsg } from '../../../services/sysChatService';
 import { checkTaskInLadderEnd, checkTaskInLadderStart, checkTaskInLadderSweep } from '../../../services/task/taskService';
+import { BattleRecordModel } from '../../../db/BattleRecord';
 
 export default function (app: Application) {
     new HandlerService(app, {});
@@ -136,9 +137,10 @@ export class LadderHandler {
     }
 
     // 6. 布完阵开始挑战
-    async checkBattle(msg: { battleCode: string, heroes: { actorId: number, order: number }[] }, session: BackendSession) {
+    async checkBattle(msg: { battleCode: string, battleId: number, heroes: { actorId: number, order: number }[] }, session: BackendSession) {
         let roleId = session.get('roleId');
-        let { battleCode, heroes } = msg;
+        let roleName = session.get('roleId');
+        let { battleId, battleCode, heroes } = msg;
 
         let rec = await LadderMatchRecModel.findByBattleCode(battleCode);
         if(!rec || rec.roleId1 != roleId) return resResult(STATUS.LADDER_REC_NOT_FOUND);
@@ -152,7 +154,15 @@ export class LadderHandler {
             heroInfo.setByDefenseHero(hero);
             return heroInfo;
         });
-
+        let warInfo = gameData.war.get(battleId);
+        await BattleRecordModel.updateBattleRecordByCode(battleCode, {
+            $set: {
+                roleId, roleName, battleId,
+                status: 0,
+                warName: warInfo?.gk_name,
+                warType: warInfo?.warType,
+            }
+        });
         rec = await LadderMatchRecModel.startBattle(battleCode, attackHeroes);
         pinus.app.rpc.systimer.systimerRemote.setLadderCountDown.broadcast(rec.battleCode, rec.battleTime, LADDER_STATUS.BATTLE);
 
@@ -196,6 +206,7 @@ export class LadderHandler {
         } else {
             rec = await LadderMatchRecModel.battleEnd(battleCode, isSuccess);
         }
+        await BattleRecordModel.updateBattleRecordByCode(battleCode, { $set: { status: isSuccess? 1: 2 } });
 
         let historyRank = ladderData.historyRank;
         ladderData = await LadderMatchModel.updateByRoleId(roleId, { historyRank: historyRank > atkLadderMatch.rank? atkLadderMatch.rank: historyRank, locked: 0 });
diff --git a/game-server/app/servers/role/handler/heroHandler.ts b/game-server/app/servers/role/handler/heroHandler.ts
index 61c85dacf..99a5c2562 100644
--- a/game-server/app/servers/role/handler/heroHandler.ts
+++ b/game-server/app/servers/role/handler/heroHandler.ts
@@ -423,7 +423,7 @@ export class HeroHandler {
         if (heroes.length < dicFriendShip.hids.length) return resResult(STATUS.ROLE_HERO_NOT_EXISTS);
         let hero = heroes.find(cur => cur.hid == hid);
         if(!hero) return resResult(STATUS.ROLE_HERO_NOT_EXISTS);
-        let { connections } = hero;
+        let { connections = []} = hero;
         let curConnect = connections.find(cur => cur.shipId == shipId);
         let { level: oldLv = 0, exp: oldExp = 0 } = curConnect||{};
 
diff --git a/game-server/app/services/task/taskObj.ts b/game-server/app/services/task/taskObj.ts
index 9e8c2ea29..59bc25ee2 100644
--- a/game-server/app/services/task/taskObj.ts
+++ b/game-server/app/services/task/taskObj.ts
@@ -1294,21 +1294,25 @@ export class CheckSingleTask {
                 }
             case TASK_TYPE.CONNECT_ONE_HERO_MAX_LV: // 124. 单个武将其中最高等级的羁绊达X级
                 {
-                    let { connections, oldConnections } = param;
-                    let oldMaxLv = Math.max(...connections.map(cur => cur.level))||0;
-                    let maxLv = Math.max(...oldConnections.map(cur => cur.level))||0;
-                    if(dicTaskParam[0] <= oldMaxLv && dicTaskParam[0] > maxLv) {
-                        result = { inc: 1 };
+                    let { connections } = param;
+                    let records = await getRecord();
+                    let oldLv = records.length > 0? parseInt(records[0]): 0;
+
+                    let maxLv = Math.max(...connections.map(cur => cur.level))||0;
+                    console.log('##### TASK_TYPE.CONNECT_ONE_HERO_MAX_LV', oldLv, maxLv )
+                    if(oldLv < maxLv) {
+                        result = { set: maxLv, records: [`${maxLv}`] };
                     }
                     break;
                 }
             case TASK_TYPE.CONNECT_ONE_HERO_SUM_LV: // 125. 单个武将3条羁绊总共提升X级
                 {
-                    let { connections, oldConnections } = param;
-                    let oldSumLv = connections.reduce((pre, cur) => pre + cur.level, 0);
-                    let sumLv = oldConnections.reduce((pre, cur) => pre + cur.level, 0);
-                    if(dicTaskParam[0] <= oldSumLv && dicTaskParam[0] > sumLv) {
-                        result = { inc: 1 };
+                    let { connections } = param;
+                    let records = await getRecord();
+                    let oldLv = records.length > 0? parseInt(records[0]): 0;
+                    let sumLv = connections.reduce((pre, cur) => pre + cur.level, 0);
+                    if(oldLv < sumLv) {
+                        result = { set: sumLv, records: [`${sumLv}`] };
                     }
                     break;
                 }
diff --git a/shared/consts/constModules/sysConst.ts b/shared/consts/constModules/sysConst.ts
index 50482e46f..e7b6895fa 100644
--- a/shared/consts/constModules/sysConst.ts
+++ b/shared/consts/constModules/sysConst.ts
@@ -567,7 +567,7 @@ export const WAR_RELATE_TABLES = [
     FILENAME.DIC_GK_PROBATION,
     FILENAME.DIC_GK_ARMY_TRAIN,
     FILENAME.DIC_GK_ARMY_BOSS,
-    // FILENAME.DIC_GK_LADDER,
+    FILENAME.DIC_GK_LADDER,
 ]
 
 // 装备栏强化类型
diff --git a/shared/db/LadderMatch.ts b/shared/db/LadderMatch.ts
index bbcc1df3c..544519a4c 100644
--- a/shared/db/LadderMatch.ts
+++ b/shared/db/LadderMatch.ts
@@ -103,14 +103,14 @@ export default class LadderMatch extends BaseModel {
             let atkLadderMatch: LadderMatchType, defLadderMatch: LadderMatchType, isChange = false;
             if(defenseInfo.isRobot) {
                 atkLadderMatch = await LadderMatchModel.findOne({ roleId: attackInfo.roleId }).lean();
-                if(isSuccess && atkLadderMatch && atkLadderMatch.rank > defenseInfo.oldRank) {
+                if(isSuccess && atkLadderMatch && (atkLadderMatch.rank == 0 || atkLadderMatch.rank > defenseInfo.oldRank)) {
                     atkLadderMatch = await LadderMatchModel.findOneAndUpdate({ roleId: attackInfo.roleId }, { $set: { rank: defenseInfo.oldRank, oldRank: atkLadderMatch.rank } }, { new: true }).lean();
                     isChange = true;
                 }
             } else {
                 atkLadderMatch = await LadderMatchModel.findOne({ roleId: attackInfo.roleId }).lean();
                 defLadderMatch = await LadderMatchModel.findOne({ roleId: defenseInfo.roleId }).lean();
-                if(isSuccess && atkLadderMatch && defLadderMatch && atkLadderMatch.rank > defLadderMatch.rank) {
+                if(isSuccess && atkLadderMatch && defLadderMatch && (atkLadderMatch.rank == 0 || atkLadderMatch.rank > defLadderMatch.rank)) {
                     atkLadderMatch = await LadderMatchModel.findOneAndUpdate({ roleId: attackInfo.roleId }, { $set: { rank: defLadderMatch.rank, oldRank: atkLadderMatch.rank } }, { new: true }).lean();
                     defLadderMatch = await LadderMatchModel.findOneAndUpdate({ roleId: defenseInfo.roleId }, { $set: { rank: atkLadderMatch.rank, oldRank: defLadderMatch.rank } }, { new: true }).lean();
                     isChange = true;
diff --git a/shared/resource/jsons/dic_zyz_achievement.json b/shared/resource/jsons/dic_zyz_achievement.json
index 3263f6b59..77bac8ecb 100644
--- a/shared/resource/jsons/dic_zyz_achievement.json
+++ b/shared/resource/jsons/dic_zyz_achievement.json
@@ -2247,11 +2247,11 @@
         "subTab": 17,
         "subTabName": "攻擂",
         "taskType": 123,
-        "taskParam": "100&",
+        "taskParam": "100&1",
         "achieveType": 61,
         "achieveTaskName": "不屈不挠·壹",
         "taskInfo": "名将擂台排名进入前100名",
-        "condition": 100,
+        "condition": 1,
         "taskReward": "17054&100",
         "point": 10
     },
@@ -2263,11 +2263,11 @@
         "subTab": 17,
         "subTabName": "攻擂",
         "taskType": 123,
-        "taskParam": "50&",
+        "taskParam": "50&1",
         "achieveType": 61,
         "achieveTaskName": "不屈不挠·贰",
         "taskInfo": "名将擂台排名进入前50名",
-        "condition": 50,
+        "condition": 1,
         "taskReward": "17054&100",
         "point": 10
     }
diff --git a/shared/resource/jsons/dic_zyz_taskType.json b/shared/resource/jsons/dic_zyz_taskType.json
index d246fc8e7..38004b2c8 100644
--- a/shared/resource/jsons/dic_zyz_taskType.json
+++ b/shared/resource/jsons/dic_zyz_taskType.json
@@ -7,19 +7,7 @@
         "string": "天数",
         "content": "每天5点开始计算",
         "condition": "day",
-        "sumType": 1,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 1
     },
     {
         "id": 2,
@@ -29,19 +17,7 @@
         "string": "天数",
         "content": "每天5点开始计算；当某一天没有登录就会从1开始重新计算",
         "condition": "day",
-        "sumType": 1,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 1
     },
     {
         "id": 3,
@@ -51,19 +27,7 @@
         "string": "主公等级&",
         "content": 0,
         "condition": "lv",
-        "sumType": 1,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 1
     },
     {
         "id": 4,
@@ -73,19 +37,7 @@
         "string": "招募次数&",
         "content": "包括引导抽卡的次数；10连是算10次的",
         "condition": "count",
-        "sumType": 2,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 2
     },
     {
         "id": 5,
@@ -95,19 +47,7 @@
         "string": "武将数量&",
         "content": 0,
         "condition": "herocount",
-        "sumType": 1,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 1
     },
     {
         "id": 6,
@@ -117,19 +57,7 @@
         "string": "武将数量&升星次数&",
         "content": "星级上升了才算是1次；升彩星也是算入的；每个武将独立计算，以武将数为进度",
         "condition": "herocount",
-        "sumType": 2,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 2
     },
     {
         "id": 7,
@@ -139,19 +67,7 @@
         "string": "武将数量&品质&",
         "content": 0,
         "condition": "herocount",
-        "sumType": 1,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 1
     },
     {
         "id": 8,
@@ -161,19 +77,7 @@
         "string": "武将数量&品质&星级&",
         "content": "升至x星是只算普通升星的；品质是使用等号判断的，紫色的升星不能达成蓝色的条件",
         "condition": "herocount",
-        "sumType": 1,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 1
     },
     {
         "id": 9,
@@ -183,19 +87,7 @@
         "string": "武将数量&武将等级&",
         "content": 0,
         "condition": "herocount",
-        "sumType": 1,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 1
     },
     {
         "id": 10,
@@ -205,19 +97,7 @@
         "string": "武将数量&训练次数",
         "content": "每个点算是1次，不算升阶的那一次",
         "condition": "herocount",
-        "sumType": 2,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 2
     },
     {
         "id": 11,
@@ -227,19 +107,7 @@
         "string": "武将数量&",
         "content": "每个武将计算一次，一个武将升了10次品，进度也只算1次",
         "condition": "herocount",
-        "sumType": 2,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 2
     },
     {
         "id": 12,
@@ -249,19 +117,7 @@
         "string": "武将觉醒次数&",
         "content": "只计算从6星升到觉醒1星那一次",
         "condition": "herocount",
-        "sumType": 2,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 2
     },
     {
         "id": 13,
@@ -271,19 +127,7 @@
         "string": "训练次数",
         "content": "每个点算是1次，不算升阶的那一次；所有武将累积",
         "condition": "count",
-        "sumType": 2,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 2
     },
     {
         "id": 14,
@@ -293,19 +137,7 @@
         "string": "武将数量&进阶次数&",
         "content": "只算升阶的那次",
         "condition": "herocount",
-        "sumType": 2,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 2
     },
     {
         "id": 15,
@@ -315,19 +147,7 @@
         "string": "武将数量&好感度等级&",
         "content": 0,
         "condition": "herocount",
-        "sumType": 1,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 1
     },
     {
         "id": 16,
@@ -337,19 +157,7 @@
         "string": "激活次数&星级&",
         "content": "这个星级现在指的是dic_zyz_friend_ship表的level字段；用等号判断，高级无法替低级达成",
         "condition": "count",
-        "sumType": 2,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 2
     },
     {
         "id": 17,
@@ -359,19 +167,7 @@
         "string": "解锁的数量&",
         "content": 0,
         "condition": "count",
-        "sumType": 1,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 1
     },
     {
         "id": 18,
@@ -381,19 +177,7 @@
         "string": "放置武将数量&",
         "content": "放置后又取走进度会回退",
         "condition": "herocount",
-        "sumType": 1,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 1
     },
     {
         "id": 19,
@@ -403,19 +187,7 @@
         "string": "升到的爵位&",
         "content": "dic_zyz_title的id",
         "condition": "title",
-        "sumType": 1,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 1
     },
     {
         "id": 20,
@@ -425,19 +197,7 @@
         "string": "强化次数&",
         "content": "只算强化次数不算进阶的",
         "condition": "count",
-        "sumType": 2,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 2
     },
     {
         "id": 21,
@@ -447,19 +207,7 @@
         "string": "武将数量&",
         "content": "只算从没有激活到激活的那一次",
         "condition": "herocount",
-        "sumType": 1,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 1
     },
     {
         "id": 29,
@@ -469,19 +217,7 @@
         "string": "天数",
         "content": "未开发",
         "condition": "day",
-        "sumType": 1,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 1
     },
     {
         "id": 34,
@@ -491,19 +227,7 @@
         "string": "好友数量&",
         "content": "只算加上了的；加上又解除好友的进度会回退",
         "condition": "count",
-        "sumType": 1,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 1
     },
     {
         "id": 35,
@@ -513,19 +237,7 @@
         "string": "赠送次数&",
         "content": 0,
         "condition": "count",
-        "sumType": 2,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 2
     },
     {
         "id": 36,
@@ -535,19 +247,7 @@
         "string": "聊天频道type&发言次数&",
         "content": "chattype: 0-不限 2-世界 3-军团 4-寻宝队伍 5-私聊",
         "condition": "count",
-        "sumType": 2,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 2
     },
     {
         "id": 37,
@@ -557,19 +257,7 @@
         "string": "消耗体力数&",
         "content": "凡是消耗体力的都能触发，不过目前只有战斗消耗体力",
         "condition": "cost",
-        "sumType": 2,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 2
     },
     {
         "id": 38,
@@ -579,19 +267,7 @@
         "string": "武将id&挑战次数&填几个warid&关卡id&…",
         "content": "必须完成战斗且挑战胜利",
         "condition": "count",
-        "sumType": 2,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 2
     },
     {
         "id": 39,
@@ -601,19 +277,7 @@
         "string": "关卡id",
         "content": "只计算warType为1的关卡；必须挑战胜利才计算；计算扫荡；主线基金是算这个type的",
         "condition": "warcount",
-        "sumType": 2,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 2
     },
     {
         "id": 40,
@@ -623,19 +287,7 @@
         "string": "扫荡次数&",
         "content": "只计算warType为1的关卡；只计算扫荡；",
         "condition": "count",
-        "sumType": 2,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 2
     },
     {
         "id": 41,
@@ -645,19 +297,7 @@
         "string": "奇遇类型&次数&",
         "content": "eventType: 0-任意类型 1-宝箱 2-答题 3-战斗；需要到领取到奖励才算达成；不需要战斗胜利/答题正确；",
         "condition": "count",
-        "sumType": 2,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 2
     },
     {
         "id": 42,
@@ -667,19 +307,7 @@
         "string": "星级&通关次数&填几个warid&关卡id&…",
         "content": "star: 0-不限制星级 1~3-所需星级；只计算warType为4的关卡；必须挑战胜利且星级>=star才计算；不计算扫荡；",
         "condition": "count",
-        "sumType": 2,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 2
     },
     {
         "id": 43,
@@ -689,19 +317,7 @@
         "string": "每日类型&挑战次数&",
         "content": "dailytype: 0-不限制类型 1~4 dic_zyz_daily表的dailyType；只计算warType为4的关卡；必须挑战胜利；扫荡也算",
         "condition": "count",
-        "sumType": 2,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 2
     },
     {
         "id": 44,
@@ -711,19 +327,7 @@
         "string": "秘境挑战次数&",
         "content": "只计算warType为6或13的关卡；必须挑战胜利才计算；扫荡也算",
         "condition": "count",
-        "sumType": 2,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 2
     },
     {
         "id": 45,
@@ -733,19 +337,7 @@
         "string": "填几个warid&关卡id&…",
         "content": "只计算warType为6或13的关卡；必须挑战胜利才计算；扫荡也算",
         "condition": "warcount",
-        "sumType": 1,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 1
     },
     {
         "id": 46,
@@ -755,19 +347,7 @@
         "string": "镇念塔层数",
         "content": "战斗胜利升到下一层或跳过层数时候会达成",
         "condition": "lv",
-        "sumType": 1,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 1
     },
     {
         "id": 47,
@@ -777,19 +357,7 @@
         "string": "通关次数&",
         "content": "只计算warType为8的关卡；必须挑战胜利才计算；扫荡也算",
         "condition": "count",
-        "sumType": 2,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 2
     },
     {
         "id": 48,
@@ -799,19 +367,7 @@
         "string": "挑战次数&",
         "content": "只计算warType为2的关卡；必须挑战胜利才计算；扫荡也算",
         "condition": "count",
-        "sumType": 1,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 1
     },
     {
         "id": 49,
@@ -821,19 +377,7 @@
         "string": "远征次数&",
         "content": "只计算warType为5的关卡；必须挑战胜利才计算；扫荡也算",
         "condition": "count",
-        "sumType": 2,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 2
     },
     {
         "id": 50,
@@ -843,19 +387,7 @@
         "string": "领取次数&宝箱的积分&",
         "content": "point：领取宝箱消耗的点数",
         "condition": "warcount",
-        "sumType": 2,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 2
     },
     {
         "id": 51,
@@ -865,19 +397,7 @@
         "string": "创建队伍次数&",
         "content": "创建了队伍，匹配到别人了（只有自己一人不算，机器人算）；只要开始寻宝就算，中途强退也算",
         "condition": "count",
-        "sumType": 2,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 2
     },
     {
         "id": 53,
@@ -887,19 +407,7 @@
         "string": "协助寻宝次数&",
         "content": "一定靠匹配加入其他人的队伍，创建队伍不算；只要开始寻宝就算，中途强退也算",
         "condition": "count",
-        "sumType": 2,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 2
     },
     {
         "id": 54,
@@ -909,19 +417,7 @@
         "string": "寻宝次数&",
         "content": "创建队伍和匹配的都算；只要开始寻宝就算，中途强退也算",
         "condition": "count",
-        "sumType": 2,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 2
     },
     {
         "id": 57,
@@ -931,19 +427,7 @@
         "string": "pvp次数&",
         "content": "开始挑战就算",
         "condition": "count",
-        "sumType": 2,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 2
     },
     {
         "id": 58,
@@ -953,19 +437,7 @@
         "string": "pvp胜利次数&",
         "content": "必须挑战且结算胜利才算",
         "condition": "count",
-        "sumType": 2,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 2
     },
     {
         "id": 59,
@@ -975,19 +447,7 @@
         "string": "领取次数&",
         "content": 0,
         "condition": "count",
-        "sumType": 2,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 2
     },
     {
         "id": 60,
@@ -997,19 +457,7 @@
         "string": "连胜次数&",
         "content": "必须挑战且结算胜利才算；中途失败了会从1开始计数",
         "condition": "count",
-        "sumType": 1,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 1
     },
     {
         "id": 61,
@@ -1019,19 +467,7 @@
         "string": "武将数量&积分&",
         "content": "在挑战结算和赛季末结算的时候会计算武将数",
         "condition": "herocount",
-        "sumType": 1,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 1
     },
     {
         "id": 62,
@@ -1041,19 +477,7 @@
         "string": "排名&",
         "content": "赛季末结算时计算达成；只算最高的一次",
         "condition": "rank",
-        "sumType": 1,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 1
     },
     {
         "id": 63,
@@ -1063,19 +487,7 @@
         "string": "军团的官职&",
         "content": "每周军团结算的时候算达成；只算最高的一次",
         "condition": "job",
-        "sumType": 1,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 1
     },
     {
         "id": 64,
@@ -1085,19 +497,7 @@
         "string": "捐献次数&",
         "content": "军团捐献，不区分大中小都算1次",
         "condition": "count",
-        "sumType": 2,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 2
     },
     {
         "id": 65,
@@ -1107,19 +507,7 @@
         "string": "领取活跃宝箱次数&",
         "content": "领取一个箱子算一个箱子，不区分大中小都算1次",
         "condition": "count",
-        "sumType": 2,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 2
     },
     {
         "id": 67,
@@ -1129,19 +517,7 @@
         "string": "加速次数&",
         "content": "只计算协助加速的次数",
         "condition": "count",
-        "sumType": 2,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 2
     },
     {
         "id": 68,
@@ -1151,19 +527,7 @@
         "string": "压制次数&",
         "content": "军团练兵场挑战结算成功时计数；不需要达成度到100%，只要打了就有",
         "condition": "count",
-        "sumType": 2,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 2
     },
     {
         "id": 69,
@@ -1173,19 +537,7 @@
         "string": "挑战次数&",
         "content": "军团演武台只要开始挑战就计算，不需要胜利",
         "condition": "count",
-        "sumType": 2,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 2
     },
     {
         "id": 70,
@@ -1195,19 +547,7 @@
         "string": "挑战次数&",
         "content": "在军团练兵场挑战结算时计算，不需要胜利，但是是结算时候算",
         "condition": "count",
-        "sumType": 2,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 2
     },
     {
         "id": 71,
@@ -1217,19 +557,7 @@
         "string": "军团活动id&活动次数&",
         "content": "aid: 0.任意活动 1.蛮夷 2.诸侯 3.粮草；只需要开始参加就可以，蛮夷&诸侯-进入战场，粮草-加入木马",
         "condition": "count",
-        "sumType": 2,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 2
     },
     {
         "id": 72,
@@ -1239,19 +567,7 @@
         "string": "加入军团次数&",
         "content": "加入进军团后才能计算，只申请不算",
         "condition": "count",
-        "sumType": 1,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 1
     },
     {
         "id": 73,
@@ -1261,19 +577,7 @@
         "string": "关卡id",
         "content": 0,
         "condition": "warcount",
-        "sumType": 1,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 1
     },
     {
         "id": 74,
@@ -1283,19 +587,7 @@
         "string": "武将数量&武将初始品质&武将升级后品质",
         "content": 0,
         "condition": "herocount",
-        "sumType": 1,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 1
     },
     {
         "id": 75,
@@ -1305,19 +597,7 @@
         "string": "武将数量&武将初始品质",
         "content": 0,
         "condition": "herocount",
-        "sumType": 1,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 1
     },
     {
         "id": 76,
@@ -1327,19 +607,7 @@
         "string": "武将数量&星级",
         "content": 0,
         "condition": "herocount",
-        "sumType": 1,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 1
     },
     {
         "id": 79,
@@ -1349,19 +617,7 @@
         "string": "发生次数&关卡Id&",
         "content": 0,
         "condition": "count",
-        "sumType": 2,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 2
     },
     {
         "id": 80,
@@ -1371,19 +627,7 @@
         "string": "数量&阵营类型&",
         "content": 0,
         "condition": "count",
-        "sumType": 1,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 1
     },
     {
         "id": 81,
@@ -1393,19 +637,7 @@
         "string": "数量&武将品质&",
         "content": 0,
         "condition": "count",
-        "sumType": 2,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 2
     },
     {
         "id": 82,
@@ -1415,19 +647,7 @@
         "string": "次数&",
         "content": 0,
         "condition": "count",
-        "sumType": 1,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 1
     },
     {
         "id": 84,
@@ -1437,19 +657,7 @@
         "string": "武将数量",
         "content": 0,
         "condition": "herocount",
-        "sumType": 1,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 1
     },
     {
         "id": 86,
@@ -1459,19 +667,7 @@
         "string": "累计充值金额",
         "content": 0,
         "condition": "RMB",
-        "sumType": 1,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 1
     },
     {
         "id": 87,
@@ -1481,19 +677,7 @@
         "string": "装备数量&强化等级&",
         "content": 0,
         "condition": "equipcount",
-        "sumType": 1,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 1
     },
     {
         "id": 88,
@@ -1503,19 +687,7 @@
         "string": "装备数量&天晶品阶",
         "content": "必须同时镶嵌中，脱下再嵌不算",
         "condition": "equipcount",
-        "sumType": 1,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 1
     },
     {
         "id": 89,
@@ -1525,19 +697,7 @@
         "string": "装备数量&各镶嵌的地玉数量",
         "content": 0,
         "condition": "equipcount",
-        "sumType": 1,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 1
     },
     {
         "id": 90,
@@ -1547,19 +707,7 @@
         "string": "装备数量&装备星级",
         "content": 0,
         "condition": "equipcount",
-        "sumType": 1,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 1
     },
     {
         "id": 91,
@@ -1569,19 +717,7 @@
         "string": "装备数量&升星次数&",
         "content": 0,
         "condition": "equipcount",
-        "sumType": 1,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 1
     },
     {
         "id": 92,
@@ -1591,19 +727,7 @@
         "string": "武将数量&单名武将激活的套装词条数&",
         "content": 0,
         "condition": "herocount",
-        "sumType": 1,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 1
     },
     {
         "id": 93,
@@ -1613,19 +737,7 @@
         "string": "装备数量&",
         "content": 0,
         "condition": "equipcount",
-        "sumType": 1,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 1
     },
     {
         "id": 94,
@@ -1635,19 +747,7 @@
         "string": "升品次数",
         "content": 0,
         "condition": "count",
-        "sumType": 2,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 2
     },
     {
         "id": 95,
@@ -1657,19 +757,7 @@
         "string": "装备数量&装备品质&",
         "content": 0,
         "condition": "equipcount",
-        "sumType": 1,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 1
     },
     {
         "id": 96,
@@ -1679,19 +767,7 @@
         "string": "装备数量&",
         "content": 0,
         "condition": "equipcount",
-        "sumType": 1,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 1
     },
     {
         "id": 97,
@@ -1701,19 +777,7 @@
         "string": "武将数量&单名武将装备的装备数量&",
         "content": 0,
         "condition": "herocount",
-        "sumType": 1,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 1
     },
     {
         "id": 98,
@@ -1723,19 +787,7 @@
         "string": "强化次数",
         "content": 0,
         "condition": "count",
-        "sumType": 2,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 2
     },
     {
         "id": 99,
@@ -1745,19 +797,7 @@
         "string": "装备数量",
         "content": 0,
         "condition": "count",
-        "sumType": 1,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 1
     },
     {
         "id": 100,
@@ -1767,19 +807,7 @@
         "string": "装备数量",
         "content": 0,
         "condition": "count",
-        "sumType": 1,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 1
     },
     {
         "id": 101,
@@ -1789,19 +817,7 @@
         "string": "地玉数量",
         "content": 0,
         "condition": "count",
-        "sumType": 1,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 1
     },
     {
         "id": 102,
@@ -1811,19 +827,7 @@
         "string": "装备数量&单件装备地玉数量&地玉品阶",
         "content": 0,
         "condition": "equipcount",
-        "sumType": 1,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 1
     },
     {
         "id": 103,
@@ -1833,19 +837,7 @@
         "string": "天晶数量&词条数量",
         "content": 0,
         "condition": "count",
-        "sumType": 1,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 1
     },
     {
         "id": 104,
@@ -1855,19 +847,7 @@
         "string": "地玉合成次数",
         "content": 0,
         "condition": "count",
-        "sumType": 2,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 2
     },
     {
         "id": 105,
@@ -1877,19 +857,7 @@
         "string": "天晶洗炼次数",
         "content": 0,
         "condition": "count",
-        "sumType": 2,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 2
     },
     {
         "id": 106,
@@ -1899,19 +867,7 @@
         "string": "天晶淬炼次数",
         "content": 0,
         "condition": "count",
-        "sumType": 2,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 2
     },
     {
         "id": 107,
@@ -1921,19 +877,7 @@
         "string": "天晶淬炼成功次数",
         "content": 0,
         "condition": "count",
-        "sumType": 2,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 2
     },
     {
         "id": 108,
@@ -1943,19 +887,7 @@
         "string": "天晶藏宝图品级&次数&",
         "content": "创建了队伍，匹配到人了，并进去挑战了才算一次",
         "condition": "count",
-        "sumType": 2,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 2
     },
     {
         "id": 109,
@@ -1965,19 +897,7 @@
         "string": "天晶品级&次数&",
         "content": 0,
         "condition": "count",
-        "sumType": 2,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 2
     },
     {
         "id": 110,
@@ -1987,19 +907,7 @@
         "string": "升星次数&",
         "content": 0,
         "condition": "count",
-        "sumType": 2,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 2
     },
     {
         "id": 111,
@@ -2009,19 +917,7 @@
         "string": "挑战主线次数",
         "content": "进入战场点击挑战即算次数",
         "condition": "warcount",
-        "sumType": 2,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 2
     },
     {
         "id": 112,
@@ -2031,19 +927,7 @@
         "string": "挑战镇念塔次数",
         "content": "进入战场点击挑战即算次数",
         "condition": "warcount",
-        "sumType": 2,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 2
     },
     {
         "id": 113,
@@ -2053,19 +937,7 @@
         "string": "挑战遗迹次数",
         "content": "进入战场点击挑战即算次数",
         "condition": "warcount",
-        "sumType": 1,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 1
     },
     {
         "id": 114,
@@ -2075,19 +947,7 @@
         "string": "每日类型&挑战次数&",
         "content": "dailytype: 0-不限制类型 1~4 dic_zyz_daily表的dailyType；只计算warType为4的关卡；进入战场点击挑战即算次数",
         "condition": "warcount",
-        "sumType": 2,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 2
     },
     {
         "id": 115,
@@ -2097,19 +957,7 @@
         "string": "创建队伍次数&",
         "content": "创建了队伍，匹配到别人了（只有自己一人不算，机器人算）；胜利结算才算次数",
         "condition": "count",
-        "sumType": 2,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 2
     },
     {
         "id": 116,
@@ -2119,19 +967,7 @@
         "string": "协助寻宝次数&",
         "content": "一定靠匹配加入其他人的队伍，创建队伍不算；胜利结算才算次数",
         "condition": "count",
-        "sumType": 2,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 2
     },
     {
         "id": 117,
@@ -2141,19 +977,7 @@
         "string": "寻宝次数&",
         "content": "创建队伍和匹配的都算；胜利结算才算次数",
         "condition": "count",
-        "sumType": 2,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 2
     },
     {
         "id": 118,
@@ -2163,19 +987,7 @@
         "string": "挑战次数&",
         "content": "进入战场点击挑战即算次数",
         "condition": "count",
-        "sumType": 2,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 2
     },
     {
         "id": 119,
@@ -2185,19 +997,7 @@
         "string": "挑战次数&",
         "content": "进入战场点击挑战即算次数",
         "condition": "count",
-        "sumType": 2,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 2
     },
     {
         "id": 120,
@@ -2207,19 +1007,7 @@
         "string": "捐献次数&",
         "content": "只算有元宝的捐献",
         "condition": "count",
-        "sumType": 2,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 2
     },
     {
         "id": 121,
@@ -2229,19 +1017,7 @@
         "string": "挑战次数&",
         "content": "含扫荡（扣挑战次数就算）",
         "condition": "count",
-        "sumType": 2,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 2
     },
     {
         "id": 122,
@@ -2251,41 +1027,17 @@
         "string": "胜利次数&",
         "content": "含扫荡",
         "condition": "count",
-        "sumType": 2,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 2
     },
     {
         "id": 123,
         "name": "名将擂台",
         "info": "名将擂台排名进入前X名",
-        "param": "rank&",
-        "string": "名次&",
+        "param": "rank&count&",
+        "string": "名次&条件",
         "content": 0,
-        "condition": "rank",
-        "sumType": 1,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "condition": "count",
+        "sumType": 1
     },
     {
         "id": 124,
@@ -2295,19 +1047,7 @@
         "string": "等级&",
         "content": 0,
         "condition": "level&",
-        "sumType": 1,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 1
     },
     {
         "id": 125,
@@ -2317,18 +1057,6 @@
         "string": "等级&",
         "content": 0,
         "condition": "level&",
-        "sumType": 1,
-        "__EMPTY": 0,
-        "__EMPTY_1": 0,
-        "__EMPTY_2": 0,
-        "__EMPTY_3": 0,
-        "__EMPTY_4": 0,
-        "__EMPTY_5": 0,
-        "__EMPTY_6": 0,
-        "__EMPTY_7": 0,
-        "__EMPTY_8": 0,
-        "__EMPTY_9": 0,
-        "__EMPTY_10": 0,
-        "__EMPTY_11": 0
+        "sumType": 1
     }
 ]
\ No newline at end of file