diff --git a/game-server/app/servers/chat/remote/guildRemote.ts b/game-server/app/servers/chat/remote/guildRemote.ts
index 1fa9f3a62..6f18a56e0 100644
--- a/game-server/app/servers/chat/remote/guildRemote.ts
+++ b/game-server/app/servers/chat/remote/guildRemote.ts
@@ -254,6 +254,11 @@ export class GuildRemote {
             declareGuildCode,
             declareCount
         });
+        this.pushMessage(declareGuildCode, this.GUILD_CITY_DECLARE, {
+            cityId,
+            declareGuildCode,
+            declareCount
+        });
     }
 
     /**
diff --git a/game-server/app/servers/role/handler/mailHandler.ts b/game-server/app/servers/role/handler/mailHandler.ts
index a8397e193..8152c6bd2 100644
--- a/game-server/app/servers/role/handler/mailHandler.ts
+++ b/game-server/app/servers/role/handler/mailHandler.ts
@@ -39,17 +39,36 @@ export class MailHandler {
     public async readMail(msg: { id: string, mailType: number }, session: BackendSession) {
         let roleId: string = session.get('roleId');
         let { id, mailType } = msg;
-        let mail;
+        let mails = [];
         if (mailType == GM_MAIL_TYPE.SINGLE) {
-            mail = await MailModel.updateStatusWithCondition(id, MAIL_STATUS.READ, [MAIL_STATUS.CREATE]);          
+            let mail = await MailModel.getMailById(id);
+            if(mail && mail.status == MAIL_STATUS.CREATE) {
+                mail = await MailModel.updateStatusWithCondition(id, MAIL_STATUS.READ);
+                mails.push({ id, status: MAIL_STATUS.READ, mailType });
+            }
+                    
         } else if (mailType == GM_MAIL_TYPE.GROUP) {
-            mail = await GroupMailModel.updateStatusWithCondition(id, roleId, MAIL_STATUS.READ, [MAIL_STATUS.CREATE]);        
+            let mail = await GroupMailModel.getMailById(id);
+            if(mail) {
+                let myStatus = mail.roleStatus.find(cur => cur.roleId == roleId);
+                if(myStatus && myStatus.status == MAIL_STATUS.CREATE) {
+                    mail = await GroupMailModel.updateStatusWithCondition(id, roleId, MAIL_STATUS.READ);
+                    mails.push({ id, status: MAIL_STATUS.READ, mailType });
+                }
+            }
         } else if (mailType == GM_MAIL_TYPE.SERVER) {
-            mail = await ServerMailModel.updateStatusWithCondition(id, roleId, MAIL_STATUS.READ, [MAIL_STATUS.CREATE])
+            let mail = await ServerMailModel.getMailById(id);
+            if(mail) {
+                let myStatus = mail.roleStatus.find(cur => cur.roleId == roleId);
+                if(!myStatus || myStatus.status == MAIL_STATUS.CREATE) {
+                    mail = await ServerMailModel.updateStatusWithCondition(id, roleId, MAIL_STATUS.READ);
+                    mails.push({ id, status: MAIL_STATUS.READ, mailType });
+                }
+            }
         }
         // if (!mail)
         //     return resResult(STATUS.WRONG_PARMS);
-        return resResult(STATUS.SUCCESS, { mails: mail?[{ id, status: MAIL_STATUS.READ, mailType }]:[] });
+        return resResult(STATUS.SUCCESS, { mails });
     }
 
     public async delMails(msg: { id: string, mailType: number, type: number }, session: BackendSession) {
@@ -99,26 +118,40 @@ export class MailHandler {
             let mail: MailType|GroupMailType|ServerMailType;
             if (mailType == GM_MAIL_TYPE.SINGLE) {
                 mail = await MailModel.getMailById(id);
+                if (!mail) return resResult(STATUS.WRONG_PARMS);
+                if(mail.status != MAIL_STATUS.READ &&  mail.status != MAIL_STATUS.CREATE) return resResult(STATUS.WRONG_PARMS);
             } else if (mailType == GM_MAIL_TYPE.GROUP) {
                 mail = await GroupMailModel.getMailById(id);
+                if (!mail) return resResult(STATUS.WRONG_PARMS);
+                let myStatus = mail.roleStatus.find(cur => cur.roleId == roleId);
+                if(!myStatus) return resResult(STATUS.WRONG_PARMS);
+                if(myStatus.status != MAIL_STATUS.READ &&  myStatus.status != MAIL_STATUS.CREATE) return resResult(STATUS.WRONG_PARMS);
             } else if (mailType == GM_MAIL_TYPE.SERVER) {
                 mail = await ServerMailModel.getMailById(id);
+                if (!mail) return resResult(STATUS.WRONG_PARMS);
+                let myStatus = mail.roleStatus.find(cur => cur.roleId == roleId);
+                if(myStatus && myStatus.status != MAIL_STATUS.READ &&  myStatus.status != MAIL_STATUS.CREATE) return resResult(STATUS.WRONG_PARMS);
             }
-            if (!mail) return resResult(STATUS.WRONG_PARMS);
             originMails.push({ mailType, mail });
         } else {//一键领取
             let singlemails = await MailModel.findRewardsMails(roleId);
+            for(let mail of singlemails) {
+                if(mail.status != MAIL_STATUS.READ &&  mail.status != MAIL_STATUS.CREATE) continue;
+                originMails.push({ mailType: GM_MAIL_TYPE.SINGLE, mail });
+            }
             let groupMails = await GroupMailModel.findRewardsMails(roleId);
+            for(let mail of groupMails) {
+                let myStatus = mail.roleStatus.find(cur => cur.roleId == roleId);
+                if(!myStatus) continue;
+                if(myStatus.status != MAIL_STATUS.READ &&  myStatus.status != MAIL_STATUS.CREATE) continue;
+                originMails.push({ mailType: GM_MAIL_TYPE.GROUP, mail })
+            }
             let servermails = await ServerMailModel.findRewardsMails(serverId, roleId);
-            [
-                { mails: singlemails, mailType: GM_MAIL_TYPE.SINGLE },
-                { mails: groupMails, mailType: GM_MAIL_TYPE.GROUP },
-                { mails: servermails, mailType: GM_MAIL_TYPE.SERVER },
-            ].forEach(({ mails, mailType }) => {
-                mails.forEach((mail: MailType|GroupMailType|ServerMailType) => {
-                    originMails.push({ mailType, mail })
-                });
-            });
+            for(let mail of servermails) {
+                let myStatus = mail.roleStatus.find(cur => cur.roleId == roleId);
+                if(myStatus && myStatus.status != MAIL_STATUS.READ &&  myStatus.status != MAIL_STATUS.CREATE) continue;
+                originMails.push({ mailType: GM_MAIL_TYPE.SERVER, mail })
+            }
         }
 
         let mailGoods: ItemInter[] = [], mails: MailParam[] = [];
@@ -134,11 +167,11 @@ export class MailHandler {
             equipCount = newEquipCount;
 
             if(mailType == GM_MAIL_TYPE.SINGLE) {
-                mail = await MailModel.updateStatusWithCondition(mail._id, MAIL_STATUS.RECEIVED, [MAIL_STATUS.READ, MAIL_STATUS.CREATE]);
+                mail = await MailModel.updateStatusWithCondition(mail._id, MAIL_STATUS.RECEIVED);
             } else if (mailType == GM_MAIL_TYPE.GROUP) {
-                mail = await GroupMailModel.updateStatusWithCondition(mail._id, roleId, MAIL_STATUS.RECEIVED, [MAIL_STATUS.READ, MAIL_STATUS.CREATE]);
+                mail = await GroupMailModel.updateStatusWithCondition(mail._id, roleId, MAIL_STATUS.RECEIVED);
             } else if (mailType == GM_MAIL_TYPE.SERVER) {
-                mail = await ServerMailModel.updateStatusWithCondition(mail._id, roleId, MAIL_STATUS.RECEIVED, [MAIL_STATUS.READ, MAIL_STATUS.CREATE]);
+                mail = await ServerMailModel.updateStatusWithCondition(mail._id, roleId, MAIL_STATUS.RECEIVED, <ServerMailType>mail);
             }
             if(!mail) return resResult(STATUS.MAIL_HAS_RECEIVE);
 
diff --git a/game-server/app/servers/role/handler/roleHandler.ts b/game-server/app/servers/role/handler/roleHandler.ts
index 91b2df491..2cae61943 100644
--- a/game-server/app/servers/role/handler/roleHandler.ts
+++ b/game-server/app/servers/role/handler/roleHandler.ts
@@ -325,14 +325,6 @@ export class RoleHandler {
             update.scrollStar = dicHero.initialStars;
             update.scrollQuality = dicHero.quality;
             update.scrollColorStar = 0;
-
-            // 获取一定好感度
-            let maxLv = gameData.maxFriendShipLv.max;
-            if (maxLv > favourLv) {
-
-                update.favour += SCROLL.SCROLL_ACTIVE_FAVOUR;
-                update.favourLv = getFriendLvByExp(update.favour);
-            }
             await checkActivityTask(serverId, sid, roleId, TASK_TYPE.HERO_UNLOCK, 1, { dicHeroes: [dicHero] })
         } else {
             if (star > scrollStar) { // 可以升星
@@ -351,16 +343,10 @@ export class RoleHandler {
         let dicHeroScroll = getScollByStar(dicHero.quality, update.scrollStar, update.scrollQuality, update.scrollColorStar);
         update.scrollId = dicHeroScroll ? dicHeroScroll.id : 0;
 
-        let hero = curHero;
-        if(curHero.favourLv != update.favourLv) {
-            hero = await calPlayerCeAndSave(HERO_SYSTEM_TYPE.FAVOUR, sid, roleId, curHero, update); // 更新单个武将战力
-        } else {
-            hero = await HeroModel.updateHeroInfo(roleId, hid, update);
-        }
+        let hero = await HeroModel.updateHeroInfo(roleId, hid, update);
         await calAllHeroCe(HERO_SYSTEM_TYPE.SCROLL, sid, roleId, {}, [hid]); // 全局增加战力
 
         // 任务
-        if (favourLv != hero.favourLv) await checkTaskWithHero(roleId, sid, TASK_TYPE.HERO_FAVOUR_LV, hero, [favourLv]);
         if (!scrollActive) await checkTask(roleId, sid, TASK_TYPE.ROLE_SCROLL_ACTIVE, 1, true, {});
 
         return resResult(STATUS.SUCCESS, {
diff --git a/game-server/app/services/activity/gachaService.ts b/game-server/app/services/activity/gachaService.ts
index 4ed8b01e9..3fe36a321 100644
--- a/game-server/app/services/activity/gachaService.ts
+++ b/game-server/app/services/activity/gachaService.ts
@@ -127,8 +127,11 @@ export class GachaPull {
         // 设置pickup的武将
         let newPercent = [];
         for (let { id, weight } of percent) {
-            if (id == gameData.gachaContentHero.get(0)) {
+            if (id == 4) {
                 newPercent.push({ id, weight, goodId: userGacha.pickHero })
+            } else if ( id == 14 || id == 15) {
+                let dicHero = gameData.hero.get(userGacha.pickHero);
+                newPercent.push({ id, weight, goodId: dicHero.pieceId });
             } else {
                 newPercent.push({ id, weight });
             }
diff --git a/game-server/app/services/battleService.ts b/game-server/app/services/battleService.ts
index b864c104b..b175bf5a0 100644
--- a/game-server/app/services/battleService.ts
+++ b/game-server/app/services/battleService.ts
@@ -248,8 +248,8 @@ export async function towerBattleEnd(sid: string, roleId: string, serverId: numb
                 await startHangUp(roleId, roleName);
             }
             // 任务
-            await checkTask(roleId, sid, TASK_TYPE.BATTLE_TOWER_LV, role.towerLv, false, {});
-            await checkActivityTask(serverId, sid, roleId, TASK_TYPE.BATTLE_TOWER_LV, 1, { towerLv: role.towerLv });
+            await checkTask(roleId, sid, TASK_TYPE.BATTLE_TOWER_LV, role.towerLv - 1, false, {});
+            await checkActivityTask(serverId, sid, roleId, TASK_TYPE.BATTLE_TOWER_LV, 1, { towerLv: role.towerLv - 1 });
         }
         return {
             status: 0,
diff --git a/shared/db/GroupMail.ts b/shared/db/GroupMail.ts
index c77d93e9a..147b4140b 100644
--- a/shared/db/GroupMail.ts
+++ b/shared/db/GroupMail.ts
@@ -26,8 +26,10 @@ export default class GroupMail extends MailTemp {
      */
     public static async findByRoleId(roleId: string) {
         const result: GroupMailType[] = await GroupMailModel.find({ 
-            'roleStatus.roleId': roleId, 
-            'roleStatus.status': { $in: [ MAIL_STATUS.CREATE, MAIL_STATUS.READ, MAIL_STATUS.RECEIVED ] }, 
+            $and: [
+                {'roleStatus.roleId': roleId}, 
+                {'roleStatus.status': { $in: [ MAIL_STATUS.CREATE, MAIL_STATUS.READ, MAIL_STATUS.RECEIVED ] }}
+            ], 
             endTime: { $gte: nowSeconds() } 
         }).populate('mail').lean();
         return result;
@@ -53,12 +55,15 @@ export default class GroupMail extends MailTemp {
         const result: GroupMailType = await GroupMailModel.findOneAndUpdate(
             { 
                 _id, sendTime:{ $lte: nowSeconds() },
-                'roleStatus.roleId': roleId,
-                $or: [{
-                    'roleStatus.status': MAIL_STATUS.READ, hasGoods:false
-                }, {
-                    'roleStatus.status': MAIL_STATUS.RECEIVED
-                }]
+                $and: [{
+                    'roleStatus.roleId': roleId,
+                },{
+                    $or: [{
+                        'roleStatus.status': MAIL_STATUS.READ, hasGoods:false
+                    }, {
+                        'roleStatus.status': MAIL_STATUS.RECEIVED
+                    }]
+                }],
             },
             { $set:{ 'roleStatus.$.status': MAIL_STATUS.DELETE } }, 
             { new: true }
@@ -89,7 +94,7 @@ export default class GroupMail extends MailTemp {
     }
 
     public static async getGroupMailsByRoleId(roleId: string, lean = true) {
-        const result: GroupMailType[] = await GroupMailModel.find({ 'roleStatus.roleId': roleId, 'roleStatus.status': { $ne: -1}, sendTime:{$lte: nowSeconds()} }).lean(lean);
+        const result: GroupMailType[] = await GroupMailModel.find({ $and:[{'roleStatus.roleId': roleId}, { 'roleStatus.status': { $ne: -1}}], sendTime:{$lte: nowSeconds()} }).lean(lean);
         return result;
     }
 
@@ -108,8 +113,8 @@ export default class GroupMail extends MailTemp {
         return result;
     }
 
-    public static async updateStatusWithCondition(_id: string, roleId: string, status: number, conditions: number[], lean = true) {
-        const result: GroupMailType = await GroupMailModel.findOneAndUpdate({ _id, 'roleStatus.roleId': roleId, sendTime:{$lte: nowSeconds()}, 'roleStatus.status': {$in: conditions} }, {$set:{ 'roleStatus.$.status': status }}, { new: true }).lean(lean);
+    public static async updateStatusWithCondition(_id: string, roleId: string, status: number) {
+        const result: GroupMailType = await GroupMailModel.findOneAndUpdate({ _id, 'roleStatus.roleId': roleId, sendTime:{$lte: nowSeconds()} }, {$set:{ 'roleStatus.$.status': status }}, { new: true }).lean();
         return result;
     }
 
diff --git a/shared/db/Mail.ts b/shared/db/Mail.ts
index cbeb202d5..5b7256428 100644
--- a/shared/db/Mail.ts
+++ b/shared/db/Mail.ts
@@ -44,9 +44,9 @@ export default class Mail extends MailTemp {
      * @param status 邮件状态
      * @param conditions 可更新邮件状态
      */
-    public static async updateStatusWithCondition(_id: string, status: MAIL_STATUS, conditions: MAIL_STATUS[]) {
+    public static async updateStatusWithCondition(_id: string, status: MAIL_STATUS) {
         const result: MailType = await MailModel.findOneAndUpdate(
-            { _id, status: { $in: conditions }, sendTime:{$lte: nowSeconds()} }, 
+            { _id, sendTime:{$lte: nowSeconds()} }, 
             { $set: { status } }, { new: true }
         ).lean();
         return result;
diff --git a/shared/db/ServerMail.ts b/shared/db/ServerMail.ts
index 22db4ca3f..eb8e7b596 100644
--- a/shared/db/ServerMail.ts
+++ b/shared/db/ServerMail.ts
@@ -104,12 +104,10 @@ export default class ServerMail extends MailTemp {
     }
 
 
-    public static async updateStatusWithCondition(_id: string, roleId: string, status: number, conditions: number[], servermail?: ServerMailType) {
+    public static async updateStatusWithCondition(_id: string, roleId: string, status: number, servermail?: ServerMailType) {
         if(!servermail) servermail = await ServerMailModel.findById(_id).lean();
         let { roleStatus } = servermail;
         let hasRole = roleStatus.find(cur => cur.roleId == roleId);
-        let myStatus = hasRole?hasRole.status: MAIL_STATUS.CREATE;
-        if(conditions.indexOf(myStatus) == -1) return null;
         if(hasRole) {
             servermail = await ServerMailModel.findOneAndUpdate({ _id, 'roleStatus.roleId': roleId }, { $set: { 'roleStatus.$.status': status } }, {new: true}).lean();
         } else {
diff --git a/shared/pubUtils/itemUtils.ts b/shared/pubUtils/itemUtils.ts
index 3f2bf3917..b04eb882b 100644
--- a/shared/pubUtils/itemUtils.ts
+++ b/shared/pubUtils/itemUtils.ts
@@ -302,10 +302,12 @@ export async function addFigure(roleId: string, ids: number[], reason: number) {
  * @param conditionId 条件id
  */
 function unlockSingleFigure(dbFigures: Figure[], id: number, reason: number, unlockDirect = false, conditionId?: number) {
-    let figure = dbFigures.find(cur => cur.id == id);
-    if (!figure) {
+    let index = dbFigures.findIndex(cur => cur.id == id);
+    let figure = dbFigures[index];
+    if (index == -1) {
         figure = new Figure(id, false);
         dbFigures.push(figure);
+        index = dbFigures.length - 1;
     }
     if (figure.unlocked) return; // 已解锁过
     if (!figure.unlockedId) figure.unlockedId = new Array<number>();
@@ -335,6 +337,7 @@ function unlockSingleFigure(dbFigures: Figure[], id: number, reason: number, unl
 
     figure.inc = 1;
     figure.reason = reason;
+    dbFigures[index] = figure;
     return figure
 }
 
diff --git a/shared/resource/jsons/dic_zyz_gk_dungeon.json b/shared/resource/jsons/dic_zyz_gk_dungeon.json
index 212c4c6ff..8ca466255 100644
--- a/shared/resource/jsons/dic_zyz_gk_dungeon.json
+++ b/shared/resource/jsons/dic_zyz_gk_dungeon.json
@@ -15,7 +15,6 @@
         "fobiddenCharactor": "&",
         "victoryInfoInUI": "消灭所有敌军",
         "loseInfoInUI": "我方全部阵亡",
-        "starInfoInUI": "1.取得胜利；\r\n2.我军全员生存；\r\n3.10回合内获得胜利",
         "cost": 0,
         "recommendedPower": 20958,
         "previousGk": 110,
@@ -25,7 +24,7 @@
         "iconName": "怒浪洞穴",
         "iconInMap": "spine&mj_nldx",
         "bossSkill": "18&19",
-        "movePoint": 27,
+        "movePoint": 651,
         "needPrepare": 1,
         "gkInfo": "居住在冀州山林中的残忍巨兽，身上有着不知道从何而来的甲胄和铁链。能够号令山林中的野狼，残忍嗜血，有着能够裂石穿金的利爪和范围巨大的铁尾。",
         "HeroNum": "6&6",
@@ -47,7 +46,6 @@
         "fobiddenCharactor": "&",
         "victoryInfoInUI": "消灭所有敌军",
         "loseInfoInUI": "我方全部阵亡",
-        "starInfoInUI": "1.取得胜利；\r\n2.我军全员生存；\r\n3.10回合内获得胜利",
         "cost": 0,
         "recommendedPower": 349295,
         "previousGk": 5001,
@@ -57,7 +55,7 @@
         "iconName": "怒浪洞穴",
         "iconInMap": "spine&mj_nldx",
         "bossSkill": "18&19",
-        "movePoint": 27,
+        "movePoint": 651,
         "needPrepare": 1,
         "gkInfo": "居住在冀州山林中的残忍巨兽，身上有着不知道从何而来的甲胄和铁链。能够号令山林中的野狼，残忍嗜血，有着能够裂石穿金的利爪和范围巨大的铁尾。",
         "HeroNum": "6&6",
@@ -79,7 +77,6 @@
         "fobiddenCharactor": "&",
         "victoryInfoInUI": "消灭所有敌军",
         "loseInfoInUI": "我方全部阵亡",
-        "starInfoInUI": "1.取得胜利；\r\n2.我军全员生存；\r\n3.10回合内获得胜利",
         "cost": 0,
         "recommendedPower": 698589,
         "previousGk": 5002,
@@ -89,7 +86,7 @@
         "iconName": "怒浪洞穴",
         "iconInMap": "spine&mj_nldx",
         "bossSkill": "18&19",
-        "movePoint": 27,
+        "movePoint": 651,
         "needPrepare": 1,
         "gkInfo": "居住在冀州山林中的残忍巨兽，身上有着不知道从何而来的甲胄和铁链。能够号令山林中的野狼，残忍嗜血，有着能够裂石穿金的利爪和范围巨大的铁尾。",
         "HeroNum": "6&6",
@@ -111,7 +108,6 @@
         "fobiddenCharactor": "&",
         "victoryInfoInUI": "消灭所有敌军",
         "loseInfoInUI": "我方全部阵亡",
-        "starInfoInUI": "1.取得胜利；\r\n2.我军全员生存；\r\n3.10回合内获得胜利",
         "cost": 0,
         "recommendedPower": 1397178,
         "previousGk": 5003,
@@ -121,7 +117,7 @@
         "iconName": "怒浪洞穴",
         "iconInMap": "spine&mj_nldx",
         "bossSkill": "18&19",
-        "movePoint": 27,
+        "movePoint": 651,
         "needPrepare": 1,
         "gkInfo": "居住在冀州山林中的残忍巨兽，身上有着不知道从何而来的甲胄和铁链。能够号令山林中的野狼，残忍嗜血，有着能够裂石穿金的利爪和范围巨大的铁尾。",
         "HeroNum": "6&6",
@@ -143,7 +139,6 @@
         "fobiddenCharactor": "&",
         "victoryInfoInUI": "消灭所有敌军",
         "loseInfoInUI": "我方全部阵亡",
-        "starInfoInUI": "1.取得胜利；\r\n2.我军全员生存；\r\n3.10回合内获得胜利",
         "cost": 0,
         "recommendedPower": 2479990,
         "previousGk": 5004,
@@ -153,7 +148,7 @@
         "iconName": "怒浪洞穴",
         "iconInMap": "spine&mj_nldx",
         "bossSkill": "18&19",
-        "movePoint": 27,
+        "movePoint": 651,
         "needPrepare": 1,
         "gkInfo": "居住在冀州山林中的残忍巨兽，身上有着不知道从何而来的甲胄和铁链。能够号令山林中的野狼，残忍嗜血，有着能够裂石穿金的利爪和范围巨大的铁尾。",
         "HeroNum": "6&6",
@@ -175,7 +170,6 @@
         "fobiddenCharactor": "&",
         "victoryInfoInUI": "消灭吕布",
         "loseInfoInUI": "我方全部阵亡",
-        "starInfoInUI": "1.取得胜利；\r\n2.我军全员生存；\r\n3.10回合内获得胜利",
         "cost": 0,
         "recommendedPower": 125746,
         "previousGk": 206,
@@ -207,7 +201,6 @@
         "fobiddenCharactor": "&",
         "victoryInfoInUI": "消灭吕布",
         "loseInfoInUI": "我方全部阵亡",
-        "starInfoInUI": "1.取得胜利；\r\n2.我军全员生存；\r\n3.10回合内获得胜利",
         "cost": 0,
         "recommendedPower": 391210,
         "previousGk": 5010,
@@ -239,7 +232,6 @@
         "fobiddenCharactor": "&",
         "victoryInfoInUI": "消灭吕布",
         "loseInfoInUI": "我方全部阵亡",
-        "starInfoInUI": "1.取得胜利；\r\n2.我军全员生存；\r\n3.10回合内获得胜利",
         "cost": 0,
         "recommendedPower": 943095,
         "previousGk": 5011,
@@ -271,7 +263,6 @@
         "fobiddenCharactor": "&",
         "victoryInfoInUI": "消灭吕布",
         "loseInfoInUI": "我方全部阵亡",
-        "starInfoInUI": "1.取得胜利；\r\n2.我军全员生存；\r\n3.10回合内获得胜利",
         "cost": 0,
         "recommendedPower": 1571825,
         "previousGk": 5012,
@@ -303,7 +294,6 @@
         "fobiddenCharactor": "&",
         "victoryInfoInUI": "消灭吕布",
         "loseInfoInUI": "我方全部阵亡",
-        "starInfoInUI": "1.取得胜利；\r\n2.我军全员生存；\r\n3.10回合内获得胜利",
         "cost": 0,
         "recommendedPower": 2514919,
         "previousGk": 5013,
@@ -335,7 +325,6 @@
         "fobiddenCharactor": "&",
         "victoryInfoInUI": "消灭所有敌军",
         "loseInfoInUI": "我方全部阵亡",
-        "starInfoInUI": "1.取得胜利；\r\n2.我军全员生存；\r\n3.10回合内获得胜利",
         "cost": 0,
         "recommendedPower": 558871,
         "previousGk": 320,
@@ -367,7 +356,6 @@
         "fobiddenCharactor": "&",
         "victoryInfoInUI": "消灭所有敌军",
         "loseInfoInUI": "我方全部阵亡",
-        "starInfoInUI": "1.取得胜利；\r\n2.我军全员生存；\r\n3.10回合内获得胜利",
         "cost": 0,
         "recommendedPower": 1222530,
         "previousGk": 5020,
@@ -399,7 +387,6 @@
         "fobiddenCharactor": "&",
         "victoryInfoInUI": "消灭所有敌军",
         "loseInfoInUI": "我方全部阵亡",
-        "starInfoInUI": "1.取得胜利；\r\n2.我军全员生存；\r\n3.10回合内获得胜利",
         "cost": 0,
         "recommendedPower": 1886190,
         "previousGk": 5021,
@@ -431,7 +418,6 @@
         "fobiddenCharactor": "&",
         "victoryInfoInUI": "消灭所有敌军",
         "loseInfoInUI": "我方全部阵亡",
-        "starInfoInUI": "1.取得胜利；\r\n2.我军全员生存；\r\n3.10回合内获得胜利",
         "cost": 0,
         "recommendedPower": 3597732,
         "previousGk": 5022,
@@ -463,7 +449,6 @@
         "fobiddenCharactor": "&",
         "victoryInfoInUI": "消灭所有敌军",
         "loseInfoInUI": "我方全部阵亡",
-        "starInfoInUI": "1.取得胜利；\r\n2.我军全员生存；\r\n3.10回合内获得胜利",
         "cost": 0,
         "recommendedPower": 5414062,
         "previousGk": 5023,
@@ -495,7 +480,6 @@
         "fobiddenCharactor": "&",
         "victoryInfoInUI": "消灭所有敌军",
         "loseInfoInUI": "我方全部阵亡",
-        "starInfoInUI": "1.取得胜利；\r\n2.我军全员生存；\r\n3.10回合内获得胜利",
         "cost": 0,
         "recommendedPower": 1047883,
         "previousGk": 220,
@@ -527,7 +511,6 @@
         "fobiddenCharactor": "&",
         "victoryInfoInUI": "消灭所有敌军",
         "loseInfoInUI": "我方全部阵亡",
-        "starInfoInUI": "1.取得胜利；\r\n2.我军全员生存；\r\n3.10回合内获得胜利",
         "cost": 0,
         "recommendedPower": 1746472,
         "previousGk": 5030,
@@ -559,7 +542,6 @@
         "fobiddenCharactor": "&",
         "victoryInfoInUI": "消灭所有敌军",
         "loseInfoInUI": "我方全部阵亡",
-        "starInfoInUI": "1.取得胜利；\r\n2.我军全员生存；\r\n3.10回合内获得胜利",
         "cost": 0,
         "recommendedPower": 2969002,
         "previousGk": 5031,
@@ -591,7 +573,6 @@
         "fobiddenCharactor": "&",
         "victoryInfoInUI": "消灭所有敌军",
         "loseInfoInUI": "我方全部阵亡",
-        "starInfoInUI": "1.取得胜利；\r\n2.我军全员生存；\r\n3.10回合内获得胜利",
         "cost": 0,
         "recommendedPower": 4366179,
         "previousGk": 5032,
@@ -623,7 +604,6 @@
         "fobiddenCharactor": "&",
         "victoryInfoInUI": "消灭所有敌军",
         "loseInfoInUI": "我方全部阵亡",
-        "starInfoInUI": "1.取得胜利；\r\n2.我军全员生存；\r\n3.10回合内获得胜利",
         "cost": 0,
         "recommendedPower": 6461945,
         "previousGk": 5033,
@@ -655,7 +635,6 @@
         "fobiddenCharactor": "&",
         "victoryInfoInUI": "消灭所有敌军",
         "loseInfoInUI": "我方全部阵亡",
-        "starInfoInUI": "1.取得胜利；\r\n2.我军全员生存；\r\n3.10回合内获得胜利",
         "cost": 0,
         "recommendedPower": 1816331,
         "previousGk": 304,
@@ -687,7 +666,6 @@
         "fobiddenCharactor": "&",
         "victoryInfoInUI": "消灭所有敌军",
         "loseInfoInUI": "我方全部阵亡",
-        "starInfoInUI": "1.取得胜利；\r\n2.我军全员生存；\r\n3.10回合内获得胜利",
         "cost": 0,
         "recommendedPower": 2689566,
         "previousGk": 5040,
@@ -719,7 +697,6 @@
         "fobiddenCharactor": "&",
         "victoryInfoInUI": "消灭所有敌军",
         "loseInfoInUI": "我方全部阵亡",
-        "starInfoInUI": "1.取得胜利；\r\n2.我军全员生存；\r\n3.10回合内获得胜利",
         "cost": 0,
         "recommendedPower": 4121673,
         "previousGk": 5041,
@@ -751,7 +728,6 @@
         "fobiddenCharactor": "&",
         "victoryInfoInUI": "消灭所有敌军",
         "loseInfoInUI": "我方全部阵亡",
-        "starInfoInUI": "1.取得胜利；\r\n2.我军全员生存；\r\n3.10回合内获得胜利",
         "cost": 0,
         "recommendedPower": 5763356,
         "previousGk": 5042,
@@ -783,7 +759,6 @@
         "fobiddenCharactor": "&",
         "victoryInfoInUI": "消灭所有敌军",
         "loseInfoInUI": "我方全部阵亡",
-        "starInfoInUI": "1.取得胜利；\r\n2.我军全员生存；\r\n3.10回合内获得胜利",
         "cost": 0,
         "recommendedPower": 7684475,
         "previousGk": 5043,
@@ -815,7 +790,6 @@
         "fobiddenCharactor": "&",
         "victoryInfoInUI": "消灭所有敌军",
         "loseInfoInUI": "我方全部阵亡",
-        "starInfoInUI": "1.取得胜利；\r\n2.我军全员生存；\r\n3.10回合内获得胜利",
         "cost": 0,
         "recommendedPower": 2340272,
         "previousGk": 310,
@@ -847,7 +821,6 @@
         "fobiddenCharactor": "&",
         "victoryInfoInUI": "消灭所有敌军",
         "loseInfoInUI": "我方全部阵亡",
-        "starInfoInUI": "1.取得胜利；\r\n2.我军全员生存；\r\n3.10回合内获得胜利",
         "cost": 0,
         "recommendedPower": 3283367,
         "previousGk": 5050,
@@ -879,7 +852,6 @@
         "fobiddenCharactor": "&",
         "victoryInfoInUI": "消灭所有敌军",
         "loseInfoInUI": "我方全部阵亡",
-        "starInfoInUI": "1.取得胜利；\r\n2.我军全员生存；\r\n3.10回合内获得胜利",
         "cost": 0,
         "recommendedPower": 5134626,
         "previousGk": 5051,
@@ -911,7 +883,6 @@
         "fobiddenCharactor": "&",
         "victoryInfoInUI": "消灭所有敌军",
         "loseInfoInUI": "我方全部阵亡",
-        "starInfoInUI": "1.取得胜利；\r\n2.我军全员生存；\r\n3.10回合内获得胜利",
         "cost": 0,
         "recommendedPower": 7020816,
         "previousGk": 5052,
@@ -943,7 +914,6 @@
         "fobiddenCharactor": "&",
         "victoryInfoInUI": "消灭所有敌军",
         "loseInfoInUI": "我方全部阵亡",
-        "starInfoInUI": "1.取得胜利；\r\n2.我军全员生存；\r\n3.10回合内获得胜利",
         "cost": 0,
         "recommendedPower": 8033769,
         "previousGk": 5053,
@@ -975,7 +945,6 @@
         "fobiddenCharactor": "&",
         "victoryInfoInUI": "消灭所有敌军",
         "loseInfoInUI": "我方全部阵亡",
-        "starInfoInUI": "1.取得胜利；\r\n2.我军全员生存；\r\n3.10回合内获得胜利",
         "cost": 0,
         "recommendedPower": 4785332,
         "previousGk": 320,
@@ -1007,7 +976,6 @@
         "fobiddenCharactor": "&",
         "victoryInfoInUI": "消灭所有敌军",
         "loseInfoInUI": "我方全部阵亡",
-        "starInfoInUI": "1.取得胜利；\r\n2.我军全员生存；\r\n3.10回合内获得胜利",
         "cost": 0,
         "recommendedPower": 5658568,
         "previousGk": 5060,
@@ -1039,7 +1007,6 @@
         "fobiddenCharactor": "&",
         "victoryInfoInUI": "消灭所有敌军",
         "loseInfoInUI": "我方全部阵亡",
-        "starInfoInUI": "1.取得胜利；\r\n2.我军全员生存；\r\n3.10回合内获得胜利",
         "cost": 0,
         "recommendedPower": 7230392,
         "previousGk": 5061,
@@ -1071,7 +1038,6 @@
         "fobiddenCharactor": "&",
         "victoryInfoInUI": "消灭所有敌军",
         "loseInfoInUI": "我方全部阵亡",
-        "starInfoInUI": "1.取得胜利；\r\n2.我军全员生存；\r\n3.10回合内获得胜利",
         "cost": 0,
         "recommendedPower": 7335180,
         "previousGk": 5062,
@@ -1103,7 +1069,6 @@
         "fobiddenCharactor": "&",
         "victoryInfoInUI": "消灭所有敌军",
         "loseInfoInUI": "我方全部阵亡",
-        "starInfoInUI": "1.取得胜利；\r\n2.我军全员生存；\r\n3.10回合内获得胜利",
         "cost": 0,
         "recommendedPower": 8383063,
         "previousGk": 5063,
diff --git a/shared/resource/warJsons/4504.json b/shared/resource/warJsons/4504.json
index 88e2493a2..a6c9dbeb2 100644
--- a/shared/resource/warJsons/4504.json
+++ b/shared/resource/warJsons/4504.json
@@ -1,6 +1,6 @@
 [
     {
-        "warId": 4503,
+        "warId": 4504,
         "actorName": "我军",
         "actorId": 0,
         "dataId": 0,
@@ -21,7 +21,7 @@
         "randomEnemy": "&"
     },
     {
-        "warId": 4503,
+        "warId": 4504,
         "actorName": "我军",
         "actorId": 0,
         "dataId": 0,
@@ -42,7 +42,7 @@
         "randomEnemy": "&"
     },
     {
-        "warId": 4503,
+        "warId": 4504,
         "actorName": "我军",
         "actorId": 0,
         "dataId": 0,
@@ -63,7 +63,7 @@
         "randomEnemy": "&"
     },
     {
-        "warId": 4503,
+        "warId": 4504,
         "actorName": "我军",
         "actorId": 0,
         "dataId": 0,
@@ -84,7 +84,7 @@
         "randomEnemy": "&"
     },
     {
-        "warId": 4503,
+        "warId": 4504,
         "actorName": "我军",
         "actorId": 0,
         "dataId": 0,
@@ -105,7 +105,7 @@
         "randomEnemy": "&"
     },
     {
-        "warId": 4503,
+        "warId": 4504,
         "actorName": "我军",
         "actorId": 0,
         "dataId": 0,
@@ -126,7 +126,7 @@
         "randomEnemy": "&"
     },
     {
-        "warId": 4503,
+        "warId": 4504,
         "actorName": "我军",
         "actorId": 0,
         "dataId": 0,
@@ -147,7 +147,7 @@
         "randomEnemy": "&"
     },
     {
-        "warId": 4503,
+        "warId": 4504,
         "actorName": "我军",
         "actorId": 0,
         "dataId": 0,
@@ -168,7 +168,7 @@
         "randomEnemy": "&"
     },
     {
-        "warId": 4503,
+        "warId": 4504,
         "actorName": "我军",
         "actorId": 0,
         "dataId": 0,
@@ -189,7 +189,7 @@
         "randomEnemy": "&"
     },
     {
-        "warId": 4503,
+        "warId": 4504,
         "actorName": "我军",
         "actorId": 0,
         "dataId": 0,
@@ -210,7 +210,7 @@
         "randomEnemy": "&"
     },
     {
-        "warId": 4503,
+        "warId": 4504,
         "actorName": "我军",
         "actorId": 0,
         "dataId": 0,
@@ -231,7 +231,7 @@
         "randomEnemy": "&"
     },
     {
-        "warId": 4503,
+        "warId": 4504,
         "actorName": "我军",
         "actorId": 0,
         "dataId": 0,
@@ -252,7 +252,7 @@
         "randomEnemy": "&"
     },
     {
-        "warId": 4503,
+        "warId": 4504,
         "actorName": "我军",
         "actorId": 0,
         "dataId": 0,
@@ -273,7 +273,7 @@
         "randomEnemy": "&"
     },
     {
-        "warId": 4503,
+        "warId": 4504,
         "actorName": "我军",
         "actorId": 0,
         "dataId": 0,
@@ -294,7 +294,7 @@
         "randomEnemy": "&"
     },
     {
-        "warId": 4503,
+        "warId": 4504,
         "actorName": "我军",
         "actorId": 0,
         "dataId": 0,
@@ -315,7 +315,7 @@
         "randomEnemy": "&"
     },
     {
-        "warId": 4503,
+        "warId": 4504,
         "actorName": "我军",
         "actorId": 0,
         "dataId": 0,
@@ -336,7 +336,7 @@
         "randomEnemy": "&"
     },
     {
-        "warId": 4503,
+        "warId": 4504,
         "actorName": "我军",
         "actorId": 0,
         "dataId": 0,
@@ -357,7 +357,7 @@
         "randomEnemy": "&"
     },
     {
-        "warId": 4503,
+        "warId": 4504,
         "actorName": "我军",
         "actorId": 0,
         "dataId": 0,
@@ -378,7 +378,7 @@
         "randomEnemy": "&"
     },
     {
-        "warId": 4503,
+        "warId": 4504,
         "actorName": "我军",
         "actorId": 0,
         "dataId": 0,
@@ -399,7 +399,7 @@
         "randomEnemy": "&"
     },
     {
-        "warId": 4503,
+        "warId": 4504,
         "actorName": "我军",
         "actorId": 0,
         "dataId": 0,
@@ -420,7 +420,7 @@
         "randomEnemy": "&"
     },
     {
-        "warId": 4503,
+        "warId": 4504,
         "actorName": "敌军",
         "actorId": 0,
         "dataId": 2001,
@@ -441,7 +441,7 @@
         "randomEnemy": "&"
     },
     {
-        "warId": 4503,
+        "warId": 4504,
         "actorName": "敌军",
         "actorId": 0,
         "dataId": 2002,
@@ -462,7 +462,7 @@
         "randomEnemy": "&"
     },
     {
-        "warId": 4503,
+        "warId": 4504,
         "actorName": "敌军",
         "actorId": 0,
         "dataId": 2003,
@@ -483,7 +483,7 @@
         "randomEnemy": "&"
     },
     {
-        "warId": 4503,
+        "warId": 4504,
         "actorName": "敌军",
         "actorId": 0,
         "dataId": 2004,
@@ -504,7 +504,7 @@
         "randomEnemy": "&"
     },
     {
-        "warId": 4503,
+        "warId": 4504,
         "actorName": "敌军",
         "actorId": 0,
         "dataId": 2005,
@@ -525,7 +525,7 @@
         "randomEnemy": "&"
     },
     {
-        "warId": 4503,
+        "warId": 4504,
         "actorName": "敌军",
         "actorId": 0,
         "dataId": 2006,
@@ -546,7 +546,7 @@
         "randomEnemy": "&"
     },
     {
-        "warId": 4503,
+        "warId": 4504,
         "actorName": "敌军",
         "actorId": 0,
         "dataId": 2007,
@@ -567,7 +567,7 @@
         "randomEnemy": "&"
     },
     {
-        "warId": 4503,
+        "warId": 4504,
         "actorName": "敌军",
         "actorId": 0,
         "dataId": 2008,
@@ -588,7 +588,7 @@
         "randomEnemy": "&"
     },
     {
-        "warId": 4503,
+        "warId": 4504,
         "actorName": "敌军",
         "actorId": 0,
         "dataId": 2009,
@@ -609,7 +609,7 @@
         "randomEnemy": "&"
     },
     {
-        "warId": 4503,
+        "warId": 4504,
         "actorName": "敌军",
         "actorId": 0,
         "dataId": 2010,
@@ -630,7 +630,7 @@
         "randomEnemy": "&"
     },
     {
-        "warId": 4503,
+        "warId": 4504,
         "actorName": "敌军",
         "actorId": 0,
         "dataId": 2011,
@@ -651,7 +651,7 @@
         "randomEnemy": "&"
     },
     {
-        "warId": 4503,
+        "warId": 4504,
         "actorName": "敌军",
         "actorId": 0,
         "dataId": 2012,
@@ -672,7 +672,7 @@
         "randomEnemy": "&"
     },
     {
-        "warId": 4503,
+        "warId": 4504,
         "actorName": "敌军",
         "actorId": 0,
         "dataId": 2013,
@@ -693,7 +693,7 @@
         "randomEnemy": "&"
     },
     {
-        "warId": 4503,
+        "warId": 4504,
         "actorName": "敌军",
         "actorId": 0,
         "dataId": 2014,
@@ -714,7 +714,7 @@
         "randomEnemy": "&"
     },
     {
-        "warId": 4503,
+        "warId": 4504,
         "actorName": "敌军",
         "actorId": 0,
         "dataId": 2015,
@@ -735,7 +735,7 @@
         "randomEnemy": "&"
     },
     {
-        "warId": 4503,
+        "warId": 4504,
         "actorName": "敌军",
         "actorId": 0,
         "dataId": 2016,
@@ -756,7 +756,7 @@
         "randomEnemy": "351&346&340"
     },
     {
-        "warId": 4503,
+        "warId": 4504,
         "actorName": "敌军",
         "actorId": 0,
         "dataId": 2017,
@@ -777,7 +777,7 @@
         "randomEnemy": "&"
     },
     {
-        "warId": 4503,
+        "warId": 4504,
         "actorName": "敌军",
         "actorId": 0,
         "dataId": 2018,
@@ -798,7 +798,7 @@
         "randomEnemy": "&"
     },
     {
-        "warId": 4503,
+        "warId": 4504,
         "actorName": "敌军",
         "actorId": 0,
         "dataId": 2019,
@@ -819,7 +819,7 @@
         "randomEnemy": "&"
     },
     {
-        "warId": 4503,
+        "warId": 4504,
         "actorName": "敌军",
         "actorId": 0,
         "dataId": 2020,
@@ -840,7 +840,7 @@
         "randomEnemy": "&"
     },
     {
-        "warId": 4503,
+        "warId": 4504,
         "actorName": "敌军",
         "actorId": 0,
         "dataId": 2021,
@@ -861,7 +861,7 @@
         "randomEnemy": "302&325&319"
     },
     {
-        "warId": 4503,
+        "warId": 4504,
         "actorName": "敌军",
         "actorId": 0,
         "dataId": 2022,
@@ -882,7 +882,7 @@
         "randomEnemy": "&"
     },
     {
-        "warId": 4503,
+        "warId": 4504,
         "actorName": "敌军",
         "actorId": 0,
         "dataId": 2023,
@@ -903,7 +903,7 @@
         "randomEnemy": "&"
     },
     {
-        "warId": 4503,
+        "warId": 4504,
         "actorName": "敌军",
         "actorId": 0,
         "dataId": 2024,
@@ -924,7 +924,7 @@
         "randomEnemy": "349&332&316"
     },
     {
-        "warId": 4503,
+        "warId": 4504,
         "actorName": "敌军",
         "actorId": 0,
         "dataId": 2025,
@@ -945,7 +945,7 @@
         "randomEnemy": "&"
     },
     {
-        "warId": 4503,
+        "warId": 4504,
         "actorName": "敌军",
         "actorId": 0,
         "dataId": 2026,
@@ -966,7 +966,7 @@
         "randomEnemy": "&"
     },
     {
-        "warId": 4503,
+        "warId": 4504,
         "actorName": "敌军",
         "actorId": 0,
         "dataId": 2027,
@@ -987,7 +987,7 @@
         "randomEnemy": "322&314&305"
     },
     {
-        "warId": 4503,
+        "warId": 4504,
         "actorName": "敌军",
         "actorId": 0,
         "dataId": 2028,
@@ -1008,7 +1008,7 @@
         "randomEnemy": "&"
     },
     {
-        "warId": 4503,
+        "warId": 4504,
         "actorName": "敌军",
         "actorId": 0,
         "dataId": 2029,
@@ -1029,7 +1029,7 @@
         "randomEnemy": "313&328&340"
     },
     {
-        "warId": 4503,
+        "warId": 4504,
         "actorName": "敌军",
         "actorId": 0,
         "dataId": 2030,
@@ -1050,7 +1050,7 @@
         "randomEnemy": "304&312&321"
     },
     {
-        "warId": 4503,
+        "warId": 4504,
         "actorName": "敌军",
         "actorId": 0,
         "dataId": 2031,
@@ -1071,7 +1071,7 @@
         "randomEnemy": "&"
     },
     {
-        "warId": 4503,
+        "warId": 4504,
         "actorName": "敌军",
         "actorId": 0,
         "dataId": 2032,
@@ -1092,7 +1092,7 @@
         "randomEnemy": "&"
     },
     {
-        "warId": 4503,
+        "warId": 4504,
         "actorName": "敌军",
         "actorId": 0,
         "dataId": 2033,
@@ -1113,7 +1113,7 @@
         "randomEnemy": "&"
     },
     {
-        "warId": 4503,
+        "warId": 4504,
         "actorName": "敌军",
         "actorId": 0,
         "dataId": 2034,
@@ -1134,7 +1134,7 @@
         "randomEnemy": "&"
     },
     {
-        "warId": 4503,
+        "warId": 4504,
         "actorName": "敌军",
         "actorId": 0,
         "dataId": 2035,
@@ -1155,7 +1155,7 @@
         "randomEnemy": "&"
     },
     {
-        "warId": 4503,
+        "warId": 4504,
         "actorName": "敌军",
         "actorId": 0,
         "dataId": 2036,
@@ -1176,7 +1176,7 @@
         "randomEnemy": "&"
     },
     {
-        "warId": 4503,
+        "warId": 4504,
         "actorName": "敌军",
         "actorId": 0,
         "dataId": 2037,
@@ -1197,7 +1197,7 @@
         "randomEnemy": "&"
     },
     {
-        "warId": 4503,
+        "warId": 4504,
         "actorName": "敌军",
         "actorId": 0,
         "dataId": 2038,
@@ -1218,7 +1218,7 @@
         "randomEnemy": "&"
     },
     {
-        "warId": 4503,
+        "warId": 4504,
         "actorName": "敌军",
         "actorId": 0,
         "dataId": 2039,