From 77e6c3ba8e40ac64c7417b869c435500f61177aa Mon Sep 17 00:00:00 2001
From: luying <luying@bantus.cn>
Date: Wed, 18 May 2022 21:41:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=82=E6=95=B0=E8=A1=A8=EF=BC=9A=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=AF=BB=E5=AE=9D=E6=AC=A1=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 game-server/app/services/comBattleService.ts  |  61 ------
 shared/pubUtils/dicParam.ts                   |   4 +-
 .../resource/jsons/dic_zyz_gk_armyboss.json   | 182 +++++++++---------
 3 files changed, 93 insertions(+), 154 deletions(-)

diff --git a/game-server/app/services/comBattleService.ts b/game-server/app/services/comBattleService.ts
index e862f1453..bb6a5089b 100644
--- a/game-server/app/services/comBattleService.ts
+++ b/game-server/app/services/comBattleService.ts
@@ -360,67 +360,6 @@ export function setDismissTimer(teamStatus: MemComBtlTeam, teamMap: Map<string,
     }
 }
 
-function initEquipPrintDropData(roleId: string, roleName: string) {
-    let result: EquipPrintDropType = new EquipPrintDropModel().toJSON();
-    result.roleId = roleId;
-    result.roleName = roleName;
-    result.capTarget = getRandValueByMinMax(1, TREASURE.CAPTAIN_DROP, 0);
-    result.teammateTarget = getRandValueByMinMax(1, TREASURE.TEAMMATE_DROP, 0);
-    return result;
-}
-
-function incEquipPrintDropData(roleSt: RoleStatus, dropRec: EquipPrintDropType) {
-    const { isCap } = roleSt;
-    let dropResult = false;
-    if (isCap === true) {
-        dropRec.capAll += 1;
-        dropRec.capCur += 1;
-        if (dropRec.capCur > TREASURE.CAPTAIN_DROP) {
-            dropRec.capCur = 1;
-            dropRec.capTarget = getRandValueByMinMax(1, TREASURE.CAPTAIN_DROP, 0);
-        }
-        if (dropRec.capCur === dropRec.capTarget) {
-            dropResult = true;
-            dropRec.capDropAll += 1;
-        }
-    } else {
-        dropRec.teammateAll += 1;
-        dropRec.teammateCur += 1;
-        if (dropRec.teammateCur > TREASURE.TEAMMATE_DROP) {
-            dropRec.teammateCur = 1;
-            dropRec.teammateTarget = getRandValueByMinMax(1, TREASURE.TEAMMATE_DROP, 0);
-        }
-        if (dropRec.teammateCur === dropRec.teammateTarget) {
-            dropResult = true;
-            dropRec.teammateDropAll += 1;
-        }
-    }
-    return dropResult;
-}
-
-// export async function incEquipPrintDrop(roleSt: RoleStatus) {
-//     const { roleId, roleName } = roleSt;
-//     let dropRec = await EquipPrintDropModel.getByRoleId(roleId);
-//     if (!dropRec) {
-//         dropRec = await EquipPrintDropModel.createDoc(initEquipPrintDropData(roleId, roleName));
-//     }
-
-//     const dropResult = incEquipPrintDropData(roleSt, dropRec);
-//     dropRec = await EquipPrintDropModel.updateDoc(roleId, omit(dropRec, ['_id', 'createdAt', 'updatedAt']));
-//     return { dropResult, dropRec };
-// }
-
-// export function randEquipPrintId(warInfo: DicWar) {
-//     if (!warInfo || !warInfo.jackpotReward) {
-//         return null;
-//     }
-//     const result = getRandEelmWithWeight(warInfo.jackpotReward);
-//     if (!result || !result.dic || !result.dic.id) {
-//         return null;
-//     }
-//     return result.dic.id;
-// }
-
 /**
  * 按照好友关系，新增加成
  * 
diff --git a/shared/pubUtils/dicParam.ts b/shared/pubUtils/dicParam.ts
index aa51f92b6..45156fb5d 100644
--- a/shared/pubUtils/dicParam.ts
+++ b/shared/pubUtils/dicParam.ts
@@ -63,8 +63,8 @@ export const ARMY = {
 export const TREASURE = {
   CAPTAIN_DROP: 5, // 普通套装图纸队长必掉落次数
   TEAMMATE_DROP: 10, // 普通套装图纸队员必掉落次数
-  TREASURE_ASSIST_LIMITED: '1&1&999|2&20&999|3&30&999|4&40&999|5&50&999|6&60&999|7&70&999|8&80&999|9&90&999', // 协助寻宝星级开启玩家等级限制
-  TREASURE_ASSIST_TIME: 6, // 协助寻宝总次数
+  TREASURE_ASSIST_LIMITED: '1&20&100|2&30&100|3&40&100|4&50&100|5&60&100|6&70&100|7&80&100|8&90&100|9&90&100', // 协助寻宝星级开启玩家等级限制
+  TREASURE_ASSIST_TIME: 3, // 协助寻宝总次数
 };
 export const FRIEND = {
   FRIEND_CLOSEPOINT_ADD: 5, // 每赠送/领取一次增加的亲密度
diff --git a/shared/resource/jsons/dic_zyz_gk_armyboss.json b/shared/resource/jsons/dic_zyz_gk_armyboss.json
index 4e3b859f7..bdc019690 100644
--- a/shared/resource/jsons/dic_zyz_gk_armyboss.json
+++ b/shared/resource/jsons/dic_zyz_gk_armyboss.json
@@ -6,7 +6,7 @@
         "bg_img": 9213,
         "mapid": 9213,
         "warType": 20,
-        "gk_name": "10级血煞张角",
+        "gk_name": "演武台BOSS&10级血煞张角",
         "secondAttrLevel": 1,
         "level": 10,
         "lvLimted": 1,
@@ -26,7 +26,7 @@
         "bg_img": 224,
         "mapid": 224,
         "warType": 20,
-        "gk_name": "10级魔化董卓",
+        "gk_name": "演武台BOSS&10级魔化董卓",
         "secondAttrLevel": 1,
         "level": 10,
         "lvLimted": 1,
@@ -46,7 +46,7 @@
         "bg_img": 2533,
         "mapid": 2533,
         "warType": 20,
-        "gk_name": "10级东岳帝像",
+        "gk_name": "演武台BOSS&10级东岳帝像",
         "secondAttrLevel": 1,
         "level": 10,
         "lvLimted": 1,
@@ -66,7 +66,7 @@
         "bg_img": 2543,
         "mapid": 2543,
         "warType": 20,
-        "gk_name": "10级狼灵萨满",
+        "gk_name": "演武台BOSS&10级狼灵萨满",
         "secondAttrLevel": 1,
         "level": 10,
         "lvLimted": 1,
@@ -86,7 +86,7 @@
         "bg_img": 2553,
         "mapid": 2553,
         "warType": 20,
-        "gk_name": "10级仲帝妄语",
+        "gk_name": "演武台BOSS&10级仲帝妄语",
         "secondAttrLevel": 1,
         "level": 10,
         "lvLimted": 1,
@@ -106,7 +106,7 @@
         "bg_img": 9263,
         "mapid": 9263,
         "warType": 20,
-        "gk_name": "10级不动明王",
+        "gk_name": "演武台BOSS&10级不动明王",
         "secondAttrLevel": 1,
         "level": 10,
         "lvLimted": 1,
@@ -126,7 +126,7 @@
         "bg_img": 2573,
         "mapid": 2573,
         "warType": 20,
-        "gk_name": "10级蜘蛛女王",
+        "gk_name": "演武台BOSS&10级蜘蛛女王",
         "secondAttrLevel": 1,
         "level": 10,
         "lvLimted": 1,
@@ -146,7 +146,7 @@
         "bg_img": 2523,
         "mapid": 2523,
         "warType": 20,
-        "gk_name": "10级何太后",
+        "gk_name": "演武台BOSS&10级何太后",
         "secondAttrLevel": 1,
         "level": 10,
         "lvLimted": 1,
@@ -156,7 +156,7 @@
         "bossSkill": "32050111&32050121&32050131",
         "heroId": 3205,
         "needPrepare": 1,
-        "gkInfo": "被董卓凌虐而死，胸怀无数怨愤，对儿子的期许，对兄长的失望……\r\n这一切都在陵墓被贾诩打开后化为了复仇的动力。",
+        "gkInfo": "被董卓凌虐而死，胸怀无数怨愤，对儿子的期许，对兄长的失望……\n这一切都在陵墓被贾诩打开后化为了复仇的动力。",
         "HeroNum": "1&6"
     },
     {
@@ -166,7 +166,7 @@
         "bg_img": 9213,
         "mapid": 9213,
         "warType": 20,
-        "gk_name": "20级血煞张角",
+        "gk_name": "演武台BOSS&20级血煞张角",
         "secondAttrLevel": 1,
         "level": 20,
         "lvLimted": 1,
@@ -186,7 +186,7 @@
         "bg_img": 224,
         "mapid": 224,
         "warType": 20,
-        "gk_name": "20级魔化董卓",
+        "gk_name": "演武台BOSS&20级魔化董卓",
         "secondAttrLevel": 1,
         "level": 20,
         "lvLimted": 1,
@@ -206,7 +206,7 @@
         "bg_img": 2533,
         "mapid": 2533,
         "warType": 20,
-        "gk_name": "20级东岳帝像",
+        "gk_name": "演武台BOSS&20级东岳帝像",
         "secondAttrLevel": 1,
         "level": 20,
         "lvLimted": 1,
@@ -226,7 +226,7 @@
         "bg_img": 2543,
         "mapid": 2543,
         "warType": 20,
-        "gk_name": "20级狼灵萨满",
+        "gk_name": "演武台BOSS&20级狼灵萨满",
         "secondAttrLevel": 1,
         "level": 20,
         "lvLimted": 1,
@@ -241,12 +241,12 @@
     },
     {
         "war_id": 8013,
-        "script_id": "&",
+        "script_id": "S_8005",
         "dispatchJsonId": 8005,
         "bg_img": 2553,
         "mapid": 2553,
         "warType": 20,
-        "gk_name": "20级袁术",
+        "gk_name": "演武台BOSS&20级袁术",
         "secondAttrLevel": 1,
         "level": 20,
         "lvLimted": 1,
@@ -266,7 +266,7 @@
         "bg_img": 9263,
         "mapid": 9263,
         "warType": 20,
-        "gk_name": "20级不动明王",
+        "gk_name": "演武台BOSS&20级不动明王",
         "secondAttrLevel": 1,
         "level": 20,
         "lvLimted": 1,
@@ -286,7 +286,7 @@
         "bg_img": 2573,
         "mapid": 2573,
         "warType": 20,
-        "gk_name": "20级蜘蛛女王",
+        "gk_name": "演武台BOSS&20级蜘蛛女王",
         "secondAttrLevel": 1,
         "level": 20,
         "lvLimted": 1,
@@ -306,7 +306,7 @@
         "bg_img": 2523,
         "mapid": 2523,
         "warType": 20,
-        "gk_name": "20级何太后",
+        "gk_name": "演武台BOSS&20级何太后",
         "secondAttrLevel": 1,
         "level": 20,
         "lvLimted": 1,
@@ -316,7 +316,7 @@
         "bossSkill": "32050111&32050121&32050131",
         "heroId": 3205,
         "needPrepare": 1,
-        "gkInfo": "被董卓凌虐而死，胸怀无数怨愤，对儿子的期许，对兄长的失望……\r\n这一切都在陵墓被贾诩打开后化为了复仇的动力。",
+        "gkInfo": "被董卓凌虐而死，胸怀无数怨愤，对儿子的期许，对兄长的失望……\n这一切都在陵墓被贾诩打开后化为了复仇的动力。",
         "HeroNum": "1&6"
     },
     {
@@ -326,7 +326,7 @@
         "bg_img": 9213,
         "mapid": 9213,
         "warType": 20,
-        "gk_name": "30级血煞张角",
+        "gk_name": "演武台BOSS&30级血煞张角",
         "secondAttrLevel": 2,
         "level": 30,
         "lvLimted": 1,
@@ -346,7 +346,7 @@
         "bg_img": 224,
         "mapid": 224,
         "warType": 20,
-        "gk_name": "30级魔化董卓",
+        "gk_name": "演武台BOSS&30级魔化董卓",
         "secondAttrLevel": 2,
         "level": 30,
         "lvLimted": 1,
@@ -366,7 +366,7 @@
         "bg_img": 2533,
         "mapid": 2533,
         "warType": 20,
-        "gk_name": "30级东岳帝像",
+        "gk_name": "演武台BOSS&30级东岳帝像",
         "secondAttrLevel": 2,
         "level": 30,
         "lvLimted": 1,
@@ -386,7 +386,7 @@
         "bg_img": 2543,
         "mapid": 2543,
         "warType": 20,
-        "gk_name": "30级狼灵萨满",
+        "gk_name": "演武台BOSS&30级狼灵萨满",
         "secondAttrLevel": 2,
         "level": 30,
         "lvLimted": 1,
@@ -406,7 +406,7 @@
         "bg_img": 2553,
         "mapid": 2553,
         "warType": 20,
-        "gk_name": "30级袁术",
+        "gk_name": "演武台BOSS&30级袁术",
         "secondAttrLevel": 2,
         "level": 30,
         "lvLimted": 1,
@@ -426,7 +426,7 @@
         "bg_img": 9263,
         "mapid": 9263,
         "warType": 20,
-        "gk_name": "30级不动明王",
+        "gk_name": "演武台BOSS&30级不动明王",
         "secondAttrLevel": 2,
         "level": 30,
         "lvLimted": 1,
@@ -446,7 +446,7 @@
         "bg_img": 2573,
         "mapid": 2573,
         "warType": 20,
-        "gk_name": "30级蜘蛛女王",
+        "gk_name": "演武台BOSS&30级蜘蛛女王",
         "secondAttrLevel": 2,
         "level": 30,
         "lvLimted": 1,
@@ -466,7 +466,7 @@
         "bg_img": 2523,
         "mapid": 2523,
         "warType": 20,
-        "gk_name": "30级何太后",
+        "gk_name": "演武台BOSS&30级何太后",
         "secondAttrLevel": 2,
         "level": 30,
         "lvLimted": 1,
@@ -476,7 +476,7 @@
         "bossSkill": "32050111&32050121&32050131",
         "heroId": 3205,
         "needPrepare": 1,
-        "gkInfo": "被董卓凌虐而死，胸怀无数怨愤，对儿子的期许，对兄长的失望……\r\n这一切都在陵墓被贾诩打开后化为了复仇的动力。",
+        "gkInfo": "被董卓凌虐而死，胸怀无数怨愤，对儿子的期许，对兄长的失望……\n这一切都在陵墓被贾诩打开后化为了复仇的动力。",
         "HeroNum": "1&6"
     },
     {
@@ -486,7 +486,7 @@
         "bg_img": 9213,
         "mapid": 9213,
         "warType": 20,
-        "gk_name": "40级血煞张角",
+        "gk_name": "演武台BOSS&40级血煞张角",
         "secondAttrLevel": 3,
         "level": 40,
         "lvLimted": 1,
@@ -506,7 +506,7 @@
         "bg_img": 224,
         "mapid": 224,
         "warType": 20,
-        "gk_name": "40级魔化董卓",
+        "gk_name": "演武台BOSS&40级魔化董卓",
         "secondAttrLevel": 3,
         "level": 40,
         "lvLimted": 1,
@@ -526,7 +526,7 @@
         "bg_img": 2533,
         "mapid": 2533,
         "warType": 20,
-        "gk_name": "40级东岳帝像",
+        "gk_name": "演武台BOSS&40级东岳帝像",
         "secondAttrLevel": 3,
         "level": 40,
         "lvLimted": 1,
@@ -546,7 +546,7 @@
         "bg_img": 2543,
         "mapid": 2543,
         "warType": 20,
-        "gk_name": "40级狼灵萨满",
+        "gk_name": "演武台BOSS&40级狼灵萨满",
         "secondAttrLevel": 3,
         "level": 40,
         "lvLimted": 1,
@@ -566,7 +566,7 @@
         "bg_img": 2553,
         "mapid": 2553,
         "warType": 20,
-        "gk_name": "40级袁术",
+        "gk_name": "演武台BOSS&40级袁术",
         "secondAttrLevel": 3,
         "level": 40,
         "lvLimted": 1,
@@ -586,7 +586,7 @@
         "bg_img": 9263,
         "mapid": 9263,
         "warType": 20,
-        "gk_name": "40级不动明王",
+        "gk_name": "演武台BOSS&40级不动明王",
         "secondAttrLevel": 3,
         "level": 40,
         "lvLimted": 1,
@@ -606,7 +606,7 @@
         "bg_img": 2573,
         "mapid": 2573,
         "warType": 20,
-        "gk_name": "40级蜘蛛女王",
+        "gk_name": "演武台BOSS&40级蜘蛛女王",
         "secondAttrLevel": 3,
         "level": 40,
         "lvLimted": 1,
@@ -626,7 +626,7 @@
         "bg_img": 2523,
         "mapid": 2523,
         "warType": 20,
-        "gk_name": "40级何太后",
+        "gk_name": "演武台BOSS&40级何太后",
         "secondAttrLevel": 3,
         "level": 40,
         "lvLimted": 1,
@@ -636,7 +636,7 @@
         "bossSkill": "32050111&32050121&32050131",
         "heroId": 3205,
         "needPrepare": 1,
-        "gkInfo": "被董卓凌虐而死，胸怀无数怨愤，对儿子的期许，对兄长的失望……\r\n这一切都在陵墓被贾诩打开后化为了复仇的动力。",
+        "gkInfo": "被董卓凌虐而死，胸怀无数怨愤，对儿子的期许，对兄长的失望……\n这一切都在陵墓被贾诩打开后化为了复仇的动力。",
         "HeroNum": "1&6"
     },
     {
@@ -646,7 +646,7 @@
         "bg_img": 9213,
         "mapid": 9213,
         "warType": 20,
-        "gk_name": "50级血煞张角",
+        "gk_name": "演武台BOSS&50级血煞张角",
         "secondAttrLevel": 4,
         "level": 50,
         "lvLimted": 1,
@@ -666,7 +666,7 @@
         "bg_img": 224,
         "mapid": 224,
         "warType": 20,
-        "gk_name": "50级魔化董卓",
+        "gk_name": "演武台BOSS&50级魔化董卓",
         "secondAttrLevel": 4,
         "level": 50,
         "lvLimted": 1,
@@ -686,7 +686,7 @@
         "bg_img": 2533,
         "mapid": 2533,
         "warType": 20,
-        "gk_name": "50级东岳帝像",
+        "gk_name": "演武台BOSS&50级东岳帝像",
         "secondAttrLevel": 4,
         "level": 50,
         "lvLimted": 1,
@@ -706,7 +706,7 @@
         "bg_img": 2543,
         "mapid": 2543,
         "warType": 20,
-        "gk_name": "50级狼灵萨满",
+        "gk_name": "演武台BOSS&50级狼灵萨满",
         "secondAttrLevel": 4,
         "level": 50,
         "lvLimted": 1,
@@ -726,7 +726,7 @@
         "bg_img": 2553,
         "mapid": 2553,
         "warType": 20,
-        "gk_name": "50级袁术",
+        "gk_name": "演武台BOSS&50级袁术",
         "secondAttrLevel": 4,
         "level": 50,
         "lvLimted": 1,
@@ -746,7 +746,7 @@
         "bg_img": 9263,
         "mapid": 9263,
         "warType": 20,
-        "gk_name": "50级不动明王",
+        "gk_name": "演武台BOSS&50级不动明王",
         "secondAttrLevel": 4,
         "level": 50,
         "lvLimted": 1,
@@ -766,7 +766,7 @@
         "bg_img": 2573,
         "mapid": 2573,
         "warType": 20,
-        "gk_name": "50级蜘蛛女王",
+        "gk_name": "演武台BOSS&50级蜘蛛女王",
         "secondAttrLevel": 4,
         "level": 50,
         "lvLimted": 1,
@@ -786,7 +786,7 @@
         "bg_img": 2523,
         "mapid": 2523,
         "warType": 20,
-        "gk_name": "50级何太后",
+        "gk_name": "演武台BOSS&50级何太后",
         "secondAttrLevel": 4,
         "level": 50,
         "lvLimted": 1,
@@ -796,7 +796,7 @@
         "bossSkill": "32050111&32050121&32050131",
         "heroId": 3205,
         "needPrepare": 1,
-        "gkInfo": "被董卓凌虐而死，胸怀无数怨愤，对儿子的期许，对兄长的失望……\r\n这一切都在陵墓被贾诩打开后化为了复仇的动力。",
+        "gkInfo": "被董卓凌虐而死，胸怀无数怨愤，对儿子的期许，对兄长的失望……\n这一切都在陵墓被贾诩打开后化为了复仇的动力。",
         "HeroNum": "1&6"
     },
     {
@@ -806,7 +806,7 @@
         "bg_img": 9213,
         "mapid": 9213,
         "warType": 20,
-        "gk_name": "60级血煞张角",
+        "gk_name": "演武台BOSS&60级血煞张角",
         "secondAttrLevel": 5,
         "level": 60,
         "lvLimted": 1,
@@ -826,7 +826,7 @@
         "bg_img": 224,
         "mapid": 224,
         "warType": 20,
-        "gk_name": "60级魔化董卓",
+        "gk_name": "演武台BOSS&60级魔化董卓",
         "secondAttrLevel": 5,
         "level": 60,
         "lvLimted": 1,
@@ -846,7 +846,7 @@
         "bg_img": 2533,
         "mapid": 2533,
         "warType": 20,
-        "gk_name": "60级东岳帝像",
+        "gk_name": "演武台BOSS&60级东岳帝像",
         "secondAttrLevel": 5,
         "level": 60,
         "lvLimted": 1,
@@ -866,7 +866,7 @@
         "bg_img": 2543,
         "mapid": 2543,
         "warType": 20,
-        "gk_name": "60级狼灵萨满",
+        "gk_name": "演武台BOSS&60级狼灵萨满",
         "secondAttrLevel": 5,
         "level": 60,
         "lvLimted": 1,
@@ -886,7 +886,7 @@
         "bg_img": 2553,
         "mapid": 2553,
         "warType": 20,
-        "gk_name": "60级袁术",
+        "gk_name": "演武台BOSS&60级袁术",
         "secondAttrLevel": 5,
         "level": 60,
         "lvLimted": 1,
@@ -906,7 +906,7 @@
         "bg_img": 9263,
         "mapid": 9263,
         "warType": 20,
-        "gk_name": "60级不动明王",
+        "gk_name": "演武台BOSS&60级不动明王",
         "secondAttrLevel": 5,
         "level": 60,
         "lvLimted": 1,
@@ -926,7 +926,7 @@
         "bg_img": 2573,
         "mapid": 2573,
         "warType": 20,
-        "gk_name": "60级蜘蛛女王",
+        "gk_name": "演武台BOSS&60级蜘蛛女王",
         "secondAttrLevel": 5,
         "level": 60,
         "lvLimted": 1,
@@ -946,7 +946,7 @@
         "bg_img": 2523,
         "mapid": 2523,
         "warType": 20,
-        "gk_name": "60级何太后",
+        "gk_name": "演武台BOSS&60级何太后",
         "secondAttrLevel": 5,
         "level": 60,
         "lvLimted": 1,
@@ -956,7 +956,7 @@
         "bossSkill": "32050111&32050121&32050131",
         "heroId": 3205,
         "needPrepare": 1,
-        "gkInfo": "被董卓凌虐而死，胸怀无数怨愤，对儿子的期许，对兄长的失望……\r\n这一切都在陵墓被贾诩打开后化为了复仇的动力。",
+        "gkInfo": "被董卓凌虐而死，胸怀无数怨愤，对儿子的期许，对兄长的失望……\n这一切都在陵墓被贾诩打开后化为了复仇的动力。",
         "HeroNum": "1&6"
     },
     {
@@ -966,7 +966,7 @@
         "bg_img": 9213,
         "mapid": 9213,
         "warType": 20,
-        "gk_name": "70级血煞张角",
+        "gk_name": "演武台BOSS&70级血煞张角",
         "secondAttrLevel": 6,
         "level": 70,
         "lvLimted": 1,
@@ -986,7 +986,7 @@
         "bg_img": 224,
         "mapid": 224,
         "warType": 20,
-        "gk_name": "70级魔化董卓",
+        "gk_name": "演武台BOSS&70级魔化董卓",
         "secondAttrLevel": 6,
         "level": 70,
         "lvLimted": 1,
@@ -1006,7 +1006,7 @@
         "bg_img": 2533,
         "mapid": 2533,
         "warType": 20,
-        "gk_name": "70级东岳帝像",
+        "gk_name": "演武台BOSS&70级东岳帝像",
         "secondAttrLevel": 6,
         "level": 70,
         "lvLimted": 1,
@@ -1026,7 +1026,7 @@
         "bg_img": 2543,
         "mapid": 2543,
         "warType": 20,
-        "gk_name": "70级狼灵萨满",
+        "gk_name": "演武台BOSS&70级狼灵萨满",
         "secondAttrLevel": 6,
         "level": 70,
         "lvLimted": 1,
@@ -1046,7 +1046,7 @@
         "bg_img": 2553,
         "mapid": 2553,
         "warType": 20,
-        "gk_name": "70级袁术",
+        "gk_name": "演武台BOSS&70级袁术",
         "secondAttrLevel": 6,
         "level": 70,
         "lvLimted": 1,
@@ -1066,7 +1066,7 @@
         "bg_img": 9263,
         "mapid": 9263,
         "warType": 20,
-        "gk_name": "70级不动明王",
+        "gk_name": "演武台BOSS&70级不动明王",
         "secondAttrLevel": 6,
         "level": 70,
         "lvLimted": 1,
@@ -1086,7 +1086,7 @@
         "bg_img": 2573,
         "mapid": 2573,
         "warType": 20,
-        "gk_name": "70级蜘蛛女王",
+        "gk_name": "演武台BOSS&70级蜘蛛女王",
         "secondAttrLevel": 6,
         "level": 70,
         "lvLimted": 1,
@@ -1106,7 +1106,7 @@
         "bg_img": 2523,
         "mapid": 2523,
         "warType": 20,
-        "gk_name": "70级何太后",
+        "gk_name": "演武台BOSS&70级何太后",
         "secondAttrLevel": 6,
         "level": 70,
         "lvLimted": 1,
@@ -1116,7 +1116,7 @@
         "bossSkill": "32050111&32050121&32050131",
         "heroId": 3205,
         "needPrepare": 1,
-        "gkInfo": "被董卓凌虐而死，胸怀无数怨愤，对儿子的期许，对兄长的失望……\r\n这一切都在陵墓被贾诩打开后化为了复仇的动力。",
+        "gkInfo": "被董卓凌虐而死，胸怀无数怨愤，对儿子的期许，对兄长的失望……\n这一切都在陵墓被贾诩打开后化为了复仇的动力。",
         "HeroNum": "1&6"
     },
     {
@@ -1126,7 +1126,7 @@
         "bg_img": 9213,
         "mapid": 9213,
         "warType": 20,
-        "gk_name": "80级血煞张角",
+        "gk_name": "演武台BOSS&80级血煞张角",
         "secondAttrLevel": 7,
         "level": 80,
         "lvLimted": 1,
@@ -1146,7 +1146,7 @@
         "bg_img": 224,
         "mapid": 224,
         "warType": 20,
-        "gk_name": "80级魔化董卓",
+        "gk_name": "演武台BOSS&80级魔化董卓",
         "secondAttrLevel": 7,
         "level": 80,
         "lvLimted": 1,
@@ -1166,7 +1166,7 @@
         "bg_img": 2533,
         "mapid": 2533,
         "warType": 20,
-        "gk_name": "80级东岳帝像",
+        "gk_name": "演武台BOSS&80级东岳帝像",
         "secondAttrLevel": 7,
         "level": 80,
         "lvLimted": 1,
@@ -1186,7 +1186,7 @@
         "bg_img": 2543,
         "mapid": 2543,
         "warType": 20,
-        "gk_name": "80级狼灵萨满",
+        "gk_name": "演武台BOSS&80级狼灵萨满",
         "secondAttrLevel": 7,
         "level": 80,
         "lvLimted": 1,
@@ -1206,7 +1206,7 @@
         "bg_img": 2553,
         "mapid": 2553,
         "warType": 20,
-        "gk_name": "80级袁术",
+        "gk_name": "演武台BOSS&80级袁术",
         "secondAttrLevel": 7,
         "level": 80,
         "lvLimted": 1,
@@ -1226,7 +1226,7 @@
         "bg_img": 9263,
         "mapid": 9263,
         "warType": 20,
-        "gk_name": "80级不动明王",
+        "gk_name": "演武台BOSS&80级不动明王",
         "secondAttrLevel": 7,
         "level": 80,
         "lvLimted": 1,
@@ -1246,7 +1246,7 @@
         "bg_img": 2573,
         "mapid": 2573,
         "warType": 20,
-        "gk_name": "80级蜘蛛女王",
+        "gk_name": "演武台BOSS&80级蜘蛛女王",
         "secondAttrLevel": 7,
         "level": 80,
         "lvLimted": 1,
@@ -1266,7 +1266,7 @@
         "bg_img": 2523,
         "mapid": 2523,
         "warType": 20,
-        "gk_name": "80级何太后",
+        "gk_name": "演武台BOSS&80级何太后",
         "secondAttrLevel": 7,
         "level": 80,
         "lvLimted": 1,
@@ -1276,7 +1276,7 @@
         "bossSkill": "32050111&32050121&32050131",
         "heroId": 3205,
         "needPrepare": 1,
-        "gkInfo": "被董卓凌虐而死，胸怀无数怨愤，对儿子的期许，对兄长的失望……\r\n这一切都在陵墓被贾诩打开后化为了复仇的动力。",
+        "gkInfo": "被董卓凌虐而死，胸怀无数怨愤，对儿子的期许，对兄长的失望……\n这一切都在陵墓被贾诩打开后化为了复仇的动力。",
         "HeroNum": "1&6"
     },
     {
@@ -1286,7 +1286,7 @@
         "bg_img": 9213,
         "mapid": 9213,
         "warType": 20,
-        "gk_name": "90级血煞张角",
+        "gk_name": "演武台BOSS&90级血煞张角",
         "secondAttrLevel": 8,
         "level": 90,
         "lvLimted": 1,
@@ -1306,7 +1306,7 @@
         "bg_img": 224,
         "mapid": 224,
         "warType": 20,
-        "gk_name": "90级魔化董卓",
+        "gk_name": "演武台BOSS&90级魔化董卓",
         "secondAttrLevel": 8,
         "level": 90,
         "lvLimted": 1,
@@ -1326,7 +1326,7 @@
         "bg_img": 2533,
         "mapid": 2533,
         "warType": 20,
-        "gk_name": "90级东岳帝像",
+        "gk_name": "演武台BOSS&90级东岳帝像",
         "secondAttrLevel": 8,
         "level": 90,
         "lvLimted": 1,
@@ -1346,7 +1346,7 @@
         "bg_img": 2543,
         "mapid": 2543,
         "warType": 20,
-        "gk_name": "90级狼灵萨满",
+        "gk_name": "演武台BOSS&90级狼灵萨满",
         "secondAttrLevel": 8,
         "level": 90,
         "lvLimted": 1,
@@ -1366,7 +1366,7 @@
         "bg_img": 2553,
         "mapid": 2553,
         "warType": 20,
-        "gk_name": "90级袁术",
+        "gk_name": "演武台BOSS&90级袁术",
         "secondAttrLevel": 8,
         "level": 90,
         "lvLimted": 1,
@@ -1386,7 +1386,7 @@
         "bg_img": 9263,
         "mapid": 9263,
         "warType": 20,
-        "gk_name": "90级不动明王",
+        "gk_name": "演武台BOSS&90级不动明王",
         "secondAttrLevel": 8,
         "level": 90,
         "lvLimted": 1,
@@ -1406,7 +1406,7 @@
         "bg_img": 2573,
         "mapid": 2573,
         "warType": 20,
-        "gk_name": "90级蜘蛛女王",
+        "gk_name": "演武台BOSS&90级蜘蛛女王",
         "secondAttrLevel": 8,
         "level": 90,
         "lvLimted": 1,
@@ -1426,7 +1426,7 @@
         "bg_img": 2523,
         "mapid": 2523,
         "warType": 20,
-        "gk_name": "90级何太后",
+        "gk_name": "演武台BOSS&90级何太后",
         "secondAttrLevel": 8,
         "level": 90,
         "lvLimted": 1,
@@ -1436,7 +1436,7 @@
         "bossSkill": "32050111&32050121&32050131",
         "heroId": 3205,
         "needPrepare": 1,
-        "gkInfo": "被董卓凌虐而死，胸怀无数怨愤，对儿子的期许，对兄长的失望……\r\n这一切都在陵墓被贾诩打开后化为了复仇的动力。",
+        "gkInfo": "被董卓凌虐而死，胸怀无数怨愤，对儿子的期许，对兄长的失望……\n这一切都在陵墓被贾诩打开后化为了复仇的动力。",
         "HeroNum": "1&6"
     },
     {
@@ -1446,7 +1446,7 @@
         "bg_img": 9213,
         "mapid": 9213,
         "warType": 20,
-        "gk_name": "100级血煞张角",
+        "gk_name": "演武台BOSS&100级血煞张角",
         "secondAttrLevel": 9,
         "level": 100,
         "lvLimted": 1,
@@ -1466,7 +1466,7 @@
         "bg_img": 224,
         "mapid": 224,
         "warType": 20,
-        "gk_name": "100级魔化董卓",
+        "gk_name": "演武台BOSS&100级魔化董卓",
         "secondAttrLevel": 9,
         "level": 100,
         "lvLimted": 1,
@@ -1486,7 +1486,7 @@
         "bg_img": 2533,
         "mapid": 2533,
         "warType": 20,
-        "gk_name": "100级东岳帝像",
+        "gk_name": "演武台BOSS&100级东岳帝像",
         "secondAttrLevel": 9,
         "level": 100,
         "lvLimted": 1,
@@ -1506,7 +1506,7 @@
         "bg_img": 2543,
         "mapid": 2543,
         "warType": 20,
-        "gk_name": "100级狼灵萨满",
+        "gk_name": "演武台BOSS&100级狼灵萨满",
         "secondAttrLevel": 9,
         "level": 100,
         "lvLimted": 1,
@@ -1526,7 +1526,7 @@
         "bg_img": 2553,
         "mapid": 2553,
         "warType": 20,
-        "gk_name": "100级袁术",
+        "gk_name": "演武台BOSS&100级袁术",
         "secondAttrLevel": 9,
         "level": 100,
         "lvLimted": 1,
@@ -1546,7 +1546,7 @@
         "bg_img": 9263,
         "mapid": 9263,
         "warType": 20,
-        "gk_name": "100级不动明王",
+        "gk_name": "演武台BOSS&100级不动明王",
         "secondAttrLevel": 9,
         "level": 100,
         "lvLimted": 1,
@@ -1566,7 +1566,7 @@
         "bg_img": 2573,
         "mapid": 2573,
         "warType": 20,
-        "gk_name": "100级蜘蛛女王",
+        "gk_name": "演武台BOSS&100级蜘蛛女王",
         "secondAttrLevel": 9,
         "level": 100,
         "lvLimted": 1,
@@ -1586,7 +1586,7 @@
         "bg_img": 2523,
         "mapid": 2523,
         "warType": 20,
-        "gk_name": "100级何太后",
+        "gk_name": "演武台BOSS&100级何太后",
         "secondAttrLevel": 9,
         "level": 100,
         "lvLimted": 1,
@@ -1596,7 +1596,7 @@
         "bossSkill": "32050111&32050121&32050131",
         "heroId": 3205,
         "needPrepare": 1,
-        "gkInfo": "被董卓凌虐而死，胸怀无数怨愤，对儿子的期许，对兄长的失望……\r\n这一切都在陵墓被贾诩打开后化为了复仇的动力。",
+        "gkInfo": "被董卓凌虐而死，胸怀无数怨愤，对儿子的期许，对兄长的失望……\n这一切都在陵墓被贾诩打开后化为了复仇的动力。",
         "HeroNum": "1&6"
     }
 ]
\ No newline at end of file